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/6] 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/6] 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/6] 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 From 6a9ffaba8e73a68f16ec0060601fef81821683b0 Mon Sep 17 00:00:00 2001 From: Pavel <177363085+pkcll@users.noreply.github.com> Date: Thu, 16 Jul 2026 20:34:01 -0400 Subject: [PATCH 4/6] fix: bump chainlink-common to correct views branch commit (5ffa3320446c) --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- deployment/go.mod | 2 +- deployment/go.sum | 4 ++-- 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 ++-- system-tests/lib/go.mod | 2 +- system-tests/lib/go.sum | 4 ++-- system-tests/tests/go.mod | 2 +- system-tests/tests/go.sum | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index d45de59febb..aa30165a133 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -47,7 +47,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.106 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.20260715145851-8219609496a4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260707105132-2da5d31f22fc 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 92af015246e..b6aabcecacf 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1580,8 +1580,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.1.1-0.20260715132147-59df1b138100 h1:sH546tdm3VaYGaRLnZ6ZYBZiE25vEkMap76Xq/vQWx0= github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4 h1:LzDSHQ5bM4pp8Wrr0mFjg60A4J47+IFPIuC/rHNF1qA= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/deployment/go.mod b/deployment/go.mod index 889173e8005..d26fc9c8dd3 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.20260715145851-8219609496a4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260707105132-2da5d31f22fc github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 diff --git a/deployment/go.sum b/deployment/go.sum index 75e43de19f3..4dad690584a 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1390,8 +1390,8 @@ github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100 h github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= 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.20260715145851-8219609496a4 h1:LzDSHQ5bM4pp8Wrr0mFjg60A4J47+IFPIuC/rHNF1qA= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/go.mod b/go.mod index edb3e10f6c1..fd7da08ba0a 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.1.1-0.20260715132147-59df1b138100 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 github.com/smartcontractkit/chainlink-data-streams v0.1.15-0.20260707105132-2da5d31f22fc diff --git a/go.sum b/go.sum index bb7cdc9ff07..46a6cf002c1 100644 --- a/go.sum +++ b/go.sum @@ -1159,8 +1159,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.1.1-0.20260715132147-59df1b138100 h1:sH546tdm3VaYGaRLnZ6ZYBZiE25vEkMap76Xq/vQWx0= github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4 h1:LzDSHQ5bM4pp8Wrr0mFjg60A4J47+IFPIuC/rHNF1qA= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= 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 7239fc1860d..c6342c9a29a 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.20260715145851-8219609496a4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260715161014-611d8ac32364 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 872f4b98dbf..4ca13526004 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1377,8 +1377,8 @@ github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100 h github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= 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.20260715145851-8219609496a4 h1:LzDSHQ5bM4pp8Wrr0mFjg60A4J47+IFPIuC/rHNF1qA= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= 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 172ca6a46a4..2aed6c401cd 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.20260715145851-8219609496a4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260715161014-611d8ac32364 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.6-0.20260708113039-95f97b2d25e9 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 5d4b7a4ae36..4c6a388c605 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1637,8 +1637,8 @@ github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100 h github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= 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.20260715145851-8219609496a4 h1:LzDSHQ5bM4pp8Wrr0mFjg60A4J47+IFPIuC/rHNF1qA= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index bcee8d79808..54a861fc68d 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.106 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.20260715145851-8219609496a4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260715161014-611d8ac32364 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index d452336e6fb..4c79ed4196f 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1551,8 +1551,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.1.1-0.20260715132147-59df1b138100 h1:sH546tdm3VaYGaRLnZ6ZYBZiE25vEkMap76Xq/vQWx0= github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4 h1:LzDSHQ5bM4pp8Wrr0mFjg60A4J47+IFPIuC/rHNF1qA= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= 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 70bb420ec0a..4c87dddbd1b 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.106 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 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 12c85759577..3a6362dda29 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1756,8 +1756,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.1.1-0.20260715132147-59df1b138100 h1:sH546tdm3VaYGaRLnZ6ZYBZiE25vEkMap76Xq/vQWx0= github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260715132147-59df1b138100/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4 h1:LzDSHQ5bM4pp8Wrr0mFjg60A4J47+IFPIuC/rHNF1qA= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260715145851-8219609496a4/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c/go.mod h1:snfVBRRQTpC2x5O3bQHZe9SvJX5yv/SbG8oHkJTKLtE= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= From 69a3ed4ddf62f263c029f879659d98500a968b82 Mon Sep 17 00:00:00 2001 From: Pavel <177363085+pkcll@users.noreply.github.com> Date: Mon, 20 Jul 2026 19:38:18 -0400 Subject: [PATCH 5/6] fix(ci): align #23085 with updated chainlink-common API and merge origin/develop - Merge origin/develop into beholder-otel-metric-filter-views - Resolve go.mod/go.sum conflicts keeping views branch chainlink-common - Bump chainlink-common to v0.11.2-0.20260720200433-dee51f29efab - Bump chainlink-common/pkg/chipingress to v0.0.11-0.20260716165322-7f2edff6e954 - Rename MetricViewsAttributeDenylist -> MetricViewsDenyAttributes to match the updated chainlink-common beholder.Config field name - Regenerate docs/CONFIG.md and test fixtures - Run make gomodtidy and make config-docs --- core/cmd/shell.go | 4 ++-- core/config/docs/core.toml | 4 ++-- core/config/telemetry_config.go | 2 +- core/config/toml/types.go | 6 +++--- core/scripts/go.mod | 5 +++-- core/scripts/go.sum | 10 +++++++--- core/services/chainlink/config_telemetry.go | 4 ++-- core/services/chainlink/config_telemetry_test.go | 10 +++++----- core/services/chainlink/config_test.go | 2 +- .../chainlink/testdata/config-empty-effective.toml | 2 +- core/services/chainlink/testdata/config-full.toml | 2 +- .../testdata/config-multi-chain-effective.toml | 2 +- core/web/resolver/testdata/config-empty-effective.toml | 2 +- core/web/resolver/testdata/config-full.toml | 2 +- .../testdata/config-multi-chain-effective.toml | 2 +- deployment/go.mod | 5 +++-- deployment/go.sum | 9 ++++++--- docs/CONFIG.md | 8 ++++---- go.mod | 5 +++-- go.sum | 10 +++++++--- integration-tests/go.mod | 9 ++++++--- integration-tests/go.sum | 9 ++++++--- integration-tests/load/go.mod | 5 +++-- integration-tests/load/go.sum | 9 ++++++--- plugins/loop_registry.go | 2 +- plugins/loop_registry_test.go | 4 ++-- system-tests/lib/go.mod | 5 +++-- system-tests/lib/go.sum | 10 +++++++--- system-tests/tests/go.mod | 5 +++-- system-tests/tests/go.sum | 10 +++++++--- testdata/scripts/config/merge_raw_configs.txtar | 2 +- testdata/scripts/node/validate/default.txtar | 2 +- testdata/scripts/node/validate/defaults-override.txtar | 2 +- .../node/validate/disk-based-logging-disabled.txtar | 2 +- .../node/validate/disk-based-logging-no-dir.txtar | 2 +- .../scripts/node/validate/disk-based-logging.txtar | 2 +- testdata/scripts/node/validate/fallback-override.txtar | 2 +- testdata/scripts/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, 110 insertions(+), 76 deletions(-) diff --git a/core/cmd/shell.go b/core/cmd/shell.go index 4d17d063293..641501c5f90 100644 --- a/core/cmd/shell.go +++ b/core/cmd/shell.go @@ -165,8 +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(), - MetricViewsAttributeDenylist: cfgTelemetry.MetricViewsAttributeDenylist(), + MetricViews: metricViews(), + MetricViewsDenyAttributes: cfgTelemetry.MetricViewsDenyAttributes(), } if cfgTracing.Enabled() { diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml index 7a6a7de9704..d1fb533826b 100644 --- a/core/config/docs/core.toml +++ b/core/config/docs/core.toml @@ -914,9 +914,9 @@ LogExportMaxBatchSize = 512 # Default LogExportInterval = '1s' # Default # LogMaxQueueSize sets the maximum queue size used by the batcher LogMaxQueueSize = 2048 # Default -# MetricViewsAttributeDenylist lists attribute keys dropped before export (e.g. event_id). +# MetricViewsDenyAttributes lists attribute keys dropped before export (e.g. event_id). # Empty disables default Beholder metric attribute deny views. -MetricViewsAttributeDenylist = ['event_id'] # Default +MetricViewsDenyAttributes = ['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 cc4e44a60a5..58134228b2e 100644 --- a/core/config/telemetry_config.go +++ b/core/config/telemetry_config.go @@ -31,7 +31,7 @@ type Telemetry interface { LogExportMaxBatchSize() int LogExportInterval() time.Duration LogMaxQueueSize() int - MetricViewsAttributeDenylist() []string + MetricViewsDenyAttributes() []string PrometheusBridge() PrometheusBridge } diff --git a/core/config/toml/types.go b/core/config/toml/types.go index d2009f9b85a..6e96154a8f6 100644 --- a/core/config/toml/types.go +++ b/core/config/toml/types.go @@ -2996,7 +2996,7 @@ type Telemetry struct { LogExportInterval *commonconfig.Duration LogMaxQueueSize *int - MetricViewsAttributeDenylist []string + MetricViewsDenyAttributes []string PrometheusBridge PrometheusBridge `toml:",omitempty"` } @@ -3074,8 +3074,8 @@ func (b *Telemetry) setFrom(f *Telemetry) { if v := f.LogMaxQueueSize; v != nil { b.LogMaxQueueSize = v } - if v := f.MetricViewsAttributeDenylist; v != nil { - b.MetricViewsAttributeDenylist = v + if v := f.MetricViewsDenyAttributes; v != nil { + b.MetricViewsDenyAttributes = v } b.PrometheusBridge.setFrom(&f.PrometheusBridge) } diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 81405c46a2b..7d180d1764b 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -47,7 +47,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.106 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.20260717003002-5ffa3320446c + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-data-streams v1.0.0 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 @@ -493,7 +493,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb // indirect github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 // indirect - github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 // indirect + github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20260423135514-5b1a7565a99c // indirect @@ -508,6 +508,7 @@ require ( github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect github.com/smartcontractkit/chainlink-protos/data-feeds v0.1.1-0.20260501174546-2e8846986b36 // indirect github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 // indirect + github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe // indirect github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 // indirect github.com/smartcontractkit/chainlink-protos/orchestrator v0.11.0 // indirect github.com/smartcontractkit/chainlink-protos/ring/go v0.0.0-20260331131315-f08a616d8dcd // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 327b72aec41..407a3a42895 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1578,12 +1578,14 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-e github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:xu0Jum/nGRkjBwT/Vq7WCElWOTBBkFRwG0ZIaw9tF2I= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb h1:2p+8KYL0bhHblGcOJKRH84i9QduKGcY72NYcLJzNdNc= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 h1:t5VUHVFEdcqa0/faJiHWusuW+egKpqK3YwWZO4/yJto= +github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab h1:Eh16rlW7S1NCVEskUKMHaZCObOfuKHU1etKkkthWXt8= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab/go.mod h1:tAsXbMsNrwIp7vCqeauNsT4f3gVATbTmIviCkZPDgdo= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62/go.mod h1:HmUyH2oD9m+GRpKq7q3vuRnm1F2Uczf/Nd1v3ipMSK8= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 h1:QhTMiEn3s+AB4xBoScuQglsqHGJYxheYrgpxdIdqNAI= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954/go.mod h1:UYcRMb4dZcoaIPgZJ3hckCySTqtJc9K4Q+tOKErwTq0= github.com/smartcontractkit/chainlink-data-streams v1.0.0 h1:W+RfzuZHVt50ihlsB7+XpXiBw1v5hRks6DUK2HHH7A4= github.com/smartcontractkit/chainlink-data-streams v1.0.0/go.mod h1:dF5JiHWueHjYguUUUrFeb03MkcDqha/tssEkqTkgzp4= github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 h1:mzbvXxdbE/96Pdj1zyPKzf25ZlDR48+iTTDTbaITvmk= @@ -1624,6 +1626,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.202607011 github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea/go.mod h1:2ahgl5bI9+fMCD+dBC785Lak38Tb7ApdTe5I8a09Qp0= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 h1:NJdGFhzT6zMaTod4QkBqVD2sg0I25iw1boOYtTpEwRo= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe h1:MDnY5wQbWTpFdDnMRicEnoMfSP5nM/KncARr4skP1ug= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe/go.mod h1:z7lx7wI3XZ4u9kmUtAVdwn1BCC9T8aieWSDcuDgPTdQ= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 h1:/vkKPJoweLkRd56V4YHGRAtTG4+/JAlgklGEfvH6l4c= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16/go.mod h1:dkR2uYg9XYJuT1JASkPzWE51jjFkVb86P7a/yXe5/GM= github.com/smartcontractkit/chainlink-protos/op-catalog v0.1.0 h1:hGEJFD2X3oNIPXQbtIPxCJyg5CcKglRCYBmESS+gmeQ= diff --git a/core/services/chainlink/config_telemetry.go b/core/services/chainlink/config_telemetry.go index e3b83b7ead2..5e1072eb45f 100644 --- a/core/services/chainlink/config_telemetry.go +++ b/core/services/chainlink/config_telemetry.go @@ -214,8 +214,8 @@ func (b *telemetryConfig) LogMaxQueueSize() int { return *b.s.LogMaxQueueSize } -func (b *telemetryConfig) MetricViewsAttributeDenylist() []string { - return b.s.MetricViewsAttributeDenylist +func (b *telemetryConfig) MetricViewsDenyAttributes() []string { + return b.s.MetricViewsDenyAttributes } 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 c684a034b4e..3177846228a 100644 --- a/core/services/chainlink/config_telemetry_test.go +++ b/core/services/chainlink/config_telemetry_test.go @@ -412,23 +412,23 @@ func TestTelemetryConfig_LogMaxQueueSize(t *testing.T) { } } -func TestTelemetryConfig_MetricViewsAttributeDenylist(t *testing.T) { +func TestTelemetryConfig_MetricViewsDenyAttributes(t *testing.T) { t.Parallel() tests := []struct { name string telemetry toml.Telemetry expected []string }{ - {"DenylistSet", toml.Telemetry{MetricViewsAttributeDenylist: []string{"event_id"}}, []string{"event_id"}}, - {"DenylistNil", toml.Telemetry{MetricViewsAttributeDenylist: nil}, nil}, - {"DenylistEmpty", toml.Telemetry{MetricViewsAttributeDenylist: []string{}}, []string{}}, + {"DenylistSet", toml.Telemetry{MetricViewsDenyAttributes: []string{"event_id"}}, []string{"event_id"}}, + {"DenylistNil", toml.Telemetry{MetricViewsDenyAttributes: nil}, nil}, + {"DenylistEmpty", toml.Telemetry{MetricViewsDenyAttributes: []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.MetricViewsAttributeDenylist()) + assert.Equal(t, tt.expected, tc.MetricViewsDenyAttributes()) }) } } diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index 42a9cb4b246..175729e32ad 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -575,7 +575,7 @@ func TestConfig_Marshal(t *testing.T) { LogExportMaxBatchSize: new(512), LogExportInterval: ptrDuration(1 * time.Second), LogMaxQueueSize: new(2048), - MetricViewsAttributeDenylist: []string{"event_id"}, + MetricViewsDenyAttributes: []string{"event_id"}, PrometheusBridge: toml.PrometheusBridge{ Enabled: new(true), diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml index 0501c691c83..1037c4dc892 100644 --- a/core/services/chainlink/testdata/config-empty-effective.toml +++ b/core/services/chainlink/testdata/config-empty-effective.toml @@ -362,7 +362,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 5f35c9c4536..d657f394703 100644 --- a/core/services/chainlink/testdata/config-full.toml +++ b/core/services/chainlink/testdata/config-full.toml @@ -397,7 +397,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 635dfcc7634..a08f5b08773 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -362,7 +362,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 0501c691c83..1037c4dc892 100644 --- a/core/web/resolver/testdata/config-empty-effective.toml +++ b/core/web/resolver/testdata/config-empty-effective.toml @@ -362,7 +362,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 a83b129e58d..cf7921810b8 100644 --- a/core/web/resolver/testdata/config-full.toml +++ b/core/web/resolver/testdata/config-full.toml @@ -376,7 +376,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 7dafc864fcd..3b683e70ab3 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -362,7 +362,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/deployment/go.mod b/deployment/go.mod index 6b72c1fa4be..f4a731b676c 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.20260717003002-5ffa3320446c + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-data-streams v1.0.0 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 @@ -427,7 +427,7 @@ require ( github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect github.com/smartcontractkit/chainlink-canton v0.0.0-20260615233851-4e78e7c23a58 // indirect github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 // indirect - github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 // indirect + github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20260423135514-5b1a7565a99c // indirect github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20260714194015-527495d10a6c // indirect @@ -441,6 +441,7 @@ require ( github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect github.com/smartcontractkit/chainlink-protos/data-feeds v0.1.1-0.20260501174546-2e8846986b36 // indirect github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 // indirect + github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe // indirect github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 // indirect github.com/smartcontractkit/chainlink-protos/op-catalog v0.1.0 // indirect github.com/smartcontractkit/chainlink-protos/ring/go v0.0.0-20260331131315-f08a616d8dcd // indirect diff --git a/deployment/go.sum b/deployment/go.sum index 2ab59e6d5f5..a6716fd38b9 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1390,11 +1390,12 @@ github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 h github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= 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.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab h1:Eh16rlW7S1NCVEskUKMHaZCObOfuKHU1etKkkthWXt8= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab/go.mod h1:tAsXbMsNrwIp7vCqeauNsT4f3gVATbTmIviCkZPDgdo= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62/go.mod h1:HmUyH2oD9m+GRpKq7q3vuRnm1F2Uczf/Nd1v3ipMSK8= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 h1:QhTMiEn3s+AB4xBoScuQglsqHGJYxheYrgpxdIdqNAI= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954/go.mod h1:UYcRMb4dZcoaIPgZJ3hckCySTqtJc9K4Q+tOKErwTq0= github.com/smartcontractkit/chainlink-data-streams v1.0.0 h1:W+RfzuZHVt50ihlsB7+XpXiBw1v5hRks6DUK2HHH7A4= github.com/smartcontractkit/chainlink-data-streams v1.0.0/go.mod h1:dF5JiHWueHjYguUUUrFeb03MkcDqha/tssEkqTkgzp4= github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 h1:mzbvXxdbE/96Pdj1zyPKzf25ZlDR48+iTTDTbaITvmk= @@ -1435,6 +1436,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.202607011 github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea/go.mod h1:2ahgl5bI9+fMCD+dBC785Lak38Tb7ApdTe5I8a09Qp0= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 h1:NJdGFhzT6zMaTod4QkBqVD2sg0I25iw1boOYtTpEwRo= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe h1:MDnY5wQbWTpFdDnMRicEnoMfSP5nM/KncARr4skP1ug= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe/go.mod h1:z7lx7wI3XZ4u9kmUtAVdwn1BCC9T8aieWSDcuDgPTdQ= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 h1:/vkKPJoweLkRd56V4YHGRAtTG4+/JAlgklGEfvH6l4c= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16/go.mod h1:dkR2uYg9XYJuT1JASkPzWE51jjFkVb86P7a/yXe5/GM= github.com/smartcontractkit/chainlink-protos/op-catalog v0.1.0 h1:hGEJFD2X3oNIPXQbtIPxCJyg5CcKglRCYBmESS+gmeQ= diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 23bb432b791..0438f0cf252 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -2405,7 +2405,7 @@ LogExportTimeout = '1s' # Default LogExportMaxBatchSize = 512 # Default LogExportInterval = '1s' # Default LogMaxQueueSize = 2048 # Default -MetricViewsAttributeDenylist = ['event_id'] # Default +MetricViewsDenyAttributes = ['event_id'] # Default ``` Telemetry holds OTEL settings. This data includes open telemetry metrics, traces, & logs. @@ -2554,11 +2554,11 @@ LogMaxQueueSize = 2048 # Default ``` LogMaxQueueSize sets the maximum queue size used by the batcher -### MetricViewsAttributeDenylist +### MetricViewsDenyAttributes ```toml -MetricViewsAttributeDenylist = ['event_id'] # Default +MetricViewsDenyAttributes = ['event_id'] # Default ``` -MetricViewsAttributeDenylist lists attribute keys dropped before export (e.g. event_id). +MetricViewsDenyAttributes lists attribute keys dropped before export (e.g. event_id). Empty disables default Beholder metric attribute deny views. ## Telemetry.ResourceAttributes diff --git a/go.mod b/go.mod index b0e6b082c98..0c558dd8e95 100644 --- a/go.mod +++ b/go.mod @@ -84,10 +84,10 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260624154507-ea7ff77a0ddb 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-common v0.11.2-0.20260717003002-5ffa3320446c github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 - github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 + github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 github.com/smartcontractkit/chainlink-data-streams v1.0.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260716150153-cd1826496e2d github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 @@ -355,6 +355,7 @@ require ( github.com/smartcontractkit/chainlink-protos/chainlink-ccv/message-discovery v0.0.0-20251211142334-5c3421fe2c8d // indirect github.com/smartcontractkit/chainlink-protos/chainlink-ccv/message-rules v0.0.0-20260505131349-78e491b80735 // indirect github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect + github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe // indirect github.com/smartcontractkit/chainlink-protos/svr v1.3.0 // indirect github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20260408092456-3c6369888d4a // indirect github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect diff --git a/go.sum b/go.sum index 5d247beaf2c..9a3426d3b24 100644 --- a/go.sum +++ b/go.sum @@ -1157,12 +1157,14 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-4 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc/go.mod h1:gzCVLUlNov/zFXSC7G6zcGkZU1IfNOHaakbAPDe5Woc= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc h1:War93neyFmv7pzuElZeZC3qc/OfGtLvEXvqL3qeBfM0= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 h1:t5VUHVFEdcqa0/faJiHWusuW+egKpqK3YwWZO4/yJto= +github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab h1:Eh16rlW7S1NCVEskUKMHaZCObOfuKHU1etKkkthWXt8= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab/go.mod h1:tAsXbMsNrwIp7vCqeauNsT4f3gVATbTmIviCkZPDgdo= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62/go.mod h1:HmUyH2oD9m+GRpKq7q3vuRnm1F2Uczf/Nd1v3ipMSK8= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 h1:QhTMiEn3s+AB4xBoScuQglsqHGJYxheYrgpxdIdqNAI= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954/go.mod h1:UYcRMb4dZcoaIPgZJ3hckCySTqtJc9K4Q+tOKErwTq0= github.com/smartcontractkit/chainlink-data-streams v1.0.0 h1:W+RfzuZHVt50ihlsB7+XpXiBw1v5hRks6DUK2HHH7A4= github.com/smartcontractkit/chainlink-data-streams v1.0.0/go.mod h1:dF5JiHWueHjYguUUUrFeb03MkcDqha/tssEkqTkgzp4= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260716150153-cd1826496e2d h1:zk653q4yZISWS9Lp4JbKqFc/Gzznf22m7FU36yXauyA= @@ -1199,6 +1201,8 @@ github.com/smartcontractkit/chainlink-protos/data-feeds v0.1.1-0.20260501174546- github.com/smartcontractkit/chainlink-protos/data-feeds v0.1.1-0.20260501174546-2e8846986b36/go.mod h1:vL1bDgPSJjV0EqHYs4dDlR+EEE0cJchgvGLYXhwIjXY= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 h1:NJdGFhzT6zMaTod4QkBqVD2sg0I25iw1boOYtTpEwRo= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe h1:MDnY5wQbWTpFdDnMRicEnoMfSP5nM/KncARr4skP1ug= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe/go.mod h1:z7lx7wI3XZ4u9kmUtAVdwn1BCC9T8aieWSDcuDgPTdQ= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 h1:/vkKPJoweLkRd56V4YHGRAtTG4+/JAlgklGEfvH6l4c= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16/go.mod h1:dkR2uYg9XYJuT1JASkPzWE51jjFkVb86P7a/yXe5/GM= github.com/smartcontractkit/chainlink-protos/orchestrator v0.11.0 h1:NXKTdIESAiCkVnPS6dyZP+NXVek3GzXa6P4uFAs0o8Y= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 1c64b616915..a11418df7be 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.20260717003002-5ffa3320446c + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260716150153-cd1826496e2d @@ -60,7 +60,10 @@ require ( gopkg.in/guregu/null.v4 v4.0.0 ) -require github.com/smartcontractkit/chainlink-ton/cciplib v0.1.1-0.20260715200135-39296e69ee4e // indirect +require ( + github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe // indirect + github.com/smartcontractkit/chainlink-ton/cciplib v0.1.1-0.20260715200135-39296e69ee4e // indirect +) require ( cloud.google.com/go/compute/metadata v0.9.0 // indirect @@ -406,7 +409,7 @@ require ( github.com/smartcontractkit/chainlink-canton v0.0.0-20260615233851-4e78e7c23a58 // indirect github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260624154507-ea7ff77a0ddb // indirect github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 // indirect - github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 // indirect + github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 // indirect github.com/smartcontractkit/chainlink-data-streams v1.0.0 // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 34e235b72e9..72bc3556799 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1377,11 +1377,12 @@ github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 h github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= 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.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab h1:Eh16rlW7S1NCVEskUKMHaZCObOfuKHU1etKkkthWXt8= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab/go.mod h1:tAsXbMsNrwIp7vCqeauNsT4f3gVATbTmIviCkZPDgdo= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62/go.mod h1:HmUyH2oD9m+GRpKq7q3vuRnm1F2Uczf/Nd1v3ipMSK8= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 h1:QhTMiEn3s+AB4xBoScuQglsqHGJYxheYrgpxdIdqNAI= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954/go.mod h1:UYcRMb4dZcoaIPgZJ3hckCySTqtJc9K4Q+tOKErwTq0= github.com/smartcontractkit/chainlink-data-streams v1.0.0 h1:W+RfzuZHVt50ihlsB7+XpXiBw1v5hRks6DUK2HHH7A4= github.com/smartcontractkit/chainlink-data-streams v1.0.0/go.mod h1:dF5JiHWueHjYguUUUrFeb03MkcDqha/tssEkqTkgzp4= github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 h1:mzbvXxdbE/96Pdj1zyPKzf25ZlDR48+iTTDTbaITvmk= @@ -1422,6 +1423,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.202607011 github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea/go.mod h1:2ahgl5bI9+fMCD+dBC785Lak38Tb7ApdTe5I8a09Qp0= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 h1:NJdGFhzT6zMaTod4QkBqVD2sg0I25iw1boOYtTpEwRo= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe h1:MDnY5wQbWTpFdDnMRicEnoMfSP5nM/KncARr4skP1ug= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe/go.mod h1:z7lx7wI3XZ4u9kmUtAVdwn1BCC9T8aieWSDcuDgPTdQ= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 h1:/vkKPJoweLkRd56V4YHGRAtTG4+/JAlgklGEfvH6l4c= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16/go.mod h1:dkR2uYg9XYJuT1JASkPzWE51jjFkVb86P7a/yXe5/GM= github.com/smartcontractkit/chainlink-protos/op-catalog v0.1.0 h1:hGEJFD2X3oNIPXQbtIPxCJyg5CcKglRCYBmESS+gmeQ= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index aef24543fff..d5b1bb7f3ec 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.20260717003002-5ffa3320446c + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260716150153-cd1826496e2d github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.6-0.20260708113039-95f97b2d25e9 @@ -484,7 +484,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260624154507-ea7ff77a0ddb // indirect github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 // indirect github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 // indirect - github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 // indirect + github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 // indirect github.com/smartcontractkit/chainlink-data-streams v1.0.0 // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260713161920-de075095648b // indirect @@ -503,6 +503,7 @@ require ( github.com/smartcontractkit/chainlink-protos/data-feeds v0.1.1-0.20260501174546-2e8846986b36 // indirect github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea // indirect github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 // indirect + github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe // indirect github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 // indirect github.com/smartcontractkit/chainlink-protos/op-catalog v0.1.0 // indirect github.com/smartcontractkit/chainlink-protos/orchestrator v0.11.0 // indirect diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 528f78c3cc4..dd324ef062a 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1637,11 +1637,12 @@ github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 h github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= 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.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab h1:Eh16rlW7S1NCVEskUKMHaZCObOfuKHU1etKkkthWXt8= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab/go.mod h1:tAsXbMsNrwIp7vCqeauNsT4f3gVATbTmIviCkZPDgdo= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62/go.mod h1:HmUyH2oD9m+GRpKq7q3vuRnm1F2Uczf/Nd1v3ipMSK8= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 h1:QhTMiEn3s+AB4xBoScuQglsqHGJYxheYrgpxdIdqNAI= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954/go.mod h1:UYcRMb4dZcoaIPgZJ3hckCySTqtJc9K4Q+tOKErwTq0= github.com/smartcontractkit/chainlink-data-streams v1.0.0 h1:W+RfzuZHVt50ihlsB7+XpXiBw1v5hRks6DUK2HHH7A4= github.com/smartcontractkit/chainlink-data-streams v1.0.0/go.mod h1:dF5JiHWueHjYguUUUrFeb03MkcDqha/tssEkqTkgzp4= github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 h1:mzbvXxdbE/96Pdj1zyPKzf25ZlDR48+iTTDTbaITvmk= @@ -1682,6 +1683,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.202607011 github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea/go.mod h1:2ahgl5bI9+fMCD+dBC785Lak38Tb7ApdTe5I8a09Qp0= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 h1:NJdGFhzT6zMaTod4QkBqVD2sg0I25iw1boOYtTpEwRo= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe h1:MDnY5wQbWTpFdDnMRicEnoMfSP5nM/KncARr4skP1ug= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe/go.mod h1:z7lx7wI3XZ4u9kmUtAVdwn1BCC9T8aieWSDcuDgPTdQ= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 h1:/vkKPJoweLkRd56V4YHGRAtTG4+/JAlgklGEfvH6l4c= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16/go.mod h1:dkR2uYg9XYJuT1JASkPzWE51jjFkVb86P7a/yXe5/GM= github.com/smartcontractkit/chainlink-protos/op-catalog v0.1.0 h1:hGEJFD2X3oNIPXQbtIPxCJyg5CcKglRCYBmESS+gmeQ= diff --git a/plugins/loop_registry.go b/plugins/loop_registry.go index d5655edbda9..e1b7692e8d2 100644 --- a/plugins/loop_registry.go +++ b/plugins/loop_registry.go @@ -163,7 +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.TelemetryMetricViewsAttributeDenylist = m.cfgTelemetry.MetricViewsAttributeDenylist() + envCfg.TelemetryMetricViewsDenyAttributes = m.cfgTelemetry.MetricViewsDenyAttributes() 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 2b583a4e092..a608a9b8c10 100644 --- a/plugins/loop_registry_test.go +++ b/plugins/loop_registry_test.go @@ -94,7 +94,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) MetricViewsAttributeDenylist() []string { +func (m mockCfgTelemetry) MetricViewsDenyAttributes() []string { return []string{"event_id"} } @@ -260,7 +260,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.Equal(t, []string{"event_id"}, envCfg.TelemetryMetricViewsAttributeDenylist) + require.Equal(t, []string{"event_id"}, envCfg.TelemetryMetricViewsDenyAttributes) 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 3f9ed652489..f8e2b5a4ecd 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.106 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.20260717003002-5ffa3320446c + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260716150153-cd1826496e2d @@ -460,7 +460,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260624154507-ea7ff77a0ddb // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb // indirect github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 // indirect - github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 // indirect + github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 // indirect github.com/smartcontractkit/chainlink-data-streams v1.0.0 // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect @@ -475,6 +475,7 @@ require ( github.com/smartcontractkit/chainlink-protos/chainlink-ccv/message-rules v0.0.0-20260505131349-78e491b80735 // indirect github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect github.com/smartcontractkit/chainlink-protos/data-feeds v0.1.1-0.20260501174546-2e8846986b36 // indirect + github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe // indirect github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 // indirect github.com/smartcontractkit/chainlink-protos/orchestrator v0.11.0 // indirect github.com/smartcontractkit/chainlink-protos/ring/go v0.0.0-20260331131315-f08a616d8dcd // indirect diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index b9d9f814b89..368d83eac49 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1549,12 +1549,14 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-e github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:xu0Jum/nGRkjBwT/Vq7WCElWOTBBkFRwG0ZIaw9tF2I= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb h1:2p+8KYL0bhHblGcOJKRH84i9QduKGcY72NYcLJzNdNc= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 h1:t5VUHVFEdcqa0/faJiHWusuW+egKpqK3YwWZO4/yJto= +github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab h1:Eh16rlW7S1NCVEskUKMHaZCObOfuKHU1etKkkthWXt8= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab/go.mod h1:tAsXbMsNrwIp7vCqeauNsT4f3gVATbTmIviCkZPDgdo= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62/go.mod h1:HmUyH2oD9m+GRpKq7q3vuRnm1F2Uczf/Nd1v3ipMSK8= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 h1:QhTMiEn3s+AB4xBoScuQglsqHGJYxheYrgpxdIdqNAI= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954/go.mod h1:UYcRMb4dZcoaIPgZJ3hckCySTqtJc9K4Q+tOKErwTq0= github.com/smartcontractkit/chainlink-data-streams v1.0.0 h1:W+RfzuZHVt50ihlsB7+XpXiBw1v5hRks6DUK2HHH7A4= github.com/smartcontractkit/chainlink-data-streams v1.0.0/go.mod h1:dF5JiHWueHjYguUUUrFeb03MkcDqha/tssEkqTkgzp4= github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 h1:mzbvXxdbE/96Pdj1zyPKzf25ZlDR48+iTTDTbaITvmk= @@ -1595,6 +1597,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.202607011 github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea/go.mod h1:2ahgl5bI9+fMCD+dBC785Lak38Tb7ApdTe5I8a09Qp0= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 h1:NJdGFhzT6zMaTod4QkBqVD2sg0I25iw1boOYtTpEwRo= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe h1:MDnY5wQbWTpFdDnMRicEnoMfSP5nM/KncARr4skP1ug= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe/go.mod h1:z7lx7wI3XZ4u9kmUtAVdwn1BCC9T8aieWSDcuDgPTdQ= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 h1:/vkKPJoweLkRd56V4YHGRAtTG4+/JAlgklGEfvH6l4c= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16/go.mod h1:dkR2uYg9XYJuT1JASkPzWE51jjFkVb86P7a/yXe5/GM= github.com/smartcontractkit/chainlink-protos/op-catalog v0.1.0 h1:hGEJFD2X3oNIPXQbtIPxCJyg5CcKglRCYBmESS+gmeQ= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 5e367dd9bd0..13abf83954a 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.106 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 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 @@ -246,6 +246,7 @@ require ( github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect github.com/smartcontractkit/chainlink-protos/data-feeds v0.1.1-0.20260501174546-2e8846986b36 // indirect github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea // indirect + github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe // indirect github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 // indirect github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260513123719-d347eaf314e1 // indirect github.com/smartcontractkit/chainlink-sui/codec v0.0.0-20260714120433-7667cad5ff5c // indirect @@ -634,7 +635,7 @@ require ( github.com/smartcontractkit/chainlink-aptos v0.0.0-20260708114855-e953eeb028a7 github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260715130435-1e32cea69af1 // indirect - github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 + github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260716150153-cd1826496e2d github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20260423135514-5b1a7565a99c // indirect github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20260714194015-527495d10a6c // indirect diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index 2cebb1d93f5..10e76d4c06e 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1754,12 +1754,14 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-e github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:xu0Jum/nGRkjBwT/Vq7WCElWOTBBkFRwG0ZIaw9tF2I= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb h1:2p+8KYL0bhHblGcOJKRH84i9QduKGcY72NYcLJzNdNc= github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260624154507-ea7ff77a0ddb/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260717003002-5ffa3320446c h1:PqiSnqRei7VgEhu0RVuXjpHCjkqINs6cUFB6lef8boc= github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6 h1:t5VUHVFEdcqa0/faJiHWusuW+egKpqK3YwWZO4/yJto= +github.com/smartcontractkit/chainlink-ccv v0.1.1-0.20260716164331-d938b371c5d6/go.mod h1:0v6RGdYa9NezVnBPIAVyxB3A9furKWwaSkLha+URYGk= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab h1:Eh16rlW7S1NCVEskUKMHaZCObOfuKHU1etKkkthWXt8= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260720200433-dee51f29efab/go.mod h1:tAsXbMsNrwIp7vCqeauNsT4f3gVATbTmIviCkZPDgdo= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6 h1:DvfhsiIxB4JMuR+r1UciKV8jKiwhI/OZI/QhKawC4pM= github.com/smartcontractkit/chainlink-common/keystore v1.2.1-0.20260623104656-f39eba3e2bc6/go.mod h1:6NefaCIMH4zFBN3T+cvsFGYoy3oTSPKDaxPAyBzlYTU= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62 h1:o7vfwNQjQbMKQ9YsZFQOxvU7RMXD/wKnZsX5N9sDS3w= -github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62/go.mod h1:HmUyH2oD9m+GRpKq7q3vuRnm1F2Uczf/Nd1v3ipMSK8= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954 h1:QhTMiEn3s+AB4xBoScuQglsqHGJYxheYrgpxdIdqNAI= +github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260716165322-7f2edff6e954/go.mod h1:UYcRMb4dZcoaIPgZJ3hckCySTqtJc9K4Q+tOKErwTq0= github.com/smartcontractkit/chainlink-data-streams v1.0.0 h1:W+RfzuZHVt50ihlsB7+XpXiBw1v5hRks6DUK2HHH7A4= github.com/smartcontractkit/chainlink-data-streams v1.0.0/go.mod h1:dF5JiHWueHjYguUUUrFeb03MkcDqha/tssEkqTkgzp4= github.com/smartcontractkit/chainlink-deployments-framework v0.111.1-0.20260612191326-e31c0ae4cd54 h1:mzbvXxdbE/96Pdj1zyPKzf25ZlDR48+iTTDTbaITvmk= @@ -1800,6 +1802,8 @@ github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.202607011 github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea/go.mod h1:2ahgl5bI9+fMCD+dBC785Lak38Tb7ApdTe5I8a09Qp0= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305 h1:NJdGFhzT6zMaTod4QkBqVD2sg0I25iw1boOYtTpEwRo= github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20260512230622-65f10f4cd305/go.mod h1:qSTSwX3cBP3FKQwQacdjArqv0g6QnukjV4XuzO6UyoY= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe h1:MDnY5wQbWTpFdDnMRicEnoMfSP5nM/KncARr4skP1ug= +github.com/smartcontractkit/chainlink-protos/metering/go v0.0.0-20260710151514-27b5a126dabe/go.mod h1:z7lx7wI3XZ4u9kmUtAVdwn1BCC9T8aieWSDcuDgPTdQ= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16 h1:/vkKPJoweLkRd56V4YHGRAtTG4+/JAlgklGEfvH6l4c= github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260709145319-7782fb89eb16/go.mod h1:dkR2uYg9XYJuT1JASkPzWE51jjFkVb86P7a/yXe5/GM= github.com/smartcontractkit/chainlink-protos/op-catalog v0.1.0 h1:hGEJFD2X3oNIPXQbtIPxCJyg5CcKglRCYBmESS+gmeQ= diff --git a/testdata/scripts/config/merge_raw_configs.txtar b/testdata/scripts/config/merge_raw_configs.txtar index 5fb7fb2f3c1..8ac185cee1f 100644 --- a/testdata/scripts/config/merge_raw_configs.txtar +++ b/testdata/scripts/config/merge_raw_configs.txtar @@ -509,7 +509,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar index 1a1d2eb7602..3de7ee722f2 100644 --- a/testdata/scripts/node/validate/default.txtar +++ b/testdata/scripts/node/validate/default.txtar @@ -374,7 +374,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 da275a3c6d1..699b6ee5308 100644 --- a/testdata/scripts/node/validate/defaults-override.txtar +++ b/testdata/scripts/node/validate/defaults-override.txtar @@ -435,7 +435,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 02c0aa51fd4..49a87e9a491 100644 --- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar @@ -418,7 +418,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 495de147428..3fc2f3e11d4 100644 --- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar @@ -418,7 +418,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 e7ae49ec270..2f5eb18fb83 100644 --- a/testdata/scripts/node/validate/disk-based-logging.txtar +++ b/testdata/scripts/node/validate/disk-based-logging.txtar @@ -418,7 +418,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 bb780e24243..433a1216602 100644 --- a/testdata/scripts/node/validate/fallback-override.txtar +++ b/testdata/scripts/node/validate/fallback-override.txtar @@ -520,7 +520,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['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 9ce4562ecf2..2946492a57a 100644 --- a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar +++ b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar @@ -403,7 +403,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar index 2ebadddac33..abec32f339c 100644 --- a/testdata/scripts/node/validate/invalid.txtar +++ b/testdata/scripts/node/validate/invalid.txtar @@ -414,7 +414,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar index 3b43fab2128..fe878c69c1c 100644 --- a/testdata/scripts/node/validate/valid.txtar +++ b/testdata/scripts/node/validate/valid.txtar @@ -415,7 +415,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar index 33dec88a750..769b2efe380 100644 --- a/testdata/scripts/node/validate/warnings.txtar +++ b/testdata/scripts/node/validate/warnings.txtar @@ -397,7 +397,7 @@ LogExportTimeout = '1s' LogExportMaxBatchSize = 512 LogExportInterval = '1s' LogMaxQueueSize = 2048 -MetricViewsAttributeDenylist = ['event_id'] +MetricViewsDenyAttributes = ['event_id'] [Telemetry.PrometheusBridge] Enabled = false From 4b4517bb27fa747007a640260bbf6cb84e5d3ed0 Mon Sep 17 00:00:00 2001 From: Pavel <177363085+pkcll@users.noreply.github.com> Date: Mon, 20 Jul 2026 19:41:17 -0400 Subject: [PATCH 6/6] chore: add changeset for MetricViewsDenyAttributes --- .changeset/beholder-metric-views-deny-attributes.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/beholder-metric-views-deny-attributes.md diff --git a/.changeset/beholder-metric-views-deny-attributes.md b/.changeset/beholder-metric-views-deny-attributes.md new file mode 100644 index 00000000000..d394e5f7ad8 --- /dev/null +++ b/.changeset/beholder-metric-views-deny-attributes.md @@ -0,0 +1,5 @@ +--- +"chainlink": patch +--- + +#added Add `Telemetry.MetricViewsDenyAttributes` config option to drop specified metric attribute keys from Beholder default views.