logzio-apm-collector version 1.2.2

[Feature] add dynamic resource detection

Author: 8naama

charts/logzio-apm-collector/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changes by Version
 
 <!-- next version -->
+## 1.2.2
+- Add support for auto resource detection with `distribution` and `resourceDetection.enabled` flags.
+  - The old `resourcedetection/all` configuration now serves as fallback if `distribution` is empty or with unknown value.
+  - **Note:** If you use a custom `resourcedetection` configurations, you can disable the new behavior by setting `resourceDetection.enabled=false` and manually adding the required configuration under `traceConfig`.
+- Upgrade OpenTelemetry Collector from `0.119.0` to `0.123.0`
+
 ## 1.2.1
 - Add support for global tolerations
 

charts/logzio-apm-collector/Chart.yaml

@@ -1,11 +1,11 @@
 apiVersion: v2
 name: logzio-apm-collector
-version: 1.2.1
+version: 1.2.2
 description: Kubernetes APM agent for Logz.io based on OpenTelemetry Collector
 type: application
 home: https://logz.io/
 icon: https://logzbucket.s3.eu-west-1.amazonaws.com/logz-io-img/logo400x400.png
 maintainers:
   - name: Naama Bendalak
     email: [email protected]
-appVersion: 0.119.0
+appVersion: 0.123.0

charts/logzio-apm-collector/templates/_config.tpl

@@ -72,6 +72,18 @@
 {{- if not (or .Values.spm.enabled .Values.serviceGraph.enabled) }}
 {{- $_ := unset $tracesConfig.service.pipelines "traces/spm" }}
 {{- end -}}
+
+{{- if (eq (include "apm-collector.resourceDetectionEnabled" .) "true") }}
+{{- $resDetectionConfig := (include "apm-collector.resourceDetectionConfig" .Values.global.distribution | fromYaml) }}
+  {{- if $resDetectionConfig }}
+    {{- range $key, $value := $resDetectionConfig }}
+      {{- $_ := set $tracesConfig "processors" (merge (index $tracesConfig "processors") (dict $key $value)) }}
+      {{- $_ := set (index $tracesConfig "service" "pipelines" "traces") "processors" (prepend (index $tracesConfig "service" "pipelines" "traces" "processors") $key) }}
+      {{- $_ := set (index $tracesConfig "service" "pipelines" "traces/spm") "processors" (prepend (index $tracesConfig "service" "pipelines" "traces/spm" "processors") $key) }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+
 {{- tpl ($tracesConfig | toYaml) . }}
 {{- end -}}
 
@@ -88,3 +100,26 @@
 {{- end }}
 {{- tpl ($spmConfig | toYaml) . }}
 {{- end }}
+
+{{/* Build config for Resource Detection according to distribution */}}
+{{- define "apm-collector.resourceDetectionConfig" -}}
+{{- if . }}
+{{- if eq . "eks" }}
+resourcedetection/distribution:
+  timeout: 15s
+  detectors: ["eks", "ec2"]
+{{- else if eq . "aks" }}
+resourcedetection/distribution:
+  detectors: ["aks", "azure"]
+{{- else if eq . "gke" }}
+resourcedetection/distribution:
+  detectors: ["gcp"]
+{{- else }}
+resourcedetection/all:
+  detectors: [ec2, azure, gcp]
+{{- end }}
+{{- else }}
+resourcedetection/all:
+  detectors: [ec2, azure, gcp]
+{{- end }}
+{{- end }}

charts/logzio-apm-collector/templates/_helpers.tpl

@@ -146,3 +146,18 @@ The APM service address
 {{- $serviceName := include "apm-collector.fullname" .}}
 {{- printf "http://%s.%s.svc.cluster.local" $serviceName .Release.Namespace }}
 {{- end }}
+
+{{/*
+Returns the value of resource detection enablement state
+*/}}
+{{- define "apm-collector.resourceDetectionEnabled" -}}
+{{- if (hasKey .Values "resourceDetection") }}
+{{- if (hasKey .Values.resourceDetection "enabled") }}
+{{- .Values.resourceDetection.enabled }}
+{{- else }}
+{{- .Values.global.resourceDetection.enabled }}
+{{- end }}
+{{- else }}
+{{- .Values.global.resourceDetection.enabled }}
+{{- end }}
+{{- end }}

charts/logzio-apm-collector/values.yaml

@@ -33,6 +33,16 @@ global:
   # Optional - Overrides global.LogzioRegion listener address with a custom endpoint. For example: http://endpoint:8080
   customTracesEndpoint: ""
   customSpmEndpoint: ""
+  # Optional - Identifier for the Kubernetes distribution used. One of "eks", "aks" or "gke".
+  distribution: ""
+  # Optional - Control enabling of the OpenTelemetry Collector's resource detection feature. Dependent on `distribution` value.
+  resourceDetection:
+    enabled: false
+
+# Optional - Overrides `global.resourceDetection.enabled`.
+# Control whether the OpenTelemetry Collector's resource detection feature is enabled. Dependent on `distribution` value.
+resourceDetection:
+  enabled: true
 
 # Allows changing the OpenTelemetry Collector log level
 otelLogLevel: "info"
@@ -78,8 +88,6 @@ traceConfig:
     zipkin:
       endpoint: "0.0.0.0:9411"
   processors:
-    resourcedetection/all:
-      detectors: [ec2, azure, gcp]
     tail_sampling:
       policies:
         [
@@ -177,12 +185,12 @@ traceConfig:
     pipelines:
       traces:
         receivers: [zipkin, otlp]
-        processors: [resourcedetection/all,attributes/env_id, k8sattributes, resource/k8s, tail_sampling, batch]
+        processors: [attributes/env_id, k8sattributes, resource/k8s, tail_sampling, batch]
         exporters: [logzio]
       # Removed if spm.enabled is false
       traces/spm:
         receivers: [zipkin, otlp]
-        processors: [resourcedetection/all, attributes/env_id, k8sattributes, batch]
+        processors: [attributes/env_id, k8sattributes, batch]
         exporters: [otlp/spm_forwarder]
     telemetry:
       logs: