set error_output_paths and output_paths defaults

Signed-off-by: alex boten <[email protected]>

Author: codeboten

cmd/opampsupervisor/supervisor/config/config.go

@@ -237,8 +237,9 @@ type Telemetry struct {
 }
 
 type Logs struct {
-	Level       zapcore.Level `mapstructure:"level"`
-	OutputPaths []string      `mapstructure:"output_paths"`
+	Level            zapcore.Level `mapstructure:"level"`
+	ErrorOutputPaths []string      `mapstructure:"error_output_paths"`
+	OutputPaths      []string      `mapstructure:"output_paths"`
 	// Processors allow configuration of log record processors to emit logs to
 	// any number of supported backends.
 	Processors []config.LogRecordProcessor `mapstructure:"processors,omitempty"`
@@ -288,8 +289,9 @@ func DefaultSupervisor() Supervisor {
 		},
 		Telemetry: Telemetry{
 			Logs: Logs{
-				Level:       zapcore.InfoLevel,
-				OutputPaths: []string{"stderr"},
+				Level:            zapcore.InfoLevel,
+				OutputPaths:      []string{"stdout"},
+				ErrorOutputPaths: []string{"stderr"},
 			},
 		},
 	}

cmd/opampsupervisor/supervisor/config/config_test.go

@@ -541,6 +541,7 @@ agent:
 telemetry:
   logs:
     level: warn
+    error_output_paths: ["stderr"]
     output_paths: ["stdout"]
 `
 				config = fmt.Sprintf(config, filepath.Join(tmpDir, "storage"), executablePath)
@@ -584,8 +585,9 @@ telemetry:
 					},
 					Telemetry: Telemetry{
 						Logs: Logs{
-							Level:       zapcore.WarnLevel,
-							OutputPaths: []string{"stdout"},
+							Level:            zapcore.WarnLevel,
+							OutputPaths:      []string{"stdout"},
+							ErrorOutputPaths: []string{"stderr"},
 						},
 					},
 				}

cmd/opampsupervisor/supervisor/supervisor_test.go

@@ -534,6 +534,10 @@ service:
     telemetry:
         logs:
             encoding: json
+            error_output_paths:
+                - stderr
+            output_paths:
+                - stdout
         resource: null
 `
 
@@ -630,6 +634,10 @@ service:
     telemetry:
         logs:
             encoding: json
+            error_output_paths:
+                - stderr
+            output_paths:
+                - stdout
         resource: null
 `
 
@@ -793,6 +801,10 @@ service:
     telemetry:
         logs:
             encoding: json
+            error_output_paths:
+                - stderr
+            output_paths:
+                - stdout
         resource: null
 `
 
@@ -1494,6 +1506,10 @@ service:
     telemetry:
         logs:
             encoding: json
+            error_output_paths:
+                - stderr
+            output_paths:
+                - stdout
             processors:
                 - batch:
                     exporter:

cmd/opampsupervisor/supervisor/templates/extraconfig.yaml

@@ -3,6 +3,10 @@ service:
     logs:
       # Enables JSON log output for the Agent.
       encoding: json
+      # Ensure logs and errors are using the correct output
+      # channel
+      error_output_paths: ["stderr"]
+      output_paths: ["stdout"]
     resource:
       # Set resource attributes suggested by the OpAMP spec.
       # See https://github.com/open-telemetry/opamp-spec/blob/main/specification.md#agentdescription-message

cmd/opampsupervisor/supervisor/testdata/merged_effective_config.yaml

@@ -44,5 +44,7 @@ service:
   telemetry:
     logs:
       encoding: json
+      error_output_paths: ["stderr"]
+      output_paths: ["stdout"]
     resource:
       service.name: otelcol

cmd/opampsupervisor/supervisor/testdata/merged_local_config.yaml

@@ -33,5 +33,7 @@ service:
   telemetry:
     logs:
       encoding: json
+      error_output_paths: ["stderr"]
+      output_paths: ["stdout"]
     resource:
       service.name: otelcol

cmd/opampsupervisor/testdata/collector/effective_config.yaml

@@ -37,5 +37,7 @@ service:
     telemetry:
         logs:
             encoding: json
+            error_output_paths: ["stderr"]
+            output_paths: ["stdout"]
         resource:
             service.name: otelcol

cmd/opampsupervisor/testdata/collector/effective_config_without_extensions.yaml

@@ -35,5 +35,7 @@ service:
     telemetry:
         logs:
             encoding: json
+            error_output_paths: ["stderr"]
+            output_paths: ["stdout"]
         resource:
             service.name: otelcol