1
0
Эх сурвалжийг харах

Fix/del server interceptor duplicate copy md 20220827 (#2309)

* fix:grpc server interceptor duplicate copy MD

* modify wrong comments
maizige 2 жил өмнө
parent
commit
5d4ae201d0

+ 1 - 1
core/trace/tracer.go

@@ -38,7 +38,7 @@ func (s *metadataSupplier) Keys() []string {
 	return out
 }
 
-// Inject injects the metadata into ctx.
+// Inject injects cross-cutting concerns from the ctx into the metadata.
 func Inject(ctx context.Context, p propagation.TextMapPropagator, metadata *metadata.MD) {
 	p.Inject(ctx, &metadataSupplier{
 		metadata: metadata,

+ 2 - 5
zrpc/internal/serverinterceptors/tracinginterceptor.go

@@ -93,11 +93,8 @@ func (w *serverStream) SendMsg(m interface{}) error {
 }
 
 func startSpan(ctx context.Context, method string) (context.Context, trace.Span) {
-	var md metadata.MD
-	requestMetadata, ok := metadata.FromIncomingContext(ctx)
-	if ok {
-		md = requestMetadata.Copy()
-	} else {
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
 		md = metadata.MD{}
 	}
 	bags, spanCtx := ztrace.Extract(ctx, otel.GetTextMapPropagator(), &md)