open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
opentelemetry-java-instrume.../dd-java-agent
History
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
..
agent-bootstrap Merge changes from dd-trace-java 0.40.0 2020-01-02 08:28:06 -08:00
agent-tooling Merge changes from dd-trace-java 0.40.0 2020-01-02 08:28:06 -08:00
benchmark Remove OpenTracing interoperability (#44) 2019-12-18 10:17:50 -08:00
benchmark-integration Remove OpenTracing interoperability (#44) 2019-12-18 10:17:50 -08:00
instrumentation Merge changes from dd-trace-java 0.40.0 2020-01-02 08:28:06 -08:00
load-generator Remove OpenTracing interoperability (#44) 2019-12-18 10:17:50 -08:00
src Merge changes from dd-trace-java 0.40.0 2020-01-02 08:28:06 -08:00
testing Merge changes from dd-trace-java 0.40.0 2020-01-02 08:28:06 -08:00
README.md
…
dd-java-agent.gradle Remove OpenTracing interoperability (#44) 2019-12-18 10:17:50 -08:00

README.md

Datadog Java Agent for APM