Skip to content

beholder: exposes chipingress client #1647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmank88 merged 7 commits into from
Oct 28, 2025
Merged

beholder: exposes chipingress client #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c898a3
beholder: use chipingress.noop for beholder noop client
pkcll Oct 24, 2025
6581bc7
beholder: remove chipingress wrapper; expose chipingress client directly
pkcll Oct 24, 2025
5539a44
Merge branch 'main' of github.com:smartcontractkit/chainlink-common i…
pkcll Oct 27, 2025
fe3b522
beholder: use chipingress noop client struct
pkcll Oct 28, 2025
a6e6622
chipingress: add RegisterSchemas method and noop client (#1646)
pkcll Oct 28, 2025
a5d28bc
Merge branch 'main' into INFOPLAT-2731-common-beholder-expose-chip-cl…
pkcll Oct 28, 2025
e343de5
bump chipingress
pkcll Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require (
github.com/scylladb/go-reflectx v1.0.1
github.com/shopspring/decimal v1.4.0
github.com/smartcontractkit/chain-selectors v1.0.67
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251020164035-ab562b473fe2
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251028143833-a5d28bc58c36
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251021010742-3f8d3dba17d8
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/smartcontractkit/chain-selectors v1.0.67 h1:gxTqP/JC40KDe3DE1SIsIKSTKTZEPyEU1YufO1admnw=
github.com/smartcontractkit/chain-selectors v1.0.67/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251020164035-ab562b473fe2 h1:p79eZtyBbZYumftwZGCkyKSNDvUralW7lqcTD99Ovmw=
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251020164035-ab562b473fe2/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY=
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251028143833-a5d28bc58c36 h1:4nO2wE9ozApuVwwL7Pbebc/pfNPcVYEvN0sD+YVfacA=
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251028143833-a5d28bc58c36/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY=
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4 h1:GCzrxDWn3b7jFfEA+WiYRi8CKoegsayiDoJBCjYkneE=
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251021010742-3f8d3dba17d8 h1:hPeEwcvRVtwhyNXH45qbzqmscqlbygu94cROwbjyzNQ=
Expand Down
49 changes: 0 additions & 49 deletions pkg/beholder/chip_client.go
View file
Open in desktop
Copy link
Contributor Author

@pkcll pkcll Oct 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove wrapper ChipIngressClient interface, expose reference to chipingress.Client interface directly from beholder client (see here)

This file was deleted.

72 changes: 0 additions & 72 deletions pkg/beholder/chip_client_test.go
View file
Open in desktop

This file was deleted.

15 changes: 3 additions & 12 deletions pkg/beholder/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type Client struct {
// Message Emitter
Emitter Emitter
// Chip
Chip ChipIngressClient
Chip chipingress.Client

// Providers
LoggerProvider otellog.LoggerProvider
Expand Down Expand Up @@ -185,8 +185,8 @@ func NewGRPCClient(cfg Config, otlploggrpcNew otlploggrpcFactory) (*Client, erro
// This will eventually be removed in favor of chip-ingress emitter
// and logs will be sent via OTLP using the regular Logger instead of calling Emit
emitter := NewMessageEmitter(messageLogger)
var chipIngressClient chipingress.Client

var chipIngressClient chipingress.Client = &chipingress.NoopClient{}
// if chip ingress is enabled, create dual source emitter that sends to both otel collector and chip ingress
// eventually we will remove the dual source emitter and just use chip ingress
if cfg.ChipIngressEmitterEnabled || cfg.ChipIngressEmitterGRPCEndpoint != "" {
Expand Down Expand Up @@ -232,22 +232,13 @@ func NewGRPCClient(cfg Config, otlploggrpcNew otlploggrpcFactory) (*Client, erro
}
}

// Create interface/wrapper to chip-ingress for schema registry
var chip ChipIngressClient
if chipIngressClient != nil {
chip, err = NewChipIngressClient(chipIngressClient)
if err != nil {
return nil, fmt.Errorf("failed to create interface to chip ingress: %w", err)
}
}

onClose := func() (err error) {
for _, provider := range []shutdowner{messageLoggerProvider, loggerProvider, tracerProvider, meterProvider, messageLoggerProvider} {
err = errors.Join(err, provider.Shutdown(context.Background()))
}
return
}
return &Client{cfg, logger, tracer, meter, emitter, chip, loggerProvider, tracerProvider, meterProvider, messageLoggerProvider, signer, onClose}, nil
return &Client{cfg, logger, tracer, meter, emitter, chipIngressClient, loggerProvider, tracerProvider, meterProvider, messageLoggerProvider, signer, onClose}, nil
}

// Closes all providers, flushes all data and stops all background processes
Expand Down
Loading
Loading