Skip to content

Commit d91ebff

Browse files
committed
Update deprecated otel functions
Use new `noop.NewTracerProvider` function. Signed-off-by: SuperQ <[email protected]>
1 parent 9e90b90 commit d91ebff

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tracing/tracing.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
tracesdk "go.opentelemetry.io/otel/sdk/trace"
3333
semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
3434
"go.opentelemetry.io/otel/trace"
35+
"go.opentelemetry.io/otel/trace/noop"
3536
"google.golang.org/grpc/credentials"
3637

3738
"github.com/prometheus/prometheus/config"
@@ -87,7 +88,7 @@ func (m *Manager) ApplyConfig(cfg *config.Config) error {
8788
if cfg.TracingConfig.Endpoint == "" {
8889
m.config = cfg.TracingConfig
8990
m.shutdownFunc = nil
90-
otel.SetTracerProvider(trace.NewNoopTracerProvider())
91+
otel.SetTracerProvider(noop.NewTracerProvider())
9192
level.Info(m.logger).Log("msg", "Tracing provider uninstalled.")
9293
return nil
9394
}

tracing/tracing_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
config_util "github.com/prometheus/common/config"
2121
"github.com/stretchr/testify/require"
2222
"go.opentelemetry.io/otel"
23-
"go.opentelemetry.io/otel/trace"
23+
"go.opentelemetry.io/otel/trace/noop"
2424

2525
"github.com/prometheus/prometheus/config"
2626
)
@@ -105,7 +105,7 @@ func TestUninstallingTracerProvider(t *testing.T) {
105105
}
106106

107107
require.NoError(t, m.ApplyConfig(&cfg))
108-
require.NotEqual(t, trace.NewNoopTracerProvider(), otel.GetTracerProvider())
108+
require.NotEqual(t, noop.NewTracerProvider(), otel.GetTracerProvider())
109109

110110
// Uninstall by passing empty config.
111111
cfg2 := config.Config{
@@ -114,7 +114,7 @@ func TestUninstallingTracerProvider(t *testing.T) {
114114

115115
require.NoError(t, m.ApplyConfig(&cfg2))
116116
// Make sure we get a no-op tracer provider after uninstallation.
117-
require.Equal(t, trace.NewNoopTracerProvider(), otel.GetTracerProvider())
117+
require.Equal(t, noop.NewTracerProvider(), otel.GetTracerProvider())
118118
}
119119

120120
func TestTracerProviderShutdown(t *testing.T) {

0 commit comments

Comments
 (0)