From 05797bea518b5e77604d18bb1965b5e89d445715 Mon Sep 17 00:00:00 2001
From: Tate <tate.exon@smartcontract.com>
Date: Tue, 7 May 2024 11:03:03 -0600
Subject: [PATCH] relay metrics collect and logs cleanup

---
 .github/workflows/relay.yml | 12 +++++++++++-
 .tool-versions              |  3 +--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml
index a7f94bcbf..69e13453f 100644
--- a/.github/workflows/relay.yml
+++ b/.github/workflows/relay.yml
@@ -11,6 +11,16 @@ jobs:
     name: Relay Run Unit Tests
     runs-on: ubuntu-latest
     steps:
+      - name: Collect Metrics
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
+        with:
+          id: solana-relay-unit
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          this-job-name: Relay Run Unit Tests
+          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
       - name: Checkout sources
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       - name: Setup go
@@ -30,7 +40,7 @@ jobs:
       - name: Build
         run: go build -v ./pkg/...
       - name: Test
-        run: go test ./pkg/... -v -tags integration -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt
+        run: go test ./pkg/... -json -tags integration -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
       - name: Test with the race detector enabled
         run: go test ./pkg/... -v -race -count=10 -timeout=15m -covermode=atomic -coverpkg=./... -coverprofile=race_coverage.txt
       - name: Upload Go test results
diff --git a/.tool-versions b/.tool-versions
index f875eb382..e6006a182 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,10 +1,9 @@
-nodejs 16.13.2
+nodejs 18.20.2
 yarn 1.22.19
 rust 1.59.0
 golang 1.21.7
 golangci-lint 1.52.1
 pulumi 3.40.1
-ginkgo 2.5.1
 actionlint 1.6.22
 shellcheck 0.8.0
 helm 3.9.4