feat: add environmental variables for OTEL exporter

Author: vasil-cf

charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml

@@ -222,6 +222,14 @@ CACHE_PASSWORD:
       name: gitops-runtime-redis
       key: auth
 {{ include "codefresh-gitops-runtime.get-proxy-env-vars" . }}
+
+{{- $serviceVersion := printf "%s@%s" (index .Values "app-proxy" "image" "tag") (index .Values "app-proxy" "image" "digest") -}}
+{{- $accountId := .Values.global.codefresh.accountId -}}
+{{- $runtimeName := .Values.global.runtime.name -}}
+{{- $otelResourceAttributes := printf "service.name=app-proxy,service.version=%s,cf.account.id=%s,cf.gitops.runtime.name=%s" $serviceVersion $accountId $runtimeName -}}
+OTEL_RESOURCE_ATTRIBUTES: {{- $otelResourceAttributes -}}
+OTEL_EXPORTER_OTLP_HEADERS: "Authorization=Bearer $(RUNTIME_TOKEN)"
+
 {{- end -}}
 
 {{/*

charts/gitops-runtime/templates/_components/gitops-operator/_env.yaml

@@ -40,9 +40,15 @@ NAMESPACE:
   valueFrom:
     fieldRef:
       fieldPath: metadata.namespace
-RUNTIME_VERSION: 
+RUNTIME_VERSION:
   valueFrom:
     configMapKeyRef:
       name: codefresh-cm
       key: version
+{{- $serviceVersion := printf "%s@%s" (index .Values "gitops-operator" "image" "tag") (index .Values "gitops-operator" "image" "digest") -}}
+{{- $accountId := .Values.global.codefresh.accountId -}}
+{{- $runtimeName := .Values.global.runtime.name -}}
+{{- $otelResourceAttributes := printf "service.name=gitops-operator,service.version=%s,cf.account.id=%s,cf.gitops.runtime.name=%s" $serviceVersion $accountId $runtimeName -}}
+OTEL_RESOURCE_ATTRIBUTES: {{- $otelResourceAttributes -}}
+OTEL_EXPORTER_OTLP_HEADERS: "Authorization=Bearer $(CF_TOKEN)"
 {{- end -}}

charts/gitops-runtime/templates/app-proxy/deployment.yaml

@@ -23,14 +23,4 @@
   {{- $_ := set $appProxyContext.Values.initContainer "extraVolumeMounts" $initContainerExtraVolumeMounts }}
 {{- end }}
 
-{{- $serviceVersion := printf "%s@%s" (index .Values "app-proxy" "image" "tag") (index .Values "app-proxy" "image" "digest") -}}
-{{- $accountId := .Values.global.codefresh.accountId -}}
-{{- $runtimeName := .Values.global.runtime.name -}}
-{{- $otelResourceAttributes := printf "service.name=app-proxy,service.version=%s,cf.account.id=%s,cf.gitops.runtime.name=%s" $serviceVersion $accountId $runtimeName -}}
-{{- $__ := set $appProxyContext.Values.env "OTEL_RESOURCE_ATTRIBUTES" $otelResourceAttributes -}}
-
-{{- $token := .Values.global.codefresh.userToken.token -}}
-{{- $otelExporterOtlpHeaders := printf "Authorization=Bearer %s" $token -}}
-{{- $___ := set $appProxyContext.Values.env "OTEL_EXPORTER_OTLP_HEADERS" $otelExporterOtlpHeaders -}}
-
 {{- include "cap-app-proxy.resources.deployment" $appProxyContext }}

charts/gitops-runtime/templates/gitops-operator/deployment.yaml

@@ -25,14 +25,4 @@
   {{- $_ := set $context.Values.global.codefresh.tls.caCerts.secretKeyRef "key" ($context.Values.global.codefresh.tls.caCerts.secret.create | ternary (default "ca-bundle.crt" $context.Values.global.codefresh.tls.caCerts.secret.key) $context.Values.global.codefresh.tls.caCerts.secretKeyRef.key) }}
 {{- end }}
 
-{{- $serviceVersion := printf "%s@%s" (index .Values "gitops-operator" "image" "tag") (index .Values "gitops-operator" "image" "digest") -}}
-{{- $accountId := .Values.global.codefresh.accountId -}}
-{{- $runtimeName := .Values.global.runtime.name -}}
-{{- $otelResourceAttributes := printf "service.name=gitops-operator,service.version=%s,cf.account.id=%s,cf.gitops.runtime.name=%s" $serviceVersion $accountId $runtimeName -}}
-{{- $__ := set $context.Values.env "OTEL_RESOURCE_ATTRIBUTES" $otelResourceAttributes -}}
-
-{{- $token := .Values.global.codefresh.userToken.token -}}
-{{- $otelExporterOtlpHeaders := printf "Authorization=Bearer %s" $token -}}
-{{- $___ := set $context.Values.env "OTEL_EXPORTER_OTLP_HEADERS" $otelExporterOtlpHeaders -}}
-
 {{- include "gitops-operator.resources.deployment" $context }}