feat: consolidate spartan metrics

noir-projects/Earthfile

@@ -15,16 +15,19 @@ source:
   COPY --dir aztec-nr noir-contracts noir-protocol-circuits mock-protocol-circuits scripts .
 
 build-contracts:
+  ARG RAYON_NUM_THREADS
   FROM +source
 
   # Install transpiler
   COPY ../avm-transpiler/+build/avm-transpiler /usr/bin/avm-transpiler
 
   RUN yarn
-  RUN cd noir-contracts && NARGO=nargo TRANSPILER=avm-transpiler ./bootstrap.sh
+  ENV RAYON_NUM_THREADS=$RAYON_NUM_THREADS
+  RUN cd noir-contracts && NARGO=nargo TRANSPILER=avm-transpiler  ./bootstrap.sh
   SAVE ARTIFACT noir-contracts
 
 build-protocol-circuits:
+  ARG RAYON_NUM_THREADS
   LOCALLY
   LET bb_source_hash = $(cd .. && git ls-tree -r HEAD | grep 'barretenberg/cpp' | awk '{print $3}' | git hash-object --stdin)
   FROM +source
@@ -34,10 +37,13 @@ build-protocol-circuits:
   # Install bb
   COPY ../barretenberg/cpp/+preset-release/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
   RUN yarn
+
+  ENV RAYON_NUM_THREADS=$RAYON_NUM_THREADS
   RUN cd noir-protocol-circuits && BB_HASH=$bb_source_hash NARGO=nargo ./bootstrap.sh
   SAVE ARTIFACT noir-protocol-circuits
 
 build-mock-protocol-circuits:
+  ARG RAYON_NUM_THREADS
   LOCALLY
   LET bb_source_hash = $(cd .. && git ls-tree -r HEAD | grep 'barretenberg/cpp' | awk '{print $3}' | git hash-object --stdin)
   FROM +source
@@ -47,10 +53,14 @@ build-mock-protocol-circuits:
   # Install bb
   COPY ../barretenberg/cpp/+preset-release/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
   RUN yarn
+
+  ENV RAYON_NUM_THREADS=$RAYON_NUM_THREADS
+  RUN echo "building with num threads $RAYON_NUM_THREADS"
   RUN cd mock-protocol-circuits && BB_HASH=$bb_source_hash NARGO=nargo ./bootstrap.sh
   SAVE ARTIFACT mock-protocol-circuits
 
 build:
+  ARG RAYON_NUM_THREADS
   FROM +source
   BUILD +build-contracts
   BUILD +build-protocol-circuits

noir-projects/bootstrap.sh

@@ -33,9 +33,8 @@ case "$(uname)" in
     echo "Parallel builds not supported on this operating system"
     ;;
 esac
-# This value may be too low.
 # If builds fail with an amount of free memory greater than this value then it should be increased.
-MIN_PARALLEL_BUILD_MEMORY=32854492
+MIN_PARALLEL_BUILD_MEMORY=134217728
 
 yarn
 

noir-projects/noir-protocol-circuits/bootstrap.sh

@@ -20,7 +20,7 @@ node ./scripts/generate_variants.js
 
 echo "Compiling protocol circuits..."
 NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
-$NARGO compile --silence-warnings
+RAYON_NUM_THREADS=1 $NARGO compile --silence-warnings
 
 BB_HASH=${BB_HASH:-$(cd ../../ && git ls-tree -r HEAD | grep 'barretenberg/cpp' | awk '{print $3}' | git hash-object --stdin)}
 echo Using BB hash $BB_HASH

spartan/aztec-network/templates/_helpers.tpl

@@ -67,11 +67,11 @@ http://{{ include "aztec-network.fullname" . }}-metrics.{{ .Release.Namespace }}
 {{- end -}}
 
 {{- define "aztec-network.otelCollectorMetricsEndpoint" -}}
-{{ include "aztec-network.metricsHost" . }}:{{ .Values.metrics.ports.otlp }}/v1/metrics
+http://metrics-opentelemetry-collector.metrics:4318/v1/metrics
 {{- end -}}
 
 {{- define "aztec-network.otelCollectorTracesEndpoint" -}}
-{{ include "aztec-network.metricsHost" . }}:{{ .Values.metrics.ports.otlp }}/v1/traces
+http://metrics-opentelemetry-collector.metrics:4318/v1/traces
 {{- end -}}
 
 

spartan/aztec-network/templates/boot-node.yaml

@@ -53,7 +53,7 @@ spec:
             - name: ETHEREUM_HOST
               value: {{ include "aztec-network.ethereumHost" . | quote }}
       containers:
-        - name: aztec
+        - name: boot-node
           image: {{ .Values.images.aztec.image }}
           command:
             [

spartan/aztec-network/templates/prover-node.yaml

@@ -34,7 +34,7 @@ spec:
             - name: ETHEREUM_HOST
               value: {{ include "aztec-network.ethereumHost" . | quote }}
       containers:
-        - name: aztec
+        - name: prover-node
           image: "{{ .Values.images.aztec.image }}"
           imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
           command:

spartan/aztec-network/templates/pxe.yaml

@@ -18,7 +18,7 @@ spec:
         app: pxe
     spec:
       containers:
-        - name: aztec
+        - name: pxe
           image: "{{ .Values.images.aztec.image }}"
           command:
             - "/bin/bash"

spartan/aztec-network/templates/transaction-bot.yaml

@@ -26,7 +26,7 @@ spec:
             - |
               until curl -s {{ include "aztec-network.bootNodeUrl" . }}/status; do echo waiting for aztec-node; sleep 2; done
       containers:
-        - name: aztec
+        - name: transaction-bot
           image: "{{ .Values.images.aztec.image }}"
           command:
             - "/bin/bash"

spartan/aztec-network/templates/validator.yaml

@@ -34,7 +34,7 @@ spec:
             - name: ETHEREUM_HOST
               value: {{ include "aztec-network.ethereumHost" . | quote }}
       containers:
-        - name: aztec
+        - name: validator
           image: "{{ .Values.images.aztec.image }}"
           imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
           command: