From 86b249022167762fb9558aedf579f5648097592a Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Fri, 1 Nov 2024 10:15:26 -0400
Subject: [PATCH] feat(deploys): OTEL_RESOURCE_ATTRIBUTES (#9642)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds k8s environment to otel resources bringing back parity with
filtering when we had the daemonset
<img width="851" alt="Screenshot 2024-10-31 at 9 47 55 PM"
src="https://github.com/user-attachments/assets/7bfb672e-7569-4e1a-8b13-b4c7a994318a">
---
 spartan/aztec-network/templates/boot-node.yaml    | 2 ++
 spartan/aztec-network/templates/prover-agent.yaml | 2 ++
 spartan/aztec-network/templates/prover-node.yaml  | 8 ++++++++
 spartan/aztec-network/templates/validator.yaml    | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml
index abe934d44dd..7458a4bb2e5 100644
--- a/spartan/aztec-network/templates/boot-node.yaml
+++ b/spartan/aztec-network/templates/boot-node.yaml
@@ -135,6 +135,8 @@ spec:
               value: "0.0.0.0:{{ .Values.bootNode.service.p2pUdpPort }}"
             - name: VALIDATOR_PRIVATE_KEY
               value: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: service.name={{ .Release.Name }},service.namespace={{ .Release.Namespace }},service.version={{ .Chart.AppVersion }},environment={{ .Values.environment | default "production" }}
             - name: OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
               value: {{ include "aztec-network.otelCollectorMetricsEndpoint" . | quote }}
             - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
diff --git a/spartan/aztec-network/templates/prover-agent.yaml b/spartan/aztec-network/templates/prover-agent.yaml
index 2ded11498ee..39ea5d1729c 100644
--- a/spartan/aztec-network/templates/prover-agent.yaml
+++ b/spartan/aztec-network/templates/prover-agent.yaml
@@ -64,6 +64,8 @@ spec:
               value: {{ .Values.proverAgent.concurrency | quote }}
             - name: HARDWARE_CONCURRENCY
               value: {{ .Values.proverAgent.bb.hardwareConcurrency | quote }}
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: service.name={{ .Release.Name }},service.namespace={{ .Release.Namespace }},service.version={{ .Chart.AppVersion }},environment={{ .Values.environment | default "production" }}
             - name: OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
               value: {{ include "aztec-network.otelCollectorMetricsEndpoint" . | quote }}
             - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml
index 75111bc5372..9d27699f61f 100644
--- a/spartan/aztec-network/templates/prover-node.yaml
+++ b/spartan/aztec-network/templates/prover-node.yaml
@@ -92,9 +92,17 @@ spec:
               value: "{{ .Values.proverNode.proverAgentEnabled }}"
             - name: PROVER_PUBLISHER_PRIVATE_KEY
               value: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: service.name={{ .Release.Name }},service.namespace={{ .Release.Namespace }},service.version={{ .Chart.AppVersion }},environment={{ .Values.environment | default "production" }}
             # get private proofs from the boot node
             - name: PROVER_JOB_SOURCE_URL
               value: "http://$(POD_IP):{{ .Values.proverNode.service.nodePort }}"
+            - name: OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
+              value: {{ include "aztec-network.otelCollectorMetricsEndpoint" . | quote }}
+            - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+              value: {{ include "aztec-network.otelCollectorTracesEndpoint" . | quote }}
+            - name: OTEL_EXPORTER_OTLP_LOGS_ENDPOINT
+              value: {{ include "aztec-network.otelCollectorLogsEndpoint" . | quote }}
             - name: P2P_ENABLED
               value: "{{ .Values.proverNode.p2pEnabled }}"
             - name: P2P_TCP_ANNOUNCE_ADDR
diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml
index 310bf2bcacf..4a6a176e876 100644
--- a/spartan/aztec-network/templates/validator.yaml
+++ b/spartan/aztec-network/templates/validator.yaml
@@ -136,6 +136,8 @@ spec:
               value: "0.0.0.0:{{ .Values.validator.service.p2pTcpPort }}"
             - name: P2P_UDP_LISTEN_ADDR
               value: "0.0.0.0:{{ .Values.validator.service.p2pUdpPort }}"
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: service.name={{ .Release.Name }},service.namespace={{ .Release.Namespace }},service.version={{ .Chart.AppVersion }},environment={{ .Values.environment | default "production" }}
             - name: OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
               value: {{ include "aztec-network.otelCollectorMetricsEndpoint" . | quote }}
             - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT