use grpc.WithStatsHandler(otelgrpc.NewClientHandler ...

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Feb 8, 2024 · 47fc3f4 · 47fc3f4
1 parent 604b101
commit 47fc3f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/pkg/rgrpc/rgrpc.go b/pkg/rgrpc/rgrpc.go
@@ -326,10 +326,6 @@ func (s *Server) getInterceptors(unprotected []string) ([]grpc.ServerOption, err
 	}
 
 	unaryInterceptors := []grpc.UnaryServerInterceptor{
-		otelgrpc.UnaryServerInterceptor(
-			otelgrpc.WithTracerProvider(s.tracerProvider),
-			otelgrpc.WithPropagators(rtrace.Propagator),
-		),
 		appctx.NewUnary(s.log, s.tracerProvider),
 		token.NewUnary(),
 		useragent.NewUnary(),
@@ -372,10 +368,6 @@ func (s *Server) getInterceptors(unprotected []string) ([]grpc.ServerOption, err
 	}
 
 	streamInterceptors := []grpc.StreamServerInterceptor{
-		otelgrpc.StreamServerInterceptor(
-			otelgrpc.WithTracerProvider(s.tracerProvider),
-			otelgrpc.WithPropagators(rtrace.Propagator),
-		),
 		appctx.NewStream(s.log, s.tracerProvider),
 		token.NewStream(),
 		useragent.NewStream(),
@@ -391,6 +383,9 @@ func (s *Server) getInterceptors(unprotected []string) ([]grpc.ServerOption, err
 	streamChain := grpc_middleware.ChainStreamServer(streamInterceptors...)
 
 	opts := []grpc.ServerOption{
+		grpc.StatsHandler(otelgrpc.NewServerHandler(
+			otelgrpc.WithTracerProvider(s.tracerProvider),
+			otelgrpc.WithPropagators(rtrace.Propagator))),
 		grpc.UnaryInterceptor(unaryChain),
 		grpc.StreamInterceptor(streamChain),
 	}

diff --git a/pkg/rgrpc/todo/pool/connection.go b/pkg/rgrpc/todo/pool/connection.go
@@ -90,24 +90,14 @@ func NewConn(address string, opts ...Option) (*grpc.ClientConn, error) {
 		grpc.WithDefaultCallOptions(
 			grpc.MaxCallRecvMsgSize(maxRcvMsgSize),
 		),
-		grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor(
+		grpc.WithStatsHandler(otelgrpc.NewClientHandler(
 			otelgrpc.WithTracerProvider(
 				options.tracerProvider,
 			),
 			otelgrpc.WithPropagators(
 				rtrace.Propagator,
 			),
 		)),
-		grpc.WithUnaryInterceptor(
-			otelgrpc.UnaryClientInterceptor(
-				otelgrpc.WithTracerProvider(
-					options.tracerProvider,
-				),
-				otelgrpc.WithPropagators(
-					rtrace.Propagator,
-				),
-			),
-		),
 	)
 	if err != nil {
 		return nil, err