[otel-integration] fix allow setting dimensions for otel collector

coralogix · May 29, 2024 · c21f90a · c21f90a
1 parent 83d65f6
commit c21f90a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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,
@@ -149,4 +149,5 @@ var expectedMetrics map[string]bool = map[string]bool{
 	"otelcol_processor_batch_timeout_trigger_send":   false,
 	"otelcol_exporter_send_failed_log_records":       false,
 	"otelcol_processor_batch_batch_send_size":        false,
+	"otelcol_processor_batch_":                       false,
 }
diff --git 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
@@ -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: []