Skip to content
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

chore: remove gcloud metrics #12265

Merged
merged 2 commits into from
Feb 25, 2025
Merged

chore: remove gcloud metrics #12265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f1e6e9
chore: remove gcloud metrics
just-mitch Feb 25, 2025
14ab657
fix: one last usage
just-mitch Feb 25, 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
2 changes: 1 addition & 1 deletion spartan/aztec-network/files/config/setup-service-addresses.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/blob-sink.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions spartan/aztec-network/templates/boot-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/deploy-l1-verifier.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/faucet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/prover-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/prover-broker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/prover-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 1 addition & 3 deletions spartan/aztec-network/templates/pxe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -183,4 +181,4 @@ spec:
{{- end }}
---
{{ end }}
{{ end }}
{{ end }}
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/setup-l2-contracts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/transaction-bot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/templates/validator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion spartan/aztec-network/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ telemetry:
enabled: false
otelCollectorEndpoint:
useGcloudLogging: true
useGcloudMetrics: false
excludeMetrics: "system"

images:
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/accounts/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
{
"path": "../aztec.js"
},
{
"path": "../stdlib"
},
{
"path": "../entrypoints"
},
Expand All @@ -20,6 +17,9 @@
},
{
"path": "../foundation"
},
{
"path": "../stdlib"
}
],
"include": ["src", "artifacts/*.d.json.ts"]
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/archiver/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
{
"path": "../blob-sink"
},
{
"path": "../stdlib"
},
{
"path": "../constants"
},
Expand All @@ -39,6 +36,9 @@
{
"path": "../protocol-contracts"
},
{
"path": "../stdlib"
},
{
"path": "../telemetry-client"
}
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/aztec-node/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
{
"path": "../blob-sink"
},
{
"path": "../stdlib"
},
{
"path": "../constants"
},
Expand Down Expand Up @@ -51,6 +48,9 @@
{
"path": "../simulator"
},
{
"path": "../stdlib"
},
{
"path": "../telemetry-client"
},
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/aztec.js/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
"tsBuildInfoFile": ".tsbuildinfo"
},
"references": [
{
"path": "../stdlib"
},
{
"path": "../constants"
},
Expand All @@ -23,6 +20,9 @@
},
{
"path": "../protocol-contracts"
},
{
"path": "../stdlib"
}
],
"include": ["src", "src/**/*.json"]
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/aztec/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
{
"path": "../builder"
},
{
"path": "../stdlib"
},
{
"path": "../cli"
},
Expand Down Expand Up @@ -84,6 +81,9 @@
{
"path": "../pxe"
},
{
"path": "../stdlib"
},
{
"path": "../telemetry-client"
},
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/bb-prover/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
"tsBuildInfoFile": ".tsbuildinfo"
},
"references": [
{
"path": "../stdlib"
},
{
"path": "../constants"
},
Expand All @@ -21,6 +18,9 @@
{
"path": "../simulator"
},
{
"path": "../stdlib"
},
{
"path": "../telemetry-client"
},
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/blob-sink/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
{
"path": "../blob-lib"
},
{
"path": "../stdlib"
},
{
"path": "../foundation"
},
{
"path": "../kv-store"
},
{
"path": "../stdlib"
},
{
"path": "../telemetry-client"
}
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/bot/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
{
"path": "../aztec.js"
},
{
"path": "../stdlib"
},
{
"path": "../entrypoints"
},
Expand All @@ -33,6 +30,9 @@
{
"path": "../protocol-contracts"
},
{
"path": "../stdlib"
},
{
"path": "../telemetry-client"
}
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/builder/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
},
"references": [
{
"path": "../stdlib"
"path": "../foundation"
},
{
"path": "../foundation"
"path": "../stdlib"
}
],
"include": ["src", "src/*.json"]
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/cli-wallet/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
{
"path": "../aztec.js"
},
{
"path": "../stdlib"
},
{
"path": "../cli"
},
Expand All @@ -32,6 +29,9 @@
},
{
"path": "../pxe"
},
{
"path": "../stdlib"
}
],
"include": ["src"]
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/cli/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
{
"path": "../aztec.js"
},
{
"path": "../stdlib"
},
{
"path": "../constants"
},
Expand All @@ -24,6 +21,9 @@
{
"path": "../l1-artifacts"
},
{
"path": "../stdlib"
},
{
"path": "../world-state"
},
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/end-to-end/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
{
"path": "../bot"
},
{
"path": "../stdlib"
},
{
"path": "../constants"
},
Expand Down Expand Up @@ -87,6 +84,9 @@
{
"path": "../simulator"
},
{
"path": "../stdlib"
},
{
"path": "../telemetry-client"
},
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/entrypoints/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
{
"path": "../aztec.js"
},
{
"path": "../stdlib"
},
{
"path": "../foundation"
},
{
"path": "../protocol-contracts"
},
{
"path": "../stdlib"
}
],
"include": ["src", "src/**/*.json"]
Expand Down
Loading
Loading