fix for comments

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
open-telemetry · Sep 9, 2022 · 040efe0 · 040efe0
1 parent 148eded
commit 040efe0
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go b/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go
@@ -320,16 +320,6 @@ func UnaryServerInterceptor(opts ...Option) grpc.UnaryServerInterceptor {
 		info *grpc.UnaryServerInfo,
 		handler grpc.UnaryHandler,
 	) (interface{}, error) {
-		var statusCode grpc_codes.Code
-		var startTime = time.Now()
-		var attr []attribute.KeyValue
-
-		defer func() {
-			elapsedTime := float64(time.Since(startTime)) / float64(time.Millisecond)
-			attr = append(attr, semconv.RPCGRPCStatusCodeKey.Int64(int64(statusCode)))
-			cfg.rpcServerDuration.Record(ctx, elapsedTime, attr...)
-		}()
-
 		i := &InterceptorInfo{
 			UnaryServerInfo: info,
 			Type:            UnaryServer,
@@ -360,6 +350,13 @@ func UnaryServerInterceptor(opts ...Option) grpc.UnaryServerInterceptor {
 
 		messageReceived.Event(ctx, 1, req)
 
+		var statusCode grpc_codes.Code
+		defer func(t time.Time) {
+			elapsedTime := float64(time.Since(t)) / float64(time.Millisecond)
+			attr = append(attr, semconv.RPCGRPCStatusCodeKey.Int64(int64(statusCode)))
+			cfg.rpcServerDuration.Record(ctx, elapsedTime, attr...)
+		}(time.Now())
+
 		resp, err := handler(ctx, req)
 		if err != nil {
 			s, _ := status.FromError(err)
@@ -428,17 +425,8 @@ func StreamServerInterceptor(opts ...Option) grpc.StreamServerInterceptor {
 		info *grpc.StreamServerInfo,
 		handler grpc.StreamHandler,
 	) error {
-		var statusCode grpc_codes.Code
-		var startTime = time.Now()
-		var attr []attribute.KeyValue
 		ctx := ss.Context()
 
-		defer func() {
-			elapsedTime := float64(time.Since(startTime)) / float64(time.Millisecond)
-			attr = append(attr, semconv.RPCGRPCStatusCodeKey.Int64(int64(statusCode)))
-			cfg.rpcServerDuration.Record(ctx, elapsedTime, attr...)
-		}()
-
 		i := &InterceptorInfo{
 			StreamServerInfo: info,
 			Type:             StreamServer,
@@ -467,6 +455,13 @@ func StreamServerInterceptor(opts ...Option) grpc.StreamServerInterceptor {
 		)
 		defer span.End()
 
+		var statusCode grpc_codes.Code
+		defer func(t time.Time) {
+			elapsedTime := float64(time.Since(t)) / float64(time.Millisecond)
+			attr = append(attr, semconv.RPCGRPCStatusCodeKey.Int64(int64(statusCode)))
+			cfg.rpcServerDuration.Record(ctx, elapsedTime, attr...)
+		}(time.Now())
+
 		err := handler(srv, wrapServerStream(ctx, ss))
 		if err != nil {
 			s, _ := status.FromError(err)