[opentelemetry-integration] fix otel-gateway / receiver k8sattribute …

…collection (#446)
coralogix · Sep 5, 2024 · 35ac6ac · 35ac6ac
1 parent 5c73a54
commit 35ac6ac
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## OpenTelemtry-Integration
 
+### v0.0.101 / 2024-09-05
+- [Fix] Fix Tail sampling gateway / receiver k8s attribute collection
+
 ### v0.0.100 / 2024-08-30
 - [Feat] Bump collector version to `0.108.0`
 

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.100
+version: 0.0.101
 keywords:
   - OpenTelemetry Collector
   - OpenTelemetry Agent

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.100"
+  version: "0.0.101"
 
   extensions:
     kubernetesDashboard:
@@ -767,6 +767,13 @@ opentelemetry-gateway:
           - "service.name"
     processors:
       # needed for self-monitored otel colector metrics
+      transform/k8s_attributes:
+        metric_statements:
+        - context: resource
+          statements:
+          - set(attributes["k8s.deployment.name"], attributes["k8s.replicaset.name"])
+          - replace_pattern(attributes["k8s.deployment.name"], "^(.*)-[0-9a-zA-Z]+$", "$$1") where attributes["k8s.replicaset.name"] != nil
+          - delete_key(attributes, "k8s.replicaset.name")
       k8sattributes:
         filter:
           node_from_env_var: KUBE_NODE_NAME
@@ -841,6 +848,7 @@ opentelemetry-gateway:
           processors:
             - transform/prometheus
             - k8sattributes
+            - transform/k8s_attributes
             - resourcedetection/env
             - resourcedetection/region
             - memory_limiter
@@ -880,10 +888,10 @@ opentelemetry-receiver:
   service:
     enabled: true
   clusterRole:
-    name: "coralogix-opentelemetry-gateway"
+    name: "coralogix-opentelemetry-receiver"
     create: true
     clusterRoleBinding:
-      name: "coralogix-opentelemetry-gateway"
+      name: "coralogix-opentelemetry-receiver"
     rules:
     - apiGroups: [""]
       resources: ["pods", "namespaces"]
@@ -954,6 +962,13 @@ opentelemetry-receiver:
           - "service.name"
     processors:
       # needed for self-monitored otel colector metrics
+      transform/k8s_attributes:
+        metric_statements:
+        - context: resource
+          statements:
+          - set(attributes["k8s.deployment.name"], attributes["k8s.replicaset.name"])
+          - replace_pattern(attributes["k8s.deployment.name"], "^(.*)-[0-9a-zA-Z]+$", "$$1") where attributes["k8s.replicaset.name"] != nil
+          - delete_key(attributes, "k8s.replicaset.name")
       k8sattributes:
         filter:
           node_from_env_var: KUBE_NODE_NAME
@@ -1028,6 +1043,7 @@ opentelemetry-receiver:
           processors:
             - transform/prometheus
             - k8sattributes
+            - transform/k8s_attributes
             - resourcedetection/env
             - resourcedetection/region
             - memory_limiter