unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

fixup hooks
All checks were successful
coverage / build (push) Successful in 3m12s
Details
test / test (push) Successful in 5m4s
Details
sync / sync (push) Successful in 31s
Details

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2025-04-29 13:09:56 +03:00
parent 88606e89ca
commit 23f2ee9bb7
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hooks/metadata/metadata.go
View File

@@ -36,7 +36,7 @@ func NewClientCallWrapper(keys ...string) client.CallWrapper {
omd = metadata.New(len(imd)) omd = metadata.New(len(imd))
} }
for _, k := range keys { for _, k := range keys {
if v, ok := imd.Get(k); ok { if v := imd.Get(k); v != nil {
omd.Add(k, v...) omd.Add(k, v...)
} }
} }
@@ -59,7 +59,7 @@ func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{},
omd = metadata.New(len(imd)) omd = metadata.New(len(imd))
} }
for _, k := range w.keys { for _, k := range w.keys {
if v, ok := imd.Get(k); ok { if v := imd.Get(k); v != nil {
omd.Add(k, v...) omd.Add(k, v...)
} }
} }
@@ -80,7 +80,7 @@ func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client
omd = metadata.New(len(imd)) omd = metadata.New(len(imd))
} }
for _, k := range w.keys { for _, k := range w.keys {
if v, ok := imd.Get(k); ok { if v := imd.Get(k); v != nil {
omd.Add(k, v...) omd.Add(k, v...)
} }
} }
@@ -103,7 +103,7 @@ func NewServerHandlerWrapper(keys ...string) server.HandlerWrapper {
omd = metadata.New(len(imd)) omd = metadata.New(len(imd))
} }
for _, k := range keys { for _, k := range keys {
if v, ok := imd.Get(k); ok { if v := imd.Get(k); v != nil {
omd.Add(k, v...) omd.Add(k, v...)
} }
} }

18
hooks/requestid/requestid.go
View File

@@ -38,18 +38,16 @@ var DefaultMetadataFunc = func(ctx context.Context) (context.Context, error) {
if xid == "" { if xid == "" {
var ids []string var ids []string
if ids, iok = imd.Get(DefaultMetadataKey); iok {
for i := range ids { for i := range imd.Get(DefaultMetadataKey) {
if ids[i] != "" { if ids[i] != "" {
xid = ids[i] xid = ids[i]
}
} }
} }
if ids, ook = omd.Get(DefaultMetadataKey); ook {
for i := range ids { for i := range omd.Get(DefaultMetadataKey) {
if ids[i] != "" { if ids[i] != "" {
xid = ids[i] xid = ids[i]
}
} }
} }
} }

9
hooks/requestid/requestid_test.go
View File

@@ -2,6 +2,7 @@ package requestid
import ( import (
"context" "context"
"slices"
"testing" "testing"
"go.unistack.org/micro/v4/metadata" "go.unistack.org/micro/v4/metadata"
@@ -24,10 +25,10 @@ func TestDefaultMetadataFunc(t *testing.T) {
t.Fatalf("md missing in outgoing context") t.Fatalf("md missing in outgoing context")
} }
_, iok := imd.Get(DefaultMetadataKey) iv := imd.Get(DefaultMetadataKey)
_, ook := omd.Get(DefaultMetadataKey) ov := omd.Get(DefaultMetadataKey)
if !iok || !ook { if !slices.Equal(iv, ov) {
t.Fatalf("missing metadata key value") t.Fatalf("missing metadata key value %v != %v", iv, ov)
} }
} }