fixup metadata

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

.github/workflows/build.yml

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

.github/workflows/codeql-analysis.yml

@@ -47,7 +47,7 @@ jobs:
     - name: setup
       uses: actions/setup-go@v3
       with:
-        go-version: 1.17
+        go-version: 1.20
     # Initializes the CodeQL tools for scanning.
     - name: init
       uses: github/codeql-action/init@v2

.github/workflows/pr.yml

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

go.mod

@@ -2,6 +2,4 @@ module go.unistack.org/micro-wrapper-requestid/v4
 
 go 1.20
 
-require go.unistack.org/micro/v4 v4.0.14
+require go.unistack.org/micro/v4 v4.0.17
-
-require golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect

go.sum

@@ -1,4 +1,2 @@
-go.unistack.org/micro/v4 v4.0.14 h1:zN+aVfTceei3TPzuA7f2wAXLYHoSHWpx2XgW8yqaTIA=
+go.unistack.org/micro/v4 v4.0.17 h1:mF7uM+J4ILdG+1fcwzKYCwDlxhdbF/e1WnGzKKLnIXc=
-go.unistack.org/micro/v4 v4.0.14/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
+go.unistack.org/micro/v4 v4.0.17/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=

requestid.go

@@ -3,6 +3,7 @@ package requestid
 import (
 	"context"
 	"net/textproto"
+	"strings"
 
 	"go.unistack.org/micro/v4/client"
 	"go.unistack.org/micro/v4/logger"
@@ -13,9 +14,10 @@ import (
 )
 
 func init() {
+	requestIDLog := strings.ToLower(DefaultMetadataKey)
 	logger.DefaultContextAttrFuncs = append(logger.DefaultContextAttrFuncs, func(ctx context.Context) []interface{} {
 		if v, ok := ctx.Value(XRequestIDKey{}).(string); ok {
-			return []interface{}{DefaultMetadataKey, v}
+			return []interface{}{requestIDLog, v}
 		}
 		return nil
 	})
@@ -29,31 +31,51 @@ 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 {
+	cid, cok := ctx.Value(XRequestIDKey{}).(string)
+	if cok && cid != "" {
+		xid = cid
+	}
+
+	imd, iok := metadata.FromIncomingContext(ctx)
+	if !iok || imd == nil {
+		imd = metadata.New(1)
+		ctx = metadata.NewIncomingContext(ctx, imd)
+	}
+
+	omd, ook := metadata.FromOutgoingContext(ctx)
+	if !ook || omd == nil {
+		omd = metadata.New(1)
+		ctx = metadata.NewOutgoingContext(ctx, omd)
+	}
+
+	if xid == "" {
+		var id string
+		if id, iok = imd.Get(DefaultMetadataKey); iok && id != "" {
+			xid = id
+		}
+		if id, ook = omd.Get(DefaultMetadataKey); ook && id != "" {
+			xid = id
+		}
+	}
+
+	if xid == "" {
+		var err error
 		xid, err = id.New()
 		if err != nil {
 			return ctx, err
 		}
+	}
+
+	if !cok {
 		ctx = context.WithValue(ctx, XRequestIDKey{}, xid)
 	}
 
-	imd, ok := metadata.FromIncomingContext(ctx)
+	if !iok {
-	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 !ook {
-	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)
 	}