From fc26bd9cf138f177b89354f1cf67ab0a5da5dcf5 Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Fri, 28 Feb 2025 09:25:15 +0200 Subject: [PATCH] [otel-integration] Update opentelemetry collector v0.120.0 --- otel-integration/CHANGELOG.md | 4 + otel-integration/k8s-helm/Chart.yaml | 12 +-- .../k8s-helm/e2e-test/expected_test.go | 79 +++++++++++++++++-- .../k8s-helm/e2e-test/main_test.go | 4 + otel-integration/k8s-helm/values.yaml | 2 +- 5 files changed, 87 insertions(+), 14 deletions(-) diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md index e426694c..71daaaa6 100644 --- a/otel-integration/CHANGELOG.md +++ b/otel-integration/CHANGELOG.md @@ -2,6 +2,10 @@ ## OpenTelemtry-Integration +### v0.0.150 / 2025-02-29 + +- [Feat] Upgrade OpenTelemetry Collector to `0.120.0` + ### v0.0.149 / 2025-02-27 - [Feat] Upgrade OpenTelemetry Collector to `0.119.0` diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml index 9a22bbf4..5e45b944 100644 --- a/otel-integration/k8s-helm/Chart.yaml +++ b/otel-integration/k8s-helm/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: otel-integration description: OpenTelemetry Integration -version: 0.0.149 +version: 0.0.150 keywords: - OpenTelemetry Collector - OpenTelemetry Agent @@ -11,27 +11,27 @@ keywords: dependencies: - name: opentelemetry-collector alias: opentelemetry-agent - version: "0.107.1" + version: "0.108.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-agent.enabled - name: opentelemetry-collector alias: opentelemetry-agent-windows - version: "0.107.1" + version: "0.108.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-agent-windows.enabled - name: opentelemetry-collector alias: opentelemetry-cluster-collector - version: "0.107.1" + version: "0.108.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-cluster-collector.enabled - name: opentelemetry-collector alias: opentelemetry-receiver - version: "0.107.1" + version: "0.108.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-receiver.enabled - name: opentelemetry-collector alias: opentelemetry-gateway - version: "0.107.1" + version: "0.108.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-gateway.enabled - name: coralogix-ebpf-agent diff --git a/otel-integration/k8s-helm/e2e-test/expected_test.go b/otel-integration/k8s-helm/e2e-test/expected_test.go index 69e13468..645a8084 100644 --- a/otel-integration/k8s-helm/e2e-test/expected_test.go +++ b/otel-integration/k8s-helm/e2e-test/expected_test.go @@ -56,6 +56,7 @@ var expectedResourceAttributesKubeletstatreceiver = map[string]string{ "k8s.pod.uid": "", "k8s.statefulset.name": "", "os.type": "linux", + "service.version": "", } var expectedResourceAttributesHostmetricsreceiver = map[string]string{ @@ -80,6 +81,7 @@ var expectedResourceAttributesHostmetricsreceiver = map[string]string{ "process.owner": "", "process.parent_pid": "", "process.pid": "", + "service.version": "", } var expectedResourceAttributesK8sattributesprocessor = map[string]string{ @@ -91,7 +93,7 @@ var expectedResourceAttributesK8sattributesprocessor = map[string]string{ "http.scheme": "", "server.port": "", "url.scheme": "", - "cx_agent_type": "", + "cx.agent.type": "", "k8s_node_name": "", "service_instance_id": "", "cx.otel_integration.name": "coralogix-integration-helm", @@ -112,10 +114,42 @@ var expectedResourceAttributesK8sattributesprocessor = map[string]string{ "azure.vm.size": "", "azure.vm.scaleset.name": "", "azure.resourcegroup.name": "", + "service.version": "", +} + +var expectedResourceAttributesService = map[string]string{ + "service.name": "opentelemetry-collector", + "net.host.name": "", + "server.address": "", + "k8s.pod.ip": "", + "net.host.port": "", + "http.scheme": "http", + "server.port": "", + "url.scheme": "", + "cx.agent.type": "", + "k8s.node.name": "", + "service.version": "", + "k8s.cluster.name": "otel-integration-agent-e2e", + "cx.otel_integration.name": "coralogix-integration-helm", + "k8s.pod.name": "", + "k8s.namespace.name": "", + "k8s.daemonset.name": "", + "host.name": "", + "os.type": "linux", + "host.id": "", + "cloud.provider": "azure", + "cloud.platform": "azure_vm", + "cloud.region": "", + "cloud.account.id": "", + "azure.vm.name": "", + "azure.vm.size": "", + "azure.vm.scaleset.name": "", + "azure.resourcegroup.name": "", } var expectedResourceAttributesMemorylimiterprocessor = map[string]string{ "service.name": "opentelemetry-collector", + "service.version": "", "net.host.name": "", "server.address": "", "k8s.pod.ip": "", @@ -123,11 +157,11 @@ var expectedResourceAttributesMemorylimiterprocessor = map[string]string{ "http.scheme": "http", "server.port": "", "url.scheme": "", - "cx_agent_type": "", + "cx.agent.type": "", "k8s_node_name": "", "service_instance_id": "", "cx.otel_integration.name": "coralogix-integration-helm", - "service_version": expectedScopeVersion, + "service_version": "", "k8s.cluster.name": "otel-integration-agent-e2e", "k8s.pod.name": "", "k8s.namespace.name": "", @@ -161,6 +195,7 @@ var expectedResourceAttributesLoadscraper = map[string]string{ "azure.vm.size": "", "azure.vm.scaleset.name": "", "azure.resourcegroup.name": "", + "service.version": "", } var expectedResourceAttributesPrometheusreceiver = map[string]string{ @@ -189,12 +224,11 @@ var expectedResourceAttributesPrometheusreceiver = map[string]string{ "os.type": "linux", "server.address": "", "server.port": "", - "service_version": expectedScopeVersion, - "service.instance.id": "", + "service.version": "", + "service_instance_id": "", "service.name": "opentelemetry-collector", "url.scheme": "", - "cx_agent_type": "", - "service_instance_id": "", + "cx.agent.type": "", } var expectedResourceAttributesProcessscraper = map[string]string{ @@ -218,6 +252,37 @@ var expectedResourceAttributesProcessscraper = map[string]string{ "azure.vm.size": "", "azure.vm.scaleset.name": "", "azure.resourcegroup.name": "", + "service.version": "", +} + +var expectedResourceAttributesProcessorhelper = map[string]string{ + "service.name": "opentelemetry-collector", + "net.host.name": "", + "server.address": "", + "k8s.pod.ip": "", + "net.host.port": "", + "http.scheme": "http", + "server.port": "", + "url.scheme": "", + "cx.agent.type": "", + "k8s.node.name": "otel-integration-agent-e2e-control-plane", + "service.version": "", + "k8s.cluster.name": "otel-integration-agent-e2e", + "cx.otel_integration.name": "coralogix-integration-helm", + "k8s.pod.name": "", + "k8s.namespace.name": "", + "k8s.daemonset.name": "", + "host.name": "", + "os.type": "linux", + "host.id": "", + "cloud.provider": "azure", + "cloud.platform": "azure_vm", + "cloud.region": "", + "cloud.account.id": "", + "azure.vm.name": "", + "azure.vm.size": "", + "azure.vm.scaleset.name": "", + "azure.resourcegroup.name": "", } var expectedMetrics map[string]bool = map[string]bool{ diff --git a/otel-integration/k8s-helm/e2e-test/main_test.go b/otel-integration/k8s-helm/e2e-test/main_test.go index 1de526ff..9ca48466 100644 --- a/otel-integration/k8s-helm/e2e-test/main_test.go +++ b/otel-integration/k8s-helm/e2e-test/main_test.go @@ -194,6 +194,10 @@ func checkResourceAttributes(t *testing.T, attributes pcommon.Map, scopeName str compareMap = expectedResourceAttributesMemorylimiterprocessor case "processscraper": compareMap = expectedResourceAttributesProcessscraper + case "service": + compareMap = expectedResourceAttributesService + case "processorhelper": + compareMap = expectedResourceAttributesProcessorhelper default: compareMap = expectedResourceAttributesMemorylimiterprocessor } diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml index 155cafea..77e10644 100644 --- a/otel-integration/k8s-helm/values.yaml +++ b/otel-integration/k8s-helm/values.yaml @@ -5,7 +5,7 @@ global: defaultSubsystemName: "integration" logLevel: "warn" collectionInterval: "30s" - version: "0.0.149" + version: "0.0.150" extensions: kubernetesDashboard: