Merge pull request #126 from codecademy-engineering/lindsay-otel-fixes-2

fix more otel things

Author: lindsaylandry

charts/service/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: service
 description: A generic k8s service chart
 type: application
-version: 1.8.19
+version: 1.8.20
 maintainers:
   - email: devops@codecademy.com
     name: devops

charts/service/templates/cronjob.yaml

@@ -27,6 +27,11 @@ spec:
             tags.datadoghq.com/service: {{ .service }}
             tags.datadoghq.com/version: {{ .version | quote }}
           {{- end }}
+          {{- with $otel }}
+            tags.datadoghq.com/env: {{ .env }}
+            tags.datadoghq.com/service: {{ .service }}
+            tags.datadoghq.com/version: {{ .version | quote }}
+          {{- end }}
         spec:
           serviceAccountName: {{ $serviceAccountName }}
           containers:
@@ -72,15 +77,15 @@ spec:
             - name: OTEL_ENV
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/env']
+                  fieldPath: metadata.labels['tags.datadoghq.com/env']
             - name: OTEL_SERVICE
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/service']
+                  fieldPath: metadata.labels['tags.datadoghq.com/service']
             - name: OTEL_VERSION
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/version']
+                  fieldPath: metadata.labels['tags.datadoghq.com/version']
             {{- end }}
             {{- if .envFromSecret }}
             envFrom:

charts/service/templates/deployment.yaml

@@ -117,15 +117,15 @@ spec:
             - name: OTEL_ENV
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/env']
+                  fieldPath: metadata.labels['tags.datadoghq.com/env']
             - name: OTEL_SERVICE
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/service']
+                  fieldPath: metadata.labels['tags.datadoghq.com/service']
             - name: OTEL_VERSION
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/version']
+                  fieldPath: metadata.labels['tags.datadoghq.com/version']
           {{- end }}
           {{- with .Values.initContainer.resources }}
           resources:
@@ -178,15 +178,15 @@ spec:
             - name: OTEL_ENV
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/env']
+                  fieldPath: metadata.labels['tags.datadoghq.com/env']
             - name: OTEL_SERVICE
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/service']
+                  fieldPath: metadata.labels['tags.datadoghq.com/service']
             - name: OTEL_VERSION
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.labels['opentelemetry/version']
+                  fieldPath: metadata.labels['tags.datadoghq.com/version']
           {{- end }}
           {{- range $key, $value := .Values.envKeyValue }}
             - name: {{ $key }}

charts/service/templates/jobs.yaml

@@ -28,9 +28,9 @@ spec:
         {{- end }}
         {{- with $otel }}
         {{- if and .service .env }}
-        opentelemetry/env: {{ .env }}
-        opentelemetry/service: {{ .service }}
-        opentelemetry/version: {{ .version | quote }}
+        tags.datadoghq.com/env: {{ .env }}
+        tags.datadoghq.com/service: {{ .service }}
+        tags.datadoghq.com/version: {{ .version | quote }}
         {{- end }}
         {{- end }}
     spec: