Merge branch 'main' into feature/PLEX-1471-e2e-fixes

Author: ilija42

.github/workflows/api-diff.yml

@@ -0,0 +1,31 @@
+name: Analyze API Changes
+description: Runs apidiff-go action to check for breaking changes to modules' public APIs
+
+on:
+  pull_request:
+
+jobs:
+  root-module:
+    name: Root Module
+    permissions:
+      pull-requests: write
+      contents: read
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
+          cache: false
+
+      - uses: smartcontractkit/.github/actions/apidiff-go@apidiff-go/0.1.0
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          go-mod-paths: "./"
+          enforce-compatible: "false" # dont fail on breaking changes

pkg/loop/config.go

@@ -63,7 +63,8 @@ const (
 	envTelemetryEmitterMaxQueueSize       = "CL_TELEMETRY_EMITTER_MAX_QUEUE_SIZE"
 	envTelemetryLogStreamingEnabled       = "CL_TELEMETRY_LOG_STREAMING_ENABLED"
 
-	envChipIngressEndpoint = "CL_CHIP_INGRESS_ENDPOINT"
+	envChipIngressEndpoint           = "CL_CHIP_INGRESS_ENDPOINT"
+	envChipIngressInsecureConnection = "CL_CHIP_INGRESS_INSECURE_CONNECTION"
 )
 
 // EnvConfig is the configuration between the application and the LOOP executable. The values
@@ -118,7 +119,8 @@ type EnvConfig struct {
 	TelemetryEmitterMaxQueueSize       int
 	TelemetryLogStreamingEnabled       bool
 
-	ChipIngressEndpoint string
+	ChipIngressEndpoint           string
+	ChipIngressInsecureConnection bool
 }
 
 // AsCmdEnv returns a slice of environment variable key/value pairs for an exec.Cmd.
@@ -187,6 +189,7 @@ func (e *EnvConfig) AsCmdEnv() (env []string) {
 	add(envTelemetryLogStreamingEnabled, strconv.FormatBool(e.TelemetryLogStreamingEnabled))
 
 	add(envChipIngressEndpoint, e.ChipIngressEndpoint)
+	add(envChipIngressInsecureConnection, strconv.FormatBool(e.ChipIngressInsecureConnection))
 
 	return
 }
@@ -350,6 +353,10 @@ func (e *EnvConfig) parse() error {
 		}
 		// Optional
 		e.ChipIngressEndpoint = os.Getenv(envChipIngressEndpoint)
+		e.ChipIngressInsecureConnection, err = getBool(envChipIngressInsecureConnection)
+		if err != nil {
+			return fmt.Errorf("failed to parse %s: %w", envChipIngressInsecureConnection, err)
+		}
 	}
 
 	return nil

pkg/loop/config_test.go

@@ -76,7 +76,8 @@ func TestEnvConfig_parse(t *testing.T) {
 				envTelemetryEmitterMaxQueueSize:       "1000",
 				envTelemetryLogStreamingEnabled:       "false",
 
-				envChipIngressEndpoint: "http://chip-ingress.example.com",
+				envChipIngressEndpoint:           "chip-ingress.example.com:50051",
+				envChipIngressInsecureConnection: "true",
 			},
 			expectError:  false,
 			expectConfig: envCfgFull,
@@ -174,7 +175,8 @@ var envCfgFull = EnvConfig{
 	TelemetryEmitterMaxQueueSize:       1000,
 	TelemetryLogStreamingEnabled:       false,
 
-	ChipIngressEndpoint: "http://chip-ingress.example.com",
+	ChipIngressEndpoint:           "chip-ingress.example.com:50051",
+	ChipIngressInsecureConnection: true,
 }
 
 func TestEnvConfig_AsCmdEnv(t *testing.T) {
@@ -224,7 +226,8 @@ func TestEnvConfig_AsCmdEnv(t *testing.T) {
 	assert.Equal(t, "false", got[envTelemetryLogStreamingEnabled])
 
 	// Assert ChipIngress environment variables
-	assert.Equal(t, "http://chip-ingress.example.com", got[envChipIngressEndpoint])
+	assert.Equal(t, "chip-ingress.example.com:50051", got[envChipIngressEndpoint])
+	assert.Equal(t, "true", got[envChipIngressInsecureConnection])
 }
 
 func TestGetMap(t *testing.T) {

pkg/loop/server.go

@@ -16,6 +16,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink-common/pkg/settings/limits"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/promhealth"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil/pg"
 )
@@ -126,7 +127,7 @@ func (s *Server) start() error {
 			LogStreamingEnabled:            s.EnvConfig.TelemetryLogStreamingEnabled,
 			ChipIngressEmitterEnabled:      s.EnvConfig.ChipIngressEndpoint != "",
 			ChipIngressEmitterGRPCEndpoint: s.EnvConfig.ChipIngressEndpoint,
-			ChipIngressInsecureConnection:  s.EnvConfig.TelemetryInsecureConnection,
+			ChipIngressInsecureConnection:  s.EnvConfig.ChipIngressInsecureConnection,
 		}
 
 		if tracingConfig.Enabled {
@@ -153,7 +154,7 @@ func (s *Server) start() error {
 		return fmt.Errorf("error starting prometheus server: %w", err)
 	}
 
-	s.checker = services.NewChecker("", "")
+	s.checker = promhealth.NewChecker("", "")
 	if err := s.checker.Start(); err != nil {
 		return fmt.Errorf("error starting health checker: %w", err)
 	}

pkg/services/health.go

@@ -8,9 +8,6 @@ import (
 	"sync"
 	"testing"
 	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
 // HealthReporter should be implemented by any type requiring health checks.
@@ -52,7 +49,7 @@ type HealthChecker struct {
 	chStop chan struct{}
 	chDone chan struct{}
 
-	ver, sha string
+	cfg HealthCheckerConfig
 
 	servicesMu sync.RWMutex
 	services   map[string]HealthReporter
@@ -64,34 +61,12 @@ type HealthChecker struct {
 
 const interval = 15 * time.Second
 
-var (
-	healthStatus = promauto.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Name: "health",
-			Help: "Health status by service",
-		},
-		[]string{"service_id"},
-	)
-	uptimeSeconds = promauto.NewCounter(
-		prometheus.CounterOpts{
-			Name: "uptime_seconds",
-			Help: "Uptime of the application measured in seconds",
-		},
-	)
-	version = promauto.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "version",
-			Help: "Application version information",
-		},
-		[]string{"version", "commit"},
-	)
-)
-
-// Deprecated: Use NewHealthChecker
+// Deprecated: Use HealthCheckerConfig.New or a helper like promhealth.NewChecker for the old behavior.
 func NewChecker(ver, sha string) *HealthChecker {
 	return NewHealthChecker(ver, sha)
 }
 
+// Deprecated: Use HealthCheckerConfig.New or a helper like promhealth.NewChecker for the old behavior.
 func NewHealthChecker(ver, sha string) *HealthChecker {
 	if ver == "" || sha == "" {
 		if bi, ok := debug.ReadBuildInfo(); ok {
@@ -106,9 +81,55 @@ func NewHealthChecker(ver, sha string) *HealthChecker {
 	if len(sha) > 7 {
 		sha = sha[:7]
 	}
+	return HealthCheckerConfig{Ver: ver, Sha: sha}.New()
+}
+
+type HealthCheckerConfig struct {
+	// Optionally override debug.BuildInfo
+	Ver, Sha string
+	// Optional hooks for reporting.
+	IncVersion func(ver string, sha string)
+	AddUptime  func(duration time.Duration)
+	SetStatus  func(name string, status int)
+	Delete     func(name string)
+}
+
+func (cfg HealthCheckerConfig) initVerSha() {
+	if cfg.Ver == "" || cfg.Sha == "" {
+		if bi, ok := debug.ReadBuildInfo(); ok {
+			if cfg.Ver == "" {
+				cfg.Ver = bi.Main.Version
+			}
+			if cfg.Sha == "" {
+				cfg.Sha = bi.Main.Sum
+			}
+		}
+	}
+	if len(cfg.Sha) > 7 {
+		cfg.Sha = cfg.Sha[:7]
+	}
+}
+
+func (cfg HealthCheckerConfig) setNoopHooks() {
+	if cfg.IncVersion == nil {
+		cfg.IncVersion = func(ver, sha string) {}
+	}
+	if cfg.AddUptime == nil {
+		cfg.AddUptime = func(d time.Duration) {}
+	}
+	if cfg.SetStatus == nil {
+		cfg.SetStatus = func(name string, status int) {}
+	}
+	if cfg.Delete == nil {
+		cfg.Delete = func(name string) {}
+	}
+}
+
+func (cfg HealthCheckerConfig) New() *HealthChecker {
+	cfg.initVerSha()
+	cfg.setNoopHooks()
 	return &HealthChecker{
-		ver:      ver,
-		sha:      sha,
+		cfg:      cfg,
 		services: make(map[string]HealthReporter, 10),
 		healthy:  make(map[string]error, 10),
 		ready:    make(map[string]error, 10),
@@ -119,7 +140,7 @@ func NewHealthChecker(ver, sha string) *HealthChecker {
 
 func (c *HealthChecker) Start() error {
 	return c.StartOnce("HealthCheck", func() error {
-		version.WithLabelValues(c.ver, c.sha).Inc()
+		c.cfg.IncVersion(c.cfg.Ver, c.cfg.Sha)
 
 		// update immediately
 		c.update()
@@ -175,10 +196,10 @@ func (c *HealthChecker) update() {
 			}
 
 			// report metrics to prometheus
-			healthStatus.WithLabelValues(name).Set(float64(value))
+			c.cfg.SetStatus(name, value)
 		}
 	}
-	uptimeSeconds.Add(interval.Seconds())
+	c.cfg.AddUptime(interval)
 
 	// save state
 	c.stateMu.Lock()
@@ -214,7 +235,7 @@ func (c *HealthChecker) Unregister(name string) error {
 	c.servicesMu.Lock()
 	defer c.servicesMu.Unlock()
 	delete(c.services, name)
-	healthStatus.DeleteLabelValues(name)
+	c.cfg.Delete(name)
 	return nil
 }
 

pkg/services/promhealth/promhealth.go

@@ -0,0 +1,53 @@
+package promhealth
+
+import (
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+)
+
+var (
+	healthStatus = promauto.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Name: "health",
+			Help: "Health status by service",
+		},
+		[]string{"service_id"},
+	)
+	uptimeSeconds = promauto.NewCounter(
+		prometheus.CounterOpts{
+			Name: "uptime_seconds",
+			Help: "Uptime of the application measured in seconds",
+		},
+	)
+	version = promauto.NewCounterVec(
+		prometheus.CounterOpts{
+			Name: "version",
+			Help: "Application version information",
+		},
+		[]string{"version", "commit"},
+	)
+)
+
+// NewChecker returns a *services.HealthChecker with hooks for prometheus metrics.
+func NewChecker(ver, sha string) *services.HealthChecker {
+	return services.HealthCheckerConfig{
+		Ver: ver,
+		Sha: sha,
+		AddUptime: func(d time.Duration) {
+			uptimeSeconds.Add(d.Seconds())
+		},
+		IncVersion: func(ver string, sha string) {
+			version.WithLabelValues(ver, sha).Inc()
+		},
+		SetStatus: func(name string, value int) {
+			healthStatus.WithLabelValues(name).Set(float64(value))
+		},
+		Delete: func(name string) {
+			healthStatus.DeleteLabelValues(name)
+		},
+	}.New()
+}