feat: Add service name and namespace to the k8sattributes processor (#3954)

* feat: Add service name and namespace to the k8sattributes processor

* Add the service name and namespace to the expected labels

* Increasing resources for testing the logs daemonset

Author: rnishtala-sumo

.changelog/3954.added.txt

@@ -0,0 +1 @@
+feat: Add service name and namespace to the k8sattributes processor

deploy/helm/sumologic/conf/logs/otelcol/config.yaml

@@ -347,6 +347,8 @@ processors:
         - k8s.statefulset.name
         - k8s.namespace.name
         - k8s.node.name
+        - service.name
+        - service.namespace
     ## Has to be false to enrich metadata
     passthrough: false
     pod_association:

deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml

@@ -72,6 +72,8 @@ k8sattributes:
       - k8s.statefulset.name
       - k8s.namespace.name
       - k8s.node.name
+      - service.name
+      - service.namespace
   ## Has to be false to enrich metadata
   passthrough: false
   pod_association:

tests/helm/testdata/goldenfile/metadata_logs_otc/k8sattributes.output.yaml

@@ -180,6 +180,8 @@ data:
           - k8s.statefulset.name
           - k8s.namespace.name
           - k8s.node.name
+          - service.name
+          - service.namespace
         passthrough: false
         pod_association:
         - sources:

tests/integration/features.go

@@ -32,7 +32,7 @@ type MetricsCollector string
 
 const (
 	tickDuration = 3 * time.Second
-	waitDuration = 1 * time.Minute
+	waitDuration = 2 * time.Minute
 	// number determined experimentally
 	expectedEventCount uint = 50
 	logsGeneratorCount uint = 1000
@@ -107,6 +107,8 @@ func GetMetricsK8sattributes(expectedMetrics []string, metricsCollector MetricsC
 					"pod_labels_pod-template-hash": ".+",
 					"pod":                          podList.Items[0].Name,
 					"replicaset":                   fmt.Sprintf("%s-.*", deployment),
+					"service":                      deployment,
+					"service.namespace":            ctxopts.Namespace(ctx),
 				}
 				expectedLabels = addCollectorSpecificMetricLabels(expectedLabels, releaseName, namespace, metricsCollector)
 

tests/integration/values/values_common.yaml

@@ -123,6 +123,28 @@ otellogs:
         journald:
           directory: /run/log/journal
   daemonset:
+    containers:
+      otelcol:
+        livenessProbe:
+          initialDelaySeconds: 15
+          periodSeconds: 15
+          timeoutSeconds: 10
+          failureThreshold: 3
+        readinessProbe:
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 3
+          failureThreshold: 3
+        startupProbe:
+          periodSeconds: 3
+          failureThreshold: 60
+    resources:
+      limits:
+        memory: 1Gi
+        cpu: 1000m
+      requests:
+        memory: 64Mi
+        cpu: 500m
     extraVolumeMounts:
       - mountPath: /run/log/journal
         name: run-log-journal
@@ -159,4 +181,8 @@ debug:
       resources:
         limits:
           memory: 5Gi # unlimited
+          cpu: 1000m
+        requests:
+          memory: 1000Mi
+          cpu: 500m
   enableLocalMode: true