fix xid

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

go.mod

@@ -1,5 +1,5 @@
-module go.unistack.org/micro-wrapper-requestid/v3
+module go.unistack.org/micro-wrapper-requestid/v4
 
-go 1.16
+go 1.20
 
-require go.unistack.org/micro/v3 v3.10.19
+require go.unistack.org/micro/v4 v4.0.7

go.sum

@@ -1,7 +1,4 @@
-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.19 h1:JtPacglETxHyb+GiuMdfxqGtnWSTYXPQm6PlDQfNIl8=
-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.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
+go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
+go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=

requestid.go

@@ -1,48 +1,61 @@
-package requestid // import "go.unistack.org/micro-wrapper-requestid/v3"
+package requestid // import "go.unistack.org/micro-wrapper-requestid/v4"
 
 import (
 	"context"
 	"net/textproto"
 
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/server"
-	"go.unistack.org/micro/v3/util/id"
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/server"
+	"go.unistack.org/micro/v4/util/id"
 )
 
 var XRequestIDKey struct{}
 
-// DefaultMetadataKey contains metadata key
+// DefaultMetadataKey contains metadata key x-request-id
 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)
-	if !ok {
-		imd = metadata.New(1)
-	}
-	omd, ok := metadata.FromOutgoingContext(ctx)
-	if !ok {
-		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()
+	var xid string
+	var err error
+	var ook, iok bool
+
+	if _, ok := ctx.Value(XRequestIDKey).(string); !ok {
+		xid, 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)
-	ctx = context.WithValue(ctx, XRequestIDKey, v)
+
+	imd, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		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
 }
@@ -72,7 +85,7 @@ func NewClientCallWrapper() client.CallWrapper {
 	}
 }
 
-func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
+func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...options.Option) error {
 	var err error
 	if ctx, err = DefaultMetadataFunc(ctx); err != nil {
 		return err
@@ -80,7 +93,7 @@ func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{},
 	return w.Client.Call(ctx, req, rsp, opts...)
 }
 
-func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
+func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...options.Option) (client.Stream, error) {
 	var err error
 	if ctx, err = DefaultMetadataFunc(ctx); err != nil {
 		return nil, err
@@ -88,14 +101,6 @@ func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client
 	return w.Client.Stream(ctx, req, opts...)
 }
 
-func (w *wrapper) Publish(ctx context.Context, msg client.Message, opts ...client.PublishOption) error {
-	var err error
-	if ctx, err = DefaultMetadataFunc(ctx); err != nil {
-		return err
-	}
-	return w.Client.Publish(ctx, msg, opts...)
-}
-
 func NewServerHandlerWrapper() server.HandlerWrapper {
 	return func(fn server.HandlerFunc) server.HandlerFunc {
 		return func(ctx context.Context, req server.Request, rsp interface{}) error {
@@ -107,29 +112,3 @@ func NewServerHandlerWrapper() server.HandlerWrapper {
 		}
 	}
 }
-
-func NewServerSubscriberWrapper() server.SubscriberWrapper {
-	return func(fn server.SubscriberFunc) server.SubscriberFunc {
-		return func(ctx context.Context, msg server.Message) error {
-			var err error
-			imd, ok := metadata.FromIncomingContext(ctx)
-			if !ok {
-				imd = metadata.New(1)
-			}
-			omd, ok := metadata.FromOutgoingContext(ctx)
-			if !ok {
-				omd = metadata.New(1)
-			}
-			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 {
-				return err
-			}
-			return fn(ctx, msg)
-		}
-	}
-}

requestid_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
 )
 
 func TestDefaultMetadataFunc(t *testing.T) {