Update OTel Deps

.github/workflows/ci.yml

@@ -739,7 +739,7 @@ jobs:
           benchmark-data-dir-path: ""
           # Set auto-push to false since GitHub API token is not given
           auto-push: false
-          alert-threshold: '170%'
+          alert-threshold: '185%'
           gh-pages-branch: "benchmark-results"
           fail-on-alert: true
       - name: Push benchmark result

internal/collector/containermetricsreceiver/metadata.yaml

@@ -1,4 +1,4 @@
-type: containermetrics
+type: container_metrics
 
 status:
   class: receiver

internal/collector/otelcol.tmpl

@@ -1,13 +1,13 @@
 receivers:
 {{- if ne .Receivers.ContainerMetrics nil }}
-  containermetrics:
+  container_metrics:
     {{- if .Receivers.ContainerMetrics.CollectionInterval }}
     collection_interval: {{ .Receivers.ContainerMetrics.CollectionInterval }}
     {{- end}}
 {{- end }}
 
 {{- if ne .Receivers.HostMetrics nil }}
-  hostmetrics:
+  host_metrics:
     {{- if .Receivers.HostMetrics.CollectionInterval }}
     collection_interval: {{ .Receivers.HostMetrics.CollectionInterval }}
     {{- end}}
@@ -275,14 +275,7 @@ service:
     metrics/{{$pipelineName}}:
       receivers:
         {{- range $receiver := $pipeline.Receivers }}
-          {{- if eq $receiver "host_metrics" }}
-            {{- if ne $.Receivers.ContainerMetrics nil }}
-        - containermetrics
-            {{- end }}
-            {{- if ne $.Receivers.HostMetrics nil }}
-        - hostmetrics
-            {{- end }}
-          {{- else if eq $receiver "nginx_metrics" }}
+          {{- if eq $receiver "nginx_metrics" }}
             {{- range $.Receivers.NginxReceivers }}
             {{- if gt (len $.Receivers.NginxReceivers) 1 }}
         - nginx/{{- .InstanceID -}}

internal/collector/settings_test.go

@@ -192,7 +192,7 @@ func TestTemplateWrite(t *testing.T) {
 	cfg.Collector.Pipelines.Metrics = make(map[string]*config.Pipeline)
 	cfg.Collector.Pipelines.Metrics["default"] = &config.Pipeline{
 		Receivers: []string{
-			"hostmetrics", "containermetrics",
+			"host_metrics", "container_metrics",
 			"otlp/default", "nginx", "nginxplus/456", "nginxplus/789",
 		},
 		Processors: []string{"resource/default", "batch/default"},

internal/collector/testdata/merge_config.yaml

@@ -30,7 +30,7 @@ processors:
       key: resource.id
       value: f16dedd7-929f-3642-b823-4ac8d295cc23
 receivers:
-  hostmetrics:
+  host_metrics:
     collection_interval: 1m0s
     initial_delay: 1s
     scrapers:
@@ -57,7 +57,7 @@ service:
       - batch/default_metrics
       - resource/default
       receivers:
-      - hostmetrics
+      - host_metrics
     metrics/prometheus-example-pipeline:
       exporters:
       - prometheus

internal/collector/testdata/otel_config.yaml

@@ -1,5 +1,5 @@
 receivers:
-  hostmetrics:
+  host_metrics:
     collection_interval: 1m0s
     initial_delay: 1s
     scrapers:
@@ -56,7 +56,7 @@ service:
   pipelines:
     metrics/default:
       receivers:
-        - hostmetrics
+        - host_metrics
       processors:
         - batch/default_metrics
         - resource/default

internal/config/config.go

@@ -214,9 +214,20 @@ func addDefaultPipelines(collector *Collector) {
 	if collector.Pipelines.Metrics == nil {
 		collector.Pipelines.Metrics = make(map[string]*Pipeline)
 	}
+
+	isContainer, err := host.NewInfo().IsContainer()
+	if err != nil {
+		slog.Debug("No container information found", "error", err)
+	}
+	receivers := []string{"host_metrics", "nginx_metrics"}
+	if isContainer {
+		receivers = append(receivers, "container_metrics")
+	}
+
+	// add check if container and nginx plus or oss
 	if _, ok := collector.Pipelines.Metrics[DefaultPipeline]; !ok {
 		collector.Pipelines.Metrics[DefaultPipeline] = &Pipeline{
-			Receivers:  []string{"host_metrics", "nginx_metrics"},
+			Receivers:  receivers,
 			Processors: []string{"batch/default_metrics"},
 			Exporters:  []string{"otlp_grpc/default"},
 		}
@@ -1248,6 +1259,10 @@ func resolvePipelines() Pipelines {
 		}
 	}
 
+	if metricsPipelines["default"] != nil && slices.Contains(metricsPipelines["default"].Receivers, "host_metrics") {
+		metricsPipelines["default"].Receivers = append(metricsPipelines["default"].Receivers, "container_metrics")
+	}
+
 	var logsPipelines map[string]*Pipeline
 
 	if viperInstance.IsSet(CollectorLogsPipelinesKey) {

internal/config/config_test.go

@@ -71,6 +71,7 @@ func TestResolveConfig(t *testing.T) {
 		headers := actual.Collector.Extensions.HeadersSetter.Headers
 		return headers[i].Key < headers[j].Key
 	})
+
 	assert.Equal(t, createConfig(), actual)
 }
 

test/config/collector/test-opentelemetry-collector-agent.yaml

@@ -1,7 +1,7 @@
 receivers:
-  containermetrics:
+  container_metrics:
     collection_interval: 1s
-  hostmetrics:
+  host_metrics:
     collection_interval: 1m0s
     initial_delay: 1s
     scrapers:
@@ -123,8 +123,8 @@ service:
   pipelines:
     metrics/default:
       receivers:
-        - hostmetrics
-        - containermetrics
+        - host_metrics
+        - container_metrics
         - otlp/default
         - nginx
         - nginxplus/456