From dc0cbeb95d66ee1ba13d0d4d7b7426166f1c636a Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 4 Dec 2019 15:42:53 -0500 Subject: [PATCH] apply comma split logic to servlet request extract adapter --- .../servlet2/HttpServletRequestExtractAdapter.java | 4 +++- .../servlet3/HttpServletRequestExtractAdapter.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java index 054fb9bae1..bcaf31e1da 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java +++ b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java @@ -29,6 +29,8 @@ public class HttpServletRequestExtractAdapter if (attribute instanceof String) { return (String) attribute; } - return carrier.getHeader(key); + String s = carrier.getHeader(key); + if (s == null) return null; + return s.split(",")[0].trim(); } } diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletRequestExtractAdapter.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletRequestExtractAdapter.java index e8b1fff393..889482e06c 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletRequestExtractAdapter.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletRequestExtractAdapter.java @@ -29,6 +29,8 @@ public class HttpServletRequestExtractAdapter if (attribute instanceof String) { return (String) attribute; } - return carrier.getHeader(key); + String s = carrier.getHeader(key); + if (s == null) return null; + return s.split(",")[0].trim(); } }