File tree 2 files changed +5
-4
lines changed
2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -32,6 +32,7 @@ import (
32
32
tracesdk "go.opentelemetry.io/otel/sdk/trace"
33
33
semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
34
34
"go.opentelemetry.io/otel/trace"
35
+ "go.opentelemetry.io/otel/trace/noop"
35
36
"google.golang.org/grpc/credentials"
36
37
37
38
"github.com/prometheus/prometheus/config"
@@ -87,7 +88,7 @@ func (m *Manager) ApplyConfig(cfg *config.Config) error {
87
88
if cfg .TracingConfig .Endpoint == "" {
88
89
m .config = cfg .TracingConfig
89
90
m .shutdownFunc = nil
90
- otel .SetTracerProvider (trace . NewNoopTracerProvider ())
91
+ otel .SetTracerProvider (noop . NewTracerProvider ())
91
92
level .Info (m .logger ).Log ("msg" , "Tracing provider uninstalled." )
92
93
return nil
93
94
}
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ import (
20
20
config_util "github.com/prometheus/common/config"
21
21
"github.com/stretchr/testify/require"
22
22
"go.opentelemetry.io/otel"
23
- "go.opentelemetry.io/otel/trace"
23
+ "go.opentelemetry.io/otel/trace/noop "
24
24
25
25
"github.com/prometheus/prometheus/config"
26
26
)
@@ -105,7 +105,7 @@ func TestUninstallingTracerProvider(t *testing.T) {
105
105
}
106
106
107
107
require .NoError (t , m .ApplyConfig (& cfg ))
108
- require .NotEqual (t , trace . NewNoopTracerProvider (), otel .GetTracerProvider ())
108
+ require .NotEqual (t , noop . NewTracerProvider (), otel .GetTracerProvider ())
109
109
110
110
// Uninstall by passing empty config.
111
111
cfg2 := config.Config {
@@ -114,7 +114,7 @@ func TestUninstallingTracerProvider(t *testing.T) {
114
114
115
115
require .NoError (t , m .ApplyConfig (& cfg2 ))
116
116
// 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 ())
118
118
}
119
119
120
120
func TestTracerProviderShutdown (t * testing.T ) {
You can’t perform that action at this time.
0 commit comments