PR feedback

Author: aphralG

api/grpc/mpi/v1/command.pb.go

@@ -45,6 +45,7 @@ const (
 		`? (let utcTime = ` +
 		`date(timestamp).UTC(); utcTime.Format("Jan  2 15:04:05")) : date(timestamp).Format("Jan 02 15:04:05"); ` +
 		`split(body, ">")[0] + ">" + newTimestamp + " " + split(body, " ", 2)[1])'`
+	debugOTelConfigPath = "/var/lib/nginx-agent/opentelemetry-collector-agent-debug.yaml"
 )
 
 type (
@@ -388,7 +389,7 @@ func (oc *Collector) updateHeadersSetterExtension(
 
 func (oc *Collector) writeRunningConfig(ctx context.Context, settings otelcol.CollectorSettings) error {
 	slog.DebugContext(ctx, "Writing running OTel collector config", "path",
-		"/var/lib/nginx-agent/opentelemetry-collector-agent-debug.yaml")
+		debugOTelConfigPath)
 	resolver, err := confmap.NewResolver(settings.ConfigProviderSettings.ResolverSettings)
 	if err != nil {
 		return fmt.Errorf("unable to create resolver: %w", err)
@@ -403,7 +404,7 @@ func (oc *Collector) writeRunningConfig(ctx context.Context, settings otelcol.Co
 		return fmt.Errorf("error while marshaling to YAML: %w", err)
 	}
 
-	writeErr := os.WriteFile("/var/lib/nginx-agent/opentelemetry-collector-agent-debug.yaml", b, filePermission)
+	writeErr := os.WriteFile(debugOTelConfigPath, b, filePermission)
 	if writeErr != nil {
 		return fmt.Errorf("error while writing debug config: %w", err)
 	}

api/grpc/mpi/v1/common.pb.go

@@ -72,8 +72,8 @@ func createConverterFactories() []confmap.ConverterFactory {
 
 func createURIs(cfg *config.Config) []string {
 	configFiles := []string{cfg.Collector.ConfigPath}
-	configFiles = slices.Concat(configFiles, cfg.Collector.AdditionalPaths)
-	slog.Info("Additional config files:", "", configFiles)
+	configFiles = slices.Concat(configFiles, cfg.Collector.AdditionalConfigPaths)
+	slog.Info("Merging additional OTel config files", "config_files", configFiles)
 
 	return configFiles
 }

api/grpc/mpi/v1/files.pb.go

@@ -1061,14 +1061,14 @@ func resolveCollector(allowedDirs []string) (*Collector, error) {
 	}
 
 	col := &Collector{
-		ConfigPath:      viperInstance.GetString(CollectorConfigPathKey),
-		AdditionalPaths: viperInstance.GetStringSlice(CollectorAdditionalConfigPathsKey),
-		Exporters:       exporters,
-		Processors:      resolveProcessors(),
-		Receivers:       receivers,
-		Extensions:      resolveExtensions(),
-		Log:             resolveCollectorLog(),
-		Pipelines:       resolvePipelines(),
+		ConfigPath:            viperInstance.GetString(CollectorConfigPathKey),
+		AdditionalConfigPaths: viperInstance.GetStringSlice(CollectorAdditionalConfigPathsKey),
+		Exporters:             exporters,
+		Processors:            resolveProcessors(),
+		Receivers:             receivers,
+		Extensions:            resolveExtensions(),
+		Log:                   resolveCollectorLog(),
+		Pipelines:             resolvePipelines(),
 	}
 
 	// Check for self-signed certificate true in Agent conf

internal/collector/otel_collector_plugin.go

@@ -1112,8 +1112,8 @@ func createConfig() *Config {
 			},
 		},
 		Collector: &Collector{
-			ConfigPath:      "/etc/nginx-agent/nginx-agent-otelcol.yaml",
-			AdditionalPaths: []string{"/configs/my_config.yaml", "/etc/nginx-agent/nginx-agent-otelcol.yaml"},
+			ConfigPath:            "/etc/nginx-agent/nginx-agent-otelcol.yaml",
+			AdditionalConfigPaths: []string{"/configs/my_config.yaml", "/etc/nginx-agent/nginx-agent-otelcol.yaml"},
 			Exporters: Exporters{
 				OtlpExporters: map[string]*OtlpExporter{
 					"default": {

internal/collector/settings.go

@@ -105,14 +105,14 @@ type (
 	}
 
 	Collector struct {
-		ConfigPath      string     `yaml:"config_path"             mapstructure:"config_path"`
-		AdditionalPaths []string   `yaml:"additional_config_paths" mapstructure:"additional_config_paths"`
-		Log             *Log       `yaml:"log"                     mapstructure:"log"`
-		Exporters       Exporters  `yaml:"exporters"               mapstructure:"exporters"`
-		Extensions      Extensions `yaml:"extensions"              mapstructure:"extensions"`
-		Processors      Processors `yaml:"processors"              mapstructure:"processors"`
-		Pipelines       Pipelines  `yaml:"pipelines"               mapstructure:"pipelines"`
-		Receivers       Receivers  `yaml:"receivers"               mapstructure:"receivers"`
+		ConfigPath            string     `yaml:"config_path"             mapstructure:"config_path"`
+		AdditionalConfigPaths []string   `yaml:"additional_config_paths" mapstructure:"additional_config_paths"`
+		Log                   *Log       `yaml:"log"                     mapstructure:"log"`
+		Exporters             Exporters  `yaml:"exporters"               mapstructure:"exporters"`
+		Extensions            Extensions `yaml:"extensions"              mapstructure:"extensions"`
+		Processors            Processors `yaml:"processors"              mapstructure:"processors"`
+		Pipelines             Pipelines  `yaml:"pipelines"               mapstructure:"pipelines"`
+		Receivers             Receivers  `yaml:"receivers"               mapstructure:"receivers"`
 	}
 
 	Pipelines struct {
@@ -365,7 +365,7 @@ func (col *Collector) Validate(allowedDirectories []string) error {
 		err = errors.Join(err, nginxReceiver.Validate(allowedDirectories))
 	}
 
-	for _, path := range col.AdditionalPaths {
+	for _, path := range col.AdditionalConfigPaths {
 		cleanPath := filepath.Clean(path)
 		pathAllowed := isAllowedDir(cleanPath, allowedDirectories)
 		if !pathAllowed {