From d023ea7245a6e2912d7d4c90b4f8f91a1499f615 Mon Sep 17 00:00:00 2001 From: Tarcisio Ferraz Date: Tue, 31 Mar 2026 15:39:52 -0300 Subject: [PATCH] use db emitter --- core/services/beholder/db_emitter.go | 50 +++++++++++++++++++ core/services/chainlink/application.go | 14 +----- .../migrations/0296_chip_cdc_queue.sql | 12 +++++ 3 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 core/services/beholder/db_emitter.go create mode 100644 core/store/migrate/migrations/0296_chip_cdc_queue.sql diff --git a/core/services/beholder/db_emitter.go b/core/services/beholder/db_emitter.go new file mode 100644 index 00000000000..4888914ca02 --- /dev/null +++ b/core/services/beholder/db_emitter.go @@ -0,0 +1,50 @@ +package beholder + +import ( + "context" + "encoding/json" + "fmt" + + "github.com/smartcontractkit/chainlink-common/pkg/beholder" + "github.com/smartcontractkit/chainlink-common/pkg/chipingress" + "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" +) + +type DbEmitter struct { + ds sqlutil.DataSource +} + +var _ beholder.Emitter = (*DbEmitter)(nil) + +func NewDbEmitter(ds sqlutil.DataSource) *DbEmitter { + return &DbEmitter{ + ds: ds, + } +} + +func (emitter *DbEmitter) Emit(ctx context.Context, body []byte, attrKVs ...any) error { + _, err := emitter.BatchEmit(ctx, []beholder.Message{ + beholder.NewMessage(body, attrKVs...), + }) + return err +} + +func (emitter *DbEmitter) BatchEmit(ctx context.Context, messages []beholder.Message, options ...beholder.BatchEmitOption) ([]*chipingress.PublishResult, error) { + return nil, sqlutil.TransactDataSource(ctx, emitter.ds, nil, func(ds sqlutil.DataSource) error { + for _, msg := range messages { + attrs, err := json.Marshal(msg.Attrs) + if err != nil { + return fmt.Errorf("marshaling attributes: %w", err) + } + _, err = ds.ExecContext(ctx, "INSERT INTO queue (payload, attributes) VALUES ($1, $2)", msg.Body, attrs) + if err != nil { + return fmt.Errorf("inserting message: %w", err) + } + } + return nil + }) +} + +func (emitter *DbEmitter) Close() error { + return nil +} diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go index 61eba7250a9..0dac4788682 100644 --- a/core/services/chainlink/application.go +++ b/core/services/chainlink/application.go @@ -1284,26 +1284,16 @@ func setupDurableEmitter(ctx context.Context, ds sqlutil.DataSource, lggr logger return fmt.Errorf("chip ingress client not available") } - pgStore := beholdersvc.NewPgDurableEventStore(ds) - durableCfg := beholder.DefaultDurableEmitterConfig() - durableCfg.Metrics = &beholder.DurableEmitterMetricsConfig{ - RecordProcessStats: true, - } - durableCfg.PersistCloudEventSources = telem.DurableEmitterPersistSources() - durableEmitter, err := beholder.NewDurableEmitter(pgStore, chipClient, durableCfg, lggr) - if err != nil { - return fmt.Errorf("failed to create durable emitter: %w", err) - } + emitter := beholdersvc.NewDbEmitter(ds) // Build a new DualSourceEmitter: durable chip + OTLP. messageLogger := client.MessageLoggerProvider.Logger("durable-emitter") otlpEmitter := beholder.NewMessageEmitter(messageLogger) - dualEmitter, err := beholder.NewDualSourceEmitter(durableEmitter, otlpEmitter) + dualEmitter, err := beholder.NewDualSourceEmitter(emitter, otlpEmitter) if err != nil { return fmt.Errorf("failed to create dual source emitter: %w", err) } - durableEmitter.Start(ctx) client.Emitter = dualEmitter switch { diff --git a/core/store/migrate/migrations/0296_chip_cdc_queue.sql b/core/store/migrate/migrations/0296_chip_cdc_queue.sql new file mode 100644 index 00000000000..ea975474ef8 --- /dev/null +++ b/core/store/migrate/migrations/0296_chip_cdc_queue.sql @@ -0,0 +1,12 @@ +-- +goose Up + +CREATE TABLE IF NOT EXISTS cre.chip_queue ( + id BIGSERIAL PRIMARY KEY, + payload BYTEA NOT NULL, + attributes JSONB, + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); + +-- +goose Down + +DROP TABLE IF EXISTS cre.chip_queue;