move config

.mockery.yaml

@@ -298,6 +298,11 @@ packages:
     interfaces:
       Config:
       FeeConfig:
+  github.com/smartcontractkit/chainlink/v2/core/services/telemetry:
+    config:
+      dir: "{{ .InterfaceDir }}/../../internal/mocks"
+    interfaces:
+      MonitoringEndpointGenerator:
   github.com/smartcontractkit/chainlink/v2/core/services/webhook:
     interfaces:
       ExternalInitiatorManager:

common/headtracker/types/config.go

@@ -15,4 +15,5 @@ type HeadTrackerConfig interface {
 	SamplingInterval() time.Duration
 	FinalityTagBypass() bool
 	MaxAllowedFinalityDepth() uint32
+	HeadTelemetryEnabled() bool
 }

core/chains/evm/config/chain_scoped_head_tracker.go

@@ -29,3 +29,7 @@ func (h *headTrackerConfig) FinalityTagBypass() bool {
 func (h *headTrackerConfig) MaxAllowedFinalityDepth() uint32 {
 	return *h.c.MaxAllowedFinalityDepth
 }
+
+func (h *headTrackerConfig) HeadTelemetryEnabled() bool {
+	return *h.c.HeadTelemetryEnabled
+}

core/chains/evm/config/config.go

@@ -74,6 +74,7 @@ type HeadTracker interface {
 	SamplingInterval() time.Duration
 	FinalityTagBypass() bool
 	MaxAllowedFinalityDepth() uint32
+	HeadTelemetryEnabled() bool
 }
 
 type BalanceMonitor interface {

core/chains/evm/config/toml/config.go

@@ -747,6 +747,7 @@ type HeadTracker struct {
 	SamplingInterval        *commonconfig.Duration
 	MaxAllowedFinalityDepth *uint32
 	FinalityTagBypass       *bool
+	HeadTelemetryEnabled    *bool
 }
 
 func (t *HeadTracker) setFrom(f *HeadTracker) {
@@ -765,6 +766,9 @@ func (t *HeadTracker) setFrom(f *HeadTracker) {
 	if v := f.FinalityTagBypass; v != nil {
 		t.FinalityTagBypass = v
 	}
+	if v := f.HeadTelemetryEnabled; v != nil {
+		t.HeadTelemetryEnabled = v
+	}
 }
 
 func (t *HeadTracker) ValidateConfig() (err error) {

core/chains/evm/config/toml/defaults/fallback.toml

@@ -61,6 +61,7 @@ MaxBufferSize = 3
 SamplingInterval = '1s'
 FinalityTagBypass = true
 MaxAllowedFinalityDepth = 10000
+HeadTelemetryEnabled = false
 
 [NodePool]
 PollFailureThreshold = 5

core/chains/evm/headtracker/head_saver_test.go

@@ -42,6 +42,9 @@ func (h *headTrackerConfig) FinalityTagBypass() bool {
 func (h *headTrackerConfig) MaxAllowedFinalityDepth() uint32 {
 	return 10000
 }
+func (h *headTrackerConfig) HeadTelemetryEnabled() bool {
+	return false
+}
 
 type config struct {
 	finalityDepth                     uint32

core/cmd/shell.go

@@ -19,8 +19,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
-
 	"github.com/Depado/ginprom"
 	"github.com/Masterminds/semver/v3"
 	"github.com/getsentry/sentry-go"
@@ -48,6 +46,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/periodicbackup"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
+	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
 	"github.com/smartcontractkit/chainlink/v2/core/services/versioning"
 	"github.com/smartcontractkit/chainlink/v2/core/services/webhook"
 	"github.com/smartcontractkit/chainlink/v2/core/sessions"

core/config/app_config.go

@@ -53,7 +53,6 @@ type AppConfig interface {
 	Pyroscope() Pyroscope
 	Sentry() Sentry
 	TelemetryIngress() TelemetryIngress
-	HeadReport() HeadReport
 	Threshold() Threshold
 	WebServer() WebServer
 	Tracing() Tracing

core/config/docs/chains-evm.toml

@@ -330,6 +330,8 @@ FinalityTagBypass = true # Default
 # If actual finality depth exceeds this number, HeadTracker aborts backfill and returns an error.
 # Has no effect if `FinalityTagsEnabled` = false
 MaxAllowedFinalityDepth = 10000 # Default
+# HeadTelemetryEnabled controls if it collects information about new blocks from blockchain
+HeadTelemetryEnabled = false # Default
 
 [[EVM.KeySpecific]]
 # Key is the account to apply these settings to

core/config/docs/core.toml

@@ -650,8 +650,4 @@ TransmitQueueMaxSize = 10_000 # Default
 # TransmitTimeout controls how long the transmitter will wait for a response
 # when sending a message to the mercury server, before aborting and considering
 # the transmission to be failed.
-TransmitTimeout = "5s" # Default
-
-[HeadReport]
-# TelemetryEnabled controls if it collects information about new blocks from blockchain
-TelemetryEnabled = false # Default
+TransmitTimeout = "5s" # Default

core/config/toml/types.go

@@ -56,7 +56,6 @@ type Core struct {
 	Insecure         Insecure         `toml:",omitempty"`
 	Tracing          Tracing          `toml:",omitempty"`
 	Mercury          Mercury          `toml:",omitempty"`
-	HeadReport       HeadReport       `toml:",omitempty"`
 	Capabilities     Capabilities     `toml:",omitempty"`
 }
 
@@ -77,7 +76,6 @@ func (c *Core) SetFrom(f *Core) {
 	c.TelemetryIngress.setFrom(&f.TelemetryIngress)
 	c.AuditLogger.SetFrom(&f.AuditLogger)
 	c.Log.setFrom(&f.Log)
-	c.HeadReport.setFrom(&f.HeadReport)
 
 	c.WebServer.setFrom(&f.WebServer)
 	c.JobPipeline.setFrom(&f.JobPipeline)
@@ -487,16 +485,6 @@ func (t *TelemetryIngress) setFrom(f *TelemetryIngress) {
 	}
 }
 
-type HeadReport struct {
-	TelemetryEnabled *bool
-}
-
-func (t *HeadReport) setFrom(f *HeadReport) {
-	if v := f.TelemetryEnabled; v != nil {
-		t.TelemetryEnabled = v
-	}
-}
-
 type AuditLogger struct {
 	Enabled        *bool
 	ForwardToUrl   *commonconfig.URL

core/internal/cltest/cltest.go

@@ -18,8 +18,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
-
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -82,6 +80,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
+	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
 	"github.com/smartcontractkit/chainlink/v2/core/services/webhook"
 	clsessions "github.com/smartcontractkit/chainlink/v2/core/sessions"
 	"github.com/smartcontractkit/chainlink/v2/core/static"

core/internal/cltest/mocks.go

@@ -10,18 +10,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-
 	"github.com/jmoiron/sqlx"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"

core/services/chainlink/config_general.go

@@ -483,12 +483,6 @@ func (g *generalConfig) RootDir() string {
 	return h
 }
 
-func (g *generalConfig) HeadReport() coreconfig.HeadReport {
-	return &headReport{
-		h: g.c.HeadReport,
-	}
-}
-
 func (g *generalConfig) TelemetryIngress() coreconfig.TelemetryIngress {
 	return &telemetryIngressConfig{
 		c: g.c.TelemetryIngress,

core/services/chainlink/config_general_test.go

@@ -30,7 +30,6 @@ func TestTOMLGeneralConfig_Defaults(t *testing.T) {
 	assert.False(t, config.StarkNetEnabled())
 	assert.Equal(t, false, config.JobPipeline().ExternalInitiatorsEnabled())
 	assert.Equal(t, 15*time.Minute, config.WebServer().SessionTimeout().Duration())
-	assert.Equal(t, false, config.HeadReport().TelemetryEnabled())
 }
 
 func TestTOMLGeneralConfig_InsecureConfig(t *testing.T) {

core/services/chainlink/config_test.go

@@ -586,6 +586,7 @@ func TestConfig_Marshal(t *testing.T) {
 					SamplingInterval:        &hour,
 					FinalityTagBypass:       ptr[bool](false),
 					MaxAllowedFinalityDepth: ptr[uint32](1500),
+					HeadTelemetryEnabled:    ptr[bool](true),
 				},
 
 				NodePool: evmcfg.NodePool{
@@ -732,9 +733,6 @@ func TestConfig_Marshal(t *testing.T) {
 		},
 		VerboseLogging: ptr(true),
 	}
-	full.HeadReport = toml.HeadReport{
-		TelemetryEnabled: ptr(true),
-	}
 	for _, tt := range []struct {
 		name   string
 		config Config
@@ -1055,6 +1053,7 @@ MaxBufferSize = 17
 SamplingInterval = '1h0m0s'
 MaxAllowedFinalityDepth = 1500
 FinalityTagBypass = false
+HeadTelemetryEnabled = true
 
 [[EVM.KeySpecific]]
 Key = '0x2a3e23c6f242F5345320814aC8a1b4E58707D292'
@@ -1204,9 +1203,6 @@ CertFile = '/path/to/cert.pem'
 [Mercury.Transmitter]
 TransmitQueueMaxSize = 123
 TransmitTimeout = '3m54s'
-`},
-		{"HeadReport", Config{Core: toml.Core{HeadReport: full.HeadReport}}, `[HeadReport]
-TelemetryEnabled = true
 `},
 		{"full", full, fullTOML},
 		{"multi-chain", multiChain, multiChainTOML},