Merge pull request 'add request id in context' (#99 ) from rq into v3

Reviewed-on: #99
insert request id in context
2023-08-23 16:31:27 +03:00 · 2023-08-23 16:30:47 +03:00 · 2023-04-03 19:00:47 +03:00 · 2023-04-03 15:59:07 +00:00 · 2023-03-16 19:01:38 +03:00 · 2023-03-16 15:59:12 +00:00
3 changed files with 8 additions and 6 deletions
--- a/go.mod
+++ b/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
--- a/go.sum
+++ b/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.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+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.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/requestid.go
+++ b/requestid.go
@@ -10,6 +10,8 @@ import (
 	"go.unistack.org/micro/v3/util/id"
 )

+var XRequestIDKey struct{}
+
 // DefaultMetadataKey contains metadata key
 var DefaultMetadataKey = textproto.CanonicalMIMEHeaderKey("x-request-id")

@@ -40,7 +42,8 @@ var DefaultMetadataFunc = func(ctx context.Context) (context.Context, error) {
 	omd.Set(DefaultMetadataKey, v)
 	ctx = metadata.NewIncomingContext(ctx, imd)
 	ctx = metadata.NewOutgoingContext(ctx, omd)
-	return ctx, nil
+
+	return context.WithValue(ctx, XRequestIDKey, v), nil
 }

 type wrapper struct {
Author	SHA1	Message	Date
Vasiliy Tolstov	a12fb08b7e	Merge pull request 'add request id in context' (#99 ) from rq into v3 Some checks failed codeql / analyze (go) (push) Failing after 3m9s Details build / test (push) Failing after 1m28s Details build / lint (push) Failing after 2m38s Details Reviewed-on: #99	2023-08-23 16:31:27 +03:00
Vasiliy Tolstov	d03bf1aa14	insert request id in context Some checks failed codeql / analyze (go) (pull_request) Failing after 3m15s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 1m29s Details prbuild / lint (pull_request) Failing after 2m37s Details autoapprove / autoapprove (pull_request) Failing after 1m26s Details automerge / automerge (pull_request) Failing after 4s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-08-23 16:30:47 +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