diff --git a/helm/templates/mapproxinator/mapproxinator-configmap.yaml b/helm/templates/mapproxinator/mapproxinator-configmap.yaml index 753c8a5..6b5fb85 100644 --- a/helm/templates/mapproxinator/mapproxinator-configmap.yaml +++ b/helm/templates/mapproxinator/mapproxinator-configmap.yaml @@ -24,7 +24,7 @@ data: LOG_PRETTY_PRINT_ENABLED: {{ .Values.mapproxinator.env.logPrettyPrintEnabled | quote }} {{ if $tracing.enabled }} TELEMETRY_TRACING_ENABLED: 'true' - TELEMETRY_TRACING_URL: {{ $tracing.url }} + TELEMETRY_TRACING_URL: {{ .Values.mapproxinator.tracing.url | default $tracing.url }} {{ end }} {{ if $metrics.enabled }} TELEMETRY_METRICS_ENABLED: 'true' diff --git a/helm/values.yaml b/helm/values.yaml index a9fb67d..63bc3db 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -388,6 +388,14 @@ nginx: mapproxinator: enabled: true replicaCount: 1 + tracing: + # The mapproxinator app exports OTLP over HTTP (@map-colonies/telemetry -> + # @opentelemetry/exporter-trace-otlp-proto), while the mapproxy container + # exports OTLP over gRPC. When the collector serves those on different ports + # the shared `tracing.url` cannot satisfy both, so set the HTTP endpoint here, + # e.g. "http://otel-collector:4318/v1/traces". + # Empty means inherit the shared tracing.url. + url: "" image: repository: mapproxinator tag: "latest"