From f2d0d67d4cab24d98c13f3e713d7a219227fa40a Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Fri, 2 May 2025 09:22:19 +0300
Subject: [PATCH] hooks/requestid: fixup panic

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 hooks/requestid/requestid.go | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/hooks/requestid/requestid.go b/hooks/requestid/requestid.go
index 0dff2172..eb83a520 100644
--- a/hooks/requestid/requestid.go
+++ b/hooks/requestid/requestid.go
@@ -37,18 +37,9 @@ var DefaultMetadataFunc = func(ctx context.Context) (context.Context, error) {
 	}
 
 	if xid == "" {
-		var ids []string
-
-		for i := range imd.Get(DefaultMetadataKey) {
-			if ids[i] != "" {
-				xid = ids[i]
-			}
-		}
-
-		for i := range omd.Get(DefaultMetadataKey) {
-			if ids[i] != "" {
-				xid = ids[i]
-			}
+		xid = imd.GetJoined(DefaultMetadataKey)
+		if xid == "" {
+			xid = omd.GetJoined(DefaultMetadataKey)
 		}
 	}