Merge pull request 'insert request id in context' (#101 ) from rr into master

Reviewed-on: #101
insert request id in context
2023-08-23 16:34:27 +03:00 · 2023-08-23 16:34:04 +03:00 · 2023-05-07 19:41:34 +03:00 · 2023-05-07 19:41:15 +03:00 · 2023-04-03 19:00:47 +03:00 · 2023-04-03 15:59:07 +00:00
4 changed files with 15 additions and 18 deletions
--- a/go.mod
+++ b/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.14
+require go.unistack.org/micro/v4 v4.0.1
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,2 @@
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-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.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
-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=
+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=
--- a/requestid.go
+++ b/requestid.go
@@ -1,16 +1,18 @@
-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/server"
+	"go.unistack.org/micro/v4/util/id"
 )

-// DefaultMetadataKey contains metadata key
+var XRequestIDKey struct{}
+
+// 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
@@ -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
--- a/requestid_test.go
+++ b/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) {
Author	SHA1	Message	Date
Vasiliy Tolstov	fdffd31ed3	Merge pull request 'insert request id in context' (#101 ) from rr into master Some checks failed build / test (push) Failing after 1m30s Details build / lint (push) Failing after 2m34s Details codeql / analyze (go) (push) Failing after 3m9s Details Reviewed-on: #101	2023-08-23 16:34:27 +03:00
Vasiliy Tolstov	1a3daf4263	insert request id in context Some checks failed dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m38s Details autoapprove / autoapprove (pull_request) Failing after 1m25s Details automerge / automerge (pull_request) Failing after 4s Details codeql / analyze (go) (pull_request) Failing after 3m12s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-08-23 16:34:04 +03:00
Vasiliy Tolstov	a7932622b2	Merge pull request 'move to micro v4' (#98 ) from v4 into master Reviewed-on: #98	2023-05-07 19:41:34 +03:00
Vasiliy Tolstov	300d1fe705	move to micro v4 Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-05-07 19:41:15 +03:00
Vasiliy Tolstov	74ee3bbbf1	Merge pull request #101 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.19 Bump go.unistack.org/micro/v3 from 3.10.18 to 3.10.19	2023-04-03 19:00:47 +03:00
dependabot[bot]	f074bc0872	Bump go.unistack.org/micro/v3 from 3.10.18 to 3.10.19 Bumps go.unistack.org/micro/v3 from 3.10.18 to 3.10.19. --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-04-03 15:59:07 +00:00
Vasiliy Tolstov	5054029b39	Merge pull request #100 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.18 Bump go.unistack.org/micro/v3 from 3.10.16 to 3.10.18	2023-03-16 19:01:38 +03:00
dependabot[bot]	17b6e45d41	Bump go.unistack.org/micro/v3 from 3.10.16 to 3.10.18 Bumps go.unistack.org/micro/v3 from 3.10.16 to 3.10.18. --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-16 15:59:12 +00:00
Vasiliy Tolstov	1fd5a92b18	Merge pull request #98 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.10.16 Bump go.unistack.org/micro/v3 from 3.10.14 to 3.10.16	2023-03-15 19:00:32 +03:00
dependabot[bot]	2c6b702d95	Bump go.unistack.org/micro/v3 from 3.10.14 to 3.10.16 Bumps go.unistack.org/micro/v3 from 3.10.14 to 3.10.16. --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-03-15 15:58:35 +00:00