zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* fix:grpc server interceptor duplicate copy MD

* modify wrong comments
This commit is contained in:
maizige
2022-08-27 18:55:40 +08:00
committed by GitHub
parent 05007c86bb
commit 5d4ae201d0
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/trace/tracer.go
View File

@@ -38,7 +38,7 @@ func (s *metadataSupplier) Keys() []string {
return out 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) { func Inject(ctx context.Context, p propagation.TextMapPropagator, metadata *metadata.MD) {
p.Inject(ctx, &metadataSupplier{ p.Inject(ctx, &metadataSupplier{
metadata: metadata, metadata: metadata,

7
zrpc/internal/serverinterceptors/tracinginterceptor.go
View File

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