Tyler Benson e84e6eb25d Merge changes from dd-trace-java 0.40.0 ... https://github.com/DataDog/dd-trace-java/releases/tag/v0.40.0 # Conflicts: # dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java # dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy # dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy # dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy # dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy # dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy # dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy # dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy # dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy # dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy # dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy # dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy # dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy # dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/SpringBootBasedTest.groovy # dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy # dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy # dd-trace-api/src/main/java/datadog/trace/api/Config.java # dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java # dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java # dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java # dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy # dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy		2020-01-02 08:28:06 -08:00
..
akka-2.5-testing	Remove test dependency on GlobalTracer	2019-10-24 20:53:14 -07:00
akka-testing	Remove resource name decorators (#34)	2019-12-04 13:04:50 -08:00
kotlin-testing	Remove resource name decorators (#34)	2019-12-04 13:04:50 -08:00
scala-testing	Remove resource name decorators (#34)	2019-12-04 13:04:50 -08:00
src	Remove thread name and thread id tags (#42)	2019-12-17 14:04:23 -08:00
java-concurrent.gradle	Add option for muzzle validation on the specific JDK version	2019-12-18 13:40:19 -08:00