chore: remove gcloud metrics (#12265)

also ran `yarn prepare` which reordered some tsconfig stuff.
AztecProtocol · Feb 25, 2025 · 01eb3f1 · 01eb3f1
1 parent 65b9f1e
commit 01eb3f1
Show file tree

Hide file tree

Showing 53 changed files with 103 additions and 318 deletions.
diff --git a/spartan/aztec-network/files/config/setup-service-addresses.sh b/spartan/aztec-network/files/config/setup-service-addresses.sh
@@ -123,7 +123,7 @@ else
 fi
 
 # Configure OTEL_COLLECTOR_ENDPOINT if not set in values file
-if [ "${TELEMETRY:-false}" = "true" ] && [ "${OTEL_COLLECTOR_ENDPOINT}" = "" ] && [ "${USE_GCLOUD_METRICS:-false}" = "false" ]; then
+if [ "${TELEMETRY:-false}" = "true" ] && [ "${OTEL_COLLECTOR_ENDPOINT}" = "" ]; then
     OTEL_COLLECTOR_PORT=${OTEL_COLLECTOR_PORT:-4318}
     OTEL_COLLECTOR_ENDPOINT="http://metrics-opentelemetry-collector.metrics:$OTEL_COLLECTOR_PORT"
 fi

diff --git a/spartan/aztec-network/templates/_helpers.tpl b/spartan/aztec-network/templates/_helpers.tpl
@@ -169,8 +169,6 @@ Service Address Setup Container
       value: "{{ .Values.proverBroker.service.nodePort }}"
     - name: USE_GCLOUD_LOGGING
       value: "{{ .Values.telemetry.useGcloudLogging }}"
-    - name: USE_GCLOUD_METRICS
-      value: "{{ .Values.telemetry.useGcloudMetrics }}"
     - name: SERVICE_NAME
       value: {{ include "aztec-network.fullname" . }}
   volumeMounts:

diff --git a/spartan/aztec-network/templates/blob-sink.yaml b/spartan/aztec-network/templates/blob-sink.yaml
@@ -89,8 +89,6 @@ spec:
               value: "{{ .Values.blobSink.dataStoreConfig.dataStoreMapSize }}"
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
           ports:
             - containerPort: {{ .Values.blobSink.service.nodePort }}
           resources:

diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml
@@ -133,8 +133,6 @@ spec:
                   fieldPath: metadata.namespace
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
       {{- end }}
       containers:
         - name: boot-node
@@ -253,8 +251,6 @@ spec:
               value: "{{ .Values.storage.worldStateMapSize }}"
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
             {{- if .Values.blobSink.enabled }}

diff --git a/spartan/aztec-network/templates/deploy-l1-verifier.yaml b/spartan/aztec-network/templates/deploy-l1-verifier.yaml
@@ -116,8 +116,6 @@ spec:
               value: {{ include "aztec-network.fullname" . }}
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
           volumeMounts:
             - name: config
               mountPath: /shared/config

diff --git a/spartan/aztec-network/templates/faucet.yaml b/spartan/aztec-network/templates/faucet.yaml
@@ -90,8 +90,6 @@ spec:
               value: faucet
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
           ports:

diff --git a/spartan/aztec-network/templates/prover-agent.yaml b/spartan/aztec-network/templates/prover-agent.yaml
@@ -112,8 +112,6 @@ spec:
               value: service.name={{ .Release.Name }},service.namespace={{ .Release.Namespace }},service.version={{ .Chart.AppVersion }},environment={{ .Values.environment | default "production" }}
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
           resources:

diff --git a/spartan/aztec-network/templates/prover-broker.yaml b/spartan/aztec-network/templates/prover-broker.yaml
@@ -110,8 +110,6 @@ spec:
               value: service.name={{ .Release.Name }},service.namespace={{ .Release.Namespace }},service.version={{ .Chart.AppVersion }},environment={{ .Values.environment | default "production" }}
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
           resources:

diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml
@@ -223,8 +223,6 @@ spec:
               value: "{{ .Values.storage.worldStateMapSize }}"
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
             {{- if .Values.blobSink.enabled }}

diff --git a/spartan/aztec-network/templates/pxe.yaml b/spartan/aztec-network/templates/pxe.yaml
@@ -111,8 +111,6 @@ spec:
               value: "{{ .Values.aztec.realProofs }}"
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
             - name: L1_CHAIN_ID
@@ -183,4 +181,4 @@ spec:
       {{- end }}
 ---
 {{ end }}
-{{ end }}
+{{ end }}
diff --git a/spartan/aztec-network/templates/setup-l2-contracts.yaml b/spartan/aztec-network/templates/setup-l2-contracts.yaml
@@ -104,6 +104,4 @@ spec:
               value: {{ include "aztec-network.fullname" . }}
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
 {{ end }}
diff --git a/spartan/aztec-network/templates/transaction-bot.yaml b/spartan/aztec-network/templates/transaction-bot.yaml
@@ -157,8 +157,6 @@ spec:
               value: "{{ .Values.bot.stopIfUnhealthy }}"
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
             - name: L1_CHAIN_ID

diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml
@@ -235,8 +235,6 @@ spec:
               value: "{{ .Values.storage.worldStateMapSize }}"
             - name: USE_GCLOUD_LOGGING
               value: "{{ .Values.telemetry.useGcloudLogging }}"
-            - name: USE_GCLOUD_METRICS
-              value: "{{ .Values.telemetry.useGcloudMetrics }}"
             - name: OTEL_EXCLUDE_METRICS
               value: "{{ .Values.telemetry.excludeMetrics }}"
             {{- if .Values.blobSink.enabled }}

diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml
@@ -24,7 +24,6 @@ telemetry:
   enabled: false
   otelCollectorEndpoint:
   useGcloudLogging: true
-  useGcloudMetrics: false
   excludeMetrics: "system"
 
 images:

diff --git a/yarn-project/accounts/tsconfig.json b/yarn-project/accounts/tsconfig.json
@@ -9,9 +9,6 @@
     {
       "path": "../aztec.js"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../entrypoints"
     },
@@ -20,6 +17,9 @@
     },
     {
       "path": "../foundation"
+    },
+    {
+      "path": "../stdlib"
     }
   ],
   "include": ["src", "artifacts/*.d.json.ts"]

diff --git a/yarn-project/archiver/tsconfig.json b/yarn-project/archiver/tsconfig.json
@@ -12,9 +12,6 @@
     {
       "path": "../blob-sink"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../constants"
     },
@@ -39,6 +36,9 @@
     {
       "path": "../protocol-contracts"
     },
+    {
+      "path": "../stdlib"
+    },
     {
       "path": "../telemetry-client"
     }

diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json
@@ -15,9 +15,6 @@
     {
       "path": "../blob-sink"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../constants"
     },
@@ -51,6 +48,9 @@
     {
       "path": "../simulator"
     },
+    {
+      "path": "../stdlib"
+    },
     {
       "path": "../telemetry-client"
     },

diff --git a/yarn-project/aztec.js/tsconfig.json b/yarn-project/aztec.js/tsconfig.json
@@ -6,9 +6,6 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../constants"
     },
@@ -23,6 +20,9 @@
     },
     {
       "path": "../protocol-contracts"
+    },
+    {
+      "path": "../stdlib"
     }
   ],
   "include": ["src", "src/**/*.json"]

diff --git a/yarn-project/aztec/tsconfig.json b/yarn-project/aztec/tsconfig.json
@@ -33,9 +33,6 @@
     {
       "path": "../builder"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../cli"
     },
@@ -84,6 +81,9 @@
     {
       "path": "../pxe"
     },
+    {
+      "path": "../stdlib"
+    },
     {
       "path": "../telemetry-client"
     },

diff --git a/yarn-project/bb-prover/tsconfig.json b/yarn-project/bb-prover/tsconfig.json
@@ -6,9 +6,6 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../constants"
     },
@@ -21,6 +18,9 @@
     {
       "path": "../simulator"
     },
+    {
+      "path": "../stdlib"
+    },
     {
       "path": "../telemetry-client"
     },

diff --git a/yarn-project/blob-sink/tsconfig.json b/yarn-project/blob-sink/tsconfig.json
@@ -9,15 +9,15 @@
     {
       "path": "../blob-lib"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../foundation"
     },
     {
       "path": "../kv-store"
     },
+    {
+      "path": "../stdlib"
+    },
     {
       "path": "../telemetry-client"
     }

diff --git a/yarn-project/bot/tsconfig.json b/yarn-project/bot/tsconfig.json
@@ -12,9 +12,6 @@
     {
       "path": "../aztec.js"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../entrypoints"
     },
@@ -33,6 +30,9 @@
     {
       "path": "../protocol-contracts"
     },
+    {
+      "path": "../stdlib"
+    },
     {
       "path": "../telemetry-client"
     }

diff --git a/yarn-project/builder/tsconfig.json b/yarn-project/builder/tsconfig.json
@@ -7,10 +7,10 @@
   },
   "references": [
     {
-      "path": "../stdlib"
+      "path": "../foundation"
     },
     {
-      "path": "../foundation"
+      "path": "../stdlib"
     }
   ],
   "include": ["src", "src/*.json"]

diff --git a/yarn-project/cli-wallet/tsconfig.json b/yarn-project/cli-wallet/tsconfig.json
@@ -12,9 +12,6 @@
     {
       "path": "../aztec.js"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../cli"
     },
@@ -32,6 +29,9 @@
     },
     {
       "path": "../pxe"
+    },
+    {
+      "path": "../stdlib"
     }
   ],
   "include": ["src"]

diff --git a/yarn-project/cli/tsconfig.json b/yarn-project/cli/tsconfig.json
@@ -12,9 +12,6 @@
     {
       "path": "../aztec.js"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../constants"
     },
@@ -24,6 +21,9 @@
     {
       "path": "../l1-artifacts"
     },
+    {
+      "path": "../stdlib"
+    },
     {
       "path": "../world-state"
     },

diff --git a/yarn-project/end-to-end/tsconfig.json b/yarn-project/end-to-end/tsconfig.json
@@ -33,9 +33,6 @@
     {
       "path": "../bot"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../constants"
     },
@@ -87,6 +84,9 @@
     {
       "path": "../simulator"
     },
+    {
+      "path": "../stdlib"
+    },
     {
       "path": "../telemetry-client"
     },

diff --git a/yarn-project/entrypoints/tsconfig.json b/yarn-project/entrypoints/tsconfig.json
@@ -9,14 +9,14 @@
     {
       "path": "../aztec.js"
     },
-    {
-      "path": "../stdlib"
-    },
     {
       "path": "../foundation"
     },
     {
       "path": "../protocol-contracts"
+    },
+    {
+      "path": "../stdlib"
     }
   ],
   "include": ["src", "src/**/*.json"]