Merge pull request 'insert request id in context' (#100) from rq into v3

Reviewed-on: #100
2023-08-23 16:32:38 +03:00 · 2023-08-23 16:32:38 +03:00 · f163a2de72
commit f163a2de72
parent a12fb08b7e 9170371647
1 changed files with 2 additions and 1 deletions
--- a/requestid.go
+++ b/requestid.go
@ -40,10 +40,11 @@ var DefaultMetadataFunc = func(ctx context.Context) (context.Context, error) {
 	}
 	imd.Set(DefaultMetadataKey, v)
 	omd.Set(DefaultMetadataKey, v)
+	ctx = context.WithValue(ctx, XRequestIDKey, v)
 	ctx = metadata.NewIncomingContext(ctx, imd)
 	ctx = metadata.NewOutgoingContext(ctx, omd)

-	return context.WithValue(ctx, XRequestIDKey, v), nil
+	return ctx, nil
 }

 type wrapper struct {