Revert instance related commits

    instead let the proxy handle different types of stats

This reverts commit 895a1a1.
This reverts commit 6d417d0.
This reverts commit b31d02d.
This reverts commit f41d8e8.

Author: nocturnalnematode

.github/actions/pushLoggedMetrics/action.yml

@@ -15,50 +15,40 @@ runs:
           # send some stats whilst we're at it
           echo Metrics file found.
           nl .sfpowerscripts/logs/metrics.log
-          countmetrics=$(jq --slurp --raw-output '
+          metrics=$(jq --slurp --raw-output '
             # just keep the last value
             reverse | unique_by(.metric, .tags) | reverse | .[] |
-            select(.type == "count") |
+            (
+                if .type == "count" then "counter"
+                # note the spelling
+                elif .type == "guage" then "gauge"
+                # statsd-timers are always in ms. prometheus has no such type, so just
+                # use a gauge
+                elif .type == "timers" then "gauge"
+                # anything else, handle it when the time comes
+                else "unknown" end
+            ) as $type |
             # assume counters with no value given are 1
             (
-                if .value == null then 1
-                else .value
+                if .value == null and $type == "counter" then 1
+                elif $type == "gauge" then .value
+                else null
                 end
             ) as $value |
-            # only allow alpha, _, and : in metrics name
-            (.metric | gsub("[^a-z_]"; ":")) as $metric |
-            # transform tags into prometheus
-            (.tags // {} | to_entries | map(.key + "=\"" + (.value | tostring) + "\"") | join(",")) as $tags |
-            # put it all together. one line with description, one line with metric.
-            "# TYPE \($metric) counter\n\($metric){\($tags)} \($value)"
-          ' .sfpowerscripts/logs/metrics.log | awk '/^# TYPE / && a[$3]++ {next}; 1')
-          gaugemetrics=$(jq --slurp --raw-output '
-            # just keep the last value
-            reverse | unique_by(.metric, .tags) | reverse | .[] |
-            select(.type == "guage" or .type == "timers") |
-            # only allow alpha, _, and : in metrics name
-            (.metric | gsub("[^a-z_]"; ":")) as $metric |
+            select($value != null) |
+            # only allow alpha and _ in metrics name
+            (.metric | gsub("[^a-z]"; "_")) as $metric |
             # transform tags into prometheus
-            (.tags // {} | to_entries | map(.key + "=\"" + (.value | tostring) + "\"") | join(",")) as $tags |
+            (.tags // {} | to_entries | map(.key + "=\"" + .value + "\"") | join(",")) as $tags |
             # put it all together. one line with description, one line with metric.
-            "# TYPE \($metric) gauge\n\($metric){\($tags)} \(.value)"
+            "# TYPE \($metric) \($type)\n\($metric){\($tags)} \($value)"
           ' .sfpowerscripts/logs/metrics.log | awk '/^# TYPE / && a[$3]++ {next}; 1')
           echo "METRICSKEY len: ${#METRICSKEY}"
           keyfile=$(mktemp) || exit 1
           cat > "$keyfile" <<< "$METRICSKEY"
-          # send count metrics. accumulate by specifying instance per run.
-          sig=$(printf %s "$countmetrics" | openssl dgst -sha256 -sign "$keyfile" -out - | base64 -w0)
-          jq --compact-output --null-input \
-            --arg metrics "$countmetrics" \
-            --arg runner sf-platform \
-            --arg sig "$sig" \
-            '{"runner":$runner,"metrics":$metrics,"signature":$sig}' |
-            tee >(curl -D- -H 'Content-Type: application/json' --data-binary @- \
-              "https://sf-github-metrics.ekstern.dev.nav.no/measures/job/sfplatform/instance/${{github.run_id}}")
-          # send gauge metrics. no instance means metrics sent get overwritten.
-          sig=$(printf %s "$gaugemetrics" | openssl dgst -sha256 -sign "$keyfile" -out - | base64 -w0)
+          sig=$(printf %s "$metrics" | openssl dgst -sha256 -sign "$keyfile" -out - | base64 -w0)
           jq --compact-output --null-input \
-            --arg metrics "$gaugemetrics" \
+            --arg metrics "$metrics" \
             --arg runner sf-platform \
             --arg sig "$sig" \
             '{"runner":$runner,"metrics":$metrics,"signature":$sig}' |