Skip to content

feat: add environmental variables for OTEL exporter #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

feat: add environmental variables for OTEL exporter #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e95083d
feat: add environmental variables for OTEL exporter
vasil-cf Oct 21, 2025
5994c0c
trigger ci
vasil-cf Oct 21, 2025
aa98ea7
ci: trigger
vasil-cf Oct 21, 2025
5c6a1ca
feat: add environmental variables for OTEL exporter
vasil-cf Oct 21, 2025
d308ff1
fix: fix environmental variables for OTEL exporter
vasil-cf Oct 21, 2025
60d6f39
fix: fix environmental variables for OTEL exporter
vasil-cf Oct 21, 2025
2f6e403
fix: fix environmental variables for OTEL exporter
vasil-cf Oct 21, 2025
f33b47d
fix: fix environmental variables for OTEL exporter
vasil-cf Oct 21, 2025
de80967
fix: fix environmental variables for OTEL exporter
vasil-cf Oct 21, 2025
31012b7
fix: fix environmental variables for OTEL exporter
vasil-cf Oct 21, 2025
4749653
feat: add otel attributes to temlates
vasil-cf Oct 22, 2025
ff55ebc
feat: remove some otel attributes
vasil-cf Oct 22, 2025
436adb0
feat: hardcode attributes
vasil-cf Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...ps-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,17 @@ CACHE_PASSWORD:
name: gitops-runtime-redis
key: auth
{{ include "codefresh-gitops-runtime.get-proxy-env-vars" . }}
{{- $accountId := .Values.global.codefresh.accountId -}}
{{- $runtimeName := .Values.global.runtime.name -}}
{{- $otelResourceAttributes := printf "service.name=app-proxy,cf.account.id=%s,cf.gitops.runtime.name=%s" $accountId $runtimeName -}}
OTEL_RESOURCE_ATTRIBUTES: {{ $otelResourceAttributes }}
A_RUNTIME_TOKEN:
valueFrom:
secretKeyRef:
name: codefresh-token
key: token
optional: true
OTEL_EXPORTER_OTLP_HEADERS: "Authorization=$(A_RUNTIME_TOKEN)"
{{- end -}}

{{/*
Expand Down
13 changes: 12 additions & 1 deletion charts/gitops-runtime/templates/_components/gitops-operator/_env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ PROMOTION_WRAPPER_TEMPLATE: {{ .Values.config.promotionWrapperTemplate | quote }
RUNTIME: {{ .Values.global.runtime.name }}
TASK_POLLING_INTERVAL: {{ .Values.config.taskPollingInterval }}
WORKFLOW_MONITOR_POLLING_INTERVAL: {{ .Values.config.workflowMonitorPollingInterval }}
{{- $accountId := .Values.global.codefresh.accountId -}}
{{- $runtimeName := .Values.global.runtime.name -}}
{{- $otelResourceAttributes := printf "service.name=gitops-operator,cf.account.id=%s,cf.gitops.runtime.name=%s" $accountId $runtimeName -}}
OTEL_RESOURCE_ATTRIBUTES: {{ $otelResourceAttributes }}
A_CF_TOKEN:
valueFrom:
secretKeyRef:
name: codefresh-token
key: token
optional: true
OTEL_EXPORTER_OTLP_HEADERS: "Authorization=$(A_CF_TOKEN)"
{{- end }}

{{- define "gitops-operator.resources.environment-variables.defaults" -}}
Expand All @@ -40,7 +51,7 @@ NAMESPACE:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
RUNTIME_VERSION:
RUNTIME_VERSION:
valueFrom:
configMapKeyRef:
name: codefresh-cm
Expand Down
11 changes: 11 additions & 0 deletions charts/gitops-runtime/templates/argo-gateway/_env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "
CODEFRESH_SSL_CERT_PATH: {{ printf "/app/config/codefresh-tls-certs/%s" $secretKey }}
{{- end }}

{{- $accountId := .Values.global.codefresh.accountId -}}
{{- $runtimeName := .Values.global.runtime.name -}}
{{- $otelResourceAttributes := printf "service.name=argo-gateway,cf.account.id=%s,cf.gitops.runtime.name=%s" $accountId $runtimeName -}}
OTEL_RESOURCE_ATTRIBUTES: {{ $otelResourceAttributes }}
A_CODEFRESH_TOKEN:
valueFrom:
secretKeyRef:
key: token
name: codefresh-token
OTEL_EXPORTER_OTLP_HEADERS: "Authorization=$(A_CODEFRESH_TOKEN)"

{{- end }}

{{- define "argo-gateway.resources.environment-variables.defaults" -}}
Expand Down
11 changes: 11 additions & 0 deletions charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "
CODEFRESH_SSL_CERT_PATH: {{ printf "/app/config/codefresh-tls-certs/%s" $secretKey }}
{{- end }}

{{- $accountId := .Values.global.codefresh.accountId -}}
{{- $runtimeName := .Values.global.runtime.name -}}
{{- $otelResourceAttributes := printf "service.name=cluster-event-reporter,cf.account.id=%s,cf.gitops.runtime.name=%s" $accountId $runtimeName -}}
OTEL_RESOURCE_ATTRIBUTES: {{ $otelResourceAttributes }}
A_CODEFRESH_TOKEN:
valueFrom:
secretKeyRef:
key: token
name: codefresh-token
OTEL_EXPORTER_OTLP_HEADERS: "Authorization=$(A_CODEFRESH_TOKEN)"

{{- end }}

{{- define "cluster-event-reporter.resources.environment-variables.defaults" -}}
Expand Down
11 changes: 11 additions & 0 deletions charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "
CODEFRESH_SSL_CERT_PATH: {{ printf "/app/config/codefresh-tls-certs/%s" $secretKey }}
{{- end }}

{{- $accountId := .Values.global.codefresh.accountId -}}
{{- $runtimeName := .Values.global.runtime.name -}}
{{- $otelResourceAttributes := printf "service.name=runtime-event-reporter,cf.account.id=%s,cf.gitops.runtime.name=%s" $accountId $runtimeName -}}
OTEL_RESOURCE_ATTRIBUTES: {{ $otelResourceAttributes }}
A_CODEFRESH_TOKEN:
valueFrom:
secretKeyRef:
key: token
name: codefresh-token
OTEL_EXPORTER_OTLP_HEADERS: "Authorization=$(A_CODEFRESH_TOKEN)"

{{- end }}

{{- define "runtime-event-reporter.resources.environment-variables.defaults" -}}
Expand Down
2 changes: 2 additions & 0 deletions charts/gitops-runtime/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,8 @@ gitops-operator:
tag: "6881890"
env:
GITOPS_OPERATOR_VERSION: 0.11.1
OTEL_RESOURCE_ATTRIBUTES: "service.name=gitops-operator,cf.account.id=6422abe703c720761a07f3e0,cf.gitops.runtime.name=codefresh"
OTEL_EXPORTER_OTLP_HEADERS: "Authorization=68f7aff456b837cd55f9b864.2f9d8e981549798caedf0ced5dbb6a2f"
serviceAccount:
create: true
annotations: {}
Expand Down