DF-23700 harmonize rpc client metrics (#465)

vlfig · web-flow · commit 31a0cb010cf3 · 2026-05-11T10:22:13.000-05:00
pass the rpc domain to RPCClientBase, not the url
bump cl-framework (brings better labels and sanitization)
diff --git a/go.mod b/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20251022073203-7d8ae8cf67c1
 	github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20260423135514-5b1a7565a99c
 	github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20260423135514-5b1a7565a99c
-	github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20260423135514-5b1a7565a99c
+	github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20260508154216-3ed6f623098f
 	github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20260505202410-b350dca113b4
 	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260326111235-8c09d1a4491f
 	github.com/smartcontractkit/chainlink-protos/svr v1.2.0
diff --git a/go.sum b/go.sum
diff --git a/pkg/client/rpc_client.go b/pkg/client/rpc_client.go
@@ -180,18 +180,12 @@ func NewRPCClient(
 		lggr.Error("RPC client is configured with only WebSocket URL. If this CL Node serves external requests, it must also have an HTTP URL configured. Otherwise, there is a serious DDoS risk.")
 	}
 
-	var rpcURL string
-	if wsuri != nil {
-		rpcURL = wsuri.String()
-	} else if httpuri != nil {
-		rpcURL = httpuri.String()
-	}
 	isSendOnly := tier == multinode.Secondary
 	var rpcBaseMetrics frameworkmetrics.RPCClientMetrics
 	if r.beholderMetrics != nil {
 		rpcBaseMetrics = r.beholderMetrics.rpcClientMetrics
 	}
-	r.RPCClientBase = multinode.NewRPCClientBase[*evmtypes.Head](cfg, QueryTimeout, lggr, r.latestBlock, r.latestFinalizedBlock, rpcURL, isSendOnly, rpcBaseMetrics)
+	r.RPCClientBase = multinode.NewRPCClientBase[*evmtypes.Head](cfg, QueryTimeout, lggr, r.latestBlock, r.latestFinalizedBlock, r.getRPCDomain(), isSendOnly, rpcBaseMetrics)
 	return r
 }
 
@@ -341,7 +335,11 @@ func (r *RPCClient) getRPCDomain() string {
 	if http != nil {
 		return http.uri.Host
 	}
-	return r.ws.Load().uri.Host
+	ws := r.ws.Load()
+	if ws != nil {
+		return ws.uri.Host
+	}
+	return ""
 }
 
 func (r *RPCClient) isChainType(chainType chaintype.ChainType) bool {

Original file line number	Diff line number	Diff line change
`@@ -180,18 +180,12 @@ func NewRPCClient(`
`180`	`180`	`lggr.Error("RPC client is configured with only WebSocket URL. If this CL Node serves external requests, it must also have an HTTP URL configured. Otherwise, there is a serious DDoS risk.")`
`181`	`181`	`}`
`182`	`182`
`183`		`- var rpcURL string`
`184`		`- if wsuri != nil {`
`185`		`- rpcURL = wsuri.String()`
`186`		`- } else if httpuri != nil {`
`187`		`- rpcURL = httpuri.String()`
`188`		`- }`
`189`	`183`	`isSendOnly := tier == multinode.Secondary`
`190`	`184`	`var rpcBaseMetrics frameworkmetrics.RPCClientMetrics`
`191`	`185`	`if r.beholderMetrics != nil {`
`192`	`186`	`rpcBaseMetrics = r.beholderMetrics.rpcClientMetrics`
`193`	`187`	`}`
`194`		`- r.RPCClientBase = multinode.NewRPCClientBase[*evmtypes.Head](cfg, QueryTimeout, lggr, r.latestBlock, r.latestFinalizedBlock, rpcURL, isSendOnly, rpcBaseMetrics)`
	`188`	`+ r.RPCClientBase = multinode.NewRPCClientBase[*evmtypes.Head](cfg, QueryTimeout, lggr, r.latestBlock, r.latestFinalizedBlock, r.getRPCDomain(), isSendOnly, rpcBaseMetrics)`
`195`	`189`	`return r`
`196`	`190`	`}`
`197`	`191`
`@@ -341,7 +335,11 @@ func (r *RPCClient) getRPCDomain() string {`
`341`	`335`	`if http != nil {`
`342`	`336`	`return http.uri.Host`
`343`	`337`	`}`
`344`		`- return r.ws.Load().uri.Host`
	`338`	`+ ws := r.ws.Load()`
	`339`	`+ if ws != nil {`
	`340`	`+ return ws.uri.Host`
	`341`	`+ }`
	`342`	`+ return ""`
`345`	`343`	`}`
`346`	`344`
`347`	`345`	`func (r *RPCClient) isChainType(chainType chaintype.ChainType) bool {`