diff --git a/.mockery.yaml b/.mockery.yaml index 7f24b68097..e0bd1121b4 100644 --- a/.mockery.yaml +++ b/.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: diff --git a/common/headtracker/types/config.go b/common/headtracker/types/config.go index 06ad93d39d..289d2bc502 100644 --- a/common/headtracker/types/config.go +++ b/common/headtracker/types/config.go @@ -15,4 +15,5 @@ type HeadTrackerConfig interface { SamplingInterval() time.Duration FinalityTagBypass() bool MaxAllowedFinalityDepth() uint32 + HeadTelemetryEnabled() bool } diff --git a/core/chains/evm/config/chain_scoped_head_tracker.go b/core/chains/evm/config/chain_scoped_head_tracker.go index 8bc1ff188a..de6e19e9d6 100644 --- a/core/chains/evm/config/chain_scoped_head_tracker.go +++ b/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 +} diff --git a/core/chains/evm/config/config.go b/core/chains/evm/config/config.go index ea0d52f570..209a8d646b 100644 --- a/core/chains/evm/config/config.go +++ b/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 { diff --git a/core/chains/evm/config/toml/config.go b/core/chains/evm/config/toml/config.go index 3e35bb4b55..724021b6ca 100644 --- a/core/chains/evm/config/toml/config.go +++ b/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) { diff --git a/core/chains/evm/config/toml/defaults/fallback.toml b/core/chains/evm/config/toml/defaults/fallback.toml index 8bf3392210..229c1668fa 100644 --- a/core/chains/evm/config/toml/defaults/fallback.toml +++ b/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 diff --git a/core/chains/evm/headtracker/head_saver_test.go b/core/chains/evm/headtracker/head_saver_test.go index 43e79235e9..c87e1830d9 100644 --- a/core/chains/evm/headtracker/head_saver_test.go +++ b/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 diff --git a/core/cmd/shell.go b/core/cmd/shell.go index e146115ba0..744c768aad 100644 --- a/core/cmd/shell.go +++ b/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" diff --git a/core/config/app_config.go b/core/config/app_config.go index fe877d110a..112e242636 100644 --- a/core/config/app_config.go +++ b/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 diff --git a/core/config/docs/chains-evm.toml b/core/config/docs/chains-evm.toml index f053be9fa6..f7a7488d5e 100644 --- a/core/config/docs/chains-evm.toml +++ b/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 diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml index cbe5d22614..be0f509ec5 100644 --- a/core/config/docs/core.toml +++ b/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 \ No newline at end of file diff --git a/core/config/head_report_config.go b/core/config/head_report_config.go deleted file mode 100644 index 9f4ae85eb6..0000000000 --- a/core/config/head_report_config.go +++ /dev/null @@ -1,5 +0,0 @@ -package config - -type HeadReport interface { - TelemetryEnabled() bool -} diff --git a/core/config/toml/types.go b/core/config/toml/types.go index a503720ea9..0c91ddd81a 100644 --- a/core/config/toml/types.go +++ b/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 diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go index ace483ac91..90d4ba471f 100644 --- a/core/internal/cltest/cltest.go +++ b/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" diff --git a/core/internal/cltest/mocks.go b/core/internal/cltest/mocks.go index 53ce942db1..ab901af8cf 100644 --- a/core/internal/cltest/mocks.go +++ b/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" diff --git a/core/internal/mocks/monitoring_endpoint_generator.go b/core/internal/mocks/monitoring_endpoint_generator.go new file mode 100644 index 0000000000..1384e2e2a4 --- /dev/null +++ b/core/internal/mocks/monitoring_endpoint_generator.go @@ -0,0 +1,88 @@ +// Code generated by mockery v2.43.2. DO NOT EDIT. + +package mocks + +import ( + commontypes "github.com/smartcontractkit/libocr/commontypes" + mock "github.com/stretchr/testify/mock" + + synchronization "github.com/smartcontractkit/chainlink/v2/core/services/synchronization" +) + +// MonitoringEndpointGenerator is an autogenerated mock type for the MonitoringEndpointGenerator type +type MonitoringEndpointGenerator struct { + mock.Mock +} + +type MonitoringEndpointGenerator_Expecter struct { + mock *mock.Mock +} + +func (_m *MonitoringEndpointGenerator) EXPECT() *MonitoringEndpointGenerator_Expecter { + return &MonitoringEndpointGenerator_Expecter{mock: &_m.Mock} +} + +// GenMonitoringEndpoint provides a mock function with given fields: network, chainID, contractID, telemType +func (_m *MonitoringEndpointGenerator) GenMonitoringEndpoint(network string, chainID string, contractID string, telemType synchronization.TelemetryType) commontypes.MonitoringEndpoint { + ret := _m.Called(network, chainID, contractID, telemType) + + if len(ret) == 0 { + panic("no return value specified for GenMonitoringEndpoint") + } + + var r0 commontypes.MonitoringEndpoint + if rf, ok := ret.Get(0).(func(string, string, string, synchronization.TelemetryType) commontypes.MonitoringEndpoint); ok { + r0 = rf(network, chainID, contractID, telemType) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(commontypes.MonitoringEndpoint) + } + } + + return r0 +} + +// MonitoringEndpointGenerator_GenMonitoringEndpoint_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GenMonitoringEndpoint' +type MonitoringEndpointGenerator_GenMonitoringEndpoint_Call struct { + *mock.Call +} + +// GenMonitoringEndpoint is a helper method to define mock.On call +// - network string +// - chainID string +// - contractID string +// - telemType synchronization.TelemetryType +func (_e *MonitoringEndpointGenerator_Expecter) GenMonitoringEndpoint(network interface{}, chainID interface{}, contractID interface{}, telemType interface{}) *MonitoringEndpointGenerator_GenMonitoringEndpoint_Call { + return &MonitoringEndpointGenerator_GenMonitoringEndpoint_Call{Call: _e.mock.On("GenMonitoringEndpoint", network, chainID, contractID, telemType)} +} + +func (_c *MonitoringEndpointGenerator_GenMonitoringEndpoint_Call) Run(run func(network string, chainID string, contractID string, telemType synchronization.TelemetryType)) *MonitoringEndpointGenerator_GenMonitoringEndpoint_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(string), args[1].(string), args[2].(string), args[3].(synchronization.TelemetryType)) + }) + return _c +} + +func (_c *MonitoringEndpointGenerator_GenMonitoringEndpoint_Call) Return(_a0 commontypes.MonitoringEndpoint) *MonitoringEndpointGenerator_GenMonitoringEndpoint_Call { + _c.Call.Return(_a0) + return _c +} + +func (_c *MonitoringEndpointGenerator_GenMonitoringEndpoint_Call) RunAndReturn(run func(string, string, string, synchronization.TelemetryType) commontypes.MonitoringEndpoint) *MonitoringEndpointGenerator_GenMonitoringEndpoint_Call { + _c.Call.Return(run) + return _c +} + +// NewMonitoringEndpointGenerator creates a new instance of MonitoringEndpointGenerator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewMonitoringEndpointGenerator(t interface { + mock.TestingT + Cleanup(func()) +}) *MonitoringEndpointGenerator { + mock := &MonitoringEndpointGenerator{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/core/services/chainlink/config_general.go b/core/services/chainlink/config_general.go index abdd48d759..5b6b839fb5 100644 --- a/core/services/chainlink/config_general.go +++ b/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, diff --git a/core/services/chainlink/config_general_test.go b/core/services/chainlink/config_general_test.go index 6247ebd91c..29393ee0fd 100644 --- a/core/services/chainlink/config_general_test.go +++ b/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) { diff --git a/core/services/chainlink/config_head_report.go b/core/services/chainlink/config_head_report.go deleted file mode 100644 index e6e292938d..0000000000 --- a/core/services/chainlink/config_head_report.go +++ /dev/null @@ -1,13 +0,0 @@ -package chainlink - -import ( - "github.com/smartcontractkit/chainlink/v2/core/config/toml" -) - -type headReport struct { - h toml.HeadReport -} - -func (h headReport) TelemetryEnabled() bool { - return *h.h.TelemetryEnabled -} diff --git a/core/services/chainlink/config_head_report_test.go b/core/services/chainlink/config_head_report_test.go deleted file mode 100644 index 1840c4f578..0000000000 --- a/core/services/chainlink/config_head_report_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package chainlink - -import ( - "testing" - - "github.com/stretchr/testify/require" -) - -func TestHeadReportConfig(t *testing.T) { - opts := GeneralConfigOpts{ - ConfigStrings: []string{fullTOML}, - } - cfg, err := opts.New() - require.NoError(t, err) - - hr := cfg.HeadReport() - require.True(t, hr.TelemetryEnabled()) -} diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index f027978841..387ac4e071 100644 --- a/core/services/chainlink/config_test.go +++ b/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}, diff --git a/core/services/chainlink/mocks/general_config.go b/core/services/chainlink/mocks/general_config.go index f04ff40c56..c42ed5c701 100644 --- a/core/services/chainlink/mocks/general_config.go +++ b/core/services/chainlink/mocks/general_config.go @@ -692,53 +692,6 @@ func (_c *GeneralConfig_FluxMonitor_Call) RunAndReturn(run func() config.FluxMon return _c } -// HeadReport provides a mock function with given fields: -func (_m *GeneralConfig) HeadReport() config.HeadReport { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for HeadReport") - } - - var r0 config.HeadReport - if rf, ok := ret.Get(0).(func() config.HeadReport); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(config.HeadReport) - } - } - - return r0 -} - -// GeneralConfig_HeadReport_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'HeadReport' -type GeneralConfig_HeadReport_Call struct { - *mock.Call -} - -// HeadReport is a helper method to define mock.On call -func (_e *GeneralConfig_Expecter) HeadReport() *GeneralConfig_HeadReport_Call { - return &GeneralConfig_HeadReport_Call{Call: _e.mock.On("HeadReport")} -} - -func (_c *GeneralConfig_HeadReport_Call) Run(run func()) *GeneralConfig_HeadReport_Call { - _c.Call.Run(func(args mock.Arguments) { - run() - }) - return _c -} - -func (_c *GeneralConfig_HeadReport_Call) Return(_a0 config.HeadReport) *GeneralConfig_HeadReport_Call { - _c.Call.Return(_a0) - return _c -} - -func (_c *GeneralConfig_HeadReport_Call) RunAndReturn(run func() config.HeadReport) *GeneralConfig_HeadReport_Call { - _c.Call.Return(run) - return _c -} - // Insecure provides a mock function with given fields: func (_m *GeneralConfig) Insecure() config.Insecure { ret := _m.Called() diff --git a/core/services/chainlink/relayer_chain_interoperators.go b/core/services/chainlink/relayer_chain_interoperators.go index 7902a17810..9421d223e9 100644 --- a/core/services/chainlink/relayer_chain_interoperators.go +++ b/core/services/chainlink/relayer_chain_interoperators.go @@ -130,7 +130,7 @@ func InitEVM(ctx context.Context, factory RelayerFactory, config EVMFactoryConfi legacyMap[id.ChainID] = a.Chain() } op.legacyChains.EVMChains = legacyevm.NewLegacyChains(legacyMap, config.AppConfig.EVMConfigs()) - headReporter := headreporter.NewHeadReporterService(config.AppConfig.HeadReport(), config.DS, op.legacyChains.EVMChains, factory.Logger, monitoringEndpointGen, true) + headReporter := headreporter.NewHeadReporterService(config.DS, op.legacyChains.EVMChains, factory.Logger, monitoringEndpointGen, true) op.srvs = append(op.srvs, headReporter) return nil } diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml index d0749477aa..16adff24a7 100644 --- a/core/services/chainlink/testdata/config-empty-effective.toml +++ b/core/services/chainlink/testdata/config-empty-effective.toml @@ -237,9 +237,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml index 4cf8c5d8e6..4b886f49e7 100644 --- a/core/services/chainlink/testdata/config-full.toml +++ b/core/services/chainlink/testdata/config-full.toml @@ -247,9 +247,6 @@ CertFile = '/path/to/cert.pem' TransmitQueueMaxSize = 123 TransmitTimeout = '3m54s' -[HeadReport] -TelemetryEnabled = true - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 13 @@ -349,6 +346,7 @@ MaxBufferSize = 17 SamplingInterval = '1h0m0s' MaxAllowedFinalityDepth = 1500 FinalityTagBypass = false +HeadTelemetryEnabled = true [[EVM.KeySpecific]] Key = '0x2a3e23c6f242F5345320814aC8a1b4E58707D292' diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index ae3b027c34..057abafc94 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -237,9 +237,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 @@ -326,6 +323,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [EVM.NodePool] PollFailureThreshold = 5 @@ -425,6 +423,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [EVM.NodePool] PollFailureThreshold = 5 @@ -518,6 +517,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [EVM.NodePool] PollFailureThreshold = 5 diff --git a/core/services/relay/evm/headreporter/head_reporter.go b/core/services/relay/evm/headreporter/head_reporter.go index 6d215866ed..878c8b667b 100644 --- a/core/services/relay/evm/headreporter/head_reporter.go +++ b/core/services/relay/evm/headreporter/head_reporter.go @@ -6,7 +6,6 @@ import ( "time" "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - "github.com/smartcontractkit/chainlink/v2/core/config" "github.com/smartcontractkit/chainlink/v2/core/services/telemetry" "github.com/smartcontractkit/chainlink-common/pkg/services" @@ -37,11 +36,10 @@ type ( } ) -func NewHeadReporterService(config config.HeadReport, ds sqlutil.DataSource, chainContainer legacyevm.LegacyChainContainer, lggr logger.Logger, monitoringEndpointGen telemetry.MonitoringEndpointGenerator, opts ...interface{}) *HeadReporterService { - reporters := make([]HeadReporter, 1, 2) - reporters[0] = NewPrometheusReporter(ds, chainContainer, lggr, opts) - if config.TelemetryEnabled() { - reporters = append(reporters, NewTelemetryReporter(chainContainer, lggr, monitoringEndpointGen)) +func NewHeadReporterService(ds sqlutil.DataSource, chainContainer legacyevm.LegacyChainContainer, lggr logger.Logger, monitoringEndpointGen telemetry.MonitoringEndpointGenerator, opts ...interface{}) *HeadReporterService { + reporters := []HeadReporter{ + NewPrometheusReporter(ds, chainContainer, lggr, opts), + NewTelemetryReporter(chainContainer, lggr, monitoringEndpointGen), } return NewHeadReporterServiceWithReporters(ds, chainContainer, lggr, reporters, opts) } @@ -73,8 +71,10 @@ func NewHeadReporterServiceWithReporters(ds sqlutil.DataSource, chainContainer l func (hrd *HeadReporterService) subscribe() { hrd.unsubscribeFns = make([]func(), 0, hrd.chains.Len()) for _, chain := range hrd.chains.Slice() { - _, unsubscribe := chain.HeadBroadcaster().Subscribe(hrd) - hrd.unsubscribeFns = append(hrd.unsubscribeFns, unsubscribe) + if chain.Config().EVM().HeadTracker().HeadTelemetryEnabled() { + _, unsubscribe := chain.HeadBroadcaster().Subscribe(hrd) + hrd.unsubscribeFns = append(hrd.unsubscribeFns, unsubscribe) + } } } diff --git a/core/services/relay/evm/headreporter/telemetry_reporter_test.go b/core/services/relay/evm/headreporter/telemetry_reporter_test.go index 2f5f95c0c8..5fa9fbed95 100644 --- a/core/services/relay/evm/headreporter/telemetry_reporter_test.go +++ b/core/services/relay/evm/headreporter/telemetry_reporter_test.go @@ -1,12 +1,11 @@ package headreporter_test import ( + mocks2 "github.com/smartcontractkit/chainlink/v2/core/internal/mocks" "math/big" "testing" "time" - "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/headreporter" - "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -18,9 +17,9 @@ import ( "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" "github.com/smartcontractkit/chainlink/v2/core/logger" + "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/headreporter" "github.com/smartcontractkit/chainlink/v2/core/services/synchronization" "github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem" - mocks2 "github.com/smartcontractkit/chainlink/v2/core/services/telemetry/mocks" ) type IngressAgent struct { diff --git a/core/services/telemetry/common.go b/core/services/telemetry/common.go index 1ccd967458..37a92f16c6 100644 --- a/core/services/telemetry/common.go +++ b/core/services/telemetry/common.go @@ -6,7 +6,6 @@ import ( "github.com/smartcontractkit/chainlink/v2/core/services/synchronization" ) -//go:generate mockery --quiet --name MonitoringEndpointGenerator --output ./mocks --case=underscore type MonitoringEndpointGenerator interface { GenMonitoringEndpoint(network string, chainID string, contractID string, telemType synchronization.TelemetryType) ocrtypes.MonitoringEndpoint } diff --git a/core/services/telemetry/mocks/monitoring_endpoint_generator.go b/core/services/telemetry/mocks/monitoring_endpoint_generator.go deleted file mode 100644 index 717654f404..0000000000 --- a/core/services/telemetry/mocks/monitoring_endpoint_generator.go +++ /dev/null @@ -1,49 +0,0 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. - -package mocks - -import ( - commontypes "github.com/smartcontractkit/libocr/commontypes" - mock "github.com/stretchr/testify/mock" - - synchronization "github.com/smartcontractkit/chainlink/v2/core/services/synchronization" -) - -// MonitoringEndpointGenerator is an autogenerated mock type for the MonitoringEndpointGenerator type -type MonitoringEndpointGenerator struct { - mock.Mock -} - -// GenMonitoringEndpoint provides a mock function with given fields: network, chainID, contractID, telemType -func (_m *MonitoringEndpointGenerator) GenMonitoringEndpoint(network string, chainID string, contractID string, telemType synchronization.TelemetryType) commontypes.MonitoringEndpoint { - ret := _m.Called(network, chainID, contractID, telemType) - - if len(ret) == 0 { - panic("no return value specified for GenMonitoringEndpoint") - } - - var r0 commontypes.MonitoringEndpoint - if rf, ok := ret.Get(0).(func(string, string, string, synchronization.TelemetryType) commontypes.MonitoringEndpoint); ok { - r0 = rf(network, chainID, contractID, telemType) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(commontypes.MonitoringEndpoint) - } - } - - return r0 -} - -// NewMonitoringEndpointGenerator creates a new instance of MonitoringEndpointGenerator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -// The first argument is typically a *testing.T value. -func NewMonitoringEndpointGenerator(t interface { - mock.TestingT - Cleanup(func()) -}) *MonitoringEndpointGenerator { - mock := &MonitoringEndpointGenerator{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml index d0749477aa..16adff24a7 100644 --- a/core/web/resolver/testdata/config-empty-effective.toml +++ b/core/web/resolver/testdata/config-empty-effective.toml @@ -237,9 +237,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml index a69df54985..ccdc078157 100644 --- a/core/web/resolver/testdata/config-full.toml +++ b/core/web/resolver/testdata/config-full.toml @@ -247,9 +247,6 @@ CertFile = '' TransmitQueueMaxSize = 123 TransmitTimeout = '3m54s' -[HeadReport] -TelemetryEnabled = true - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 13 @@ -348,6 +345,7 @@ MaxBufferSize = 17 SamplingInterval = '1h0m0s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = true [[EVM.KeySpecific]] Key = '0x2a3e23c6f242F5345320814aC8a1b4E58707D292' diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index 20df6769bf..2426eb9725 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -237,9 +237,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 @@ -326,6 +323,8 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false +HeadTelemetryEnabled = false [EVM.NodePool] PollFailureThreshold = 5 @@ -425,6 +424,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [EVM.NodePool] PollFailureThreshold = 5 diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 3681b2f4a8..1eef5889a1 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -1768,13 +1768,6 @@ 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. -## HeadReport -```toml -[HeadReport] -TelemetryEnabled = false # Default -``` - - ### TelemetryEnabled ```toml TelemetryEnabled = false # Default @@ -1851,6 +1844,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -1944,6 +1938,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2037,6 +2032,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2130,6 +2126,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2224,6 +2221,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2317,6 +2315,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2410,6 +2409,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2504,6 +2504,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2597,6 +2598,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2689,6 +2691,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2781,6 +2784,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -2968,6 +2972,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3061,6 +3066,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3154,6 +3160,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3247,6 +3254,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3340,6 +3348,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3433,6 +3442,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3526,6 +3536,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3619,6 +3630,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3712,6 +3724,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3805,6 +3818,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3899,6 +3913,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -3992,6 +4007,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -4178,6 +4194,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -4271,6 +4288,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -4364,6 +4382,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -4457,6 +4476,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -4642,6 +4662,7 @@ MaxBufferSize = 100 SamplingInterval = '0s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -4735,6 +4756,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -4828,6 +4850,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -4921,6 +4944,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -5014,6 +5038,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -5200,6 +5225,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -5293,6 +5319,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -5386,6 +5413,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -5574,6 +5602,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -5667,6 +5696,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -5853,6 +5883,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -5946,6 +5977,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6038,6 +6070,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6130,6 +6163,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6222,6 +6256,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6315,6 +6350,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6501,6 +6537,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6593,6 +6630,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6780,6 +6818,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6874,6 +6913,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -6968,6 +7008,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -7062,6 +7103,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -7156,6 +7198,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -7249,6 +7292,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -7342,6 +7386,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -7528,6 +7573,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -7715,6 +7761,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 @@ -7808,6 +7855,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar index 54533f328f..a2dea94e02 100644 --- a/testdata/scripts/node/validate/default.txtar +++ b/testdata/scripts/node/validate/default.txtar @@ -249,9 +249,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar index e530d8286e..e8147997ed 100644 --- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar @@ -293,9 +293,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 @@ -382,6 +379,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [EVM.NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar index 98e829f16c..d0f2068c42 100644 --- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar @@ -293,9 +293,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar index e304c92e6a..e44b45e19d 100644 --- a/testdata/scripts/node/validate/disk-based-logging.txtar +++ b/testdata/scripts/node/validate/disk-based-logging.txtar @@ -293,9 +293,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 @@ -382,6 +379,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [EVM.NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar index 2496848fb9..36e3324126 100644 --- a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar +++ b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar @@ -278,9 +278,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar index de205b6873..4c449c4929 100644 --- a/testdata/scripts/node/validate/invalid.txtar +++ b/testdata/scripts/node/validate/invalid.txtar @@ -283,9 +283,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar index 910a1890cf..16ca162363 100644 --- a/testdata/scripts/node/validate/valid.txtar +++ b/testdata/scripts/node/validate/valid.txtar @@ -290,9 +290,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10 @@ -379,6 +376,7 @@ MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 FinalityTagBypass = true +HeadTelemetryEnabled = false [EVM.NodePool] PollFailureThreshold = 5 diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar index fa6bb69f6e..683ef2519b 100644 --- a/testdata/scripts/node/validate/warnings.txtar +++ b/testdata/scripts/node/validate/warnings.txtar @@ -272,9 +272,6 @@ CertFile = '' TransmitQueueMaxSize = 10000 TransmitTimeout = '5s' -[HeadReport] -TelemetryEnabled = false - [Capabilities] [Capabilities.Peering] IncomingMessageBufferSize = 10