Merge branch 'develop' into rtinianov_lenient

smartcontractkit · Apr 18, 2024 · de59ad5 · de59ad5
2 parents 59620d5 + 6fe3ee0
commit de59ad5
Show file tree

Hide file tree

Showing 32 changed files with 979 additions and 163 deletions.
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
@@ -1,8 +1,8 @@
 self-hosted-runner:
   # Labels of self-hosted or large runner labels in array of string
   labels:
-    - ubuntu20.04-4cores-16GB
-    - ubuntu20.04-8cores-32GB
-    - ubuntu20.04-16cores-64GB
-    - ubuntu20.04-32cores-128GB
-    - ubuntu20.04-64cores-256GB
+    - ubuntu-latest-4cores-16GB
+    - ubuntu-latest-8cores-32GB
+    - ubuntu-latest-16cores-64GB
+    - ubuntu-latest-32cores-128GB
+    - ubuntu-latest-64cores-256GB
diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml
@@ -53,7 +53,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    runs-on: ubuntu20.04-32cores-128GB
+    runs-on: ubuntu-latest-32cores-128GB
     needs: [get_projectserum_version]
     container:
       image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
@@ -68,7 +68,7 @@ jobs:
 
   e2e_custom_build_custom_chainlink_image:
     name: E2E Custom Build Custom CL Image
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu-latest-16cores-64GB
     environment: integration
     permissions:
       id-token: write
@@ -101,7 +101,7 @@ jobs:
       pull-requests: write
       id-token: write
       contents: read
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu-latest-16cores-64GB
 
     needs: [e2e_custom_build_artifacts, e2e_custom_build_custom_chainlink_image, check_test_compilation]
     env:

diff --git a/cmd/monitoring/main.go b/cmd/monitoring/main.go
@@ -57,27 +57,51 @@ func main() {
 		return
 	}
 
+	// per-feed sources
 	feedBalancesSourceFactory := monitoring.NewFeedBalancesSourceFactory(
 		chainReader,
 		logger.With(log, "component", "source-feed-balances"),
 	)
+	txDetailsSourceFactory := monitoring.NewTxDetailsSourceFactory(
+		chainReader,
+		logger.With(log, "component", "source-tx-details"),
+	)
+	monitor.SourceFactories = append(monitor.SourceFactories,
+		feedBalancesSourceFactory,
+		txDetailsSourceFactory,
+	)
+
+	// network sources
 	nodeBalancesSourceFactory := monitoring.NewNodeBalancesSourceFactory(
 		chainReader,
 		logger.With(log, "component", "source-node-balances"),
 	)
-	monitor.SourceFactories = append(monitor.SourceFactories, feedBalancesSourceFactory)
-	monitor.NetworkSourceFactories = append(monitor.NetworkSourceFactories, nodeBalancesSourceFactory)
+	monitor.NetworkSourceFactories = append(monitor.NetworkSourceFactories,
+		nodeBalancesSourceFactory,
+	)
 
+	// per-feed exporters
 	feedBalancesExporterFactory := exporter.NewFeedBalancesFactory(
 		logger.With(log, "component", "solana-prom-exporter"),
 		metrics.NewFeedBalances(logger.With(log, "component", "solana-metrics")),
 	)
+	reportObservationsFactory := exporter.NewReportObservationsFactory(
+		logger.With(log, "component", "solana-prome-exporter"),
+		metrics.NewReportObservations(logger.With(log, "component", "solana-metrics")),
+	)
+	monitor.ExporterFactories = append(monitor.ExporterFactories,
+		feedBalancesExporterFactory,
+		reportObservationsFactory,
+	)
+
+	// network exporters
 	nodeBalancesExporterFactory := exporter.NewNodeBalancesFactory(
 		logger.With(log, "component", "solana-prom-exporter"),
 		metrics.NewNodeBalances,
 	)
-	monitor.ExporterFactories = append(monitor.ExporterFactories, feedBalancesExporterFactory)
-	monitor.NetworkExporterFactories = append(monitor.NetworkExporterFactories, nodeBalancesExporterFactory)
+	monitor.NetworkExporterFactories = append(monitor.NetworkExporterFactories,
+		nodeBalancesExporterFactory,
+	)
 
 	monitor.Run()
 	log.Infow("monitor stopped")

diff --git a/go.mod b/go.mod
@@ -4,9 +4,9 @@ go 1.21
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
-	github.com/gagliardetto/binary v0.7.1
+	github.com/gagliardetto/binary v0.7.7
 	github.com/gagliardetto/gofuzz v1.2.2
-	github.com/gagliardetto/solana-go v1.4.1-0.20220428092759-5250b4abbb27
+	github.com/gagliardetto/solana-go v1.8.4
 	github.com/gagliardetto/treeout v0.1.4
 	github.com/gagliardetto/utilz v0.1.1
 	github.com/google/uuid v1.3.1
@@ -83,12 +83,14 @@ require (
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v5 v5.2.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/streamingfast/logging v0.0.0-20220405224725-2755dab2ce75 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect
 	github.com/tidwall/gjson v1.14.4 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
+	go.mongodb.org/mongo-driver v1.15.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
 	go.opentelemetry.io/otel v1.19.0 // indirect
@@ -104,6 +106,7 @@ require (
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
 	google.golang.org/grpc v1.58.3 // indirect