diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 1990072..2e4ae42 100644
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -45,7 +45,6 @@
 	of "github.com/opencord/voltha-protos/v3/go/openflow_13"
 	oop "github.com/opencord/voltha-protos/v3/go/openolt"
 	"github.com/opencord/voltha-protos/v3/go/voltha"
-	"github.com/opentracing/opentracing-go"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -679,10 +678,10 @@
 		grpc.WithInsecure(),
 		grpc.WithBlock(),
 		grpc.WithStreamInterceptor(grpc_middleware.ChainStreamClient(
-			grpc_opentracing.StreamClientInterceptor(grpc_opentracing.WithTracer(opentracing.GlobalTracer())),
+			grpc_opentracing.StreamClientInterceptor(grpc_opentracing.WithTracer(log.ActiveTracerProxy{})),
 		)),
 		grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(
-			grpc_opentracing.UnaryClientInterceptor(grpc_opentracing.WithTracer(opentracing.GlobalTracer())),
+			grpc_opentracing.UnaryClientInterceptor(grpc_opentracing.WithTracer(log.ActiveTracerProxy{})),
 		)))
 
 	if err != nil {
diff --git a/internal/pkg/olterrors/olterrors.go b/internal/pkg/olterrors/olterrors.go
index 8555cf1..214c206 100644
--- a/internal/pkg/olterrors/olterrors.go
+++ b/internal/pkg/olterrors/olterrors.go
@@ -89,23 +89,24 @@
 
 // Error returns a string representation of the error
 func (e *ErrAdapter) Error() string {
+	ctx := context.Background()
 	var buf strings.Builder
 	_, er := buf.WriteString(e.name)
 	if er != nil {
-		log.Error(er)
+		logger.Error(ctx, er)
 	}
 	if len(e.fields) > 0 {
 		if val, err := json.Marshal(e.fields); err == nil {
 			_, er = buf.WriteString(fmt.Sprintf(": [%s]", string(val)))
 			if er != nil {
-				log.Error(er)
+				logger.Error(ctx, er)
 			}
 		}
 	}
 	if e.wrapped != nil {
 		_, er = buf.WriteString(fmt.Sprintf(": %s", e.wrapped.Error()))
 		if er != nil {
-			log.Error(er)
+			logger.Error(ctx, er)
 		}
 	}
 	return buf.String()