Merge pull request 'xid fix' (#104) from xid into v3

Reviewed-on: #104

go.mod

@@ -2,4 +2,4 @@ module go.unistack.org/micro-wrapper-requestid/v3
 
 go 1.16
 
-require go.unistack.org/micro/v3 v3.10.14
+require go.unistack.org/micro/v3 v3.10.19

go.sum

@@ -1,8 +1,7 @@
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-go.unistack.org/micro/v3 v3.10.14 h1:7fgLpwGlCN67twhwtngJDEQvrMkUBDSA5vzZqxIDqNE=
+go.unistack.org/micro/v3 v3.10.19 h1:JtPacglETxHyb+GiuMdfxqGtnWSTYXPQm6PlDQfNIl8=
-go.unistack.org/micro/v3 v3.10.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+go.unistack.org/micro/v3 v3.10.19/go.mod h1:XIArw29f0b3uvF4cq96X/nQt2f0J2OGnjh8J+DBbC0s=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

requestid.go

@@ -10,36 +10,52 @@ import (
 	"go.unistack.org/micro/v3/util/id"
 )
 
+var XRequestIDKey struct{}
+
 // DefaultMetadataKey contains metadata key
 var DefaultMetadataKey = textproto.CanonicalMIMEHeaderKey("x-request-id")
 
 // DefaultMetadataFunc wil be used if user not provide own func to fill metadata
 var DefaultMetadataFunc = func(ctx context.Context) (context.Context, error) {
-	imd, ok := metadata.FromIncomingContext(ctx)
+	var xid string
-	if !ok {
+	var err error
-		imd = metadata.New(1)
+	var ook, iok bool
-	}
+
-	omd, ok := metadata.FromOutgoingContext(ctx)
+	if _, ok := ctx.Value(XRequestIDKey).(string); !ok {
-	if !ok {
+		xid, err = id.New()
-		omd = metadata.New(1)
-	}
-	v, iok := imd.Get(DefaultMetadataKey)
-	if iok {
-		if _, ook := omd.Get(DefaultMetadataKey); ook {
-			return ctx, nil
-		}
-	}
-	if !iok {
-		uid, err := id.New()
 		if err != nil {
 			return ctx, err
 		}
-		v = uid
+		ctx = context.WithValue(ctx, XRequestIDKey, xid)
 	}
-	imd.Set(DefaultMetadataKey, v)
+
-	omd.Set(DefaultMetadataKey, v)
+	imd, ok := metadata.FromIncomingContext(ctx)
-	ctx = metadata.NewIncomingContext(ctx, imd)
+	if !ok {
-	ctx = metadata.NewOutgoingContext(ctx, omd)
+		imd = metadata.New(1)
+		imd.Set(DefaultMetadataKey, xid)
+	} else if _, ok = imd.Get(DefaultMetadataKey); !ok {
+		imd.Set(DefaultMetadataKey, xid)
+	} else {
+		iok = true
+	}
+
+	omd, ok := metadata.FromOutgoingContext(ctx)
+	if !ok {
+		omd = metadata.New(1)
+		omd.Set(DefaultMetadataKey, xid)
+	} else if _, ok = omd.Get(DefaultMetadataKey); !ok {
+		omd.Set(DefaultMetadataKey, xid)
+	} else {
+		ook = true
+	}
+
+	if !iok {
+		ctx = metadata.NewIncomingContext(ctx, imd)
+	}
+	if !ook {
+		ctx = metadata.NewOutgoingContext(ctx, omd)
+	}
+
 	return ctx, nil
 }
 
@@ -119,6 +135,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 {