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

Reviewed-on: #103

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     - name: setup
       uses: actions/setup-go@v3
       with:
-        go-version: 1.20
+        go-version: 1.17
     - name: checkout
       uses: actions/checkout@v3
     - name: cache

.github/workflows/pr.yml

@@ -12,7 +12,7 @@ jobs:
     - name: setup
       uses: actions/setup-go@v3
       with:
-        go-version: 1.20
+        go-version: 1.17
     - name: checkout
       uses: actions/checkout@v3
     - name: cache

go.mod

@@ -1,13 +1,5 @@
-module go.unistack.org/micro-wrapper-requestid/v3
+module go.unistack.org/micro-wrapper-requestid/v4
 
 go 1.20
 
-require go.unistack.org/micro/v3 v3.10.49
-
-require (
-	github.com/golang/protobuf v1.5.4 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 // indirect
-	google.golang.org/grpc v1.62.1 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
-)
+require go.unistack.org/micro/v4 v4.0.1

go.sum

@@ -1,15 +1,2 @@
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-go.unistack.org/micro/v3 v3.10.49 h1:eW+1OCH4ENjfL0Uaw3+Js9pXRB63+NuThfaozM+eWBs=
-go.unistack.org/micro/v3 v3.10.49/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 h1:em/y72n4XlYRtayY/cVj6pnVzHa//BDA1BdoO+z9mdE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
-google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
-google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+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=

requestid.go

@@ -1,61 +1,48 @@
-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/logger"
-	"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/server"
+	"go.unistack.org/micro/v4/util/id"
 )
 
-func init() {
-	logger.DefaultContextAttrFuncs = append(logger.DefaultContextAttrFuncs, func(ctx context.Context) []interface{} {
-		if v, ok := ctx.Value(XRequestIDKey{}).(string); ok {
-			return []interface{}{DefaultMetadataKey, v}
-		}
-		return nil
-	})
-}
+var XRequestIDKey struct{}
 
-type 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) {
-	var xid string
-	var err error
-
-	if _, ok := ctx.Value(XRequestIDKey{}).(string); !ok {
-		xid, err = id.New()
-		if err != nil {
-			return ctx, err
-		}
-		ctx = context.WithValue(ctx, XRequestIDKey{}, xid)
-	}
-
 	imd, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
 		imd = metadata.New(1)
-		imd.Set(DefaultMetadataKey, xid)
-		ctx = metadata.NewIncomingContext(ctx, imd)
-	} else if _, ok = imd.Get(DefaultMetadataKey); !ok {
-		imd.Set(DefaultMetadataKey, xid)
 	}
-
 	omd, ok := metadata.FromOutgoingContext(ctx)
 	if !ok {
 		omd = metadata.New(1)
-		omd.Set(DefaultMetadataKey, xid)
-		ctx = metadata.NewOutgoingContext(ctx, imd)
-	} else if _, ok = omd.Get(DefaultMetadataKey); !ok {
-		omd.Set(DefaultMetadataKey, xid)
 	}
-
+	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
+	}
+	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
 }
 
@@ -124,10 +111,21 @@ func NewServerSubscriberWrapper() server.SubscriberWrapper {
 	return func(fn server.SubscriberFunc) server.SubscriberFunc {
 		return func(ctx context.Context, msg server.Message) error {
 			var err error
-			if xid, ok := msg.Header()[DefaultMetadataKey]; ok {
-				ctx = context.WithValue(ctx, XRequestIDKey{}, xid)
+			imd, ok := metadata.FromIncomingContext(ctx)
+			if !ok {
+				imd = metadata.New(1)
 			}
-			if ctx, err = DefaultMetadataFunc(ctx); err != nil {
+			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) {