[chore] Improve Auto-instrumentation Configurations (#1166)

* Make auto-instrumented applications use global service endpoints instead of namespace service endpoints * Improve adding env var SPLUNK_OTEL_AGENT to otelinst only when needed
signalfx · Feb 15, 2024 · cc80d17 · cc80d17
1 parent bbb9de5
commit cc80d17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/helm-charts/splunk-otel-collector/templates/operator/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/operator/_helpers.tpl
@@ -32,7 +32,7 @@ Helper to ensure the correct usage of the Splunk OpenTelemetry Collector Operato
 {{/*
 Helper to define an endpoint for exporting telemetry data related to auto-instrumentation.
 - Determines the endpoint based on user-defined values or default agent/gateway settings.
-- Order of precedence: User-defined > Agent service endpoint > Agent host port endpoint > Gateway endpoint
+- Order of precedence: User-defined endpoint > Agent service endpoint > Agent host port endpoint > Gateway endpoint
 */}}
 {{- define "splunk-otel-collector.operator.instrumentation-exporter-endpoint" -}}
   {{- /* Initialize endpoint variable */ -}}
@@ -48,7 +48,7 @@ Helper to define an endpoint for exporting telemetry data related to auto-instru
   {{- $endpoint = .Values.operator.instrumentation.spec.exporter.endpoint -}}
   {{- /* Use the agent service endpoint if the agent is enabled */ -}}
   {{- else if .Values.agent.service.enabled -}}
-    {{- $endpoint = printf "http://%s-agent:4317" (include "splunk-otel-collector.fullname" .) -}}
+    {{- $endpoint = printf "http://%s-agent.%s.svc.cluster.local:4317" (include "splunk-otel-collector.fullname" .) .Release.Namespace -}}
   {{- /* Use the agent host port endpoint if the agent is enabled */ -}}
   {{- else if .Values.agent.enabled -}}
     {{- $endpoint = "http://$(SPLUNK_OTEL_AGENT):4317" -}}

diff --git a/helm-charts/splunk-otel-collector/templates/operator/instrumentation.yaml b/helm-charts/splunk-otel-collector/templates/operator/instrumentation.yaml
@@ -37,7 +37,7 @@ spec:
       value: "true"
     {{- end }}
     {{- end }}
-    {{- if .Values.agent.enabled }}
+    {{- if contains "SPLUNK_OTEL_AGENT" (include "splunk-otel-collector.operator.instrumentation-exporter-endpoint" .) }}
     - name: SPLUNK_OTEL_AGENT
       valueFrom:
         fieldRef: