From 86b070ed0699a4812630dd72b13a54d461c5f070 Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Wed, 29 May 2024 16:04:11 +0300 Subject: [PATCH] [otel-integration] fix allow setting dimensions for otel collector --- otel-integration/CHANGELOG.md | 4 ++++ otel-integration/k8s-helm/Chart.yaml | 10 +++++----- otel-integration/k8s-helm/e2e-test/expected_test.go | 4 ++-- otel-integration/k8s-helm/e2e-test/main_test.go | 4 ++++ otel-integration/k8s-helm/values.yaml | 10 +++++++++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md index 01ab5354..ff651768 100644 --- a/otel-integration/CHANGELOG.md +++ b/otel-integration/CHANGELOG.md @@ -2,6 +2,10 @@ ## OpenTelemtry-Integration +### v0.0.74 / 2024-05-28 +- [FEAT] Bump Collector to 0.101.0 +- [FEAT] Allow setting dimensions to spanMetricsMulti preset + ### v0.0.73 / 2024-05-28 - [FEAT] Bump Helm chart dependencies. - [FEAT] Allowing loadBalancing presets dns configs (timout and resolver interval). diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml index 0b3a64fe..81da6ece 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.73 +version: 0.0.74 keywords: - OpenTelemetry Collector - OpenTelemetry Agent @@ -11,22 +11,22 @@ keywords: dependencies: - name: opentelemetry-collector alias: opentelemetry-agent - version: "0.84.1" + version: "0.85.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-agent.enabled - name: opentelemetry-collector alias: opentelemetry-agent-windows - version: "0.84.1" + version: "0.85.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-agent-windows.enabled - name: opentelemetry-collector alias: opentelemetry-cluster-collector - version: "0.84.1" + version: "0.85.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-cluster-collector.enabled - name: opentelemetry-collector alias: opentelemetry-gateway - version: "0.84.1" + version: "0.85.0" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-gateway.enabled sources: diff --git a/otel-integration/k8s-helm/e2e-test/expected_test.go b/otel-integration/k8s-helm/e2e-test/expected_test.go index 35074f6a..f1ee4329 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.100.0" +const expectedScopeVersion = "0.101.0" var expectedScopeNames = map[string]bool{ "otelcol/hostmetricsreceiver/network": false, @@ -127,7 +127,7 @@ var expectedMetrics map[string]bool = map[string]bool{ "otelcol_process_runtime_total_sys_memory_bytes": false, "otelcol_process_uptime": false, "otelcol_processor_accepted_metric_points": false, - "otelcol_processor_batch_metadata_cardinality": false, + "otelcol_processor_batch_": false, "otelcol_receiver_refused_log_records": false, "otelcol_receiver_refused_metric_points": false, "otelcol_processor_dropped_metric_points": false, diff --git a/otel-integration/k8s-helm/e2e-test/main_test.go b/otel-integration/k8s-helm/e2e-test/main_test.go index a9262147..786e7c54 100644 --- a/otel-integration/k8s-helm/e2e-test/main_test.go +++ b/otel-integration/k8s-helm/e2e-test/main_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + "github.com/davecgh/go-spew/spew" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" @@ -109,6 +110,9 @@ func checkScopeMetrics(t *testing.T, rmetrics pmetric.ResourceMetrics) error { if ok { expectedMetrics[metric.Name()] = true } + if !ok { + spew.Dump(metric) + } require.True(t, ok, "metrics %v does not match one of the expected values", metric.Name()) } } diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml index bd0229c7..12e04c17 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.73" + version: "0.0.74" extensions: kubernetesDashboard: @@ -136,6 +136,10 @@ opentelemetry-agent: enabled: false collectionInterval: "{{.Values.global.collectionInterval}}" metricsExpiration: 5m + extraDimensions: + - name: http.method + - name: cgx.transaction + - name: cgx.transaction.root defaultHistogramBuckets: [1ms, 4ms, 10ms, 20ms, 50ms, 100ms, 200ms, 500ms, 1s, 2s, 5s] configs: [] @@ -375,6 +379,10 @@ opentelemetry-cluster-collector: enabled: true clusterName: "{{.Values.global.clusterName}}" integrationName: "coralogix-integration-helm" + # Removes uids and other uneeded attributes from metric resources. + # This reduces target_info cardinality. + reduceResourceAttributes: + enabled: false extraEnvs: - name: CORALOGIX_PRIVATE_KEY