fixing testscripts test; using eng logger; using time.seconds const

smartcontractkit · Jan 10, 2025 · d4519a9 · d4519a9
1 parent 8b02f20
commit d4519a9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
@@ -83,7 +83,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/plugins"
 )
 
-const ApplicationHeartbeatSeconds = 1
+const Heartbeat = time.Second
 
 // Application implements the common functions used in the core node.
 type Application interface {
@@ -207,8 +207,7 @@ type ApplicationHeartbeat struct {
 
 func NewApplicationHeartbeat(lggr logger.Logger) ApplicationHeartbeat {
 	h := ApplicationHeartbeat{
-		beat: ApplicationHeartbeatSeconds * time.Second,
-		lggr: lggr,
+		beat: Heartbeat,
 	}
 	h.Service, h.eng = commonservices.Config{
 		Name:  "NodeHeartbeat",
@@ -242,7 +241,7 @@ func (h *ApplicationHeartbeat) start(_ context.Context) error {
 
 		err = cme.Emit(engCtx, "heartbeat")
 		if err != nil {
-			h.lggr.Errorw("heartbeat emit failed", "err", err)
+			h.eng.Errorw("heartbeat emit failed", "err", err)
 		}
 	}
 

diff --git a/core/services/chainlink/config_telemetry_test.go b/core/services/chainlink/config_telemetry_test.go
@@ -97,17 +97,21 @@ func TestTelemetryConfig_ResourceAttributes(t *testing.T) {
 			"DefaultAttributes",
 			toml.Telemetry{ResourceAttributes: nil},
 			map[string]string{
-				"service.name":    "chainlink",
-				"service.version": static.Version,
+				"service.name":         "chainlink",
+				"service.sha":          "unset",
+				"service.shortversion": "unset",
+				"service.version":      static.Version,
 			},
 		},
 		{
 			"CustomAttributes",
 			toml.Telemetry{ResourceAttributes: map[string]string{"custom.key": "custom.value"}},
 			map[string]string{
-				"service.name":    "chainlink",
-				"service.version": static.Version,
-				"custom.key":      "custom.value",
+				"service.name":         "chainlink",
+				"service.sha":          "unset",
+				"service.shortversion": "unset",
+				"service.version":      static.Version,
+				"custom.key":           "custom.value",
 			},
 		},
 	}

diff --git a/testdata/scripts/health/default.txtar b/testdata/scripts/health/default.txtar
@@ -36,6 +36,7 @@ ok JobSpawner
 ok Mailbox.Monitor
 ok Mercury.WSRPCPool
 ok Mercury.WSRPCPool.CacheSet
+ok NodeHeartbeat
 ok PipelineORM
 ok PipelineRunner
 ok PipelineRunner.BridgeCache
@@ -91,6 +92,15 @@ ok WorkflowDBStore
         "output": ""
       }
     },
+    {
+      "type": "checks",
+      "id": "NodeHeartbeat",
+      "attributes": {
+        "name": "NodeHeartbeat",
+        "status": "passing",
+        "output": ""
+      }
+    },
     {
       "type": "checks",
       "id": "PipelineORM",

diff --git a/testdata/scripts/health/multi-chain.txtar b/testdata/scripts/health/multi-chain.txtar
@@ -90,6 +90,7 @@ ok JobSpawner
 ok Mailbox.Monitor
 ok Mercury.WSRPCPool
 ok Mercury.WSRPCPool.CacheSet
+ok NodeHeartbeat
 ok PipelineORM
 ok PipelineRunner
 ok PipelineRunner.BridgeCache
@@ -299,6 +300,15 @@ ok WorkflowDBStore
         "output": ""
       }
     },
+    {
+      "type": "checks",
+      "id": "NodeHeartbeat",
+      "attributes": {
+        "name": "NodeHeartbeat",
+        "status": "passing",
+        "output": ""
+      }
+    },
     {
       "type": "checks",
       "id": "PipelineORM",