ufm-metamask correct envs

ufm-test-services/.env.example

@@ -15,7 +15,7 @@ METRICS_WRITE_URL="http://pushgateway:9091"
 # Dictates how the request body is structured when pushing metrics. Should be either "grafana" or "prometheus-pushgateway"
 METRICS_WRITE_TOOL="prometheus-pushgateway"
 # This is the source the pushed metric will be labeled as originting from. May not need this value
-METRIC_WRITE_SOURCE=""
+METRICS_WRITE_SOURCE=""
 # The needed credentials to access METRICS_READ_URL. Will be sent as: Authorization: Bearer username:password
 METRICS_WRITE_USERNAME=""
 METRICS_WRITE_PASSWORD=""

ufm-test-services/.secrets.example

@@ -15,7 +15,7 @@ METRICS_WRITE_URL="http://pushgateway:9091"
 # Dictates how the request body is structured when pushing metrics. Should be either "grafana" or "prometheus-pushgateway"
 METRICS_WRITE_TOOL="prometheus-pushgateway"
 # This is the source the pushed metric will be labeled as originting from. May not need this value
-METRIC_WRITE_SOURCE=""
+METRICS_WRITE_SOURCE=""
 # The needed credentials to access METRICS_READ_URL. Will be sent as: Authorization: Bearer username:password
 METRICS_WRITE_USERNAME=""
 METRICS_WRITE_PASSWORD=""

ufm-test-services/docker-compose.yml

@@ -42,7 +42,7 @@ services:
       context: ./metamask
       dockerfile: Dockerfile
       args:
-        - METAMASK_RUN_HEADLESS=${METAMASK_RUN_HEADLESS}
+        - METAMASK_PLAYWRIGHT_RUN_HEADLESS=${METAMASK_PLAYWRIGHT_RUN_HEADLESS}
     container_name: test-service-metamask
     profiles: ["5minute"]
     environment:
@@ -54,7 +54,7 @@ services:
       METRICS_READ_PASSWORD: ${METRICS_READ_PASSWORD}
       METRICS_WRITE_URL: ${METRICS_WRITE_URL}
       METRICS_WRITE_TOOL: ${METRICS_WRITE_TOOL}
-      METRIC_WRITE_SOURCE: ${METRIC_WRITE_SOURCE}
+      METRICS_WRITE_SOURCE: ${METRICS_WRITE_SOURCE}
       METRICS_WRITE_USERNAME: ${METRICS_WRITE_USERNAME}
       METRICS_WRITE_PASSWORD: ${METRICS_WRITE_PASSWORD}
       METAMASK_PLAYWRIGHT_RUN_HEADLESS: ${METAMASK_PLAYWRIGHT_RUN_HEADLESS}

ufm-test-services/metamask/Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /app
 # Update PATH
 ENV PATH /app/node_modules/.bin:$PATH
 
-RUN if [ "$METAMASK_RUN_HEADLESS" != "false" ]; then \
+RUN if [ "$METAMASK_PLAYWRIGHT_RUN_HEADLESS" != "false" ]; then \
         apt-get update && \
         apt-get install -y xvfb && \
         rm -rf /var/lib/apt/lists/* ; \

ufm-test-services/metamask/github_workflow.example.yaml

@@ -22,7 +22,7 @@ jobs:
           METRICS_READ_PASSWORD: ${{ secrets.METRICS_READ_PASSWORD }}
           METRICS_WRITE_URL: ${{ secrets.METRICS_WRITE_URL }}
           METRICS_WRITE_TOOL: ${{ secrets.METRICS_WRITE_TOOL }}
-          METRIC_WRITE_SOURCE: ${{ secrets.METRIC_WRITE_SOURCE }}
+          METRICS_WRITE_SOURCE: ${{ secrets.METRICS_WRITE_SOURCE }}
           METRICS_WRITE_USERNAME: ${{ secrets.METRICS_WRITE_USERNAME }}
           METRICS_WRITE_PASSWORD: ${{ secrets.METRICS_WRITE_PASSWORD }}
           METAMASK_SECRET_WORDS_OR_PRIVATEKEY: ${{ secrets.METAMASK_SECRET_WORDS_OR_PRIVATEKEY }}

ufm-test-services/metamask/start.sh

 #!/bin/bash
 
-if [ "$METAMASK_RUN_HEADLESS" == "true" ]; then
+if [ "$METAMASK_PLAYWRIGHT_RUN_HEADLESS" != "false" ]; then
     # Start Xvfb in the background on display :99
     Xvfb :99 &
 

ufm-test-services/metamask/tests/prometheusUtils.ts

@@ -9,7 +9,7 @@ const env = z
     METRICS_READ_PASSWORD: z.string().optional(),
     METRICS_WRITE_URL: z.string().url(),
     METRICS_WRITE_TOOL: z.enum(['grafana', 'prometheus-pushgateway']),
-    METRIC_WRITE_SOURCE: z.string().optional(),
+    METRICS_WRITE_SOURCE: z.string().optional(),
     METRICS_WRITE_USERNAME: z.string().optional(),
     METRICS_WRITE_PASSWORD: z.string().optional(),
   })
@@ -40,7 +40,7 @@ const env = z
     (data) => {
       if (
         data.METRICS_WRITE_TOOL === 'grafana' &&
-        data.METRIC_WRITE_SOURCE === undefined
+        data.METRICS_WRITE_SOURCE === undefined
       )
         return false
 
@@ -48,7 +48,7 @@ const env = z
     },
     {
       message:
-        'Writing to Grafana requires a source, please specify one using METRIC_WRITE_SOURCE env',
+        'Writing to Grafana requires a source, please specify one using METRICS_WRITE_SOURCE env',
     }
   )
   .parse(process.env)
@@ -164,7 +164,7 @@ export const getSelfSendGaugeValue = async () => {
 const pushMetricsGrafana = (metricName: string, valueToSetTo: number) =>
   pushMetricsWriteUrl(
     `${metricName},source=${
-      env.METRIC_WRITE_SOURCE
+      env.METRICS_WRITE_SOURCE
     } metric=${valueToSetTo}`
   )