Merge pull request 'fix server subscriber' (#103) from idfix into master

Reviewed-on: #103

requestid.go

@@ -10,6 +10,8 @@ import (
 	"go.unistack.org/micro/v4/util/id"
 )
 
+var XRequestIDKey struct{}
+
 // DefaultMetadataKey contains metadata key x-request-id
 var DefaultMetadataKey = textproto.CanonicalMIMEHeaderKey("x-request-id")
 
@@ -38,6 +40,7 @@ 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 ctx, nil
@@ -119,6 +122,7 @@ func NewServerSubscriberWrapper() server.SubscriberWrapper {
 			if id, ok := msg.Header()[DefaultMetadataKey]; ok {
 				imd.Set(DefaultMetadataKey, id)
 				omd.Set(DefaultMetadataKey, id)
+				ctx = context.WithValue(ctx, XRequestIDKey, id)
 				ctx = metadata.NewIncomingContext(ctx, imd)
 				ctx = metadata.NewOutgoingContext(ctx, omd)
 			} else if ctx, err = DefaultMetadataFunc(ctx); err != nil {