From fc9f1d120c846a5e244c5264b7aadff269c665e7 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Wed, 29 May 2019 13:54:11 -0700 Subject: [PATCH] Misc fixes. --- .../test/groovy/AkkaHttpClientInstrumentationTest.groovy | 1 - .../groovy/AkkaHttpClientPoolInstrumentationTest.groovy | 1 - .../apache-httpasyncclient-4.gradle | 2 ++ .../src/test/groovy/HttpUriRequest.groovy | 8 ++++---- .../src/test/groovy/HttpUriRequest.groovy | 8 ++++---- .../src/test/groovy/SpringRestTemplateTest.groovy | 2 +- .../datadog/trace/agent/test/utils/TraceUtils.groovy | 2 +- dd-trace-api/src/main/java/datadog/trace/api/Config.java | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) 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 6135719cb9..0fee963802 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 @@ -11,7 +11,6 @@ import io.opentracing.tag.Tags import spock.lang.Shared class AkkaHttpClientInstrumentationTest extends HttpClientTest { - private static final long TIMEOUT = 10000L @Shared ActorSystem system = ActorSystem.create() 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 122843e543..bb5c04aad4 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 @@ -14,7 +14,6 @@ import scala.util.Try import spock.lang.Shared class AkkaHttpClientPoolInstrumentationTest extends HttpClientTest { - private static final long TIMEOUT = 10000L @Shared ActorSystem system = ActorSystem.create() diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle b/dd-java-agent/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle index efa75ff2d5..eb3910b258 100644 --- a/dd-java-agent/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle +++ b/dd-java-agent/instrumentation/apache-httpasyncclient-4/apache-httpasyncclient-4.gradle @@ -32,6 +32,8 @@ dependencies { implementation deps.autoservice testCompile project(':dd-java-agent:testing') + testCompile project(':dd-java-agent:instrumentation:java-concurrent') + testCompile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0' latestDepTestCompile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '+' diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/HttpUriRequest.groovy b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/HttpUriRequest.groovy index adec36dbd3..a24d4cab16 100644 --- a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/HttpUriRequest.groovy +++ b/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/HttpUriRequest.groovy @@ -2,15 +2,15 @@ import org.apache.http.client.methods.HttpRequestBase class HttpUriRequest extends HttpRequestBase { - private final String methodName; + private final String methodName HttpUriRequest(final String methodName, final URI uri) { - this.methodName = methodName; - setURI(uri); + this.methodName = methodName + setURI(uri) } @Override String getMethod() { - return methodName; + return methodName } } diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/HttpUriRequest.groovy b/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/HttpUriRequest.groovy index adec36dbd3..a24d4cab16 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/HttpUriRequest.groovy +++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/HttpUriRequest.groovy @@ -2,15 +2,15 @@ import org.apache.http.client.methods.HttpRequestBase class HttpUriRequest extends HttpRequestBase { - private final String methodName; + private final String methodName HttpUriRequest(final String methodName, final URI uri) { - this.methodName = methodName; - setURI(uri); + this.methodName = methodName + setURI(uri) } @Override String getMethod() { - return methodName; + return methodName } } diff --git a/dd-java-agent/instrumentation/http-url-connection/src/test/groovy/SpringRestTemplateTest.groovy b/dd-java-agent/instrumentation/http-url-connection/src/test/groovy/SpringRestTemplateTest.groovy index 781456fea1..fd3784a355 100644 --- a/dd-java-agent/instrumentation/http-url-connection/src/test/groovy/SpringRestTemplateTest.groovy +++ b/dd-java-agent/instrumentation/http-url-connection/src/test/groovy/SpringRestTemplateTest.groovy @@ -16,7 +16,7 @@ class SpringRestTemplateTest extends HttpClientTest int doRequest(String method, URI uri, Map headers, Closure callback) { def httpHeaders = new HttpHeaders() headers.each { httpHeaders.put(it.key, [it.value]) } - def request = new HttpEntity(httpHeaders); + def request = new HttpEntity(httpHeaders) ResponseEntity response = restTemplate.exchange(uri, HttpMethod.resolve(method), request, String) callback?.call() return response.statusCode.value() 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 65eb3618fc..57d02031e8 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 @@ -60,7 +60,7 @@ class TraceUtils { } @SneakyThrows - static Object withConfigOverride(final String name, final String value, final Callable r) { + synchronized static Object withConfigOverride(final String name, final String value, final Callable r) { def existingConfig = Config.get() // We can't reference INSTANCE directly or the reflection below will fail. Properties properties = new Properties() properties.put(name, value) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/Config.java b/dd-trace-api/src/main/java/datadog/trace/api/Config.java index 9c7fd6b064..66c9a9d145 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/Config.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/Config.java @@ -100,8 +100,8 @@ public class Config { parseIntegerRangeSet("500-599", "default"); private static final Set DEFAULT_HTTP_CLIENT_ERROR_STATUSES = parseIntegerRangeSet("400-499", "default"); - private static final boolean DEFAULT_HTTP_SERVER_TAG_QUERY_STRING = true; - private static final boolean DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING = true; + private static final boolean DEFAULT_HTTP_SERVER_TAG_QUERY_STRING = false; + private static final boolean DEFAULT_HTTP_CLIENT_TAG_QUERY_STRING = false; private static final boolean DEFAULT_HTTP_CLIENT_SPLIT_BY_DOMAIN = false; private static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000; private static final String DEFAULT_PROPAGATION_STYLE_EXTRACT = PropagationStyle.DATADOG.name();