Merge pull request #110 from ma-hill/HYPERFLEET-986

HYPERFLEET-986 - feat: Add OTEL env vars to deployment.yaml

Author: openshift-merge-bot[bot]

charts/templates/deployment.yaml

@@ -85,6 +85,30 @@ spec:
         # Config file from ConfigMap (generated from values)
         - name: HYPERFLEET_CONFIG
           value: /etc/hyperfleet/config.yaml
+        {{- with .Values.tracing }}
+        - name: HYPERFLEET_TRACING_ENABLED
+          value: {{ .enabled | quote }}
+        {{- if .enabled }}
+        - name: OTEL_SERVICE_NAME
+          value: {{ .serviceName | quote }}
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: {{ .otlpEndpoint | quote }}
+        - name: OTEL_EXPORTER_OTLP_PROTOCOL
+          value: {{ .otlpProtocol | quote }}
+        - name: OTEL_TRACES_SAMPLER
+          value: {{ .sampler | quote }}
+        - name: OTEL_TRACES_SAMPLER_ARG
+          value: {{ .samplerArg | quote }}
+        - name: OTEL_PROPAGATORS
+          value: {{ .propagators | quote }}
+        - name: K8S_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: OTEL_RESOURCE_ATTRIBUTES
+          value: "k8s.namespace.name=$(K8S_NAMESPACE)"
+        {{- end }}
+        {{- end }}
 
         # Database credentials from Secret (using secretKeyRef)
         {{- include "hyperfleet-api.databaseEnvVars" . | nindent 8 }}

charts/values.yaml

@@ -271,6 +271,18 @@ serviceMonitor:
   labels: {}
   namespace: ""
 
+tracing:
+  enabled: true
+  serviceName: "hyperfleet-api"
+  # OTLP exporter endpoint (traces go to stdout if not set)
+  otlpEndpoint: ""
+  # OTLP protocol: grpc (default) or http/protobuf
+  otlpProtocol: "grpc"
+  # Sampler type (default per tracing standard)
+  sampler: "parentbased_traceidratio"
+  # Sampling rate: 1.0 for dev, 0.01 for production
+  samplerArg: "1.0"
+  propagators: "tracecontext,baggage"
 # ============================================================
 # Advanced Overrides (Escape Hatch)
 # ============================================================

go.mod

@@ -29,19 +29,27 @@ require (
 	github.com/testcontainers/testcontainers-go/modules/postgres v0.42.0
 	github.com/yaacov/tree-search-language v0.0.0-20190923184055-1c2dad2e354b
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
-	go.opentelemetry.io/otel v1.42.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.42.0
-	go.opentelemetry.io/otel/sdk v1.42.0
-	go.opentelemetry.io/otel/trace v1.42.0
+	go.opentelemetry.io/otel v1.43.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.43.0
+	go.opentelemetry.io/otel/sdk v1.43.0
+	go.opentelemetry.io/otel/trace v1.43.0
 	go.uber.org/mock v0.6.0
 	gopkg.in/resty.v1 v1.12.0
 	gorm.io/datatypes v1.2.7
 	gorm.io/driver/postgres v1.6.0
 	gorm.io/gorm v1.30.0
 )
 
+require (
+	go.opentelemetry.io/contrib/propagators/aws v1.43.0 // indirect
+	go.opentelemetry.io/contrib/propagators/b3 v1.43.0 // indirect
+	go.opentelemetry.io/contrib/propagators/jaeger v1.43.0 // indirect
+	go.opentelemetry.io/contrib/propagators/ot v1.43.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+)
+
 require (
 	dario.cat/mergo v1.0.2 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
@@ -132,18 +140,19 @@ require (
 	github.com/woodsbury/decimal128 v1.3.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect
-	go.opentelemetry.io/otel/metric v1.42.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
+	go.opentelemetry.io/contrib/propagators/autoprop v0.68.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
+	go.opentelemetry.io/otel/metric v1.43.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/net v0.51.0 // indirect
-	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/crypto v0.49.0 // indirect
+	golang.org/x/net v0.52.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
 	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.34.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
-	google.golang.org/grpc v1.79.3 // indirect
+	golang.org/x/text v0.35.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
+	google.golang.org/grpc v1.80.0 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.5.6 // indirect