Do not overwrite client span if incoming request has "uber-trace-id" …

…header
opentracing-contrib · Jan 23, 2023 · d58a495 · d58a495
1 parent 8a865d5
commit d58a495
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.../main/java/io/opentracing/contrib/spring/cloud/gateway/TraceRequestHttpHeadersFilter.java b/.../main/java/io/opentracing/contrib/spring/cloud/gateway/TraceRequestHttpHeadersFilter.java
@@ -66,7 +66,9 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {
     } catch (Exception ignore) {
       log.error("TraceRequestHttpHeadersFilter error", ignore);
     }
-    headersWithInput.addAll(input);
+    for (Map.Entry<String, List<String>> entry : input.entrySet()) {
+      headersWithInput.addIfAbsent(entry.getKey(), entry.getValue().get(0));
+    }
     addHeadersWithInput(builder, headersWithInput);
     return headersWithInput;
   }
@@ -86,7 +88,7 @@ private void addHeadersWithInput(ServerHttpRequest.Builder builder,
         .entrySet()) {
       String key = entry.getKey();
       List<String> value = entry.getValue();
-      headersWithInput.put(key, value);
+      headersWithInput.putIfAbsent(key, value);
     }
   }