unistack-org/micro-wrapper-requestid
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 28 Wiki Activity

md copy from incoming to outgoing context #82

Merged
vtolstov merged 2 commits from outgoing into v3 2022-12-18 20:17:10 +03:00
Conversation 0 Commits 2 Files Changed 2 +75 -24
2 changed files with 75 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 374dd0015a - Show all commits

66
requestid.go
View File

@ -10,24 +10,36 @@ import (
"go.unistack.org/micro/v3/util/id" "go.unistack.org/micro/v3/util/id"
) )
// MetadataKey contains metadata key // DefaultMetadataKey contains metadata key
var MetadataKey = textproto.CanonicalMIMEHeaderKey("x-request-id") var DefaultMetadataKey = textproto.CanonicalMIMEHeaderKey("x-request-id")
// MetadataFunc wil be used if user not provide own func to fill metadata // DefaultMetadataFunc wil be used if user not provide own func to fill metadata
var MetadataFunc = func(ctx context.Context) (context.Context, error) { var DefaultMetadataFunc = func(ctx context.Context) (context.Context, error) {
md, ok := metadata.FromIncomingContext(ctx) imd, ok := metadata.FromIncomingContext(ctx)
if !ok { if !ok {
md = metadata.New(1) imd = metadata.New(1)
} }
if _, ok = md.Get(MetadataKey); ok { omd, ok := metadata.FromOutgoingContext(ctx)
return ctx, nil if !ok {
omd = metadata.New(1)
} }
uid, err := id.New() v, iok := imd.Get(DefaultMetadataKey)
if err != nil { if iok {
return ctx, err if _, ook := omd.Get(DefaultMetadataKey); ook {
return ctx, nil
}
} }
md.Set(MetadataKey, uid) if !iok {
ctx = metadata.NewIncomingContext(ctx, md) uid, err := id.New()
if err != nil {
return ctx, err
}
v = uid
}
imd.Set(DefaultMetadataKey, v)
omd.Set(DefaultMetadataKey, v)
ctx = metadata.NewIncomingContext(ctx, imd)
ctx = metadata.NewOutgoingContext(ctx, omd)
return ctx, nil return ctx, nil
} }
@ -48,7 +60,7 @@ func NewClientCallWrapper() client.CallWrapper {
return func(fn client.CallFunc) client.CallFunc { return func(fn client.CallFunc) client.CallFunc {
return func(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error { return func(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
var err error var err error
if ctx, err = MetadataFunc(ctx); err != nil { if ctx, err = DefaultMetadataFunc(ctx); err != nil {
return err return err
} }
return fn(ctx, addr, req, rsp, opts) return fn(ctx, addr, req, rsp, opts)
@ -58,7 +70,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 ...client.CallOption) error {
var err error var err error
if ctx, err = MetadataFunc(ctx); err != nil { if ctx, err = DefaultMetadataFunc(ctx); err != nil {
return err return err
} }
return w.Client.Call(ctx, req, rsp, opts...) return w.Client.Call(ctx, req, rsp, opts...)
@ -66,7 +78,7 @@ func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{},
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 ...client.CallOption) (client.Stream, error) {
var err error var err error
if ctx, err = MetadataFunc(ctx); err != nil { if ctx, err = DefaultMetadataFunc(ctx); err != nil {
return nil, err return nil, err
} }
return w.Client.Stream(ctx, req, opts...) return w.Client.Stream(ctx, req, opts...)
@ -74,7 +86,7 @@ func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client
func (w *wrapper) Publish(ctx context.Context, msg client.Message, opts ...client.PublishOption) error { func (w *wrapper) Publish(ctx context.Context, msg client.Message, opts ...client.PublishOption) error {
var err error var err error
if ctx, err = MetadataFunc(ctx); err != nil { if ctx, err = DefaultMetadataFunc(ctx); err != nil {
return err return err
} }
return w.Client.Publish(ctx, msg, opts...) return w.Client.Publish(ctx, msg, opts...)
@ -84,7 +96,7 @@ func NewServerHandlerWrapper() server.HandlerWrapper {
return func(fn server.HandlerFunc) server.HandlerFunc { return func(fn server.HandlerFunc) server.HandlerFunc {
return func(ctx context.Context, req server.Request, rsp interface{}) error { return func(ctx context.Context, req server.Request, rsp interface{}) error {
var err error var err error
if ctx, err = MetadataFunc(ctx); err != nil { if ctx, err = DefaultMetadataFunc(ctx); err != nil {
return err return err
} }
return fn(ctx, req, rsp) return fn(ctx, req, rsp)
@ -96,14 +108,20 @@ func NewServerSubscriberWrapper() server.SubscriberWrapper {
return func(fn server.SubscriberFunc) server.SubscriberFunc { return func(fn server.SubscriberFunc) server.SubscriberFunc {
return func(ctx context.Context, msg server.Message) error { return func(ctx context.Context, msg server.Message) error {
var err error var err error
md, ok := metadata.FromIncomingContext(ctx) imd, ok := metadata.FromIncomingContext(ctx)
if !ok { if !ok {
md = metadata.New(1) imd = metadata.New(1)
} }
if id, ok := msg.Header()[MetadataKey]; ok { omd, ok := metadata.FromOutgoingContext(ctx)
md.Set(MetadataKey, id) if !ok {
ctx = metadata.NewIncomingContext(ctx, md) omd = metadata.New(1)
} else if ctx, err = MetadataFunc(ctx); err != nil { }
if id, ok := msg.Header()[DefaultMetadataKey]; ok {
imd.Set(DefaultMetadataKey, id)
omd.Set(DefaultMetadataKey, id)
ctx = metadata.NewIncomingContext(ctx, imd)
ctx = metadata.NewOutgoingContext(ctx, omd)
} else if ctx, err = DefaultMetadataFunc(ctx); err != nil {
return err return err
} }
return fn(ctx, msg) return fn(ctx, msg)

33
requestid_test.go Normal file
View File

@ -0,0 +1,33 @@
package requestid
import (
"context"
"testing"
"go.unistack.org/micro/v3/metadata"
)
func TestDefaultMetadataFunc(t *testing.T) {
ctx := context.TODO()
nctx, err := DefaultMetadataFunc(ctx)
if err != nil {
t.Fatalf("%v", err)
}
imd, ok := metadata.FromIncomingContext(nctx)
if !ok {
t.Fatalf("md missing in incoming context")
}
omd, ok := metadata.FromOutgoingContext(nctx)
if !ok {
t.Fatalf("md missing in outgoing context")
}
_, iok := imd.Get(DefaultMetadataKey)
_, ook := omd.Get(DefaultMetadataKey)
if !iok || !ook {
t.Fatalf("missing metadata key value")
}
}