From b00cdee54a3583b4da62e3b52905932a9fba38d7 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 12 Dec 2019 13:47:40 -0800 Subject: [PATCH] Capture full servlet URL in decorator This is needed in order to tag the query string (when configured). Full test suite will follow in future PR. --- .../instrumentation/servlet2/Servlet2Decorator.java | 9 ++++++++- .../instrumentation/servlet3/Servlet3Decorator.java | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java index 9853d4ded6..df48339ea9 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java +++ b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java @@ -28,7 +28,14 @@ public class Servlet2Decorator @Override protected URI url(final HttpServletRequest httpServletRequest) throws URISyntaxException { - return new URI(httpServletRequest.getRequestURL().toString()); + return new URI( + httpServletRequest.getScheme(), + null, + httpServletRequest.getServerName(), + httpServletRequest.getServerPort(), + httpServletRequest.getRequestURI(), + httpServletRequest.getQueryString(), + null); } @Override diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java index 45cb915f75..578c06128b 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java @@ -29,7 +29,14 @@ public class Servlet3Decorator @Override protected URI url(final HttpServletRequest httpServletRequest) throws URISyntaxException { - return new URI(httpServletRequest.getRequestURL().toString()); + return new URI( + httpServletRequest.getScheme(), + null, + httpServletRequest.getServerName(), + httpServletRequest.getServerPort(), + httpServletRequest.getRequestURI(), + httpServletRequest.getQueryString(), + null); } @Override