Skip to content

Commit 61a523e

Browse files
authored
beholder: exposes chipingress client (#1647)
* beholder: use chipingress.noop for beholder noop client * beholder: remove chipingress wrapper; expose chipingress client directly * beholder: use chipingress noop client struct * chipingress: add RegisterSchemas method and noop client (#1646) * chipingress: add RegisterSchemas method; add noop client implementation * export chipingress noop client * bump chipingress
1 parent ab2f6ce commit 61a523e

File tree

11 files changed

+470
-138
lines changed

11 files changed

+470
-138
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/scylladb/go-reflectx v1.0.1
3838
github.com/shopspring/decimal v1.4.0
3939
github.com/smartcontractkit/chain-selectors v1.0.67
40-
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251020164035-ab562b473fe2
40+
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251028143833-a5d28bc58c36
4141
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4
4242
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251021010742-3f8d3dba17d8
4343
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
326326
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
327327
github.com/smartcontractkit/chain-selectors v1.0.67 h1:gxTqP/JC40KDe3DE1SIsIKSTKTZEPyEU1YufO1admnw=
328328
github.com/smartcontractkit/chain-selectors v1.0.67/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
329-
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251020164035-ab562b473fe2 h1:p79eZtyBbZYumftwZGCkyKSNDvUralW7lqcTD99Ovmw=
330-
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251020164035-ab562b473fe2/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY=
329+
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251028143833-a5d28bc58c36 h1:4nO2wE9ozApuVwwL7Pbebc/pfNPcVYEvN0sD+YVfacA=
330+
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251028143833-a5d28bc58c36/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY=
331331
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4 h1:GCzrxDWn3b7jFfEA+WiYRi8CKoegsayiDoJBCjYkneE=
332332
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
333333
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251021010742-3f8d3dba17d8 h1:hPeEwcvRVtwhyNXH45qbzqmscqlbygu94cROwbjyzNQ=

pkg/beholder/chip_client.go

Lines changed: 0 additions & 49 deletions
This file was deleted.

pkg/beholder/chip_client_test.go

Lines changed: 0 additions & 72 deletions
This file was deleted.

pkg/beholder/client.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type Client struct {
4545
// Message Emitter
4646
Emitter Emitter
4747
// Chip
48-
Chip ChipIngressClient
48+
Chip chipingress.Client
4949

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

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

235-
// Create interface/wrapper to chip-ingress for schema registry
236-
var chip ChipIngressClient
237-
if chipIngressClient != nil {
238-
chip, err = NewChipIngressClient(chipIngressClient)
239-
if err != nil {
240-
return nil, fmt.Errorf("failed to create interface to chip ingress: %w", err)
241-
}
242-
}
243-
244235
onClose := func() (err error) {
245236
for _, provider := range []shutdowner{messageLoggerProvider, loggerProvider, tracerProvider, meterProvider, messageLoggerProvider} {
246237
err = errors.Join(err, provider.Shutdown(context.Background()))
247238
}
248239
return
249240
}
250-
return &Client{cfg, logger, tracer, meter, emitter, chip, loggerProvider, tracerProvider, meterProvider, messageLoggerProvider, signer, onClose}, nil
241+
return &Client{cfg, logger, tracer, meter, emitter, chipIngressClient, loggerProvider, tracerProvider, meterProvider, messageLoggerProvider, signer, onClose}, nil
251242
}
252243

253244
// Closes all providers, flushes all data and stops all background processes

0 commit comments

Comments
 (0)