Merge branch 'main' into feat/add-getdependencies-v3api

Signed-off-by: Harsh-6291 <[email protected]>

Author: Harsh-6291

cmd/query/app/flags.go

@@ -191,12 +191,14 @@ func stringSliceAsHeader(slice []string) (http.Header, error) {
 	return http.Header(header), nil
 }
 
-func mapHTTPHeaderToOTELHeaders(h http.Header) map[string]configopaque.String {
-	otelHeaders := make(map[string]configopaque.String)
+func mapHTTPHeaderToOTELHeaders(h http.Header) configopaque.MapList {
+	var otelHeaders configopaque.MapList
 	for key, values := range h {
-		otelHeaders[key] = configopaque.String(strings.Join(values, ","))
+		otelHeaders = append(otelHeaders, configopaque.Pair{
+			Name:  key,
+			Value: configopaque.String(strings.Join(values, ",")),
+		})
 	}
-
 	return otelHeaders
 }
 

cmd/query/app/flags_test.go

@@ -42,9 +42,9 @@ func TestQueryBuilderFlags(t *testing.T) {
 	assert.Equal(t, "/jaeger", qOpts.BasePath)
 	assert.Equal(t, "127.0.0.1:8080", qOpts.HTTP.Endpoint)
 	assert.Equal(t, "127.0.0.1:8081", qOpts.GRPC.NetAddr.Endpoint)
-	assert.Equal(t, map[string]configopaque.String{
-		"Access-Control-Allow-Origin": "blerg",
-		"Whatever":                    "thing",
+	assert.Equal(t, configopaque.MapList{
+		{Name: "Access-Control-Allow-Origin", Value: "blerg"},
+		{Name: "Whatever", Value: "thing"},
 	}, qOpts.HTTP.ResponseHeaders)
 	assert.Equal(t, 10*time.Second, qOpts.MaxClockSkewAdjust)
 }