Fix tests

Author: DylanTinianov

metrics/multinode_test.go

@@ -161,7 +161,7 @@ func TestMultiNodeMetrics_LifecycleMetrics(t *testing.T) {
 		m.SetHighestFinalizedBlock(ctx, nodeName, 456)
 		require.InEpsilon(t,
 			456.0,
-			testutil.ToFloat64(promPoolRPCNodeHighestFinalizedBlock.WithLabelValues("test-network", "1", nodeName)),
+			testutil.ToFloat64(PromPoolRPCNodeHighestFinalizedBlock.WithLabelValues("test-network", "1", nodeName)),
 			0.001,
 		)
 	})

multinode/go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_model v0.6.1
 	github.com/smartcontractkit/chainlink-common v0.7.0
-	github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250502183238-e20856f9c878
+	github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250502183956-f93abf9d14bc
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0
 )

multinode/go.sum

@@ -74,8 +74,8 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/smartcontractkit/chainlink-common v0.7.0 h1:QThOrHKn+du8CTmzJPCha0Nwnvw0tonIEAQca+dnmE0=
 github.com/smartcontractkit/chainlink-common v0.7.0/go.mod h1:pptbsF6z90IGCewkCgDMBxNYjfSOyW9X9l2jzYyQgmk=
-github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250502183238-e20856f9c878 h1:yY+y9F/uzI/YbyGoHeqPzA6SdM+JDdRVsGWeuCuuIRw=
-github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250502183238-e20856f9c878/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
+github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250502183956-f93abf9d14bc h1:HXG3U4nWgzKtH8rjODkcbn4x2M2ZvD2jQotCWRpDM1Q=
+github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250502183956-f93abf9d14bc/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
 github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 h1:PKiqnVOTChlH4a4ljJKL3OKGRgYfIpJS4YD1daAIKks=
 github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298/go.mod h1:Mb7+/LC4edz7HyHxX4QkE42pSuov4AV68+AxBXAap0o=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

multinode/node_lifecycle.go

@@ -120,8 +120,8 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 				}
 				lggr.Warnw(fmt.Sprintf("Poll failure, RPC endpoint %s failed to respond properly", n.String()), "err", err, "pollFailures", pollFailures, "nodeState", n.getCachedState())
 			} else {
-				n.metrics.RecordNodeClientVersion(ctx, n.name, version)
 				lggr.Debugw("Ping successful", "nodeState", n.State())
+				n.metrics.RecordNodeClientVersion(ctx, n.name, version)
 				n.metrics.IncrementPollsSuccess(ctx, n.name)
 				pollFailures = 0
 			}

multinode/node_lifecycle_test.go

@@ -381,7 +381,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 		defer func() { assert.NoError(t, node.close()) }()
 		node.declareAlive()
 		tests.AssertEventually(t, func() bool {
-			metric, err := metrics.PromPoolRPCNodeHighestFinalizedBlock.GetMetricWithLabelValues(big.NewInt(1).String(), name)
+			metric, err := metrics.PromPoolRPCNodeHighestFinalizedBlock.GetMetricWithLabelValues("test-network", big.NewInt(1).String(), name)
 			require.NoError(t, err)
 			var m = &prom.Metric{}
 			require.NoError(t, metric.Write(m))
@@ -466,7 +466,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 			writeHeads(t, ch, head{BlockNumber: expectedBlock - 1}, head{BlockNumber: expectedBlock}, head{BlockNumber: expectedBlock - 1})
 		}()
 		tests.AssertEventually(t, func() bool {
-			metric, err := promPoolRPCNodeHighestFinalizedBlock.GetMetricWithLabelValues(big.NewInt(1).String(), name)
+			metric, err := metrics.PromPoolRPCNodeHighestFinalizedBlock.GetMetricWithLabelValues("test-network", big.NewInt(1).String(), name)
 			require.NoError(t, err)
 			var m = &prom.Metric{}
 			require.NoError(t, metric.Write(m))

multinode/node_test.go

@@ -1,6 +1,8 @@
 package multinode
 
 import (
+	"github.com/smartcontractkit/chainlink-framework/metrics"
+	"github.com/stretchr/testify/require"
 	"net/url"
 	"testing"
 	"time"
@@ -103,7 +105,10 @@ func newTestNode(t *testing.T, opts testNodeOpts) testNode {
 		opts.id = 42
 	}
 
-	nodeI := NewNode[ID, Head, RPCClient[ID, Head]](opts.config, opts.chainConfig, opts.lggr, makeMockNodeMetrics(t),
+	nodeMetrics, err := metrics.NewGenericMultiNodeMetrics("test-network", "1")
+	require.NoError(t, err)
+
+	nodeI := NewNode[ID, Head, RPCClient[ID, Head]](opts.config, opts.chainConfig, opts.lggr, nodeMetrics,
 		opts.wsuri, opts.httpuri, opts.name, opts.id, opts.chainID, opts.nodeOrder, opts.rpc, opts.chainFamily)
 
 	return testNode{
@@ -123,5 +128,12 @@ func makeMockNodeMetrics(t *testing.T) *mockNodeMetrics {
 	mockMetrics.On("IncrementNodeTransitionsToInvalidChainID", mock.Anything, mock.Anything).Maybe()
 	mockMetrics.On("IncrementNodeTransitionsToUnusable", mock.Anything, mock.Anything).Maybe()
 	mockMetrics.On("IncrementNodeTransitionsToSyncing", mock.Anything, mock.Anything).Maybe()
+	mockMetrics.On("SetHighestSeenBlock", mock.Anything, mock.Anything, mock.Anything).Maybe()
+	mockMetrics.On("SetHighestFinalizedBlock", mock.Anything, mock.Anything, mock.Anything).Maybe()
+	mockMetrics.On("IncrementSeenBlocks", mock.Anything, mock.Anything).Maybe()
+	mockMetrics.On("IncrementPolls", mock.Anything, mock.Anything).Maybe()
+	mockMetrics.On("IncrementPollsFailed", mock.Anything, mock.Anything).Maybe()
+	mockMetrics.On("IncrementPollsSuccess", mock.Anything, mock.Anything).Maybe()
+	mockMetrics.On("RecordNodeClientVersion", mock.Anything, mock.Anything, mock.Anything).Maybe()
 	return mockMetrics
 }