repaces otgrpc with otel

Signed-off-by: Afzal <[email protected]>
jaegertracing · Jul 31, 2023 · 1533288 · 1533288
1 parent e0c83b0
commit 1533288
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/plugin/storage/grpc/README.md b/plugin/storage/grpc/README.md
@@ -200,13 +200,13 @@ grpc.ServeWithGRPCServer(&shared.PluginServices{
     ArchiveStore: memStorePlugin,
 }, func(options []googleGRPC.ServerOption) *googleGRPC.Server {
     return plugin.DefaultGRPCServer([]googleGRPC.ServerOption{
-        googleGRPC.UnaryInterceptor(otgrpc.OpenTracingServerInterceptor(tracer)),
-        googleGRPC.StreamInterceptor(otgrpc.OpenTracingStreamServerInterceptor(tracer)),
+        grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor(otelgrpc.WithTracerProvider(tracerProvider))),
+		grpc.StreamInterceptor(otelgrpc.StreamServerInterceptor(otelgrpc.WithTracerProvider(tracerProvider))),
     })
 })
 ```
 
-Refer to `example/memstore-plugin` for more details.
+Refer to `example/hotrod` for more details.
 
 Bearer token propagation from the UI
 ------------------------------------

diff --git a/plugin/storage/grpc/config/config.go b/plugin/storage/grpc/config/config.go
@@ -21,10 +21,10 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
-	"github.com/opentracing/opentracing-go"
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
+	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -84,8 +84,10 @@ func (c *Configuration) Close() error {
 
 func (c *Configuration) buildRemote(logger *zap.Logger) (*ClientPluginServices, error) {
 	opts := []grpc.DialOption{
-		grpc.WithUnaryInterceptor(otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer())),
-		grpc.WithStreamInterceptor(otgrpc.OpenTracingStreamClientInterceptor(opentracing.GlobalTracer())),
+		grpc.WithUnaryInterceptor(
+			otelgrpc.UnaryClientInterceptor(otelgrpc.WithTracerProvider(otel.GetTracerProvider()))),
+		grpc.WithStreamInterceptor(
+			otelgrpc.StreamClientInterceptor(otelgrpc.WithTracerProvider(otel.GetTracerProvider()))),
 		grpc.WithBlock(),
 	}
 	if c.RemoteTLS.Enabled {
@@ -125,8 +127,10 @@ func (c *Configuration) buildRemote(logger *zap.Logger) (*ClientPluginServices,
 
 func (c *Configuration) buildPlugin(logger *zap.Logger) (*ClientPluginServices, error) {
 	opts := []grpc.DialOption{
-		grpc.WithUnaryInterceptor(otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer())),
-		grpc.WithStreamInterceptor(otgrpc.OpenTracingStreamClientInterceptor(opentracing.GlobalTracer())),
+		grpc.WithUnaryInterceptor(
+			otelgrpc.UnaryClientInterceptor(otelgrpc.WithTracerProvider(otel.GetTracerProvider()))),
+		grpc.WithStreamInterceptor(
+			otelgrpc.StreamClientInterceptor(otelgrpc.WithTracerProvider(otel.GetTracerProvider()))),
 	}
 
 	tenancyMgr := tenancy.NewManager(&c.TenancyOpts)