Switch away from deprecated function

Author: tnicolaisen-snabble

tracex/datamap/propagator_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 )
 
 const (
@@ -70,5 +71,5 @@ func propagator() *Propagator {
 }
 
 func traceProvider() trace.TracerProvider {
-	return trace.NewNoopTracerProvider()
+	return noop.NewTracerProvider()
 }

tracex/trace_provider.go

@@ -11,7 +11,7 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
-	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 )
 
 type TraceProvider struct {
@@ -37,7 +37,7 @@ func NewTraceProvider(appResource *resource.Resource, batcher sdktrace.SpanExpor
 func (p *TraceProvider) Shutdown(ctx context.Context) error {
 	err := p.tp.Shutdown(ctx)
 	otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator())
-	otel.SetTracerProvider(trace.NewNoopTracerProvider())
+	otel.SetTracerProvider(noop.NewTracerProvider())
 	return err
 }
 

tracex/trace_test.go

@@ -6,11 +6,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 )
 
 func Test_BackgroundContextWithSpan(t *testing.T) {
 	originalContextWithCancel, cancel := context.WithCancel(context.Background())
-	originalCtx, originalSpan := trace.NewNoopTracerProvider().Tracer("").Start(originalContextWithCancel, "spanName")
+	originalCtx, originalSpan := noop.NewTracerProvider().Tracer("").Start(originalContextWithCancel, "spanName")
 	newCtxWithSameSpan := BackgroundContextWithSpan(originalCtx)
 	trace.SpanContextFromContext(newCtxWithSameSpan).Equal(originalSpan.SpanContext())