Change to use non-deprecated function

Signed-off-by: Kim Christensen <kimworking@gmail.com>
getporter · May 5, 2024 · 19ceea9 · 19ceea9
1 parent 25b32d8
commit 19ceea9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pkg/portercontext/telemetry.go b/pkg/portercontext/telemetry.go
@@ -20,7 +20,7 @@ import (
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
-	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -47,7 +47,7 @@ func (c *Context) configureTelemetry(ctx context.Context, cfg LogConfiguration,
 }
 
 func createNoopTracer() tracing.Tracer {
-	tracer := trace.NewNoopTracerProvider().Tracer("noop")
+	tracer := noop.NewTracerProvider().Tracer("noop")
 	cleanup := func(_ context.Context) error { return nil }
 	t := tracing.NewTracer(tracer, cleanup)
 	t.IsNoOp = true

diff --git a/pkg/tracing/traceLogger_test.go b/pkg/tracing/traceLogger_test.go
@@ -5,14 +5,14 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
 )
 
 func TestTraceLogger_ShouldLog(t *testing.T) {
 	logger := zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel))
-	tracer := trace.NewNoopTracerProvider().Tracer("noop")
+	tracer := noop.NewTracerProvider().Tracer("noop")
 	l := newTraceLogger(context.Background(), nil, logger, NewTracer(tracer, nil))
 
 	assert.True(t, l.ShouldLog(zap.ErrorLevel))

diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go
@@ -5,6 +5,7 @@ import (
 
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -34,7 +35,7 @@ func LoggerFromContext(ctx context.Context) TraceLogger {
 	} else {
 		// default to no-op
 		logger = zap.NewNop()
-		tracer = trace.NewNoopTracerProvider().Tracer("noop")
+		tracer = noop.NewTracerProvider().Tracer("noop")
 	}
 
 	return newTraceLogger(ctx, span, logger, NewTracer(tracer, nil))