Skip to content

Commit f78ba1c

Browse files
committed
add language detection apm config
1 parent e5284d5 commit f78ba1c

File tree

5 files changed

+24
-1
lines changed

5 files changed

+24
-1
lines changed

charts/datadog/templates/_container-agent.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,11 @@
184184
value: /host
185185
{{- end }}
186186
{{- end }}
187+
188+
{{- if and .Values.datadog.apm.instrumentation.enabled .Values.datadog.apm.instrumentation.language_detection.enabled }}
189+
- name: DD_LANGUAGE_DETECTION_ENABLED
190+
value: "true"
191+
{{- end }}
187192
{{- include "additional-env-entries" .Values.agents.containers.agent.env | indent 4 }}
188193
{{- include "additional-env-dict-entries" .Values.agents.containers.agent.envDict | indent 4 }}
189194
volumeMounts:

charts/datadog/templates/_container-process-agent.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@
5252
{{- end }}
5353
- name: DD_ORCHESTRATOR_EXPLORER_ENABLED
5454
value: {{ (include "should-enable-k8s-resource-monitoring" .) | quote }}
55+
{{- if and .Values.datadog.apm.instrumentation.enabled .Values.datadog.apm.instrumentation.language_detection.enabled }}
56+
- name: DD_PROCESS_CONFIG_LANGUAGE_DETECTION_ENABLED
57+
value: "true"
58+
- name: DD_LANGUAGE_DETECTION_ENABLED
59+
value: "true"
60+
- name: DD_PROCESS_CONFIG_PROCESS_COLLECTION_ENABLED
61+
value: "true"
62+
{{- end }}
5563
{{- include "additional-env-entries" .Values.agents.containers.processAgent.env | indent 4 }}
5664
{{- include "additional-env-dict-entries" .Values.agents.containers.processAgent.envDict | indent 4 }}
5765
volumeMounts:

charts/datadog/templates/cluster-agent-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,10 @@ spec:
241241
- name: DD_APM_INSTRUMENTATION_ENABLED
242242
value: "true"
243243
{{- end }}
244+
{{- if and .Values.datadog.apm.instrumentation.enabled .Values.datadog.apm.instrumentation.language_detection.enabled }}
245+
- name: DD_LANGUAGE_DETECTION_ENABLED
246+
value: "true"
247+
{{- end }}
244248
{{- if ne (include "apmInstrumentation.enabledNamespaces" .) "" }}
245249
- name: DD_APM_INSTRUMENTATION_ENABLED_NAMESPACES
246250
value: {{ include "apmInstrumentation.enabledNamespaces" . }}

charts/datadog/templates/cluster-agent-rbac.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ rules:
155155
- list
156156
- get
157157
- watch
158-
{{- if eq (include "clusterAgent-remoteConfiguration-enabled" .) "true" }}
158+
{{- if or (eq (include "clusterAgent-remoteConfiguration-enabled" .) "true") (and .Values.datadog.apm.instrumentation.enabled .Values.datadog.apm.instrumentation.language_detection.enabled) }}
159159
- patch
160160
{{- end }}
161161
- apiGroups:

charts/datadog/values.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,12 @@ datadog:
479479

480480
# datadog.apm.instrumentation.libVersions -- Inject specific version of tracing libraries with Single Step Instrumentation (beta).
481481
libVersions: {}
482+
483+
# datadog.apm.instrumentation.language_detection -- Run language detection to automatically detect languages of user workloads (beta).
484+
language_detection:
485+
# This currently only detects languages and adds them as annotations on deployments, but doesn't use these languages for injecting libraries to applicative pods.
486+
enabled: true
487+
482488
## OTLP ingest related configuration
483489
otlp:
484490
receiver:

0 commit comments

Comments
 (0)