From 3e71cf50f54dc4ebc79d41f336e3ce61c648f2c5 Mon Sep 17 00:00:00 2001
From: Mohamed Awnallah <mohamedmohey2352@gmail.com>
Date: Wed, 10 Jul 2024 12:49:39 +0300
Subject: [PATCH 1/2] client/v3/watch.go: use fmt for metadata printing

Signed-off-by: Mohamed Awnallah <mohamedmohey2352@gmail.com>
---
 clientv3/watch.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clientv3/watch.go b/clientv3/watch.go
index d317010e229..98ec9a6af6b 100644
--- a/clientv3/watch.go
+++ b/clientv3/watch.go
@@ -1043,7 +1043,7 @@ func (pr *progressRequest) toPB() *pb.WatchRequest {
 
 func streamKeyFromCtx(ctx context.Context) string {
 	if md, ok := metadata.FromOutgoingContext(ctx); ok {
-		return fmt.Sprintf("%+v", md)
+		return fmt.Sprintf("%+v", map[string][]string(md))
 	}
 	return ""
 }

From 65421460b1281ebec7ed41bc0630587bbfad4b2c Mon Sep 17 00:00:00 2001
From: Mohamed Awnallah <mohamedmohey2352@gmail.com>
Date: Wed, 10 Jul 2024 12:45:14 +0300
Subject: [PATCH 2/2] client/v3/watch_test.go: test fmt metadata print

Signed-off-by: Mohamed Awnallah <mohamedmohey2352@gmail.com>
Co-authored-by: Benjamin Wang <ahrtr>
---
 clientv3/watch_test.go | 53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/clientv3/watch_test.go b/clientv3/watch_test.go
index a22858bc7ec..bb82764f27f 100644
--- a/clientv3/watch_test.go
+++ b/clientv3/watch_test.go
@@ -15,8 +15,11 @@
 package clientv3
 
 import (
+	"context"
 	"testing"
 
+	"google.golang.org/grpc/metadata"
+
 	"go.etcd.io/etcd/mvcc/mvccpb"
 )
 
@@ -53,3 +56,53 @@ func TestEvent(t *testing.T) {
 		}
 	}
 }
+
+// TestStreamKeyFromCtx tests the streamKeyFromCtx function to ensure it correctly
+// formats metadata as a map[string][]string when extracting metadata from the context.
+//
+// The fmt package in Go guarantees that maps are printed in a consistent order,
+// sorted by the keys. This test verifies that the streamKeyFromCtx function
+// produces the expected formatted string representation of metadata maps when called with
+// various context scenarios.
+func TestStreamKeyFromCtx(t *testing.T) {
+	tests := []struct {
+		name     string
+		ctx      context.Context
+		expected string
+	}{
+		{
+			name: "multiple keys",
+			ctx: metadata.NewOutgoingContext(context.Background(), metadata.MD{
+				"key1": []string{"value1"},
+				"key2": []string{"value2a", "value2b"},
+			}),
+			expected: "map[key1:[value1] key2:[value2a value2b]]",
+		},
+		{
+			name:     "no keys",
+			ctx:      metadata.NewOutgoingContext(context.Background(), metadata.MD{}),
+			expected: "map[]",
+		},
+		{
+			name: "only one key",
+			ctx: metadata.NewOutgoingContext(context.Background(), metadata.MD{
+				"key1": []string{"value1", "value1a"},
+			}),
+			expected: "map[key1:[value1 value1a]]",
+		},
+		{
+			name:     "no metadata",
+			ctx:      context.Background(),
+			expected: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			actual := streamKeyFromCtx(tt.ctx)
+			if actual != tt.expected {
+				t.Errorf("streamKeyFromCtx() = %v, expected %v", actual, tt.expected)
+			}
+		})
+	}
+}