Skip to content

Commit 8ddf356

Browse files
authored
[receiver/prometheus] Prometheus AppenderV2 interface implementation (#46426)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Implementing the new appenderV2 interface. Upstream code -> prometheus/prometheus#17872 --------- Signed-off-by: perebaj <perebaj@gmail.com>
1 parent bf0272e commit 8ddf356

File tree

7 files changed

+340
-171
lines changed

7 files changed

+340
-171
lines changed

receiver/prometheusreceiver/internal/appendable.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
)
1515

1616
// appendable translates Prometheus scraping diffs into OpenTelemetry format.
17+
// It implements storage.AppendableV2.
1718
type appendable struct {
1819
sink consumer.Metrics
1920
useMetadata bool
@@ -24,14 +25,14 @@ type appendable struct {
2425
obsrecv *receiverhelper.ObsReport
2526
}
2627

27-
// NewAppendable returns a storage.Appendable instance that emits metrics to the sink.
28+
// NewAppendable returns an appendable instance that emits metrics to the sink.
2829
func NewAppendable(
2930
sink consumer.Metrics,
3031
set receiver.Settings,
3132
useMetadata bool,
3233
externalLabels labels.Labels,
3334
trimSuffixes bool,
34-
) (storage.Appendable, error) {
35+
) (storage.AppendableV2, error) {
3536
obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ReceiverID: set.ID, Transport: transport, ReceiverCreateSettings: set})
3637
if err != nil {
3738
return nil, err
@@ -47,6 +48,6 @@ func NewAppendable(
4748
}, nil
4849
}
4950

50-
func (o *appendable) Appender(ctx context.Context) storage.Appender {
51+
func (o *appendable) AppenderV2(ctx context.Context) storage.AppenderV2 {
5152
return newTransaction(ctx, o.sink, o.externalLabels, o.settings, o.obsrecv, o.trimSuffixes, o.useMetadata)
5253
}

receiver/prometheusreceiver/internal/targetallocator/manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func TestManagerShutdown(t *testing.T) {
8585
require.NotNil(t, discoveryManager)
8686

8787
store := teststorage.New(t)
88-
scrapeManager, err := scrape.NewManager(&scrape.Options{}, promLogger, nil, store, nil, reg)
88+
scrapeManager, err := scrape.NewManager(&scrape.Options{}, promLogger, nil, nil, store, reg)
8989
require.NoError(t, err)
9090
defer scrapeManager.Stop()
9191

0 commit comments

Comments
 (0)