move otel env to helm template

Author: Frapschen

config/charts/inferencepool/templates/_helpers.tpl

@@ -31,22 +31,3 @@ Selector labels
 {{- define "gateway-api-inference-extension.selectorLabels" -}}
 inferencepool: {{ include "gateway-api-inference-extension.name" . }}
 {{- end -}}
-
-
-{{/*
-Generate environment variable list for inference extension
-Exclude OTEL_ prefixed environment variables when tracing is not enabled
-*/}}
-{{- define "inferenceExtension.envs" -}}
-{{- range .Values.inferenceExtension.env }}
-{{- if and (not $.Values.inferenceExtension.trace.enabled) (hasPrefix "OTEL_" .name) }}
-{{- else }}
-- name: {{ .name }}
-  {{- if .value }}
-  value: "{{ .value }}"
-  {{- else if .valueFrom }}
-  valueFrom: {{ .valueFrom | toYaml | nindent 4 }}
-  {{- end }}
-{{- end }}
-{{- end }}
-{{- end -}}

config/charts/inferencepool/templates/epp-deployment.yaml

@@ -107,7 +107,31 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        {{- include "inferenceExtension.envs" . | nindent 8 }}
+        {{- if .Values.inferenceExtension.trace.enabled }}
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: {{ .Values.inferenceExtension.trace.otelExporterEndpoint | default "http://localhost:4317" | quote }}
+        - name: OTEL_SERVICE_NAME
+          value: "gateway-api-inference-extension"
+        - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: spec.nodeName
+        - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.name
+        - name: OTEL_RESOURCE_ATTRIBUTES
+          value: 'k8s.namespace.name=$(NAMESPACE),k8s.node.name=$(OTEL_RESOURCE_ATTRIBUTES_NODE_NAME),k8s.pod.name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME)'
+        - name: OTEL_TRACES_SAMPLER
+          value: {{ .Values.inferenceExtension.trace.sampling.sampler | default "parentbased_traceidratio" | quote }}
+        - name: OTEL_TRACES_SAMPLER_ARG
+          value: {{ .Values.inferenceExtension.trace.sampling.samplerArg | default "0.1" | quote }}
+        {{- end }}
+        {{- if .Values.inferenceExtension.env }}
+        {{- toYaml .Values.inferenceExtension.env | nindent 8 }}
+        {{- end }}
         volumeMounts:
         - name: plugins-config-volume
           mountPath: "/config"

config/charts/inferencepool/values.yaml

@@ -6,29 +6,7 @@ inferenceExtension:
     tag: main
     pullPolicy: Always
   extProcPort: 9002
-  env:
-    # The default OTEL_* environments is used to config the behaviour of OTel SDK
-    # If you also enabled trace.autoENVInject setting, the auto env inject will be skipped by opentelemetry-operator,
-    - name: OTEL_EXPORTER_OTLP_ENDPOINT
-      value: "http://localhost:4317"
-    - name: OTEL_SERVICE_NAME
-      value: "gateway-api-inference-extension"
-    - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: spec.nodeName
-    - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: metadata.name
-    - name: OTEL_RESOURCE_ATTRIBUTES
-      value: 'k8s.namespace.name=$(NAMESPACE),k8s.node.name=$(OTEL_RESOURCE_ATTRIBUTES_NODE_NAME),k8s.pod.name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME)'
-    - name: OTEL_TRACES_SAMPLER
-      value: "parentbased_traceidratio"
-    - name: OTEL_TRACES_SAMPLER_ARG
-      value: "0.1"
+  env: []
   pluginsConfigFile: "default-plugins.yaml"
   # Define additional container ports
   extraContainerPorts: []
@@ -77,6 +55,10 @@ inferenceExtension:
       enabled: false
   trace:
     enabled: false
+    otelExporterEndpoint: "http://localhost:4317"
+    sampling:
+      sampler: "parentbased_traceidratio"
+      samplerArg: "0.1"
 
 inferencePool:
   targetPorts:

pkg/common/telemetry.go

@@ -31,13 +31,13 @@ func InitTracing(ctx context.Context, logger logr.Logger) error {
 	logger = logger.WithName("trace")
 	loggerWrap := &errorHandler{logger: logger}
 
-	serviceName, ok := os.LookupEnv("OTEL_SERVICE_NAME")
+	serviceName, ok := os.LookupEnv("OTEL_SERVICE_NAME") //nolint:ineffassign
 	if !ok {
 		serviceName = "gateway-api-inference-extension"
 		os.Setenv("OTEL_SERVICE_NAME", serviceName)
 	}
 
-	collectorAddr, ok := os.LookupEnv("OTEL_EXPORTER_OTLP_ENDPOINT")
+	collectorAddr, ok := os.LookupEnv("OTEL_EXPORTER_OTLP_ENDPOINT") //nolint:ineffassign
 	if !ok {
 		collectorAddr = "http://localhost:4317"
 		os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", collectorAddr)
@@ -65,6 +65,7 @@ func InitTracing(ctx context.Context, logger logr.Logger) error {
 		if err != nil {
 			fraction = 0.1
 		}
+
 		sampler = sdktrace.ParentBased(sdktrace.TraceIDRatioBased(fraction))
 	} else {
 		loggerWrap.Handle(fmt.Errorf("un supported sampler type: %s, fallback to parentbased_traceidratio with 0.1 Ratio", samplerType))