fixup hooks

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

hooks/metadata/metadata.go

@@ -36,7 +36,7 @@ func NewClientCallWrapper(keys ...string) client.CallWrapper {
 					omd = metadata.New(len(imd))
 				}
 				for _, k := range keys {
-					if v, ok := imd.Get(k); ok {
+					if v := imd.Get(k); v != nil {
 						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))
 		}
 		for _, k := range w.keys {
-			if v, ok := imd.Get(k); ok {
+			if v := imd.Get(k); v != nil {
 				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))
 		}
 		for _, k := range w.keys {
-			if v, ok := imd.Get(k); ok {
+			if v := imd.Get(k); v != nil {
 				omd.Add(k, v...)
 			}
 		}
@@ -103,7 +103,7 @@ func NewServerHandlerWrapper(keys ...string) server.HandlerWrapper {
 					omd = metadata.New(len(imd))
 				}
 				for _, k := range keys {
-					if v, ok := imd.Get(k); ok {
+					if v := imd.Get(k); v != nil {
 						omd.Add(k, v...)
 					}
 				}

hooks/requestid/requestid.go

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

hooks/requestid/requestid_test.go

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