From 41f2497830959a79513d3e80bd5195bdef8b950b Mon Sep 17 00:00:00 2001
From: Dmytro Haidashenko <34754799+dhaidashenko@users.noreply.github.com>
Date: Mon, 22 Jan 2024 15:21:06 +0100
Subject: [PATCH] Fix RPC name override (#11813)

* Fix rpc name override

* use configured name without additional checks

* multi-node metrics test

* Fix typo
---
 core/chains/legacyevm/chain.go            |  6 +-
 testdata/scripts/metrics/multi-node.txtar | 78 +++++++++++++++++++++++
 2 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 testdata/scripts/metrics/multi-node.txtar

diff --git a/core/chains/legacyevm/chain.go b/core/chains/legacyevm/chain.go
index 0e0e1e65aca..92936299cdb 100644
--- a/core/chains/legacyevm/chain.go
+++ b/core/chains/legacyevm/chain.go
@@ -474,15 +474,13 @@ func newEthClientFromCfg(cfg evmconfig.NodePool, noNewHeadsThreshold time.Durati
 	var sendonlys []commonclient.SendOnlyNode[*big.Int, evmclient.RPCCLient]
 	for i, node := range nodes {
 		if node.SendOnly != nil && *node.SendOnly {
-			name := fmt.Sprintf("eth-sendonly-rpc-%d", i)
-			rpc := evmclient.NewRPCClient(lggr, empty, (*url.URL)(node.HTTPURL), name, int32(i), chainID,
+			rpc := evmclient.NewRPCClient(lggr, empty, (*url.URL)(node.HTTPURL), *node.Name, int32(i), chainID,
 				commonclient.Secondary)
 			sendonly := commonclient.NewSendOnlyNode[*big.Int, evmclient.RPCCLient](lggr, (url.URL)(*node.HTTPURL),
 				*node.Name, chainID, rpc)
 			sendonlys = append(sendonlys, sendonly)
 		} else {
-			name := fmt.Sprintf("eth-primary-rpc-%d", i)
-			rpc := evmclient.NewRPCClient(lggr, (url.URL)(*node.WSURL), (*url.URL)(node.HTTPURL), name, int32(i),
+			rpc := evmclient.NewRPCClient(lggr, (url.URL)(*node.WSURL), (*url.URL)(node.HTTPURL), *node.Name, int32(i),
 				chainID, commonclient.Primary)
 			primaryNode := commonclient.NewNode[*big.Int, *evmtypes.Head, evmclient.RPCCLient](cfg, noNewHeadsThreshold,
 				lggr, (url.URL)(*node.WSURL), (*url.URL)(node.HTTPURL), *node.Name, int32(i), chainID, *node.Order,
diff --git a/testdata/scripts/metrics/multi-node.txtar b/testdata/scripts/metrics/multi-node.txtar
new file mode 100644
index 00000000000..c3928160443
--- /dev/null
+++ b/testdata/scripts/metrics/multi-node.txtar
@@ -0,0 +1,78 @@
+# Check that metrics specified in the expected_metrics are present in /metrics response
+# start node
+exec sh -c 'eval "echo \"$(cat config.toml.tmpl)\" > config.toml"'
+exec chainlink node -c config.toml start -p password -a creds &
+
+# ensure node is up and running
+env NODEURL=http://localhost:$PORT
+exec curl --retry 10 --retry-max-time 60 --retry-connrefused $NODEURL
+
+
+# Check
+chmod 700 ./script.sh
+exec sh -c './script.sh'
+
+-- script.sh --
+
+maxRetries=5
+for retriesNum in $(seq 1 $maxRetries); do
+    passedAllChecks=true
+    curl $NODEURL/metrics > metrics.txt
+    while IFS= read -r expectedMetric; do
+        grep -q $expectedMetric metrics.txt && continue
+
+        if [[ $retriesNum -ge $maxRetries ]]; then
+            cat metrics.txt
+            echo "FAIL Expected metric $expectedMetric to be present in GET /metrics response"
+            exit 1
+        fi
+
+        echo "Metric $expectedMetric is not present in GET /metrics response - retrying after 5s"
+        passedAllChecks=false
+        sleep 5
+        break
+    done < expected_metrics.txt
+
+    $passedAllChecks && break
+done
+
+-- testdb.txt --
+CL_DATABASE_URL
+-- testport.txt --
+PORT
+
+-- password --
+T.tLHkcmwePT/p,]sYuntjwHKAsrhm#4eRs4LuKHwvHejWYAC2JP4M8HimwgmbaZ
+-- creds --
+notreal@fakeemail.ch
+fj293fbBnlQ!f9vNs
+
+-- config.toml.tmpl --
+[Webserver]
+HTTPPort = $PORT
+
+[[EVM]]
+ChainID = '68472'
+
+[[EVM.Nodes]]
+Name = 'BlueEVMPrimaryNode'
+WSURL = 'wss://primaryfoo.bar/ws'
+HTTPURL = 'https://primaryfoo.bar'
+
+[[EVM.Nodes]]
+Name = 'YellowEVMPrimaryNode'
+WSURL = 'wss://sendonlyfoo.bar/ws'
+HTTPURL = 'https://sendonlyfoo.bar'
+SendOnly = true
+
+-- expected_metrics.txt --
+evm_pool_rpc_node_dials_total{evmChainID="68472",nodeName="BlueEVMPrimaryNode"}
+evm_pool_rpc_node_dials_total{evmChainID="68472",nodeName="YellowEVMPrimaryNode"}
+multi_node_states{chainId="68472",network="EVM",state="Alive"}
+multi_node_states{chainId="68472",network="EVM",state="Closed"}
+multi_node_states{chainId="68472",network="EVM",state="Dialed"}
+multi_node_states{chainId="68472",network="EVM",state="InvalidChainID"}
+multi_node_states{chainId="68472",network="EVM",state="OutOfSync"}
+multi_node_states{chainId="68472",network="EVM",state="Undialed"}
+multi_node_states{chainId="68472",network="EVM",state="Unreachable"}
+multi_node_states{chainId="68472",network="EVM",state="Unusable"}
\ No newline at end of file