From 8768af3b02dfda23cf6e232181b28d5ad185b179 Mon Sep 17 00:00:00 2001 From: Pavel <177363085+pkcll@users.noreply.github.com> Date: Mon, 13 Jul 2026 14:44:01 -0400 Subject: [PATCH 1/3] Wire Telemetry metric views config to Beholder and LOOP plugins. Add MetricViewsDisabled and MetricViewsAttributeBlacklist to core.toml, forward through shell and loop registry, and bump chainlink-common to ff6c540906a9 for companion PR chainlink-common #2238. Co-authored-by: Cursor --- core/cmd/shell.go | 4 +- core/config/docs/core.toml | 4 ++ core/config/telemetry_config.go | 2 + core/config/toml/types.go | 9 ++++ core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 +- core/services/chainlink/config_telemetry.go | 11 +++++ .../chainlink/config_telemetry_test.go | 42 +++++++++++++++++++ core/services/chainlink/config_test.go | 4 +- .../testdata/config-empty-effective.toml | 2 + .../chainlink/testdata/config-full.toml | 2 + .../config-multi-chain-effective.toml | 2 + .../testdata/config-empty-effective.toml | 2 + core/web/resolver/testdata/config-full.toml | 2 + .../config-multi-chain-effective.toml | 2 + deployment/go.mod | 2 +- deployment/go.sum | 4 +- docs/CONFIG.md | 14 +++++++ go.mod | 2 +- go.sum | 4 +- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 +- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 +- plugins/loop_registry.go | 2 + plugins/loop_registry_test.go | 8 ++++ system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 +- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 +- .../scripts/config/merge_raw_configs.txtar | 2 + testdata/scripts/node/validate/default.txtar | 2 + .../node/validate/defaults-override.txtar | 2 + .../disk-based-logging-disabled.txtar | 2 + .../validate/disk-based-logging-no-dir.txtar | 2 + .../node/validate/disk-based-logging.txtar | 2 + .../node/validate/fallback-override.txtar | 2 + .../node/validate/invalid-ocr-p2p.txtar | 2 + testdata/scripts/node/validate/invalid.txtar | 2 + testdata/scripts/node/validate/valid.txtar | 2 + testdata/scripts/node/validate/warnings.txtar | 2 + 41 files changed, 153 insertions(+), 23 deletions(-) diff --git a/core/cmd/shell.go b/core/cmd/shell.go index 4494588bdbd..7b34ff1fe5a 100644 --- a/core/cmd/shell.go +++ b/core/cmd/shell.go @@ -165,7 +165,9 @@ func newBeholderClient( LogMaxQueueSize: cfgTelemetry.LogMaxQueueSize(), // Due to OpenTelemetry semantics, histogram bucket boundaries must be set // when the Beholder client is constructed. - MetricViews: metricViews(), + MetricViews: metricViews(), + MetricViewsDisabled: cfgTelemetry.MetricViewsDisabled(), + MetricViewsAttributeBlacklist: cfgTelemetry.MetricViewsAttributeBlacklist(), } if cfgTracing.Enabled() { diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml index 8a285a216e6..aa3b5e881b3 100644 --- a/core/config/docs/core.toml +++ b/core/config/docs/core.toml @@ -907,6 +907,10 @@ LogExportMaxBatchSize = 512 # Default LogExportInterval = '1s' # Default # LogMaxQueueSize sets the maximum queue size used by the batcher LogMaxQueueSize = 2048 # Default +# MetricViewsDisabled skips default Beholder metric attribute deny views. +MetricViewsDisabled = false # Default +# MetricViewsAttributeBlacklist lists attribute keys dropped before export (e.g. event_id). +MetricViewsAttributeBlacklist = ['event_id'] # Default # ResourceAttributes are global metadata to include with all telemetry. [Telemetry.ResourceAttributes] diff --git a/core/config/telemetry_config.go b/core/config/telemetry_config.go index 1036eac775e..4fb69c0f8d7 100644 --- a/core/config/telemetry_config.go +++ b/core/config/telemetry_config.go @@ -28,6 +28,8 @@ type Telemetry interface { LogExportMaxBatchSize() int LogExportInterval() time.Duration LogMaxQueueSize() int + MetricViewsDisabled() bool + MetricViewsAttributeBlacklist() []string PrometheusBridge() PrometheusBridge } diff --git a/core/config/toml/types.go b/core/config/toml/types.go index 6b3bb050f1e..9aff9206d3f 100644 --- a/core/config/toml/types.go +++ b/core/config/toml/types.go @@ -2995,6 +2995,9 @@ type Telemetry struct { LogExportInterval *commonconfig.Duration LogMaxQueueSize *int + MetricViewsDisabled *bool + MetricViewsAttributeBlacklist []string + PrometheusBridge PrometheusBridge `toml:",omitempty"` } @@ -3062,6 +3065,12 @@ func (b *Telemetry) setFrom(f *Telemetry) { if v := f.LogMaxQueueSize; v != nil { b.LogMaxQueueSize = v } + if v := f.MetricViewsDisabled; v != nil { + b.MetricViewsDisabled = v + } + if v := f.MetricViewsAttributeBlacklist; v != nil { + b.MetricViewsAttributeBlacklist = v + } b.PrometheusBridge.setFrom(&f.PrometheusBridge) } diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 1f4eb79cd32..40bf1c9c1aa 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -47,7 +47,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.104 github.com/smartcontractkit/chainlink-automation v0.8.1 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260522094612-5f9f748bd87a github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 8804348258d..49e44a962f5 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1579,8 +1579,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h1:uMn1w/n95p+pSxK6hYNqji/sDaab8D0Cxuph9qUkM2g= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 h1:SDqCKcTuyoM7cxSkdweeM3EHJw/decQ0T1RUO94W4oI= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/core/services/chainlink/config_telemetry.go b/core/services/chainlink/config_telemetry.go index df61e0d3269..b448f127885 100644 --- a/core/services/chainlink/config_telemetry.go +++ b/core/services/chainlink/config_telemetry.go @@ -182,6 +182,17 @@ func (b *telemetryConfig) LogMaxQueueSize() int { return *b.s.LogMaxQueueSize } +func (b *telemetryConfig) MetricViewsDisabled() bool { + if b.s.MetricViewsDisabled == nil { + return false + } + return *b.s.MetricViewsDisabled +} + +func (b *telemetryConfig) MetricViewsAttributeBlacklist() []string { + return b.s.MetricViewsAttributeBlacklist +} + func (b *telemetryConfig) PrometheusBridge() config.PrometheusBridge { return &prometheusBridgeConfig{b.s.PrometheusBridge} } diff --git a/core/services/chainlink/config_telemetry_test.go b/core/services/chainlink/config_telemetry_test.go index 5baf19de43c..9d75febea79 100644 --- a/core/services/chainlink/config_telemetry_test.go +++ b/core/services/chainlink/config_telemetry_test.go @@ -397,3 +397,45 @@ func TestTelemetryConfig_LogMaxQueueSize(t *testing.T) { }) } } + +func TestTelemetryConfig_MetricViewsDisabled(t *testing.T) { + t.Parallel() + tests := []struct { + name string + telemetry toml.Telemetry + expected bool + }{ + {"MetricViewsDisabledTrue", toml.Telemetry{MetricViewsDisabled: ptr(true)}, true}, + {"MetricViewsDisabledFalse", toml.Telemetry{MetricViewsDisabled: ptr(false)}, false}, + {"MetricViewsDisabledNil", toml.Telemetry{MetricViewsDisabled: nil}, false}, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + tc := telemetryConfig{s: tt.telemetry} + assert.Equal(t, tt.expected, tc.MetricViewsDisabled()) + }) + } +} + +func TestTelemetryConfig_MetricViewsAttributeBlacklist(t *testing.T) { + t.Parallel() + tests := []struct { + name string + telemetry toml.Telemetry + expected []string + }{ + {"BlacklistSet", toml.Telemetry{MetricViewsAttributeBlacklist: []string{"event_id"}}, []string{"event_id"}}, + {"BlacklistNil", toml.Telemetry{MetricViewsAttributeBlacklist: nil}, nil}, + {"BlacklistEmpty", toml.Telemetry{MetricViewsAttributeBlacklist: []string{}}, []string{}}, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + tc := telemetryConfig{s: tt.telemetry} + assert.Equal(t, tt.expected, tc.MetricViewsAttributeBlacklist()) + }) + } +} diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index 27a27e70cc7..f75722bfdeb 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -571,7 +571,9 @@ func TestConfig_Marshal(t *testing.T) { LogExportTimeout: commoncfg.MustNewDuration(1 * time.Second), LogExportMaxBatchSize: ptr[int](512), LogExportInterval: ptrDuration(1 * time.Second), - LogMaxQueueSize: ptrInt(2048), + LogMaxQueueSize: ptrInt(2048), + MetricViewsDisabled: ptr(false), + MetricViewsAttributeBlacklist: []string{"event_id"}, PrometheusBridge: toml.PrometheusBridge{ Enabled: ptr(true), diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml index 6aeec786180..d55cc51f1a8 100644 --- a/core/services/chainlink/testdata/config-empty-effective.toml +++ b/core/services/chainlink/testdata/config-empty-effective.toml @@ -359,6 +359,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml index a2b99dafcbd..9537ef4e0d2 100644 --- a/core/services/chainlink/testdata/config-full.toml +++ b/core/services/chainlink/testdata/config-full.toml @@ -394,6 +394,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.ResourceAttributes] Baz = 'test' diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index ec7cb65fbe0..1bd1daf42e9 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -359,6 +359,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml index 6aeec786180..d55cc51f1a8 100644 --- a/core/web/resolver/testdata/config-empty-effective.toml +++ b/core/web/resolver/testdata/config-empty-effective.toml @@ -359,6 +359,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml index dc1cc00ae4d..b42022eb074 100644 --- a/core/web/resolver/testdata/config-full.toml +++ b/core/web/resolver/testdata/config-full.toml @@ -373,6 +373,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.ResourceAttributes] Baz = 'test' diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index a98ec27c405..4b713f54616 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -359,6 +359,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/deployment/go.mod b/deployment/go.mod index 1fc4b57b6a6..33862013f81 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -47,7 +47,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260522094612-5f9f748bd87a github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 diff --git a/deployment/go.sum b/deployment/go.sum index 4a1613e5948..22aed93e0a2 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1384,8 +1384,8 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194 h1:QxZkbKtQyPtVLYP4eMwc+VbXY7M5ve1deSiLZ2pOA+Y= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194/go.mod h1:bNMFRxwWdgVFdSsFZRmsUUPoBUncU3RM765K99svIKM= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 h1:SDqCKcTuyoM7cxSkdweeM3EHJw/decQ0T1RUO94W4oI= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/docs/CONFIG.md b/docs/CONFIG.md index af944ec92e5..b691cca49c9 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -2402,6 +2402,8 @@ LogExportTimeout = '1s' # Default LogExportMaxBatchSize = 512 # Default LogExportInterval = '1s' # Default LogMaxQueueSize = 2048 # Default +MetricViewsDisabled = false # Default +MetricViewsAttributeBlacklist = ['event_id'] # Default ``` Telemetry holds OTEL settings. This data includes open telemetry metrics, traces, & logs. @@ -2531,6 +2533,18 @@ LogMaxQueueSize = 2048 # Default ``` LogMaxQueueSize sets the maximum queue size used by the batcher +### MetricViewsDisabled +```toml +MetricViewsDisabled = false # Default +``` +MetricViewsDisabled skips default Beholder metric attribute deny views. + +### MetricViewsAttributeBlacklist +```toml +MetricViewsAttributeBlacklist = ['event_id'] # Default +``` +MetricViewsAttributeBlacklist lists attribute keys dropped before export (e.g. event_id). + ## Telemetry.ResourceAttributes ```toml [Telemetry.ResourceAttributes] diff --git a/go.mod b/go.mod index 400910078f5..299ada2f4b9 100644 --- a/go.mod +++ b/go.mod @@ -85,7 +85,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260522094612-5f9f748bd87a diff --git a/go.sum b/go.sum index 4652063940e..12a871d3f6a 100644 --- a/go.sum +++ b/go.sum @@ -1161,8 +1161,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h1:uMn1w/n95p+pSxK6hYNqji/sDaab8D0Cxuph9qUkM2g= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 h1:SDqCKcTuyoM7cxSkdweeM3EHJw/decQ0T1RUO94W4oI= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 4fdd2a8dbef..a4279e04ae3 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -33,7 +33,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260623170329-4577ef4ba0ae diff --git a/integration-tests/go.sum b/integration-tests/go.sum index b760108ee1d..fb9306ac0bb 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1371,8 +1371,8 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194 h1:QxZkbKtQyPtVLYP4eMwc+VbXY7M5ve1deSiLZ2pOA+Y= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194/go.mod h1:bNMFRxwWdgVFdSsFZRmsUUPoBUncU3RM765K99svIKM= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 h1:SDqCKcTuyoM7cxSkdweeM3EHJw/decQ0T1RUO94W4oI= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index e0d1344f023..aa63cd72c51 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -24,7 +24,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260623170329-4577ef4ba0ae github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.6-0.20260630120514-36abe27604df diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 8b1a34a2801..9a4ff0b877f 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1631,8 +1631,8 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194 h1:QxZkbKtQyPtVLYP4eMwc+VbXY7M5ve1deSiLZ2pOA+Y= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194/go.mod h1:bNMFRxwWdgVFdSsFZRmsUUPoBUncU3RM765K99svIKM= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 h1:SDqCKcTuyoM7cxSkdweeM3EHJw/decQ0T1RUO94W4oI= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/plugins/loop_registry.go b/plugins/loop_registry.go index 3968018cdbc..748a60d4d7d 100644 --- a/plugins/loop_registry.go +++ b/plugins/loop_registry.go @@ -163,6 +163,8 @@ func (m *LoopRegistry) Register(id string) (*RegisteredLoop, error) { envCfg.TelemetryLogExportMaxBatchSize = m.cfgTelemetry.LogExportMaxBatchSize() envCfg.TelemetryLogExportInterval = m.cfgTelemetry.LogExportInterval() envCfg.TelemetryLogMaxQueueSize = m.cfgTelemetry.LogMaxQueueSize() + envCfg.TelemetryMetricViewsDisabled = m.cfgTelemetry.MetricViewsDisabled() + envCfg.TelemetryMetricViewsAttributeBlacklist = m.cfgTelemetry.MetricViewsAttributeBlacklist() envCfg.TelemetryPrometheusBridgeEnabled = m.cfgTelemetry.PrometheusBridge().Enabled() envCfg.TelemetryPrometheusBridgePrefixes = m.cfgTelemetry.PrometheusBridge().Prefixes() } diff --git a/plugins/loop_registry_test.go b/plugins/loop_registry_test.go index d762dd85c57..57bd6d743a4 100644 --- a/plugins/loop_registry_test.go +++ b/plugins/loop_registry_test.go @@ -88,6 +88,12 @@ func (m mockCfgTelemetry) LogExportMaxBatchSize() int { return 512 } func (m mockCfgTelemetry) LogExportInterval() time.Duration { return 5 * time.Second } func (m mockCfgTelemetry) LogMaxQueueSize() int { return 2048 } +func (m mockCfgTelemetry) MetricViewsDisabled() bool { return false } + +func (m mockCfgTelemetry) MetricViewsAttributeBlacklist() []string { + return []string{"event_id"} +} + func (m mockCfgTelemetry) PrometheusBridge() config.PrometheusBridge { return mockPrometheusBridge{} } @@ -250,6 +256,8 @@ func TestLoopRegistry_Register(t *testing.T) { require.Equal(t, 512, envCfg.TelemetryLogExportMaxBatchSize) require.Equal(t, 5*time.Second, envCfg.TelemetryLogExportInterval) require.Equal(t, 2048, envCfg.TelemetryLogMaxQueueSize) + require.False(t, envCfg.TelemetryMetricViewsDisabled) + require.Equal(t, []string{"event_id"}, envCfg.TelemetryMetricViewsAttributeBlacklist) require.Equal(t, "example.com/chip-ingress", envCfg.ChipIngressEndpoint) require.False(t, envCfg.ChipIngressBatchEmitterEnabled) diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 1a5126431ce..47c4678c40c 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -37,7 +37,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.104 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260708114855-e953eeb028a7 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260623170329-4577ef4ba0ae diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index b68d3285841..9921fae7c73 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1544,8 +1544,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h1:uMn1w/n95p+pSxK6hYNqji/sDaab8D0Cxuph9qUkM2g= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 h1:SDqCKcTuyoM7cxSkdweeM3EHJw/decQ0T1RUO94W4oI= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index fad10458b2a..0b80c8ac794 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -62,7 +62,7 @@ require ( github.com/rs/zerolog v1.35.1 github.com/smartcontractkit/chain-selectors v1.0.104 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index b0df643c90f..b93a5eb1018 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1749,8 +1749,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h1:uMn1w/n95p+pSxK6hYNqji/sDaab8D0Cxuph9qUkM2g= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4 h1:SDqCKcTuyoM7cxSkdweeM3EHJw/decQ0T1RUO94W4oI= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260710200719-3bdfe6bc75e4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/testdata/scripts/config/merge_raw_configs.txtar b/testdata/scripts/config/merge_raw_configs.txtar index 57977a1f485..d08eebe7d78 100644 --- a/testdata/scripts/config/merge_raw_configs.txtar +++ b/testdata/scripts/config/merge_raw_configs.txtar @@ -506,6 +506,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar index c0a1abab84b..8373bef50e9 100644 --- a/testdata/scripts/node/validate/default.txtar +++ b/testdata/scripts/node/validate/default.txtar @@ -371,6 +371,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/defaults-override.txtar b/testdata/scripts/node/validate/defaults-override.txtar index 86086a4fca2..a945d5c4253 100644 --- a/testdata/scripts/node/validate/defaults-override.txtar +++ b/testdata/scripts/node/validate/defaults-override.txtar @@ -432,6 +432,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar index 36c2900e57f..b223051c276 100644 --- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar @@ -415,6 +415,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false 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 9fb002e0af8..373f23e387e 100644 --- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar @@ -415,6 +415,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar index dfdb9b48384..2c587023f0e 100644 --- a/testdata/scripts/node/validate/disk-based-logging.txtar +++ b/testdata/scripts/node/validate/disk-based-logging.txtar @@ -415,6 +415,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/fallback-override.txtar b/testdata/scripts/node/validate/fallback-override.txtar index c2320cbce92..4b139eeae37 100644 --- a/testdata/scripts/node/validate/fallback-override.txtar +++ b/testdata/scripts/node/validate/fallback-override.txtar @@ -517,6 +517,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar index 5e7eaaa1bad..cfbaec833ca 100644 --- a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar +++ b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar @@ -400,6 +400,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar index aae5e8883ca..c7c78a7c914 100644 --- a/testdata/scripts/node/validate/invalid.txtar +++ b/testdata/scripts/node/validate/invalid.txtar @@ -411,6 +411,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar index 9b0595833cb..42354881ddf 100644 --- a/testdata/scripts/node/validate/valid.txtar +++ b/testdata/scripts/node/validate/valid.txtar @@ -412,6 +412,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar index 6e000e852ba..0673739f81b 100644 --- a/testdata/scripts/node/validate/warnings.txtar +++ b/testdata/scripts/node/validate/warnings.txtar @@ -394,6 +394,8 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 +MetricViewsDisabled = false +MetricViewsAttributeBlacklist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false From bbb94f089163db782c8779f138124be7d5b3d203 Mon Sep 17 00:00:00 2001 From: Pavel <177363085+pkcll@users.noreply.github.com> Date: Mon, 13 Jul 2026 15:04:13 -0400 Subject: [PATCH 2/3] Fix GolangCI modernize and goimports lint in config tests. Co-authored-by: Cursor --- core/services/chainlink/config_telemetry_test.go | 4 ++-- core/services/chainlink/config_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/services/chainlink/config_telemetry_test.go b/core/services/chainlink/config_telemetry_test.go index 9d75febea79..9b5b1fda5ce 100644 --- a/core/services/chainlink/config_telemetry_test.go +++ b/core/services/chainlink/config_telemetry_test.go @@ -405,8 +405,8 @@ func TestTelemetryConfig_MetricViewsDisabled(t *testing.T) { telemetry toml.Telemetry expected bool }{ - {"MetricViewsDisabledTrue", toml.Telemetry{MetricViewsDisabled: ptr(true)}, true}, - {"MetricViewsDisabledFalse", toml.Telemetry{MetricViewsDisabled: ptr(false)}, false}, + {"MetricViewsDisabledTrue", toml.Telemetry{MetricViewsDisabled: new(true)}, true}, + {"MetricViewsDisabledFalse", toml.Telemetry{MetricViewsDisabled: new(false)}, false}, {"MetricViewsDisabledNil", toml.Telemetry{MetricViewsDisabled: nil}, false}, } diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index f75722bfdeb..be98ad39993 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -571,9 +571,9 @@ func TestConfig_Marshal(t *testing.T) { LogExportTimeout: commoncfg.MustNewDuration(1 * time.Second), LogExportMaxBatchSize: ptr[int](512), LogExportInterval: ptrDuration(1 * time.Second), - LogMaxQueueSize: ptrInt(2048), - MetricViewsDisabled: ptr(false), - MetricViewsAttributeBlacklist: []string{"event_id"}, + LogMaxQueueSize: ptrInt(2048), + MetricViewsDisabled: new(false), + MetricViewsAttributeBlacklist: []string{"event_id"}, PrometheusBridge: toml.PrometheusBridge{ Enabled: ptr(true), From ba005760c856fe7312ee986be89a6d00b9d5d531 Mon Sep 17 00:00:00 2001 From: Pavel <177363085+pkcll@users.noreply.github.com> Date: Mon, 13 Jul 2026 16:00:44 -0400 Subject: [PATCH 3/3] Align metric views config with common #2238 denylist API. Drop MetricViewsDisabled; empty MetricViewsAttributeDenylist disables default views. Rename blacklist to denylist and bump chainlink-common to c2bb0f6d4. Co-authored-by: Cursor --- core/cmd/shell.go | 5 ++- core/config/docs/core.toml | 7 ++--- core/config/telemetry_config.go | 3 +- core/config/toml/types.go | 10 ++---- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 +-- core/services/chainlink/config_telemetry.go | 11 ++----- .../chainlink/config_telemetry_test.go | 31 +++---------------- core/services/chainlink/config_test.go | 3 +- .../testdata/config-empty-effective.toml | 3 +- .../chainlink/testdata/config-full.toml | 3 +- .../config-multi-chain-effective.toml | 3 +- .../testdata/config-empty-effective.toml | 3 +- core/web/resolver/testdata/config-full.toml | 3 +- .../config-multi-chain-effective.toml | 3 +- deployment/go.mod | 2 +- deployment/go.sum | 4 +-- docs/CONFIG.md | 16 +++------- go.mod | 2 +- go.sum | 4 +-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 +-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 +-- plugins/loop_registry.go | 3 +- plugins/loop_registry_test.go | 7 ++--- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 +-- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 +-- .../scripts/config/merge_raw_configs.txtar | 3 +- testdata/scripts/node/validate/default.txtar | 3 +- .../node/validate/defaults-override.txtar | 3 +- .../disk-based-logging-disabled.txtar | 3 +- .../validate/disk-based-logging-no-dir.txtar | 3 +- .../node/validate/disk-based-logging.txtar | 3 +- .../node/validate/fallback-override.txtar | 3 +- .../node/validate/invalid-ocr-p2p.txtar | 3 +- testdata/scripts/node/validate/invalid.txtar | 3 +- testdata/scripts/node/validate/valid.txtar | 3 +- testdata/scripts/node/validate/warnings.txtar | 3 +- 41 files changed, 63 insertions(+), 126 deletions(-) diff --git a/core/cmd/shell.go b/core/cmd/shell.go index 7b34ff1fe5a..4d17d063293 100644 --- a/core/cmd/shell.go +++ b/core/cmd/shell.go @@ -165,9 +165,8 @@ func newBeholderClient( LogMaxQueueSize: cfgTelemetry.LogMaxQueueSize(), // Due to OpenTelemetry semantics, histogram bucket boundaries must be set // when the Beholder client is constructed. - MetricViews: metricViews(), - MetricViewsDisabled: cfgTelemetry.MetricViewsDisabled(), - MetricViewsAttributeBlacklist: cfgTelemetry.MetricViewsAttributeBlacklist(), + MetricViews: metricViews(), + MetricViewsAttributeDenylist: cfgTelemetry.MetricViewsAttributeDenylist(), } if cfgTracing.Enabled() { diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml index aa3b5e881b3..c083d02b065 100644 --- a/core/config/docs/core.toml +++ b/core/config/docs/core.toml @@ -907,10 +907,9 @@ LogExportMaxBatchSize = 512 # Default LogExportInterval = '1s' # Default # LogMaxQueueSize sets the maximum queue size used by the batcher LogMaxQueueSize = 2048 # Default -# MetricViewsDisabled skips default Beholder metric attribute deny views. -MetricViewsDisabled = false # Default -# MetricViewsAttributeBlacklist lists attribute keys dropped before export (e.g. event_id). -MetricViewsAttributeBlacklist = ['event_id'] # Default +# MetricViewsAttributeDenylist lists attribute keys dropped before export (e.g. event_id). +# Empty disables default Beholder metric attribute deny views. +MetricViewsAttributeDenylist = ['event_id'] # Default # ResourceAttributes are global metadata to include with all telemetry. [Telemetry.ResourceAttributes] diff --git a/core/config/telemetry_config.go b/core/config/telemetry_config.go index 4fb69c0f8d7..afbb58e84d6 100644 --- a/core/config/telemetry_config.go +++ b/core/config/telemetry_config.go @@ -28,8 +28,7 @@ type Telemetry interface { LogExportMaxBatchSize() int LogExportInterval() time.Duration LogMaxQueueSize() int - MetricViewsDisabled() bool - MetricViewsAttributeBlacklist() []string + MetricViewsAttributeDenylist() []string PrometheusBridge() PrometheusBridge } diff --git a/core/config/toml/types.go b/core/config/toml/types.go index 9aff9206d3f..1053193f349 100644 --- a/core/config/toml/types.go +++ b/core/config/toml/types.go @@ -2995,8 +2995,7 @@ type Telemetry struct { LogExportInterval *commonconfig.Duration LogMaxQueueSize *int - MetricViewsDisabled *bool - MetricViewsAttributeBlacklist []string + MetricViewsAttributeDenylist []string PrometheusBridge PrometheusBridge `toml:",omitempty"` } @@ -3065,11 +3064,8 @@ func (b *Telemetry) setFrom(f *Telemetry) { if v := f.LogMaxQueueSize; v != nil { b.LogMaxQueueSize = v } - if v := f.MetricViewsDisabled; v != nil { - b.MetricViewsDisabled = v - } - if v := f.MetricViewsAttributeBlacklist; v != nil { - b.MetricViewsAttributeBlacklist = v + if v := f.MetricViewsAttributeDenylist; v != nil { + b.MetricViewsAttributeDenylist = v } b.PrometheusBridge.setFrom(&f.PrometheusBridge) } diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 40bf1c9c1aa..1d6e47035cd 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -47,7 +47,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.104 github.com/smartcontractkit/chainlink-automation v0.8.1 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260522094612-5f9f748bd87a github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 49e44a962f5..42a10541469 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1579,8 +1579,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h1:uMn1w/n95p+pSxK6hYNqji/sDaab8D0Cxuph9qUkM2g= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 h1:2Hq6Qz/9/dhowBcXEQ0o4Ep57bTAlQtjh1BFeYkZ6Rw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/core/services/chainlink/config_telemetry.go b/core/services/chainlink/config_telemetry.go index b448f127885..4027c010928 100644 --- a/core/services/chainlink/config_telemetry.go +++ b/core/services/chainlink/config_telemetry.go @@ -182,15 +182,8 @@ func (b *telemetryConfig) LogMaxQueueSize() int { return *b.s.LogMaxQueueSize } -func (b *telemetryConfig) MetricViewsDisabled() bool { - if b.s.MetricViewsDisabled == nil { - return false - } - return *b.s.MetricViewsDisabled -} - -func (b *telemetryConfig) MetricViewsAttributeBlacklist() []string { - return b.s.MetricViewsAttributeBlacklist +func (b *telemetryConfig) MetricViewsAttributeDenylist() []string { + return b.s.MetricViewsAttributeDenylist } func (b *telemetryConfig) PrometheusBridge() config.PrometheusBridge { diff --git a/core/services/chainlink/config_telemetry_test.go b/core/services/chainlink/config_telemetry_test.go index 9b5b1fda5ce..03bf5d18358 100644 --- a/core/services/chainlink/config_telemetry_test.go +++ b/core/services/chainlink/config_telemetry_test.go @@ -398,44 +398,23 @@ func TestTelemetryConfig_LogMaxQueueSize(t *testing.T) { } } -func TestTelemetryConfig_MetricViewsDisabled(t *testing.T) { - t.Parallel() - tests := []struct { - name string - telemetry toml.Telemetry - expected bool - }{ - {"MetricViewsDisabledTrue", toml.Telemetry{MetricViewsDisabled: new(true)}, true}, - {"MetricViewsDisabledFalse", toml.Telemetry{MetricViewsDisabled: new(false)}, false}, - {"MetricViewsDisabledNil", toml.Telemetry{MetricViewsDisabled: nil}, false}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - t.Parallel() - tc := telemetryConfig{s: tt.telemetry} - assert.Equal(t, tt.expected, tc.MetricViewsDisabled()) - }) - } -} - -func TestTelemetryConfig_MetricViewsAttributeBlacklist(t *testing.T) { +func TestTelemetryConfig_MetricViewsAttributeDenylist(t *testing.T) { t.Parallel() tests := []struct { name string telemetry toml.Telemetry expected []string }{ - {"BlacklistSet", toml.Telemetry{MetricViewsAttributeBlacklist: []string{"event_id"}}, []string{"event_id"}}, - {"BlacklistNil", toml.Telemetry{MetricViewsAttributeBlacklist: nil}, nil}, - {"BlacklistEmpty", toml.Telemetry{MetricViewsAttributeBlacklist: []string{}}, []string{}}, + {"DenylistSet", toml.Telemetry{MetricViewsAttributeDenylist: []string{"event_id"}}, []string{"event_id"}}, + {"DenylistNil", toml.Telemetry{MetricViewsAttributeDenylist: nil}, nil}, + {"DenylistEmpty", toml.Telemetry{MetricViewsAttributeDenylist: []string{}}, []string{}}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { t.Parallel() tc := telemetryConfig{s: tt.telemetry} - assert.Equal(t, tt.expected, tc.MetricViewsAttributeBlacklist()) + assert.Equal(t, tt.expected, tc.MetricViewsAttributeDenylist()) }) } } diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index be98ad39993..75b9e478c21 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -572,8 +572,7 @@ func TestConfig_Marshal(t *testing.T) { LogExportMaxBatchSize: ptr[int](512), LogExportInterval: ptrDuration(1 * time.Second), LogMaxQueueSize: ptrInt(2048), - MetricViewsDisabled: new(false), - MetricViewsAttributeBlacklist: []string{"event_id"}, + MetricViewsAttributeDenylist: []string{"event_id"}, PrometheusBridge: toml.PrometheusBridge{ Enabled: ptr(true), diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml index d55cc51f1a8..f482ec905a6 100644 --- a/core/services/chainlink/testdata/config-empty-effective.toml +++ b/core/services/chainlink/testdata/config-empty-effective.toml @@ -359,8 +359,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml index 9537ef4e0d2..75701872d1b 100644 --- a/core/services/chainlink/testdata/config-full.toml +++ b/core/services/chainlink/testdata/config-full.toml @@ -394,8 +394,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.ResourceAttributes] Baz = 'test' diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index 1bd1daf42e9..9819524d79b 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -359,8 +359,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml index d55cc51f1a8..f482ec905a6 100644 --- a/core/web/resolver/testdata/config-empty-effective.toml +++ b/core/web/resolver/testdata/config-empty-effective.toml @@ -359,8 +359,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml index b42022eb074..ec57be99afd 100644 --- a/core/web/resolver/testdata/config-full.toml +++ b/core/web/resolver/testdata/config-full.toml @@ -373,8 +373,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.ResourceAttributes] Baz = 'test' diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index 4b713f54616..17afe4ee69c 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -359,8 +359,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/deployment/go.mod b/deployment/go.mod index 33862013f81..8e18d695806 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -47,7 +47,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260522094612-5f9f748bd87a github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 diff --git a/deployment/go.sum b/deployment/go.sum index 22aed93e0a2..3a0d7e96334 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1384,8 +1384,8 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194 h1:QxZkbKtQyPtVLYP4eMwc+VbXY7M5ve1deSiLZ2pOA+Y= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194/go.mod h1:bNMFRxwWdgVFdSsFZRmsUUPoBUncU3RM765K99svIKM= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 h1:2Hq6Qz/9/dhowBcXEQ0o4Ep57bTAlQtjh1BFeYkZ6Rw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/docs/CONFIG.md b/docs/CONFIG.md index b691cca49c9..b34a4a9aa31 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -2402,8 +2402,7 @@ LogExportTimeout = '1s' # Default LogExportMaxBatchSize = 512 # Default LogExportInterval = '1s' # Default LogMaxQueueSize = 2048 # Default -MetricViewsDisabled = false # Default -MetricViewsAttributeBlacklist = ['event_id'] # Default +MetricViewsAttributeDenylist = ['event_id'] # Default ``` Telemetry holds OTEL settings. This data includes open telemetry metrics, traces, & logs. @@ -2533,17 +2532,12 @@ LogMaxQueueSize = 2048 # Default ``` LogMaxQueueSize sets the maximum queue size used by the batcher -### MetricViewsDisabled +### MetricViewsAttributeDenylist ```toml -MetricViewsDisabled = false # Default +MetricViewsAttributeDenylist = ['event_id'] # Default ``` -MetricViewsDisabled skips default Beholder metric attribute deny views. - -### MetricViewsAttributeBlacklist -```toml -MetricViewsAttributeBlacklist = ['event_id'] # Default -``` -MetricViewsAttributeBlacklist lists attribute keys dropped before export (e.g. event_id). +MetricViewsAttributeDenylist lists attribute keys dropped before export (e.g. event_id). +Empty disables default Beholder metric attribute deny views. ## Telemetry.ResourceAttributes ```toml diff --git a/go.mod b/go.mod index 299ada2f4b9..7e68d1313fc 100644 --- a/go.mod +++ b/go.mod @@ -85,7 +85,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260522094612-5f9f748bd87a diff --git a/go.sum b/go.sum index 12a871d3f6a..b5a24287aff 100644 --- a/go.sum +++ b/go.sum @@ -1161,8 +1161,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h1:uMn1w/n95p+pSxK6hYNqji/sDaab8D0Cxuph9qUkM2g= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 h1:2Hq6Qz/9/dhowBcXEQ0o4Ep57bTAlQtjh1BFeYkZ6Rw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index a4279e04ae3..8412bc3585b 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -33,7 +33,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260623170329-4577ef4ba0ae diff --git a/integration-tests/go.sum b/integration-tests/go.sum index fb9306ac0bb..eccbe30f3d2 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1371,8 +1371,8 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194 h1:QxZkbKtQyPtVLYP4eMwc+VbXY7M5ve1deSiLZ2pOA+Y= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194/go.mod h1:bNMFRxwWdgVFdSsFZRmsUUPoBUncU3RM765K99svIKM= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 h1:2Hq6Qz/9/dhowBcXEQ0o4Ep57bTAlQtjh1BFeYkZ6Rw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index aa63cd72c51..004032c28a2 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -24,7 +24,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260623170329-4577ef4ba0ae github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.6-0.20260630120514-36abe27604df diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 9a4ff0b877f..045d8b03d32 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1631,8 +1631,8 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194 h1:QxZkbKtQyPtVLYP4eMwc+VbXY7M5ve1deSiLZ2pOA+Y= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260616151800-9a3a31c4e194/go.mod h1:bNMFRxwWdgVFdSsFZRmsUUPoBUncU3RM765K99svIKM= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 h1:2Hq6Qz/9/dhowBcXEQ0o4Ep57bTAlQtjh1BFeYkZ6Rw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/plugins/loop_registry.go b/plugins/loop_registry.go index 748a60d4d7d..d5655edbda9 100644 --- a/plugins/loop_registry.go +++ b/plugins/loop_registry.go @@ -163,8 +163,7 @@ func (m *LoopRegistry) Register(id string) (*RegisteredLoop, error) { envCfg.TelemetryLogExportMaxBatchSize = m.cfgTelemetry.LogExportMaxBatchSize() envCfg.TelemetryLogExportInterval = m.cfgTelemetry.LogExportInterval() envCfg.TelemetryLogMaxQueueSize = m.cfgTelemetry.LogMaxQueueSize() - envCfg.TelemetryMetricViewsDisabled = m.cfgTelemetry.MetricViewsDisabled() - envCfg.TelemetryMetricViewsAttributeBlacklist = m.cfgTelemetry.MetricViewsAttributeBlacklist() + envCfg.TelemetryMetricViewsAttributeDenylist = m.cfgTelemetry.MetricViewsAttributeDenylist() envCfg.TelemetryPrometheusBridgeEnabled = m.cfgTelemetry.PrometheusBridge().Enabled() envCfg.TelemetryPrometheusBridgePrefixes = m.cfgTelemetry.PrometheusBridge().Prefixes() } diff --git a/plugins/loop_registry_test.go b/plugins/loop_registry_test.go index 57bd6d743a4..ccf7e8d09db 100644 --- a/plugins/loop_registry_test.go +++ b/plugins/loop_registry_test.go @@ -88,9 +88,7 @@ func (m mockCfgTelemetry) LogExportMaxBatchSize() int { return 512 } func (m mockCfgTelemetry) LogExportInterval() time.Duration { return 5 * time.Second } func (m mockCfgTelemetry) LogMaxQueueSize() int { return 2048 } -func (m mockCfgTelemetry) MetricViewsDisabled() bool { return false } - -func (m mockCfgTelemetry) MetricViewsAttributeBlacklist() []string { +func (m mockCfgTelemetry) MetricViewsAttributeDenylist() []string { return []string{"event_id"} } @@ -256,8 +254,7 @@ func TestLoopRegistry_Register(t *testing.T) { require.Equal(t, 512, envCfg.TelemetryLogExportMaxBatchSize) require.Equal(t, 5*time.Second, envCfg.TelemetryLogExportInterval) require.Equal(t, 2048, envCfg.TelemetryLogMaxQueueSize) - require.False(t, envCfg.TelemetryMetricViewsDisabled) - require.Equal(t, []string{"event_id"}, envCfg.TelemetryMetricViewsAttributeBlacklist) + require.Equal(t, []string{"event_id"}, envCfg.TelemetryMetricViewsAttributeDenylist) require.Equal(t, "example.com/chip-ingress", envCfg.ChipIngressEndpoint) require.False(t, envCfg.ChipIngressBatchEmitterEnabled) diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 47c4678c40c..421535c34bd 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -37,7 +37,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.104 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260708114855-e953eeb028a7 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260623170329-4577ef4ba0ae diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 9921fae7c73..7dd61abda23 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1544,8 +1544,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h1:uMn1w/n95p+pSxK6hYNqji/sDaab8D0Cxuph9qUkM2g= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 h1:2Hq6Qz/9/dhowBcXEQ0o4Ep57bTAlQtjh1BFeYkZ6Rw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 0b80c8ac794..ca16649add6 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -62,7 +62,7 @@ require ( github.com/rs/zerolog v1.35.1 github.com/smartcontractkit/chain-selectors v1.0.104 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 github.com/smartcontractkit/chainlink-common/keystore v1.2.0 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index b93a5eb1018..f1992a2cc47 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1749,8 +1749,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094 h1:uMn1w/n95p+pSxK6hYNqji/sDaab8D0Cxuph9qUkM2g= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260706093831-dad26b360094/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9 h1:F2ocLHCYKrdnQWmkrkud7xs0V/f6YErkYTA58UKcRfg= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713174720-ff6c540906a9/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09 h1:2Hq6Qz/9/dhowBcXEQ0o4Ep57bTAlQtjh1BFeYkZ6Rw= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260713194138-c2bb0f6d4a09/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.0 h1:1BH/b14CkGjArfzznlioQpIJiynECWVT48JUP9E277U= github.com/smartcontractkit/chainlink-common/keystore v1.2.0/go.mod h1:9R/74vN+bJ5PbkOyM/pUy/AeAZaRwYb/k4XPeXcbDio= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/testdata/scripts/config/merge_raw_configs.txtar b/testdata/scripts/config/merge_raw_configs.txtar index d08eebe7d78..2eaaef29a2e 100644 --- a/testdata/scripts/config/merge_raw_configs.txtar +++ b/testdata/scripts/config/merge_raw_configs.txtar @@ -506,8 +506,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar index 8373bef50e9..4ee11e33f7e 100644 --- a/testdata/scripts/node/validate/default.txtar +++ b/testdata/scripts/node/validate/default.txtar @@ -371,8 +371,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/defaults-override.txtar b/testdata/scripts/node/validate/defaults-override.txtar index a945d5c4253..d34d0fd5bb3 100644 --- a/testdata/scripts/node/validate/defaults-override.txtar +++ b/testdata/scripts/node/validate/defaults-override.txtar @@ -432,8 +432,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar index b223051c276..ad228695041 100644 --- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar @@ -415,8 +415,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false 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 373f23e387e..03adef632c9 100644 --- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar @@ -415,8 +415,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar index 2c587023f0e..50d1a61364c 100644 --- a/testdata/scripts/node/validate/disk-based-logging.txtar +++ b/testdata/scripts/node/validate/disk-based-logging.txtar @@ -415,8 +415,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/fallback-override.txtar b/testdata/scripts/node/validate/fallback-override.txtar index 4b139eeae37..cafbdce7bf5 100644 --- a/testdata/scripts/node/validate/fallback-override.txtar +++ b/testdata/scripts/node/validate/fallback-override.txtar @@ -517,8 +517,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar index cfbaec833ca..8bed2c26627 100644 --- a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar +++ b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar @@ -400,8 +400,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar index c7c78a7c914..8228f5c1892 100644 --- a/testdata/scripts/node/validate/invalid.txtar +++ b/testdata/scripts/node/validate/invalid.txtar @@ -411,8 +411,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar index 42354881ddf..8fa1fedf4dc 100644 --- a/testdata/scripts/node/validate/valid.txtar +++ b/testdata/scripts/node/validate/valid.txtar @@ -412,8 +412,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar index 0673739f81b..ff2f51972d8 100644 --- a/testdata/scripts/node/validate/warnings.txtar +++ b/testdata/scripts/node/validate/warnings.txtar @@ -394,8 +394,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsDisabled = false -MetricViewsAttributeBlacklist = ['event_id'] +MetricViewsAttributeDenylist = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false