From 688736d4a363c0943f785cf4a889f0a230325c07 Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Tue, 15 Oct 2024 23:32:38 -0500 Subject: [PATCH] Use both prefixed and unprefixed otel variables --- k8s/exceptionless/templates/api.yaml | 6 ++ k8s/exceptionless/templates/app.yaml | 6 ++ k8s/exceptionless/templates/jobs.yaml | 90 +++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/k8s/exceptionless/templates/api.yaml b/k8s/exceptionless/templates/api.yaml index bdc434b66e..7ca27572a4 100644 --- a/k8s/exceptionless/templates/api.yaml +++ b/k8s/exceptionless/templates/api.yaml @@ -72,10 +72,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) - name: RunJobsInProcess value: 'false' - name: EnableWebSockets diff --git a/k8s/exceptionless/templates/app.yaml b/k8s/exceptionless/templates/app.yaml index 01a704de86..edb1a2543a 100644 --- a/k8s/exceptionless/templates/app.yaml +++ b/k8s/exceptionless/templates/app.yaml @@ -72,10 +72,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) - name: RunJobsInProcess value: 'false' {{- if (empty .Values.storage.connectionString) }} diff --git a/k8s/exceptionless/templates/jobs.yaml b/k8s/exceptionless/templates/jobs.yaml index b1d38d444b..8c8ff27fc7 100644 --- a/k8s/exceptionless/templates/jobs.yaml +++ b/k8s/exceptionless/templates/jobs.yaml @@ -63,10 +63,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) --- apiVersion: apps/v1 @@ -134,10 +140,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) --- apiVersion: batch/v1 @@ -195,10 +207,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) restartPolicy: OnFailure --- @@ -267,10 +285,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) --- apiVersion: apps/v1 @@ -338,10 +362,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) {{- if not (kindIs "invalid" ( .Values.jobs.eventPosts | default dict ).maxReplicaCount) }} --- @@ -415,10 +445,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) restartPolicy: OnFailure --- @@ -487,10 +523,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) --- apiVersion: apps/v1 kind: Deployment @@ -557,10 +599,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) --- apiVersion: batch/v1 kind: CronJob @@ -617,10 +665,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) restartPolicy: OnFailure --- @@ -679,10 +733,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) restartPolicy: OnFailure --- @@ -741,10 +801,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) restartPolicy: OnFailure --- @@ -813,10 +879,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) --- apiVersion: apps/v1 kind: Deployment @@ -883,10 +955,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) --- apiVersion: apps/v1 kind: Deployment @@ -953,10 +1031,16 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) {{- if (empty .Values.storage.connectionString) }} volumeMounts: - mountPath: "/app/storage" @@ -1055,7 +1139,13 @@ spec: fieldPath: metadata.uid - name: EX_OTEL_EXPORTER_OTLP_INSECURE value: "true" + - name: OTEL_EXPORTER_OTLP_INSECURE + value: "true" - name: EX_OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(HOST_IP):4317 + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://$(HOST_IP):4317 - name: EX_OTEL_RESOURCE_ATTRIBUTES value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID) + - name: OTEL_RESOURCE_ATTRIBUTES + value: k8s.pod.ip=$(K8S_POD_IP),k8s.pod.uid=$(K8S_POD_UID)