core/services/relay/evm/mercury/wsrpc: forward health and readiness f…

…rom CacheSet (#11592)
smartcontractkit · Dec 20, 2023 · fbe25a2 · fbe25a2
1 parent 14d5d3b
commit fbe25a2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go b/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go
@@ -104,8 +104,9 @@ func (cs *cacheSet) HealthReport() map[string]error {
 		cs.Name(): cs.Ready(),
 	}
 	cs.RLock()
-	defer cs.RUnlock()
-	for _, c := range cs.caches {
+	caches := maps.Values(cs.caches)
+	cs.RUnlock()
+	for _, c := range caches {
 		services.CopyHealth(report, c.HealthReport())
 	}
 	return report

diff --git a/core/services/relay/evm/mercury/wsrpc/pool.go b/core/services/relay/evm/mercury/wsrpc/pool.go
@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"github.com/smartcontractkit/wsrpc/credentials"
+	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services"
@@ -224,7 +225,7 @@ func (p *pool) Ready() error {
 }
 
 func (p *pool) HealthReport() map[string]error {
-	return map[string]error{
-		p.Name(): p.Ready(),
-	}
+	hp := map[string]error{p.Name(): p.Ready()}
+	maps.Copy(hp, p.cacheSet.HealthReport())
+	return hp
 }
diff --git a/core/web/testdata/body/health.html b/core/web/testdata/body/health.html
@@ -81,7 +81,10 @@
 <details open>
     <summary title=""><span class="">Mercury</span></summary>
     <details open>
-        <summary title="Mercury.WSRPCPool" class="noexpand"><span class="passing">WSRPCPool</span></summary>
+        <summary title="Mercury.WSRPCPool"><span class="passing">WSRPCPool</span></summary>
+        <details open>
+            <summary title="Mercury.WSRPCPool.CacheSet" class="noexpand"><span class="passing">CacheSet</span></summary>
+        </details>
     </details>
 </details>
 <details open>

diff --git a/core/web/testdata/body/health.json b/core/web/testdata/body/health.json
@@ -126,6 +126,15 @@
         "output": ""
       }
     },
+    {
+      "type": "checks",
+      "id": "Mercury.WSRPCPool.CacheSet",
+      "attributes": {
+        "name": "Mercury.WSRPCPool.CacheSet",
+        "status": "passing",
+        "output": ""
+      }
+    },
     {
       "type": "checks",
       "id": "PipelineORM",

diff --git a/core/web/testdata/body/health.txt b/core/web/testdata/body/health.txt
@@ -13,6 +13,7 @@
 -JobSpawner
 -Mailbox.Monitor
 -Mercury.WSRPCPool
+-Mercury.WSRPCPool.CacheSet
 -PipelineORM
 -PipelineRunner
 -PromReporter