From cd5d4f60d5b8528b50b88cb8772301ed6d873221 Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Fri, 30 Aug 2024 12:57:28 +0300 Subject: [PATCH] [opentelemetry-integration] bump collector to 108 --- otel-integration/CHANGELOG.md | 3 + otel-integration/k8s-helm/Chart.yaml | 12 ++-- .../k8s-helm/central-agent-values.yaml | 1 - .../k8s-helm/e2e-test/expected_test.go | 2 +- otel-integration/k8s-helm/values-windows.yaml | 1 - otel-integration/k8s-helm/values.yaml | 60 ++++++++++++------- 6 files changed, 48 insertions(+), 31 deletions(-) diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md index 945839bf..6c3cd1ea 100644 --- a/otel-integration/CHANGELOG.md +++ b/otel-integration/CHANGELOG.md @@ -2,6 +2,9 @@ ## OpenTelemtry-Integration +### v0.0.100 / 2024-08-30 +- [Feat] Bump collector version to `0.108.0` + ### v0.0.99 / 2024-08-29 - [Fix] Change central-agent-values.yaml log level to warn - [Fix] Turn off k8sattributes preset for central collector cluster diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml index ab4eb113..b61f04a3 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.99 +version: 0.0.100 keywords: - OpenTelemetry Collector - OpenTelemetry Agent @@ -11,27 +11,27 @@ keywords: dependencies: - name: opentelemetry-collector alias: opentelemetry-agent - version: "0.90.0" + version: "0.91.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-agent.enabled - name: opentelemetry-collector alias: opentelemetry-agent-windows - version: "0.90.0" + version: "0.91.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-agent-windows.enabled - name: opentelemetry-collector alias: opentelemetry-cluster-collector - version: "0.90.0" + version: "0.91.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-cluster-collector.enabled - name: opentelemetry-collector alias: opentelemetry-receiver - version: "0.90.0" + version: "0.91.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-receiver.enabled - name: opentelemetry-collector alias: opentelemetry-gateway - version: "0.90.0" + version: "0.91.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-gateway.enabled sources: diff --git a/otel-integration/k8s-helm/central-agent-values.yaml b/otel-integration/k8s-helm/central-agent-values.yaml index 7028d76b..100342f4 100644 --- a/otel-integration/k8s-helm/central-agent-values.yaml +++ b/otel-integration/k8s-helm/central-agent-values.yaml @@ -5,7 +5,6 @@ global: defaultSubsystemName: "integration" logLevel: "warn" collectionInterval: "30s" - version: "0.0.97" extensions: kubernetesDashboard: diff --git a/otel-integration/k8s-helm/e2e-test/expected_test.go b/otel-integration/k8s-helm/e2e-test/expected_test.go index 482fee14..b25160e8 100644 --- a/otel-integration/k8s-helm/e2e-test/expected_test.go +++ b/otel-integration/k8s-helm/e2e-test/expected_test.go @@ -5,7 +5,7 @@ var expectedSchemaURL = map[string]bool{ "https://opentelemetry.io/schemas/1.9.0": false, } -const expectedScopeVersion = "0.107.0" +const expectedScopeVersion = "0.108.1" var expectedScopeNames = map[string]bool{ "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/networkscraper": false, diff --git a/otel-integration/k8s-helm/values-windows.yaml b/otel-integration/k8s-helm/values-windows.yaml index d510e0af..2a7621fc 100644 --- a/otel-integration/k8s-helm/values-windows.yaml +++ b/otel-integration/k8s-helm/values-windows.yaml @@ -5,7 +5,6 @@ global: defaultSubsystemName: "integration" logLevel: "warn" collectionInterval: "30s" - version: "0.0.86" extensions: kubernetesDashboard: diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml index f916a841..ad76fb65 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.99" + version: "0.0.100" extensions: kubernetesDashboard: @@ -63,7 +63,7 @@ opentelemetry-agent: # Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information. command: name: otelcol-contrib - extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.strictlyTypedInput"] + extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost"] serviceAccount: # Specifies whether a service account should be created @@ -233,6 +233,13 @@ opentelemetry-agent: - context: resource statements: - set(attributes["k8s.pod.ip"], attributes["net.host.name"]) where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service.instance.id") where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_instance_id") where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_name") where attributes["service.name"] == "opentelemetry-collector" + - context: datapoint + statements: + - delete_key(attributes, "service_instance_id") where resource.attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_name") where resource.attributes["service.name"] == "opentelemetry-collector" k8sattributes: filter: node_from_env_var: KUBE_NODE_NAME @@ -279,10 +286,7 @@ opentelemetry-agent: service: telemetry: resource: - # Supress this attribute, as we don't want the UUID of the collector to be sent, - # instead we rely on instance label generated by Prometheus receiver. - - service.instance.id: - - service.name: + service.name: "opentelemetry-collector" logs: level: "{{ .Values.global.logLevel }}" encoding: json @@ -424,7 +428,7 @@ opentelemetry-cluster-collector: # Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information. command: name: otelcol-contrib - extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.strictlyTypedInput"] + extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost"] extraEnvs: - name: CORALOGIX_PRIVATE_KEY @@ -489,7 +493,14 @@ opentelemetry-cluster-collector: metric_statements: - context: resource statements: - - set(attributes["k8s.pod.ip"], attributes["net.host.name"]) where attributes["service.name"] == "opentelemetry-infrastructure-collector" + - set(attributes["k8s.pod.ip"], attributes["net.host.name"]) where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service.instance.id") where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_instance_id") where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_name") where attributes["service.name"] == "opentelemetry-collector" + - context: datapoint + statements: + - delete_key(attributes, "service_instance_id") where resource.attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_name") where resource.attributes["service.name"] == "opentelemetry-collector" resource/kube-events: attributes: - key: service.name @@ -601,10 +612,7 @@ opentelemetry-cluster-collector: service: telemetry: resource: - # Supress this attribute, as we don't want the UUID of the collector to be sent, - # instead we rely on instance label generated by Prometheus receiver. - - service.instance.id: - - service.name: + service.name: "opentelemetry-collector" logs: level: "{{ .Values.global.logLevel }}" encoding: json @@ -724,7 +732,7 @@ opentelemetry-gateway: # Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information. command: name: otelcol-contrib - extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.strictlyTypedInput"] + extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost"] config: extensions: @@ -795,6 +803,13 @@ opentelemetry-gateway: - context: resource statements: - set(attributes["k8s.pod.ip"], attributes["net.host.name"]) where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service.instance.id") where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_instance_id") where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_name") where attributes["service.name"] == "opentelemetry-collector" + - context: datapoint + statements: + - delete_key(attributes, "service_instance_id") where resource.attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_name") where resource.attributes["service.name"] == "opentelemetry-collector" receivers: prometheus: config: @@ -813,10 +828,7 @@ opentelemetry-gateway: service: telemetry: resource: - # Supress this attribute, as we don't want the UUID of the collector to be sent, - # instead we rely on instance label generated by Prometheus receiver. - - service.instance.id: - - service.name: + service.name: "opentelemetry-collector" logs: level: "{{ .Values.global.logLevel }}" encoding: json @@ -907,7 +919,7 @@ opentelemetry-receiver: # Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information. command: name: otelcol-contrib - extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.strictlyTypedInput"] + extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost"] config: extensions: @@ -978,6 +990,13 @@ opentelemetry-receiver: - context: resource statements: - set(attributes["k8s.pod.ip"], attributes["net.host.name"]) where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service.instance.id") where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_instance_id") where attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_name") where attributes["service.name"] == "opentelemetry-collector" + - context: datapoint + statements: + - delete_key(attributes, "service_instance_id") where resource.attributes["service.name"] == "opentelemetry-collector" + - delete_key(attributes, "service_name") where resource.attributes["service.name"] == "opentelemetry-collector" receivers: prometheus: config: @@ -996,10 +1015,7 @@ opentelemetry-receiver: service: telemetry: resource: - # Supress this attribute, as we don't want the UUID of the collector to be sent, - # instead we rely on instance label generated by Prometheus receiver. - - service.instance.id: - - service.name: + service.name: "opentelemetry-collector" logs: level: "{{ .Values.global.logLevel }}" encoding: json