From 8016e22bc49636422835ee2f9e90f24f9c786751 Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler.benson@datadoghq.com>
Date: Fri, 31 May 2019 09:07:22 -0700
Subject: [PATCH] Review changes

---
 .../decorator/HttpServerDecoratorTest.groovy  | 27 ++++++++++---------
 .../AkkaHttpClientInstrumentationTest.groovy  |  4 ---
 ...kaHttpClientPoolInstrumentationTest.groovy |  5 ----
 .../trace/agent/test/utils/TraceUtils.groovy  |  1 -
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpServerDecoratorTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpServerDecoratorTest.groovy
index 289e18d827..e7039378cc 100644
--- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpServerDecoratorTest.groovy
+++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpServerDecoratorTest.groovy
@@ -55,19 +55,20 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {
     0 * _
 
     where:
-    tagQueryString | url                                                   | expectedUrl           | expectedQuery      | expectedFragment
-    false          | null                                                  | null                  | null               | null
-    false          | ""                                                    | "/"                   | ""                 | null
-    false          | "/path?query"                                         | "/path"               | ""                 | null
-    false          | "https://host:0"                                      | "https://host/"       | ""                 | null
-    false          | "https://host/path"                                   | "https://host/path"   | ""                 | null
-    false          | "http://host:99/path?query#fragment"                  | "http://host:99/path" | ""                 | null
-    true           | null                                                  | null                  | null               | null
-    true           | ""                                                    | "/"                   | null               | null
-    true           | "/path?encoded+%28query%29%3F"                        | "/path"               | "encoded+(query)?" | null
-    true           | "https://host:0"                                      | "https://host/"       | null               | null
-    true           | "https://host/path"                                   | "https://host/path"   | null               | null
-    true           | "http://host:99/path?query#encoded+%28fragment%29%3F" | "http://host:99/path" | "query"            | "encoded+(fragment)?"
+    tagQueryString | url                                                    | expectedUrl           | expectedQuery       | expectedFragment
+    false          | null                                                   | null                  | null                | null
+    false          | ""                                                     | "/"                   | ""                  | null
+    false          | "/path?query"                                          | "/path"               | ""                  | null
+    false          | "https://host:0"                                       | "https://host/"       | ""                  | null
+    false          | "https://host/path"                                    | "https://host/path"   | ""                  | null
+    false          | "http://host:99/path?query#fragment"                   | "http://host:99/path" | ""                  | null
+    true           | null                                                   | null                  | null                | null
+    true           | ""                                                     | "/"                   | null                | null
+    true           | "/path?encoded+%28query%29%3F?"                        | "/path"               | "encoded+(query)??" | null
+    true           | "https://host:0"                                       | "https://host/"       | null                | null
+    true           | "https://host/path"                                    | "https://host/path"   | null                | null
+    true           | "http://host:99/path?query#enc+%28fragment%29%3F"      | "http://host:99/path" | "query"             | "enc+(fragment)?"
+    true           | "http://host:99/path?query#enc+%28fragment%29%3F?tail" | "http://host:99/path" | "query"             | "enc+(fragment)??tail"
 
     req = [url: url == null ? null : new URI(url)]
   }
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
index e729394c0e..ff13ad89ca 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
@@ -17,10 +17,6 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest<AkkaHttpClientDec
   @Shared
   ActorMaterializer materializer = ActorMaterializer.create(system)
 
-//  String readMessage(HttpResponse response) {
-//    response.entity().toStrict(TIMEOUT, materializer).toCompletableFuture().get().getData().utf8String()
-//  }
-
   @Override
   int doRequest(String method, URI uri, Map<String, String> headers, Closure callback) {
     def request = HttpRequest.create(uri.toString())
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientPoolInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientPoolInstrumentationTest.groovy
index bb5c04aad4..243b99a52b 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientPoolInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientPoolInstrumentationTest.groovy
@@ -22,11 +22,6 @@ class AkkaHttpClientPoolInstrumentationTest extends HttpClientTest<AkkaHttpClien
 
   def pool = Http.get(system).superPool(materializer)
 
-
-//  String readMessage(HttpResponse response) {
-//    response.entity().toStrict(TIMEOUT, materializer).toCompletableFuture().get().getData().utf8String()
-//  }
-
   @Override
   int doRequest(String method, URI uri, Map<String, String> headers, Closure callback) {
     def request = HttpRequest.create(uri.toString())
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy
index 0e871af7fe..db2dc132fc 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy
@@ -20,7 +20,6 @@ class TraceUtils {
     }
 
     protected String component() {
-//      return "runUnderTrace"
       return null
     }
   }