Skip to content

Commit 469d137

Browse files
committed
[hotROD] Replace gRPC instrumentation with OTEL (jaegertracing#4558)
Signed-off-by: Afzal Ansari <afzal442@gmail.com>
1 parent 372d0b7 commit 469d137

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

examples/hotrod/services/driver/server.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ import (
1919
"context"
2020
"net"
2121

22-
otgrpc "github.com/opentracing-contrib/go-grpc"
23-
"github.com/opentracing/opentracing-go"
22+
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
2423
"go.uber.org/zap"
2524
"google.golang.org/grpc"
2625

@@ -32,7 +31,6 @@ import (
3231
// Server implements jaeger-demo-frontend service
3332
type Server struct {
3433
hostPort string
35-
tracer opentracing.Tracer
3634
logger log.Factory
3735
redis *Redis
3836
server *grpc.Server
@@ -42,14 +40,13 @@ var _ DriverServiceServer = (*Server)(nil)
4240

4341
// NewServer creates a new driver.Server
4442
func NewServer(hostPort string, otelExporter string, metricsFactory metrics.Factory, logger log.Factory) *Server {
45-
tracer := tracing.Init("driver", otelExporter, metricsFactory, logger)
43+
tracerProvider := tracing.InitOTEL("driver", otelExporter, metricsFactory, logger)
4644
server := grpc.NewServer(
47-
grpc.UnaryInterceptor(otgrpc.OpenTracingServerInterceptor(tracer)),
48-
grpc.StreamInterceptor(otgrpc.OpenTracingStreamServerInterceptor(tracer)),
45+
grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor(otelgrpc.WithTracerProvider(tracerProvider))),
46+
grpc.StreamInterceptor(otelgrpc.StreamServerInterceptor(otelgrpc.WithTracerProvider(tracerProvider))),
4947
)
5048
return &Server{
5149
hostPort: hostPort,
52-
tracer: tracer,
5350
logger: logger,
5451
server: server,
5552
redis: newRedis(otelExporter, metricsFactory, logger),

0 commit comments

Comments
 (0)