Wire resource attributes into Beholder ChipIngress emitters by pkcll · Pull Request #2216 · smartcontractkit/chainlink-common

pkcll · 2026-07-02T03:31:08Z

Summary

Wire node resource attributes from beholder.Config.ResourceAttributes into the ChipIngress batch and sync emitters via CloudEvent extensions, so they reach the cre topic as ce_<sanitized> Kafka headers.

Changes

pkg/beholder/batch_emitter_service.go: store resource attributes and stamp them on each emitted event via chipingress.WithResourceAttributeExtensions.
pkg/beholder/chip_ingress_emitter.go: same for the sync emitter.
pkg/beholder/client.go: pass resource attributes into the ChipIngress client header provider.
pkg/beholder/resource_attributes.go: add resourceAttributesToStringMap helper.
Root go.mod: bump pkg/chipingress to the resource-attributes branch (Add resource attribute support to ChipIngress client #2267).

Related PRs

Upstream (chipingress client): Add resource attribute support to ChipIngress client #2267
Downstream (chainlink): bump chainlink-common for chip-ingress resource attributes chainlink#23014

Test plan

go test ./pkg/beholder/...

Notes

The previous Co-authored-by: Cursor attribution has been removed from the commit history.
gRPC metadata → Kafka header forwarding is unconfirmed on the chip-ingress server side; the CE-extension path guarantees ce_<name> headers immediately.
pkg/durableemitter remains out of scope.

github-actions · 2026-07-02T03:32:08Z

✅ API Diff Results - `github.com/smartcontractkit/chainlink-common/pkg/chipingress`

✅ Compatible Changes (7)

`./` (7)

EventOpt — ➕ Added
NewEventWithOpts — ➕ Added
NewStaticHeaderProvider — ➕ Added
SanitizeExtensionName — ➕ Added
SanitizeMetadataHeaders — ➕ Added
SanitizeMetadataValue — ➕ Added
WithResourceAttributeExtensions — ➕ Added

📄 View full apidiff report

github-actions · 2026-07-02T05:09:10Z

✅ API Diff Results - `github.com/smartcontractkit/chainlink-common`

✅ Compatible Changes (1)

`pkg/beholder.ChipIngressEmitterConfig` (1)

NewWithResourceAttributes — ➕ Added

📄 View full apidiff report

patrickhuie19 · 2026-07-10T14:26:54Z

 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
+
+replace github.com/smartcontractkit/chainlink-common/pkg/chipingress => ./pkg/chipingress


any way to avoid the local replace?

For sure, will clean this up.

engnke · 2026-07-13T15:29:09Z

overall approach lgtm. Adding the CloudEvent extensions as the guaranteed propagation path makes sense, and we're keeping the gRPC header route for observability is reasonable

Pick up chip-ingress resource attribute propagation from smartcontractkit/chainlink-common#2216. Co-authored-by: Cursor <cursoragent@cursor.com>

Pick up chip-ingress resource attribute propagation from smartcontractkit/chainlink-common#2216.

pkcll · 2026-07-21T06:31:31Z

Split into two PRs:

pkg/chipingress resource attributes: Add resource attribute support to ChipIngress client #2267
pkg/beholder wiring: feat: add chip-ingress batch config keys and tune defaults #2207
downstream chainlink bump: #23014

Propagate node resource attributes from beholder.Config.ResourceAttributes to the cre topic via ChipIngress CloudEvent extensions. Depends on the new chipingress API introduced in #2267.

Root module must pin the submodule commit from #2267 that contains the new chipingress API.

Pick up chip-ingress resource attribute propagation from smartcontractkit/chainlink-common#2216.

Copilot

Pull request overview

Wires beholder.Config.ResourceAttributes into ChipIngress emitters so node resource attributes propagate to the cre topic (via CloudEvent extensions, and as gRPC metadata headers on the client).

Changes:

Add resourceAttributesToStringMap helper to canonicalize OTel resource attributes into map[string]string.
Stamp resource attributes onto ChipIngress events for both sync and batch emitters via chipingress.WithResourceAttributeExtensions.
Pass resource attributes into the ChipIngress client as a static header provider (sanitized for gRPC metadata), and bump pkg/chipingress to the needed pseudo-version.

Reviewed changes

Copilot reviewed 8 out of 9 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
pkg/beholder/resource_attributes.go	Adds helper to convert OTel resource attributes to string map.
pkg/beholder/resource_attributes_test.go	Tests conversion/encoding behavior for several attribute types.
pkg/beholder/client.go	Plumbs resource attributes into ChipIngress client headers and emitter construction.
pkg/beholder/chip_ingress_emitter.go	Adds emitter support for stamping resource attributes as CE extensions.
pkg/beholder/chip_ingress_emitter_test.go	Verifies CE extension stamping + backward-compat behavior when unset.
pkg/beholder/batch_emitter_service.go	Stores resource attributes and stamps them on each batched event.
pkg/beholder/batch_emitter_service_test.go	Adds coverage asserting resource attributes appear in emitted batches.
go.mod	Bumps `github.com/smartcontractkit/chainlink-common/pkg/chipingress` version.
go.sum	Updates sums for the bumped `pkg/chipingress` dependency.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+	var resourceAttrs *resourceAttrExtensions
+	if len(attrs) > 0 {
+		resourceAttrs = &resourceAttrExtensions{attrs: attrs}
+	}


pkcll force-pushed the chip-ingress-resource-attributes branch from e6eabcc to fdb6dee Compare July 2, 2026 03:48

pkcll requested a review from patrickhuie19 July 2, 2026 05:05

pkcll force-pushed the chip-ingress-resource-attributes branch from 606a264 to ada7f9b Compare July 2, 2026 05:10

pkcll mentioned this pull request Jul 2, 2026

bump chainlink-common for chip-ingress resource attributes smartcontractkit/chainlink#23014

Draft

2 tasks

patrickhuie19 reviewed Jul 10, 2026

View reviewed changes

patrickhuie19 previously approved these changes Jul 10, 2026

View reviewed changes

pkcll dismissed patrickhuie19’s stale review via bab67b2 July 11, 2026 01:12

pkcll force-pushed the chip-ingress-resource-attributes branch 5 times, most recently from aa6b73c to d6a531b Compare July 11, 2026 01:32

pkcll force-pushed the chip-ingress-resource-attributes branch 2 times, most recently from 2a6fa46 to 3ebb388 Compare July 13, 2026 21:12

pkcll force-pushed the chip-ingress-resource-attributes branch 2 times, most recently from e7e82a2 to 1f79a15 Compare July 13, 2026 21:14

pkcll force-pushed the chip-ingress-resource-attributes branch from 1f79a15 to e1e0648 Compare July 20, 2026 23:48

pkcll added a commit to smartcontractkit/chainlink that referenced this pull request Jul 20, 2026

bump chainlink-common for chip-ingress resource attributes

3ad9298

Pick up chip-ingress resource attribute propagation from smartcontractkit/chainlink-common#2216.

pkcll force-pushed the chip-ingress-resource-attributes branch 3 times, most recently from f5eda78 to 0a22a31 Compare July 21, 2026 05:25

pkcll added a commit to smartcontractkit/chainlink that referenced this pull request Jul 21, 2026

bump chainlink-common for chip-ingress resource attributes

b2d9d2e

Pick up chip-ingress resource attribute propagation from smartcontractkit/chainlink-common#2216.

pkcll added a commit to smartcontractkit/chainlink that referenced this pull request Jul 21, 2026

bump chainlink-common for chip-ingress resource attributes

98ad2d2

Pick up chip-ingress resource attribute propagation from smartcontractkit/chainlink-common#2216.

pkcll closed this Jul 21, 2026

pkcll reopened this Jul 21, 2026

pkcll added 2 commits July 21, 2026 02:37

Wire resource attributes into Beholder ChipIngress emitters

6fb684d

Propagate node resource attributes from beholder.Config.ResourceAttributes to the cre topic via ChipIngress CloudEvent extensions. Depends on the new chipingress API introduced in #2267.

Bump pkg/chipingress pseudo-version for resource attributes

fccea7a

Root module must pin the submodule commit from #2267 that contains the new chipingress API.

Copilot AI review requested due to automatic review settings July 21, 2026 06:38

pkcll force-pushed the chip-ingress-resource-attributes branch from 327f9ca to fccea7a Compare July 21, 2026 06:38

pkcll changed the title ~~Add resource attribute support to ChipIngress client~~ Wire resource attributes into Beholder ChipIngress emitters Jul 21, 2026

pkcll mentioned this pull request Jul 21, 2026

Add resource attribute support to ChipIngress client #2267

Draft

Copilot started reviewing on behalf of pkcll July 21, 2026 06:38 View session

pkcll added a commit to smartcontractkit/chainlink that referenced this pull request Jul 21, 2026

bump chainlink-common for chip-ingress resource attributes

69956da

Pick up chip-ingress resource attribute propagation from smartcontractkit/chainlink-common#2216.

pkcll mentioned this pull request Jul 21, 2026

feat: add chip-ingress batch config keys and tune defaults #2207

Open

Copilot AI reviewed Jul 21, 2026

View reviewed changes

Comment thread pkg/beholder/chip_ingress_emitter.go

Comment on lines +61 to +64

var resourceAttrs *resourceAttrExtensions

if len(attrs) > 0 {

resourceAttrs = &resourceAttrExtensions{attrs: attrs}

}

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Wire resource attributes into Beholder ChipIngress emitters#2216

Wire resource attributes into Beholder ChipIngress emitters#2216
pkcll wants to merge 2 commits into
mainfrom
chip-ingress-resource-attributes

pkcll commented Jul 2, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 2, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 2, 2026 •

edited

Loading

Uh oh!

patrickhuie19 Jul 10, 2026

Uh oh!

pkcll Jul 10, 2026

Uh oh!

engnke commented Jul 13, 2026

Uh oh!

pkcll commented Jul 21, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

pkcll commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Related PRs

Test plan

Notes

Uh oh!

github-actions Bot commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ API Diff Results - github.com/smartcontractkit/chainlink-common/pkg/chipingress

✅ Compatible Changes (7)

./ (7)

Uh oh!

github-actions Bot commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ API Diff Results - github.com/smartcontractkit/chainlink-common

✅ Compatible Changes (1)

pkg/beholder.ChipIngressEmitterConfig (1)

Uh oh!

patrickhuie19 Jul 10, 2026

Choose a reason for hiding this comment

Uh oh!

pkcll Jul 10, 2026

Choose a reason for hiding this comment

Uh oh!

engnke commented Jul 13, 2026

Uh oh!

pkcll commented Jul 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

pkcll commented Jul 2, 2026 •

edited

Loading

github-actions Bot commented Jul 2, 2026 •

edited

Loading

✅ API Diff Results - `github.com/smartcontractkit/chainlink-common/pkg/chipingress`

`./` (7)

github-actions Bot commented Jul 2, 2026 •

edited

Loading

✅ API Diff Results - `github.com/smartcontractkit/chainlink-common`

`pkg/beholder.ChipIngressEmitterConfig` (1)