core: service audit (#15055)

smartcontractkit · Nov 2, 2024 · 0e199bb · 0e199bb
1 parent a0fbd3a
commit 0e199bb
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 95 deletions.
diff --git a/core/capabilities/gateway_connector/service_wrapper.go b/core/capabilities/gateway_connector/service_wrapper.go
@@ -55,7 +55,7 @@ func NewGatewayConnectorServiceWrapper(config config.GatewayConnector, keystore
 		config:   config,
 		keystore: keystore,
 		clock:    clock,
-		lggr:     lggr,
+		lggr:     lggr.Named("GatewayConnectorServiceWrapper"),
 	}
 }
 
@@ -106,7 +106,7 @@ func (e *ServiceWrapper) HealthReport() map[string]error {
 }
 
 func (e *ServiceWrapper) Name() string {
-	return "GatewayConnectorServiceWrapper"
+	return e.lggr.Name()
 }
 
 func (e *ServiceWrapper) GetGatewayConnector() connector.GatewayConnector {

diff --git a/core/capabilities/launcher.go b/core/capabilities/launcher.go
@@ -124,7 +124,7 @@ func (w *launcher) HealthReport() map[string]error {
 }
 
 func (w *launcher) Name() string {
-	return "CapabilitiesLauncher"
+	return w.lggr.Name()
 }
 
 func (w *launcher) Launch(ctx context.Context, state *registrysyncer.LocalRegistry) error {

diff --git a/core/capabilities/remote/dispatcher.go b/core/capabilities/remote/dispatcher.go
@@ -236,5 +236,5 @@ func (d *dispatcher) HealthReport() map[string]error {
 }
 
 func (d *dispatcher) Name() string {
-	return "Dispatcher"
+	return d.lggr.Name()
 }
diff --git a/core/capabilities/remote/target/client.go b/core/capabilities/remote/target/client.go
@@ -202,5 +202,5 @@ func (c *client) HealthReport() map[string]error {
 }
 
 func (c *client) Name() string {
-	return "TargetClient"
+	return c.lggr.Name()
 }
diff --git a/core/capabilities/remote/target/server.go b/core/capabilities/remote/target/server.go
@@ -226,5 +226,5 @@ func (r *server) HealthReport() map[string]error {
 }
 
 func (r *server) Name() string {
-	return "TargetServer"
+	return r.lggr.Name()
 }
diff --git a/core/capabilities/remote/trigger_publisher.go b/core/capabilities/remote/trigger_publisher.go
@@ -333,5 +333,5 @@ func (p *triggerPublisher) HealthReport() map[string]error {
 }
 
 func (p *triggerPublisher) Name() string {
-	return "TriggerPublisher"
+	return p.lggr.Name()
 }
diff --git a/core/capabilities/remote/trigger_subscriber.go b/core/capabilities/remote/trigger_subscriber.go
@@ -3,7 +3,7 @@ package remote
 import (
 	"context"
 	"errors"
-	sync "sync"
+	"sync"
 	"time"
 
 	commoncap "github.com/smartcontractkit/chainlink-common/pkg/capabilities"
@@ -269,5 +269,5 @@ func (s *triggerSubscriber) HealthReport() map[string]error {
 }
 
 func (s *triggerSubscriber) Name() string {
-	return "TriggerSubscriber"
+	return s.lggr.Name()
 }
diff --git a/core/capabilities/webapi/trigger/trigger.go b/core/capabilities/webapi/trigger/trigger.go
@@ -265,7 +265,7 @@ func (h *triggerConnectorHandler) HealthReport() map[string]error {
 }
 
 func (h *triggerConnectorHandler) Name() string {
-	return "WebAPITrigger"
+	return h.lggr.Name()
 }
 
 func (h *triggerConnectorHandler) sendResponse(ctx context.Context, gatewayID string, requestBody *api.MessageBody, payload any) error {

diff --git a/core/services/p2p/peer.go b/core/services/p2p/peer.go
@@ -232,5 +232,5 @@ func (p *peer) HealthReport() map[string]error {
 }
 
 func (p *peer) Name() string {
-	return "P2PPeer"
+	return p.lggr.Name()
 }
diff --git a/core/services/p2p/wrapper/wrapper.go b/core/services/p2p/wrapper/wrapper.go
@@ -36,7 +36,7 @@ func NewExternalPeerWrapper(keystoreP2P keystore.P2P, p2pConfig config.P2P, ds s
 	return &peerWrapper{
 		keystoreP2P: keystoreP2P,
 		p2pConfig:   p2pConfig,
-		lggr:        lggr,
+		lggr:        lggr.Named("PeerWrapper"),
 		ds:          ds,
 	}
 }
@@ -126,7 +126,7 @@ func (e *peerWrapper) HealthReport() map[string]error {
 }
 
 func (e *peerWrapper) Name() string {
-	return "PeerWrapper"
+	return e.lggr.Name()
 }
 
 func (e *peerWrapper) Sign(msg []byte) ([]byte, error) {

diff --git a/core/services/registrysyncer/syncer.go b/core/services/registrysyncer/syncer.go
@@ -444,14 +444,10 @@ func (s *registrySyncer) Close() error {
 	})
 }
 
-func (s *registrySyncer) Ready() error {
-	return nil
-}
-
 func (s *registrySyncer) HealthReport() map[string]error {
-	return nil
+	return map[string]error{s.Name(): s.Healthy()}
 }
 
 func (s *registrySyncer) Name() string {
-	return "RegistrySyncer"
+	return s.lggr.Name()
 }
diff --git a/core/services/relay/evm/chain_writer.go b/core/services/relay/evm/chain_writer.go
@@ -223,17 +223,11 @@ func (w *chainWriter) Close() error {
 }
 
 func (w *chainWriter) HealthReport() map[string]error {
-	return map[string]error{
-		w.Name(): nil,
-	}
+	return map[string]error{w.Name(): w.Healthy()}
 }
 
 func (w *chainWriter) Name() string {
-	return "chain-writer"
-}
-
-func (w *chainWriter) Ready() error {
-	return nil
+	return w.logger.Name()
 }
 
 func (w *chainWriter) Start(ctx context.Context) error {