Fix collector extensions config (#870)

nginx · Sep 26, 2024 · 011a0f9 · 011a0f9
1 parent ff2a1fb
commit 011a0f9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/internal/collector/otelcol.tmpl b/internal/collector/otelcol.tmpl
@@ -138,8 +138,13 @@ service:
       output_paths: ["{{ .Log.Path -}}"]
       error_output_paths: ["{{ .Log.Path -}}"]
   {{- end}}
+
+  {{- if ne .Extensions nil }}
   extensions:
+    {{- if ne .Extensions.Health nil }}
     - health_check
+    {{- end}}
+  {{- end}}
   pipelines:
     metrics:
       receivers:

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -366,7 +366,7 @@ func getAgentConfig() *Config {
 				},
 			},
 			Extensions: Extensions{
-				Health: Health{
+				Health: &Health{
 					Server: &ServerConfig{
 						Host: "localhost",
 						Port: 1337,

diff --git a/internal/config/types.go b/internal/config/types.go
@@ -95,7 +95,7 @@ type (
 	}
 
 	Extensions struct {
-		Health Health `yaml:"-" mapstructure:"health"`
+		Health *Health `yaml:"-" mapstructure:"health"`
 	}
 
 	Health struct {

diff --git a/test/mock/collector/nginx-agent.conf b/test/mock/collector/nginx-agent.conf
@@ -51,7 +51,7 @@ collector:
           key: /tmp/key.pem
           generate_self_signed_cert: true
   processors:
-    batch:
+    batch: {}
   exporters:
     otlp_exporters:
       - server:

diff --git a/test/types/config.go b/test/types/config.go
@@ -84,7 +84,7 @@ func AgentConfig() *config.Config {
 				},
 			},
 			Extensions: config.Extensions{
-				Health: config.Health{
+				Health: &config.Health{
 					Server: &config.ServerConfig{
 						Host: "localhost",
 						Port: randomPort3,