Skip to content

otelconf: register Prometheus reader with a MeterProvider in tests #9475

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

Open
pujitha24 wants to merge 4 commits into
base: main
Choose a base branch
from
+20 −8
Open

otelconf: register Prometheus reader with a MeterProvider in tests #9475

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c61fc7
otelconf: register Prometheus reader with a MeterProvider in tests
pujitha24 Aug 14, 2026
83e1009
changelog: add entry for Prometheus reader test fix
pujitha24 Aug 14, 2026
633831f
otelconf/x: apply same MeterProvider registration fix to TestPromethe…
pujitha24 Aug 14, 2026
f167911
otelconf: drop unneeded comments on MeterProvider registration in tests
pujitha24 Aug 17, 2026
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
13 changes: 10 additions & 3 deletions otelconf/v0.2.0/metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,11 +1201,15 @@ func TestPrometheusIPv6(t *testing.T) {
}

rs, err := prometheusReader(t.Context(), &cfg)
require.NoError(t, err)

// Register the reader with a MeterProvider so that scraping
// /metrics below does not log a "reader is not registered" error.
mp := sdkmetric.NewMeterProvider(sdkmetric.WithReader(rs))
t.Cleanup(func() {
//nolint:usetesting // required to avoid getting a canceled context at cleanup.
require.NoError(t, rs.Shutdown(context.Background()))
require.NoError(t, mp.Shutdown(context.Background()))
})
require.NoError(t, err)

hServ := rs.(readerWithServer).server
assert.True(t, strings.HasPrefix(hServ.Addr, "[::1]:"))
Expand Down Expand Up @@ -1293,9 +1297,12 @@ func TestPrometheusReaderConfigurationOptions(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, reader)

// Register the reader with a MeterProvider so that scraping /metrics
// below does not log a "reader is not registered" error.
mp := sdkmetric.NewMeterProvider(sdkmetric.WithReader(reader))
t.Cleanup(func() {
//nolint:usetesting // required to avoid getting a canceled context at cleanup.
require.NoError(t, reader.Shutdown(context.Background()))
require.NoError(t, mp.Shutdown(context.Background()))
})

rws, ok := reader.(readerWithServer)
Expand Down
13 changes: 10 additions & 3 deletions otelconf/v0.3.0/metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,11 +1434,15 @@ func TestPrometheusIPv6(t *testing.T) {
}

rs, err := prometheusReader(t.Context(), &cfg)
require.NoError(t, err)

// Register the reader with a MeterProvider so that scraping
// /metrics below does not log a "reader is not registered" error.
mp := sdkmetric.NewMeterProvider(sdkmetric.WithReader(rs))

@dashpole dashpole Aug 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks like TestPrometheusIPv6 in otelconf/x/metric_test.go has the same pattern and still logs this warning. Should we update that test as well?

t.Cleanup(func() {
//nolint:usetesting // required to avoid getting a canceled context at cleanup.
require.NoError(t, rs.Shutdown(context.Background()))
require.NoError(t, mp.Shutdown(context.Background()))
})
require.NoError(t, err)

hServ := rs.(readerWithServer).server
assert.True(t, strings.HasPrefix(hServ.Addr, "[::1]:"))
Expand Down Expand Up @@ -1572,9 +1576,12 @@ func TestPrometheusReaderConfigurationOptions(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, reader)

// Register the reader with a MeterProvider so that scraping /metrics
// below does not log a "reader is not registered" error.
mp := sdkmetric.NewMeterProvider(sdkmetric.WithReader(reader))
t.Cleanup(func() {
//nolint:usetesting // required to avoid getting a canceled context at cleanup.
require.NoError(t, reader.Shutdown(context.Background()))
require.NoError(t, mp.Shutdown(context.Background()))
})

rws, ok := reader.(readerWithServer)
Expand Down
8 changes: 6 additions & 2 deletions otelconf/x/metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1615,11 +1615,15 @@ func TestPrometheusIPv6(t *testing.T) {
}

rs, err := prometheusReader(t.Context(), &cfg)
require.NoError(t, err)

// Register the reader with a MeterProvider so that scraping
// /metrics below does not log a "reader is not registered" error.

@iblancasa iblancasa Aug 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think these comments are needed

mp := sdkmetric.NewMeterProvider(sdkmetric.WithReader(rs))
t.Cleanup(func() {
//nolint:usetesting // required to avoid getting a canceled context at cleanup.
require.NoError(t, rs.Shutdown(context.Background()))
require.NoError(t, mp.Shutdown(context.Background()))
})
require.NoError(t, err)

hServ := rs.(readerWithServer).server
assert.True(t, strings.HasPrefix(hServ.Addr, "[::1]:"))
Expand Down
Loading