From becf2a586274b736feeb52e957af77f4ac5db0b3 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 5 Jan 2018 22:36:56 +1000 Subject: [PATCH 1/2] Lots of renaming Module: dd-trace -> dd-trace-ot Packages: Standardize on `datadog.trace` and `datadog.opentracing` as the package prefixes. --- .circleci/save_artifacts.sh | 2 +- .gitignore | 6 +-- README.md | 8 ++-- .../dd-java-agent-ittests.gradle | 8 +++- .../agent/integration/TestHttpServer.groovy | 2 +- .../httpclient/ApacheHttpClientTest.groovy | 12 +++--- .../jdbc/JDBCInstrumentationTest.groovy | 8 ++-- .../servlet/JettyServletTest.groovy | 8 ++-- .../integration/servlet/TestServlet.groovy | 2 +- .../servlet/TomcatServletTest.groovy | 6 +-- .../trace}/agent/ClassLoaderTest.java | 16 +++---- .../agent/ShadowPackageRenamingTest.java | 6 +-- .../annotation/TraceAnnotationsTest.java | 20 ++++----- .../integration/AWSInstrumentationTest.java | 4 +- .../MongoAsyncClientInstrumentationTest.java | 16 +++---- .../MongoClientInstrumentationTest.java | 10 ++--- .../OkHTTPInstrumentationTest.java | 2 +- .../trace}/agent/test/SayTracedHello.java | 6 +-- .../main/java/datadog}/perftest/Worker.java | 4 +- .../perftest/jetty/JettyPerftest.java | 12 +++--- .../benchmark/out/jmh/resources/dd-trace.yaml | 2 +- .../com/datadoghq/benchmark/classes/A.java | 5 --- .../ClassRetransformingBenchmark.java | 6 +-- .../jmh/java/datadog/benchmark/classes/A.java | 5 +++ .../benchmark/classes/B.java | 2 +- .../benchmark/classes/C.java | 2 +- .../benchmark/classes/D.java | 2 +- .../benchmark/classes/E.java | 2 +- .../benchmark/classes/F.java | 2 +- .../benchmark/classes/TracedClass.java | 4 +- .../benchmark/classes/UntracedClass.java | 2 +- .../benchmark/src/jmh/resources/dd-trace.yaml | 2 +- dd-java-agent/dd-java-agent.gradle | 36 ++++++++-------- .../apache-httpclient-4.3.gradle | 2 +- .../ApacheHttpClientInstrumentation.java | 19 +++++---- .../apachehttpclient/DDTracingClientExec.java | 2 +- .../aws-sdk/aws-sdk.gradle | 2 +- .../aws/AWSClientInstrumentation.java | 10 ++--- .../datastax-cassandra-3.2.gradle | 2 +- .../CassandraClientInstrumentation.java | 21 ++++++---- .../test/groovy/CassandraClientTest.groovy | 6 +-- .../jdbc/jdbc.gradle | 2 +- .../jdbc/ConnectionInstrumentation.java | 6 +-- .../PreparedStatementInstrumentation.java | 8 ++-- .../jdbc/StatementInstrumentation.java | 8 ++-- .../jms-1/jms-1.gradle | 2 +- .../instrumentation}/jms/util/JmsUtil.java | 2 +- .../jms/util/MessagePropertyTextMap.java | 2 +- .../JMS1MessageConsumerInstrumentation.java | 20 +++++---- .../JMS1MessageListenerInstrumentation.java | 14 +++---- .../JMS1MessageProducerInstrumentation.java | 14 +++---- .../jms-1/src/test/groovy/JMS1Test.groovy | 2 +- .../jms-2/jms-2.gradle | 4 +- .../JMS2MessageConsumerInstrumentation.java | 20 +++++---- .../JMS2MessageListenerInstrumentation.java | 14 +++---- .../JMS2MessageProducerInstrumentation.java | 14 +++---- .../jms-2/src/test/groovy/JMS2Test.groovy | 2 +- .../mongo-3.1/mongo-3.1.gradle | 2 +- .../mongo/DDTracingCommandListener.java | 4 +- .../mongo/MongoClientInstrumentation.java | 10 ++--- .../mongo/MongoClientInstrumentationTest.java | 16 +++---- .../mongo-async-3.3/mongo-async-3.3.gradle | 4 +- .../MongoAsyncClientInstrumentation.java | 6 +-- .../okhttp-3/okhttp-3.gradle | 2 +- .../okhttp3/OkHttp3Instrumentation.java | 10 ++--- .../src/test/groovy/OkHttp3Test.groovy | 4 +- .../servlet-2/servlet-2.gradle | 2 +- .../servlet2/FilterChain2Instrumentation.java | 10 ++--- .../servlet2/HttpServlet2Instrumentation.java | 10 ++--- .../servlet-3/servlet-3.gradle | 2 +- .../servlet3/FilterChain3Instrumentation.java | 10 ++--- .../servlet3/HttpServlet3Instrumentation.java | 10 ++--- .../spring-web/spring-web.gradle | 2 +- .../springweb/SpringWebInstrumentation.java | 10 ++--- .../TraceAnnotationInstrumentation.java | 10 ++--- .../trace-annotation/trace-annotation.gradle | 2 +- .../trace}/agent/DDJavaAgentInfo.java | 2 +- .../trace}/agent/TracingAgent.java | 11 ++--- .../resources/supported-version-test.yaml | 39 ------------------ .../trace/agent}/test/AgentTestRunner.java | 13 +++--- .../trace/agent}/test/TestUtils.java | 33 ++++++++------- dd-java-agent/testing/testing.gradle | 2 +- .../trace/agent/tooling}/AgentInstaller.java | 17 ++++---- .../agent/tooling}/ClassLoaderMatcher.java | 2 +- .../trace/agent/tooling}/DDAdvice.java | 3 +- .../agent/tooling}/ExceptionHandlers.java | 2 +- .../trace/agent/tooling}/HelperInjector.java | 5 +-- .../trace/agent/tooling}/Instrumenter.java | 2 +- .../trace/agent/tooling}/Utils.java | 4 +- .../trace/agent}/test/HelperClass.java | 2 +- .../agent}/test/HelperInjectionTest.groovy | 13 +++--- .../trace/api}/DDTraceAnnotationsInfo.java | 4 +- .../trace => datadog/trace/api}/Trace.java | 2 +- .../src/main/resources/configuration.yaml | 5 --- dd-trace-java.gradle | 2 +- {dd-trace => dd-trace-ot}/README.md | 0 .../dd-trace-ot.gradle | 14 +++---- .../docs/opentracing-api.md | 0 .../java/datadog}/trace/DDTraceBenchmark.java | 5 ++- .../reports/2017-07-18.using-array-copy.txt | 0 .../reports/2017-07-18.using-linked-queue.txt | 0 .../java/datadog/opentracing}/DDBaseSpan.java | 5 ++- .../java/datadog/opentracing}/DDSpan.java | 6 +-- .../datadog/opentracing}/DDSpanContext.java | 5 ++- .../datadog/opentracing/DDTraceOTInfo.java | 8 ++-- .../java/datadog/opentracing}/DDTracer.java | 21 ++++++---- .../decorators}/AbstractDecorator.java | 6 +-- .../DBStatementAsResourceName.java | 6 +-- .../decorators}/DBTypeDecorator.java | 6 +-- .../decorators}/DDDecoratorsFactory.java | 8 ++-- .../decorators}/DecoratorsConfig.java | 2 +- .../opentracing/decorators}/ErrorFlag.java | 4 +- .../decorators}/HTTPComponent.java | 6 +-- .../decorators}/OperationDecorator.java | 6 +-- .../decorators}/Status404Decorator.java | 4 +- .../decorators}/URLAsResourceName.java | 10 ++--- .../opentracing}/propagation/Codec.java | 4 +- .../opentracing}/propagation/HTTPCodec.java | 4 +- .../resolver/DDTracerResolver.java | 4 +- .../main/java/datadog/trace/api}/DDTags.java | 2 +- .../datadog/trace/api}/DDTraceConfig.java | 9 ++-- .../main/java/datadog/trace/api}/Service.java | 2 +- .../trace/api}/sampling/AbstractSampler.java | 4 +- .../trace/api}/sampling/AllSampler.java | 4 +- .../trace/api}/sampling/RateSampler.java | 4 +- .../datadog/trace/api}/sampling/Sampler.java | 6 +-- .../java/datadog/trace/api}/util/Clock.java | 2 +- .../datadog/trace/api/util/ConfigUtils.java | 4 +- .../trace/api}/writer/DDAgentWriter.java | 14 +++---- .../java/datadog/trace/api}/writer/DDApi.java | 14 +++---- .../datadog/trace/api}/writer/ListWriter.java | 6 +-- .../trace/api}/writer/LoggingWriter.java | 6 +-- .../datadog/trace/api}/writer/Writer.java | 8 ++-- .../trace/api}/writer/WriterQueue.java | 2 +- .../decorators}/SpanDecoratorTest.groovy | 10 ++--- .../decorators}/URLAsResourceNameTest.groovy | 2 +- .../trace/ActiveSpanContinuationTest.groovy | 5 ++- .../datadog}/trace/DDSpanContextTest.groovy | 3 +- .../datadog}/trace/DDTraceConfigTest.groovy | 16 +++---- .../groovy/datadog}/trace/ServiceTest.groovy | 8 ++-- .../groovy/datadog}/trace/SpanFactory.groovy | 6 ++- .../api}/writer/DDAgentWriterTest.groovy | 6 +-- .../trace/api}/writer/DDApiTest.groovy | 6 +-- .../trace/api}/writer/WriterQueueTest.groovy | 2 +- .../opentracing}/DDSpanBuilderTest.java | 7 ++-- .../opentracing}/DDSpanSerializationTest.java | 3 +- .../java/datadog/opentracing}/DDSpanTest.java | 2 +- .../datadog/opentracing}/DDTracerTest.java | 6 +-- .../propagation/HTTPCodecTest.java | 4 +- .../resolver/TracerResolverTest.java | 10 ++--- .../trace/api}/sampling/AllSamplerTest.java | 6 +-- .../trace/api/sampling}/RateSamplerTest.java | 5 +-- .../test/resources/dd-trace-decorators.yaml | 0 .../src/test/resources/dd-trace-ot.version | 0 .../src/test/resources/dd-url-patterns.yaml | 0 .../src/test/resources/logback.xml | 0 {dd-trace-examples => examples}/README.md | 0 .../dropwizard-mongo-client/README.md | 2 +- .../docker-compose.yml | 0 .../dropwizard-mongo-client.gradle | 6 +-- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../dropwizard-mongo-client/gradlew | 0 .../dropwizard-mongo-client/gradlew.bat | 0 .../production}/resources/configuration.yaml | 2 +- .../example/dropwizard/BookApplication.java | 10 ++--- .../datadog}/example/dropwizard/api/Book.java | 6 +-- .../dropwizard/client/TracedClient.java | 18 ++++---- .../resources/SimpleCrudResource.java | 6 +-- .../src/main/resources/configuration.yaml | 5 +++ .../rest-spark/README.md | 2 +- .../rest-spark/docker-compose.yml | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../rest-spark/gradlew | 0 .../rest-spark/gradlew.bat | 0 .../production/resources/configuration.yaml | 5 +++ .../rest-spark/rest-spark.gradle | 6 +-- .../example/restspark/MongoDriver.java | 2 +- .../example/restspark/SparkApplication.java | 2 +- .../src/main/resources/configuration.yaml | 5 +++ .../spring-boot-jdbc/README.md | 4 +- .../spring-boot-jdbc/docker-compose.yml | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../spring-boot-jdbc/gradlew | 0 .../spring-boot-jdbc/gradlew.bat | 0 .../resources/application.properties | 2 +- .../spring-boot-jdbc/spring-boot-jdbc.gradle | 2 +- .../java/datadog}/examples/Application.java | 2 +- .../datadog}/examples/ApplicationConfig.java | 2 +- .../java/datadog}/examples/entities/User.java | 2 +- .../examples/entities/UserRepository.java | 2 +- .../examples/resources/DBResource.java | 6 +-- .../examples/resources/HomeResource.java | 2 +- .../src/main/resources/application.properties | 7 ++++ gradle/java.gradle | 9 ++++ settings.gradle | 39 +++++++++--------- 198 files changed, 606 insertions(+), 595 deletions(-) rename dd-java-agent-ittests/src/test/groovy/{com/datadoghq => datadog/trace}/agent/integration/TestHttpServer.groovy (98%) rename dd-java-agent-ittests/src/test/groovy/{com/datadoghq => datadog/trace}/agent/integration/httpclient/ApacheHttpClientTest.groovy (93%) rename dd-java-agent-ittests/src/test/groovy/{com/datadoghq => datadog/trace}/agent/integration/jdbc/JDBCInstrumentationTest.groovy (97%) rename dd-java-agent-ittests/src/test/groovy/{com/datadoghq => datadog/trace}/agent/integration/servlet/JettyServletTest.groovy (96%) rename dd-java-agent-ittests/src/test/groovy/{com/datadoghq => datadog/trace}/agent/integration/servlet/TestServlet.groovy (95%) rename dd-java-agent-ittests/src/test/groovy/{com/datadoghq => datadog/trace}/agent/integration/servlet/TomcatServletTest.groovy (97%) rename dd-java-agent-ittests/src/test/java/{com/datadoghq => datadog/trace}/agent/ClassLoaderTest.java (57%) rename dd-java-agent-ittests/src/test/java/{com/datadoghq => datadog/trace}/agent/ShadowPackageRenamingTest.java (83%) rename dd-java-agent-ittests/src/test/java/{com/datadoghq => datadog/trace}/agent/instrumentation/annotation/TraceAnnotationsTest.java (82%) rename dd-java-agent-ittests/src/test/java/{com/datadoghq => datadog/trace}/agent/integration/AWSInstrumentationTest.java (84%) rename dd-java-agent-ittests/src/test/java/{com/datadoghq => datadog/trace}/agent/integration/MongoAsyncClientInstrumentationTest.java (91%) rename dd-java-agent-ittests/src/test/java/{com/datadoghq => datadog/trace}/agent/integration/MongoClientInstrumentationTest.java (95%) rename dd-java-agent-ittests/src/test/java/{com/datadoghq => datadog/trace}/agent/integration/OkHTTPInstrumentationTest.java (91%) rename dd-java-agent-ittests/src/test/java/{com/datadoghq => datadog/trace}/agent/test/SayTracedHello.java (89%) rename dd-java-agent/benchmark-integration/{src/main/java/dd => jetty-perftest/src/main/java/datadog}/perftest/Worker.java (76%) rename dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/{dd => datadog}/perftest/jetty/JettyPerftest.java (84%) delete mode 100644 dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/A.java rename dd-java-agent/benchmark/src/jmh/java/{com/datadoghq => datadog}/benchmark/ClassRetransformingBenchmark.java (95%) create mode 100644 dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/A.java rename dd-java-agent/benchmark/src/jmh/java/{com/datadoghq => datadog}/benchmark/classes/B.java (52%) rename dd-java-agent/benchmark/src/jmh/java/{com/datadoghq => datadog}/benchmark/classes/C.java (52%) rename dd-java-agent/benchmark/src/jmh/java/{com/datadoghq => datadog}/benchmark/classes/D.java (52%) rename dd-java-agent/benchmark/src/jmh/java/{com/datadoghq => datadog}/benchmark/classes/E.java (52%) rename dd-java-agent/benchmark/src/jmh/java/{com/datadoghq => datadog}/benchmark/classes/F.java (69%) rename dd-java-agent/benchmark/src/jmh/java/{com/datadoghq => datadog}/benchmark/classes/TracedClass.java (80%) rename dd-java-agent/benchmark/src/jmh/java/{com/datadoghq => datadog}/benchmark/classes/UntracedClass.java (85%) rename dd-java-agent/{integrations => instrumentation}/apache-httpclient-4.3/apache-httpclient-4.3.gradle (97%) rename dd-java-agent/{integrations/apache-httpclient-4.3/src/main/java/dd/inst => instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation}/apachehttpclient/ApacheHttpClientInstrumentation.java (75%) rename dd-java-agent/{integrations/apache-httpclient-4.3/src/main/java/dd/inst => instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation}/apachehttpclient/DDTracingClientExec.java (99%) rename dd-java-agent/{integrations => instrumentation}/aws-sdk/aws-sdk.gradle (95%) rename dd-java-agent/{integrations/aws-sdk/src/main/java/dd/inst => instrumentation/aws-sdk/src/main/java/datadog/trace/instrumentation}/aws/AWSClientInstrumentation.java (89%) rename dd-java-agent/{integrations => instrumentation}/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle (98%) rename dd-java-agent/{integrations/datastax-cassandra-3.2/src/main/java/dd/inst => instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation}/datastax/cassandra/CassandraClientInstrumentation.java (77%) rename dd-java-agent/{integrations => instrumentation}/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy (96%) rename dd-java-agent/{integrations => instrumentation}/jdbc/jdbc.gradle (84%) rename dd-java-agent/{integrations/jdbc/src/main/java/dd => instrumentation/jdbc/src/main/java/datadog}/trace/instrumentation/jdbc/ConnectionInstrumentation.java (95%) rename dd-java-agent/{integrations/jdbc/src/main/java/dd => instrumentation/jdbc/src/main/java/datadog}/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java (95%) rename dd-java-agent/{integrations/jdbc/src/main/java/dd => instrumentation/jdbc/src/main/java/datadog}/trace/instrumentation/jdbc/StatementInstrumentation.java (94%) rename dd-java-agent/{integrations => instrumentation}/jms-1/jms-1.gradle (95%) rename dd-java-agent/{integrations/jms-1/src/main/java/dd/inst => instrumentation/jms-1/src/main/java/datadog/trace/instrumentation}/jms/util/JmsUtil.java (95%) rename dd-java-agent/{integrations/jms-1/src/main/java/dd/inst => instrumentation/jms-1/src/main/java/datadog/trace/instrumentation}/jms/util/MessagePropertyTextMap.java (96%) rename dd-java-agent/{integrations/jms-1/src/main/java/dd/inst => instrumentation/jms-1/src/main/java/datadog/trace/instrumentation}/jms1/JMS1MessageConsumerInstrumentation.java (83%) rename dd-java-agent/{integrations/jms-1/src/main/java/dd/inst => instrumentation/jms-1/src/main/java/datadog/trace/instrumentation}/jms1/JMS1MessageListenerInstrumentation.java (88%) rename dd-java-agent/{integrations/jms-1/src/main/java/dd/inst => instrumentation/jms-1/src/main/java/datadog/trace/instrumentation}/jms1/JMS1MessageProducerInstrumentation.java (92%) rename dd-java-agent/{integrations => instrumentation}/jms-1/src/test/groovy/JMS1Test.groovy (99%) rename dd-java-agent/{integrations => instrumentation}/jms-2/jms-2.gradle (89%) rename dd-java-agent/{integrations/jms-2/src/main/java/dd/inst => instrumentation/jms-2/src/main/java/datadog/trace/instrumentation}/jms2/JMS2MessageConsumerInstrumentation.java (83%) rename dd-java-agent/{integrations/jms-2/src/main/java/dd/inst => instrumentation/jms-2/src/main/java/datadog/trace/instrumentation}/jms2/JMS2MessageListenerInstrumentation.java (88%) rename dd-java-agent/{integrations/jms-2/src/main/java/dd/inst => instrumentation/jms-2/src/main/java/datadog/trace/instrumentation}/jms2/JMS2MessageProducerInstrumentation.java (92%) rename dd-java-agent/{integrations => instrumentation}/jms-2/src/test/groovy/JMS2Test.groovy (99%) rename dd-java-agent/{integrations => instrumentation}/mongo-3.1/mongo-3.1.gradle (94%) rename dd-java-agent/{integrations/mongo-3.1/src/main/java/dd/inst => instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation}/mongo/DDTracingCommandListener.java (98%) rename dd-java-agent/{integrations/mongo-3.1/src/main/java/dd/inst => instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation}/mongo/MongoClientInstrumentation.java (89%) rename dd-java-agent/{integrations/mongo-3.1/src/test/java/dd/inst => instrumentation/mongo-3.1/src/test/java/datadog/trace/instrumentation}/mongo/MongoClientInstrumentationTest.java (79%) rename dd-java-agent/{integrations => instrumentation}/mongo-async-3.3/mongo-async-3.3.gradle (84%) rename dd-java-agent/{integrations/mongo-async-3.3/src/main/java/dd/inst => instrumentation/mongo-async-3.3/src/main/java/datadog/trace/instrumentation}/mongo/MongoAsyncClientInstrumentation.java (94%) rename dd-java-agent/{integrations => instrumentation}/okhttp-3/okhttp-3.gradle (95%) rename dd-java-agent/{integrations/okhttp-3/src/main/java/dd/inst => instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation}/okhttp3/OkHttp3Instrumentation.java (90%) rename dd-java-agent/{integrations => instrumentation}/okhttp-3/src/test/groovy/OkHttp3Test.groovy (96%) rename dd-java-agent/{integrations => instrumentation}/servlet-2/servlet-2.gradle (94%) rename dd-java-agent/{integrations/servlet-2/src/main/java/dd/inst => instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation}/servlet2/FilterChain2Instrumentation.java (94%) rename dd-java-agent/{integrations/servlet-2/src/main/java/dd/inst => instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation}/servlet2/HttpServlet2Instrumentation.java (93%) rename dd-java-agent/{integrations => instrumentation}/servlet-3/servlet-3.gradle (94%) rename dd-java-agent/{integrations/servlet-3/src/main/java/dd/inst => instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation}/servlet3/FilterChain3Instrumentation.java (96%) rename dd-java-agent/{integrations/servlet-3/src/main/java/dd/inst => instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation}/servlet3/HttpServlet3Instrumentation.java (96%) rename dd-java-agent/{integrations => instrumentation}/spring-web/spring-web.gradle (95%) rename dd-java-agent/{integrations/spring-web/src/main/java/dd/inst => instrumentation/spring-web/src/main/java/datadog/trace/instrumentation}/springweb/SpringWebInstrumentation.java (90%) rename dd-java-agent/{integrations/trace-annotation/src/main/java/dd => instrumentation/trace-annotation/src/main/java/datadog}/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java (87%) rename dd-java-agent/{integrations => instrumentation}/trace-annotation/trace-annotation.gradle (87%) rename dd-java-agent/src/main/java/{com/datadoghq => datadog/trace}/agent/DDJavaAgentInfo.java (96%) rename dd-java-agent/src/main/java/{com/datadoghq => datadog/trace}/agent/TracingAgent.java (87%) delete mode 100644 dd-java-agent/src/test/resources/supported-version-test.yaml rename dd-java-agent/testing/src/main/java/{dd => datadog/trace/agent}/test/AgentTestRunner.java (85%) rename dd-java-agent/testing/src/main/java/{dd => datadog/trace/agent}/test/TestUtils.java (73%) rename dd-java-agent/tooling/src/main/java/{com/datadoghq/agent => datadog/trace/agent/tooling}/AgentInstaller.java (89%) rename dd-java-agent/tooling/src/main/java/{dd/trace => datadog/trace/agent/tooling}/ClassLoaderMatcher.java (98%) rename dd-java-agent/tooling/src/main/java/{dd/trace => datadog/trace/agent/tooling}/DDAdvice.java (95%) rename dd-java-agent/tooling/src/main/java/{dd/trace => datadog/trace/agent/tooling}/ExceptionHandlers.java (95%) rename dd-java-agent/tooling/src/main/java/{dd/trace => datadog/trace/agent/tooling}/HelperInjector.java (94%) rename dd-java-agent/tooling/src/main/java/{dd/trace => datadog/trace/agent/tooling}/Instrumenter.java (78%) rename dd-java-agent/tooling/src/main/java/{com/datadoghq/agent => datadog/trace/agent/tooling}/Utils.java (75%) rename dd-java-agent/tooling/src/test/groovy/{dd => datadog/trace/agent}/test/HelperClass.java (65%) rename dd-java-agent/tooling/src/test/groovy/{dd => datadog/trace/agent}/test/HelperInjectionTest.groovy (90%) rename dd-trace-annotations/src/main/java/{com/datadoghq/trace => datadog/trace/api}/DDTraceAnnotationsInfo.java (91%) rename dd-trace-annotations/src/main/java/{com/datadoghq/trace => datadog/trace/api}/Trace.java (94%) delete mode 100644 dd-trace-examples/dropwizard-mongo-client/src/main/resources/configuration.yaml rename {dd-trace => dd-trace-ot}/README.md (100%) rename dd-trace/dd-trace.gradle => dd-trace-ot/dd-trace-ot.gradle (87%) rename {dd-trace => dd-trace-ot}/docs/opentracing-api.md (100%) rename {dd-trace/src/jmh/java/com/datadoghq => dd-trace-ot/src/jmh/java/datadog}/trace/DDTraceBenchmark.java (93%) rename {dd-trace => dd-trace-ot}/src/jmh/reports/2017-07-18.using-array-copy.txt (100%) rename {dd-trace => dd-trace-ot}/src/jmh/reports/2017-07-18.using-linked-queue.txt (100%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/opentracing}/DDBaseSpan.java (98%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/opentracing}/DDSpan.java (84%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/opentracing}/DDSpanContext.java (98%) rename dd-trace/src/main/java/com/datadoghq/trace/DDTraceInfo.java => dd-trace-ot/src/main/java/datadog/opentracing/DDTraceOTInfo.java (79%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/opentracing}/DDTracer.java (96%) rename {dd-trace/src/main/java/com/datadoghq/trace/integration => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/AbstractDecorator.java (93%) rename {dd-trace/src/main/java/com/datadoghq/trace/integration => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/DBStatementAsResourceName.java (90%) rename {dd-trace/src/main/java/com/datadoghq/trace/integration => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/DBTypeDecorator.java (89%) rename {dd-trace/src/main/java/com/datadoghq/trace/resolver => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/DDDecoratorsFactory.java (90%) rename {dd-trace/src/main/java/com/datadoghq/trace/resolver => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/DecoratorsConfig.java (98%) rename {dd-trace/src/main/java/com/datadoghq/trace/integration => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/ErrorFlag.java (85%) rename {dd-trace/src/main/java/com/datadoghq/trace/integration => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/HTTPComponent.java (85%) rename {dd-trace/src/main/java/com/datadoghq/trace/integration => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/OperationDecorator.java (89%) rename {dd-trace/src/main/java/com/datadoghq/trace/integration => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/Status404Decorator.java (82%) rename {dd-trace/src/main/java/com/datadoghq/trace/integration => dd-trace-ot/src/main/java/datadog/opentracing/decorators}/URLAsResourceName.java (94%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/opentracing}/propagation/Codec.java (95%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/opentracing}/propagation/HTTPCodec.java (96%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/opentracing}/resolver/DDTracerResolver.java (91%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/DDTags.java (95%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/DDTraceConfig.java (92%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/Service.java (97%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/sampling/AbstractSampler.java (93%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/sampling/AllSampler.java (77%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/sampling/RateSampler.java (94%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/sampling/Sampler.java (92%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/util/Clock.java (96%) rename dd-trace/src/main/java/com/datadoghq/trace/resolver/FactoryUtils.java => dd-trace-ot/src/main/java/datadog/trace/api/util/ConfigUtils.java (95%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/writer/DDAgentWriter.java (94%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/writer/DDApi.java (95%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/writer/ListWriter.java (93%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/writer/LoggingWriter.java (86%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/writer/Writer.java (93%) rename {dd-trace/src/main/java/com/datadoghq/trace => dd-trace-ot/src/main/java/datadog/trace/api}/writer/WriterQueue.java (98%) rename {dd-trace/src/test/groovy/com/datadoghq/trace/integration => dd-trace-ot/src/test/groovy/datadog/opentracing/decorators}/SpanDecoratorTest.groovy (93%) rename {dd-trace/src/test/groovy/com/datadoghq/trace/integration => dd-trace-ot/src/test/groovy/datadog/opentracing/decorators}/URLAsResourceNameTest.groovy (98%) rename {dd-trace/src/test/groovy/com/datadoghq => dd-trace-ot/src/test/groovy/datadog}/trace/ActiveSpanContinuationTest.groovy (97%) rename {dd-trace/src/test/groovy/com/datadoghq => dd-trace-ot/src/test/groovy/datadog}/trace/DDSpanContextTest.groovy (98%) rename {dd-trace/src/test/groovy/com/datadoghq => dd-trace-ot/src/test/groovy/datadog}/trace/DDTraceConfigTest.groovy (93%) rename {dd-trace/src/test/groovy/com/datadoghq => dd-trace-ot/src/test/groovy/datadog}/trace/ServiceTest.groovy (89%) rename {dd-trace/src/test/groovy/com/datadoghq => dd-trace-ot/src/test/groovy/datadog}/trace/SpanFactory.groovy (83%) rename {dd-trace/src/test/groovy/com/datadoghq/trace => dd-trace-ot/src/test/groovy/datadog/trace/api}/writer/DDAgentWriterTest.groovy (92%) rename {dd-trace/src/test/groovy/com/datadoghq/trace => dd-trace-ot/src/test/groovy/datadog/trace/api}/writer/DDApiTest.groovy (98%) rename {dd-trace/src/test/groovy/com/datadoghq/trace => dd-trace-ot/src/test/groovy/datadog/trace/api}/writer/WriterQueueTest.groovy (99%) rename {dd-trace/src/test/java/com/datadoghq/trace => dd-trace-ot/src/test/java/datadog/opentracing}/DDSpanBuilderTest.java (97%) rename {dd-trace/src/test/java/com/datadoghq/trace => dd-trace-ot/src/test/java/datadog/opentracing}/DDSpanSerializationTest.java (96%) rename {dd-trace/src/test/java/com/datadoghq/trace => dd-trace-ot/src/test/java/datadog/opentracing}/DDSpanTest.java (98%) rename {dd-trace/src/test/java/com/datadoghq/trace => dd-trace-ot/src/test/java/datadog/opentracing}/DDTracerTest.java (89%) rename {dd-trace/src/test/java/com/datadoghq/trace => dd-trace-ot/src/test/java/datadog/opentracing}/propagation/HTTPCodecTest.java (96%) rename {dd-trace/src/test/java/com/datadoghq/trace => dd-trace-ot/src/test/java/datadog/opentracing}/resolver/TracerResolverTest.java (90%) rename {dd-trace/src/test/java/com/datadoghq/trace => dd-trace-ot/src/test/java/datadog/trace/api}/sampling/AllSamplerTest.java (88%) rename {dd-trace/src/test/java/com/datadoghq/trace => dd-trace-ot/src/test/java/datadog/trace/api/sampling}/RateSamplerTest.java (89%) rename {dd-trace => dd-trace-ot}/src/test/resources/dd-trace-decorators.yaml (100%) rename dd-trace/src/test/resources/dd-trace.version => dd-trace-ot/src/test/resources/dd-trace-ot.version (100%) rename {dd-trace => dd-trace-ot}/src/test/resources/dd-url-patterns.yaml (100%) rename {dd-trace => dd-trace-ot}/src/test/resources/logback.xml (100%) rename {dd-trace-examples => examples}/README.md (100%) rename {dd-trace-examples => examples}/dropwizard-mongo-client/README.md (98%) rename {dd-trace-examples => examples}/dropwizard-mongo-client/docker-compose.yml (100%) rename {dd-trace-examples => examples}/dropwizard-mongo-client/dropwizard-mongo-client.gradle (82%) rename {dd-trace-examples => examples}/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar (100%) rename {dd-trace-examples => examples}/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties (100%) rename {dd-trace-examples => examples}/dropwizard-mongo-client/gradlew (100%) rename {dd-trace-examples => examples}/dropwizard-mongo-client/gradlew.bat (100%) rename {dd-trace-examples/rest-spark/src/main => examples/dropwizard-mongo-client/out/production}/resources/configuration.yaml (65%) rename {dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq => examples/dropwizard-mongo-client/src/main/java/datadog}/example/dropwizard/BookApplication.java (58%) rename {dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq => examples/dropwizard-mongo-client/src/main/java/datadog}/example/dropwizard/api/Book.java (81%) rename {dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq => examples/dropwizard-mongo-client/src/main/java/datadog}/example/dropwizard/client/TracedClient.java (62%) rename {dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq => examples/dropwizard-mongo-client/src/main/java/datadog}/example/dropwizard/resources/SimpleCrudResource.java (96%) create mode 100644 examples/dropwizard-mongo-client/src/main/resources/configuration.yaml rename {dd-trace-examples => examples}/rest-spark/README.md (98%) rename {dd-trace-examples => examples}/rest-spark/docker-compose.yml (100%) rename {dd-trace-examples => examples}/rest-spark/gradle/wrapper/gradle-wrapper.jar (100%) rename {dd-trace-examples => examples}/rest-spark/gradle/wrapper/gradle-wrapper.properties (100%) rename {dd-trace-examples => examples}/rest-spark/gradlew (100%) rename {dd-trace-examples => examples}/rest-spark/gradlew.bat (100%) create mode 100644 examples/rest-spark/out/production/resources/configuration.yaml rename {dd-trace-examples => examples}/rest-spark/rest-spark.gradle (82%) rename {dd-trace-examples/rest-spark/src/main/java/com/datadoghq => examples/rest-spark/src/main/java/datadog}/example/restspark/MongoDriver.java (91%) rename {dd-trace-examples/rest-spark/src/main/java/com/datadoghq => examples/rest-spark/src/main/java/datadog}/example/restspark/SparkApplication.java (98%) create mode 100644 examples/rest-spark/src/main/resources/configuration.yaml rename {dd-trace-examples => examples}/spring-boot-jdbc/README.md (92%) rename {dd-trace-examples => examples}/spring-boot-jdbc/docker-compose.yml (100%) rename {dd-trace-examples => examples}/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar (100%) rename {dd-trace-examples => examples}/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.properties (100%) rename {dd-trace-examples => examples}/spring-boot-jdbc/gradlew (100%) rename {dd-trace-examples => examples}/spring-boot-jdbc/gradlew.bat (100%) rename {dd-trace-examples/spring-boot-jdbc/src/main => examples/spring-boot-jdbc/out/production}/resources/application.properties (85%) rename {dd-trace-examples => examples}/spring-boot-jdbc/spring-boot-jdbc.gradle (95%) rename {dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq => examples/spring-boot-jdbc/src/main/java/datadog}/examples/Application.java (89%) rename {dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq => examples/spring-boot-jdbc/src/main/java/datadog}/examples/ApplicationConfig.java (94%) rename {dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq => examples/spring-boot-jdbc/src/main/java/datadog}/examples/entities/User.java (94%) rename {dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq => examples/spring-boot-jdbc/src/main/java/datadog}/examples/entities/UserRepository.java (86%) rename {dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq => examples/spring-boot-jdbc/src/main/java/datadog}/examples/resources/DBResource.java (91%) rename {dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq => examples/spring-boot-jdbc/src/main/java/datadog}/examples/resources/HomeResource.java (94%) create mode 100644 examples/spring-boot-jdbc/src/main/resources/application.properties diff --git a/.circleci/save_artifacts.sh b/.circleci/save_artifacts.sh index 8f10d13bdc..442e1e4286 100755 --- a/.circleci/save_artifacts.sh +++ b/.circleci/save_artifacts.sh @@ -33,7 +33,7 @@ function save_libs () { save_reports dd-java-agent save_reports dd-java-agent/tooling # Save reports for all instrumentation projects -for integration_path in dd-java-agent/integrations/*; do +for integration_path in dd-java-agent/instrumentation/*; do save_reports $integration_path done save_reports dd-java-agent-ittests diff --git a/.gitignore b/.gitignore index 0509e335df..e71792ea50 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ target /.gradle */.gradle **/build/ -dd-trace-examples/**/build/ +examples/**/build/ # Eclipse # ########### @@ -49,9 +49,9 @@ Thumbs.db /bin /out */out -dd-java-agent/integrations/*/out +dd-java-agent/instrumentation/*/out dd-java-agent/benchmark-integration/perf-test-settings.rc -dd-trace-examples/*/out +examples/*/out derby.log !dd-java-agent/benchmark/releases/*.jar diff --git a/README.md b/README.md index c1464ca21b..37ea2b15a2 100644 --- a/README.md +++ b/README.md @@ -230,9 +230,9 @@ public class Application { io.opentracing.util.GlobalTracer.register(tracer); // OR from the API - Writer writer = new com.datadoghq.trace.writer.DDAgentWriter(); - Sampler sampler = new com.datadoghq.trace.sampling.AllSampler(); - Tracer tracer = new com.datadoghq.trace.DDTracer(writer, sampler); + Writer writer = new datadog.trace.api.writer.DDAgentWriter(); + Sampler sampler = new datadog.trace.api.sampling.AllSampler(); + Tracer tracer = new datadog.opentracing.DDTracer(writer, sampler); io.opentracing.util.GlobalTracer.register(tracer); // ... @@ -242,7 +242,7 @@ public class Application { ## Further Reading -- Browse the [example applications](dd-trace-examples) in this repository to see Java tracing in action +- Browse the [example applications](examples) in this repository to see Java tracing in action - Read [OpenTracing's documentation](https://github.com/opentracing/opentracing-java); feel free to use the Trace Java API to customize your instrumentation. - Brush up on [Datadog APM Terminology](https://docs.datadoghq.com/tracing/terminology/) - Read the [Datadog APM FAQ](https://docs.datadoghq.com/tracing/faq/) diff --git a/dd-java-agent-ittests/dd-java-agent-ittests.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle index f41298fef6..9ceaf9787e 100644 --- a/dd-java-agent-ittests/dd-java-agent-ittests.gradle +++ b/dd-java-agent-ittests/dd-java-agent-ittests.gradle @@ -7,11 +7,15 @@ compileTestJava.dependsOn tasks.getByPath(':dd-java-agent:tooling:testClasses') dependencies { testCompile project(':dd-trace-annotations') - testCompile project(':dd-trace') + testCompile project(':dd-trace-ot') testCompile deps.opentracingMock - testCompile project(':dd-java-agent:testing') + testCompile(project(':dd-java-agent:testing')) { + // Otherwise this can bring in classes that aren't "shadowed" + // that conflicts with those that are which are in the agent. + transitive = false + } testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2' diff --git a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/TestHttpServer.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/TestHttpServer.groovy similarity index 98% rename from dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/TestHttpServer.groovy rename to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/TestHttpServer.groovy index 045ad7357e..8428a99925 100644 --- a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/TestHttpServer.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/TestHttpServer.groovy @@ -1,4 +1,4 @@ -package com.datadoghq.agent.integration +package datadog.trace.agent.integration import io.opentracing.ActiveSpan import io.opentracing.SpanContext diff --git a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/httpclient/ApacheHttpClientTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy similarity index 93% rename from dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/httpclient/ApacheHttpClientTest.groovy rename to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy index 910c3f3cbb..fbac6232a5 100644 --- a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/httpclient/ApacheHttpClientTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy @@ -1,10 +1,10 @@ -package com.datadoghq.agent.integration.httpclient +package datadog.trace.agent.integration.httpclient -import com.datadoghq.agent.integration.TestHttpServer -import com.datadoghq.trace.DDBaseSpan -import com.datadoghq.trace.DDTracer -import com.datadoghq.trace.writer.ListWriter -import dd.test.TestUtils +import datadog.opentracing.DDBaseSpan +import datadog.opentracing.DDTracer +import datadog.trace.agent.integration.TestHttpServer +import datadog.trace.agent.test.TestUtils +import datadog.trace.api.writer.ListWriter import io.opentracing.tag.Tags import org.apache.http.HttpResponse import org.apache.http.client.HttpClient diff --git a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/jdbc/JDBCInstrumentationTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy similarity index 97% rename from dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/jdbc/JDBCInstrumentationTest.groovy rename to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy index 6c8708854f..4fc39a57be 100644 --- a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/jdbc/JDBCInstrumentationTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy @@ -1,8 +1,8 @@ -package com.datadoghq.agent.integration.jdbc +package datadog.trace.agent.integration.jdbc -import com.datadoghq.trace.DDTracer -import com.datadoghq.trace.writer.ListWriter -import dd.test.TestUtils +import datadog.opentracing.DDTracer +import datadog.trace.agent.test.TestUtils +import datadog.trace.api.writer.ListWriter import org.apache.derby.jdbc.EmbeddedDriver import org.h2.Driver import org.hsqldb.jdbc.JDBCDriver diff --git a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/JettyServletTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/JettyServletTest.groovy similarity index 96% rename from dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/JettyServletTest.groovy rename to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/JettyServletTest.groovy index 14d64638ff..3ac72ed9e0 100644 --- a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/JettyServletTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/JettyServletTest.groovy @@ -1,8 +1,8 @@ -package com.datadoghq.agent.integration.servlet +package datadog.trace.agent.integration.servlet -import com.datadoghq.trace.DDBaseSpan -import com.datadoghq.trace.DDTracer -import com.datadoghq.trace.writer.ListWriter +import datadog.opentracing.DDBaseSpan +import datadog.opentracing.DDTracer +import datadog.trace.api.writer.ListWriter import io.opentracing.util.GlobalTracer import okhttp3.Interceptor import okhttp3.OkHttpClient diff --git a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TestServlet.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TestServlet.groovy similarity index 95% rename from dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TestServlet.groovy rename to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TestServlet.groovy index 7304c090a1..ac1da45fcd 100644 --- a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TestServlet.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TestServlet.groovy @@ -1,4 +1,4 @@ -package com.datadoghq.agent.integration.servlet +package datadog.trace.agent.integration.servlet import groovy.servlet.AbstractHttpServlet diff --git a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TomcatServletTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TomcatServletTest.groovy similarity index 97% rename from dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TomcatServletTest.groovy rename to dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TomcatServletTest.groovy index 29b7d9b281..936f85f164 100644 --- a/dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TomcatServletTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TomcatServletTest.groovy @@ -1,8 +1,8 @@ -package com.datadoghq.agent.integration.servlet +package datadog.trace.agent.integration.servlet -import com.datadoghq.trace.DDTracer -import com.datadoghq.trace.writer.ListWriter import com.google.common.io.Files +import datadog.opentracing.DDTracer +import datadog.trace.api.writer.ListWriter import io.opentracing.util.GlobalTracer import okhttp3.OkHttpClient import okhttp3.Request diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/ClassLoaderTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/ClassLoaderTest.java similarity index 57% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/agent/ClassLoaderTest.java rename to dd-java-agent-ittests/src/test/java/datadog/trace/agent/ClassLoaderTest.java index 3823fc8676..43b93b41b7 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/ClassLoaderTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/ClassLoaderTest.java @@ -1,8 +1,8 @@ -package com.datadoghq.agent; +package datadog.trace.agent; -import static dd.test.TestUtils.createJarWithClasses; +import static datadog.trace.agent.test.TestUtils.createJarWithClasses; -import com.datadoghq.trace.Trace; +import datadog.trace.api.Trace; import java.net.URL; import java.net.URLClassLoader; import org.junit.Assert; @@ -13,17 +13,17 @@ public class ClassLoaderTest { /** Assert that we can instrument classloaders which cannot resolve agent advice classes. */ @Test public void instrumentClassLoadersWithoutAgentClasses() throws Exception { - URL[] classpath = new URL[] {createJarWithClasses(ClassToInstrument.class, Trace.class)}; - URLClassLoader loader = new URLClassLoader(classpath, null); + final URL[] classpath = new URL[] {createJarWithClasses(ClassToInstrument.class, Trace.class)}; + final URLClassLoader loader = new URLClassLoader(classpath, null); try { - loader.loadClass("com.datadoghq.agent.TracingAgent"); + loader.loadClass("datadog.agent.TracingAgent"); Assert.fail("loader should not see agent classes."); - } catch (ClassNotFoundException cnfe) { + } catch (final ClassNotFoundException cnfe) { // Good. loader can't see agent classes. } - Class instrumentedClass = loader.loadClass(ClassToInstrument.class.getName()); + final Class instrumentedClass = loader.loadClass(ClassToInstrument.class.getName()); Assert.assertEquals( "Class must be loaded by loader.", loader, instrumentedClass.getClassLoader()); diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/ShadowPackageRenamingTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/ShadowPackageRenamingTest.java similarity index 83% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/agent/ShadowPackageRenamingTest.java rename to dd-java-agent-ittests/src/test/java/datadog/trace/agent/ShadowPackageRenamingTest.java index 554638409c..5774c37727 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/ShadowPackageRenamingTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/ShadowPackageRenamingTest.java @@ -1,4 +1,4 @@ -package com.datadoghq.agent; +package datadog.trace.agent; import com.google.common.collect.MapMaker; import org.junit.Assert; @@ -8,14 +8,14 @@ public class ShadowPackageRenamingTest { @Test public void agentDependenciesRenamed() throws Exception { final Class ddClass = - ClassLoader.getSystemClassLoader().loadClass("com.datadoghq.agent.TracingAgent"); + ClassLoader.getSystemClassLoader().loadClass("datadog.trace.agent.TracingAgent"); final String userGuava = MapMaker.class.getProtectionDomain().getCodeSource().getLocation().getFile(); final String agentGuavaDep = ddClass .getClassLoader() - .loadClass("dd.deps." + MapMaker.class.getName()) + .loadClass("datadog.trace.agent.deps." + MapMaker.class.getName()) .getProtectionDomain() .getCodeSource() .getLocation() diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/instrumentation/annotation/TraceAnnotationsTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/instrumentation/annotation/TraceAnnotationsTest.java similarity index 82% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/agent/instrumentation/annotation/TraceAnnotationsTest.java rename to dd-java-agent-ittests/src/test/java/datadog/trace/agent/instrumentation/annotation/TraceAnnotationsTest.java index 9ed4785131..7ae9ce0937 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/instrumentation/annotation/TraceAnnotationsTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/instrumentation/annotation/TraceAnnotationsTest.java @@ -1,13 +1,13 @@ -package com.datadoghq.agent.instrumentation.annotation; +package datadog.trace.agent.instrumentation.annotation; import static org.assertj.core.api.Assertions.assertThat; -import com.datadoghq.agent.test.SayTracedHello; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.DDTracer; -import com.datadoghq.trace.integration.ErrorFlag; -import com.datadoghq.trace.writer.ListWriter; -import dd.test.TestUtils; +import datadog.opentracing.DDBaseSpan; +import datadog.opentracing.DDTracer; +import datadog.opentracing.decorators.ErrorFlag; +import datadog.trace.agent.test.SayTracedHello; +import datadog.trace.agent.test.TestUtils; +import datadog.trace.api.writer.ListWriter; import io.opentracing.util.GlobalTracer; import java.io.PrintWriter; import java.io.StringWriter; @@ -32,8 +32,7 @@ public class TraceAnnotationsTest { SayTracedHello.sayHello(); assertThat(writer.firstTrace().size()).isEqualTo(1); - assertThat(writer.firstTrace().get(0).getOperationName()) - .isEqualTo("com.datadoghq.agent.test.SayTracedHello.sayHello"); + assertThat(writer.firstTrace().get(0).getOperationName()).isEqualTo("SayTracedHello.sayHello"); assertThat(writer.firstTrace().get(0).getServiceName()).isEqualTo("test"); } @@ -50,8 +49,7 @@ public class TraceAnnotationsTest { assertThat(writer.firstTrace().get(0).context().getParentId()).isEqualTo(0); assertThat(writer.firstTrace().get(0).getServiceName()).isEqualTo("test2"); - assertThat(writer.firstTrace().get(1).getOperationName()) - .isEqualTo("com.datadoghq.agent.test.SayTracedHello.sayHello"); + assertThat(writer.firstTrace().get(1).getOperationName()).isEqualTo("SayTracedHello.sayHello"); assertThat(writer.firstTrace().get(1).getServiceName()).isEqualTo("test"); assertThat(writer.firstTrace().get(1).getParentId()).isEqualTo(parentId); diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/AWSInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/AWSInstrumentationTest.java similarity index 84% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/AWSInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/AWSInstrumentationTest.java index 9c0ab12ef4..61a60e19e5 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/AWSInstrumentationTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/AWSInstrumentationTest.java @@ -1,4 +1,4 @@ -package com.datadoghq.agent.integration; +package datadog.trace.agent.integration; import static org.assertj.core.api.Assertions.assertThat; @@ -12,7 +12,7 @@ public class AWSInstrumentationTest { public void test() { // Build AWS client with TracingRequestHandler e.g. - AmazonS3ClientBuilder builder = AmazonS3ClientBuilder.standard(); + final AmazonS3ClientBuilder builder = AmazonS3ClientBuilder.standard(); builder.withRegion(Regions.US_EAST_1); builder.build(); diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/MongoAsyncClientInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java similarity index 91% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/MongoAsyncClientInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java index 7264da7fa7..e7e587fe28 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/MongoAsyncClientInstrumentationTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java @@ -1,17 +1,17 @@ -package com.datadoghq.agent.integration; +package datadog.trace.agent.integration; -import static com.datadoghq.agent.integration.MongoClientInstrumentationTest.MONGO_DB_NAME; -import static com.datadoghq.agent.integration.MongoClientInstrumentationTest.MONGO_HOST; -import static com.datadoghq.agent.integration.MongoClientInstrumentationTest.MONGO_PORT; +import static datadog.trace.agent.integration.MongoClientInstrumentationTest.MONGO_DB_NAME; +import static datadog.trace.agent.integration.MongoClientInstrumentationTest.MONGO_HOST; +import static datadog.trace.agent.integration.MongoClientInstrumentationTest.MONGO_PORT; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.DDTracer; -import com.datadoghq.trace.writer.ListWriter; import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoClient; import com.mongodb.async.client.MongoClients; import com.mongodb.async.client.MongoDatabase; -import dd.test.TestUtils; +import datadog.opentracing.DDBaseSpan; +import datadog.opentracing.DDTracer; +import datadog.trace.agent.test.TestUtils; +import datadog.trace.api.writer.ListWriter; import io.opentracing.tag.Tags; import java.net.InetAddress; import java.nio.ByteBuffer; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/MongoClientInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java similarity index 95% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/MongoClientInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java index bcaaa78087..710a58b90f 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/MongoClientInstrumentationTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java @@ -1,12 +1,12 @@ -package com.datadoghq.agent.integration; +package datadog.trace.agent.integration; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.DDTracer; -import com.datadoghq.trace.writer.ListWriter; import com.mongodb.MongoClient; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; -import dd.test.TestUtils; +import datadog.opentracing.DDBaseSpan; +import datadog.opentracing.DDTracer; +import datadog.trace.agent.test.TestUtils; +import datadog.trace.api.writer.ListWriter; import de.flapdoodle.embed.mongo.MongodExecutable; import de.flapdoodle.embed.mongo.MongodProcess; import de.flapdoodle.embed.mongo.MongodStarter; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/OkHTTPInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/OkHTTPInstrumentationTest.java similarity index 91% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/OkHTTPInstrumentationTest.java rename to dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/OkHTTPInstrumentationTest.java index 5394faec82..8f957c6658 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/OkHTTPInstrumentationTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/OkHTTPInstrumentationTest.java @@ -1,4 +1,4 @@ -package com.datadoghq.agent.integration; +package datadog.trace.agent.integration; import static org.assertj.core.api.Assertions.assertThat; diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/test/SayTracedHello.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/test/SayTracedHello.java similarity index 89% rename from dd-java-agent-ittests/src/test/java/com/datadoghq/agent/test/SayTracedHello.java rename to dd-java-agent-ittests/src/test/java/datadog/trace/agent/test/SayTracedHello.java index 1a96234a57..07df563ce2 100644 --- a/dd-java-agent-ittests/src/test/java/com/datadoghq/agent/test/SayTracedHello.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/test/SayTracedHello.java @@ -1,7 +1,7 @@ -package com.datadoghq.agent.test; +package datadog.trace.agent.test; -import com.datadoghq.trace.DDTags; -import com.datadoghq.trace.Trace; +import datadog.trace.api.DDTags; +import datadog.trace.api.Trace; import io.opentracing.tag.StringTag; import io.opentracing.util.GlobalTracer; diff --git a/dd-java-agent/benchmark-integration/src/main/java/dd/perftest/Worker.java b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/Worker.java similarity index 76% rename from dd-java-agent/benchmark-integration/src/main/java/dd/perftest/Worker.java rename to dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/Worker.java index 2e84a3fb74..7d78a276c3 100644 --- a/dd-java-agent/benchmark-integration/src/main/java/dd/perftest/Worker.java +++ b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/Worker.java @@ -1,9 +1,9 @@ -package dd.perftest; +package datadog.perftest; public class Worker { /** Simulate work for the give number of milliseconds. */ - public static void doWork(long workTimeMS) { + public static void doWork(final long workTimeMS) { final long doneTimestamp = System.currentTimeMillis() + workTimeMS; while (System.currentTimeMillis() < doneTimestamp) { // busy-wait to simulate work diff --git a/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/dd/perftest/jetty/JettyPerftest.java b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java similarity index 84% rename from dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/dd/perftest/jetty/JettyPerftest.java rename to dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java index 5d7b0bf5cf..d7484b78cd 100644 --- a/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/dd/perftest/jetty/JettyPerftest.java +++ b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java @@ -1,6 +1,6 @@ -package dd.perftest.jetty; +package datadog.perftest.jetty; -import dd.perftest.Worker; +import datadog.perftest.Worker; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -16,7 +16,7 @@ public class JettyPerftest { private static final Server jettyServer = new Server(PORT); private static final ServletContextHandler servletContext = new ServletContextHandler(); - public static void main(String[] args) throws Exception { + public static void main(final String[] args) throws Exception { servletContext.addServlet(PerfServlet.class, PATH); jettyServer.setHandler(servletContext); jettyServer.start(); @@ -24,11 +24,12 @@ public class JettyPerftest { Runtime.getRuntime() .addShutdownHook( new Thread() { + @Override public void run() { try { jettyServer.stop(); jettyServer.destroy(); - } catch (Exception e) { + } catch (final Exception e) { throw new IllegalStateException(e); } } @@ -36,10 +37,9 @@ public class JettyPerftest { } @WebServlet - @SuppressWarnings("serial") public static class PerfServlet extends HttpServlet { @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) + protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { if (request.getParameter("error") != null) { throw new RuntimeException("some sync error"); diff --git a/dd-java-agent/benchmark/out/jmh/resources/dd-trace.yaml b/dd-java-agent/benchmark/out/jmh/resources/dd-trace.yaml index 1db6000f5c..22d9698b6f 100644 --- a/dd-java-agent/benchmark/out/jmh/resources/dd-trace.yaml +++ b/dd-java-agent/benchmark/out/jmh/resources/dd-trace.yaml @@ -1 +1 @@ -enableCustomAnnotationTracingOver: ["com.datadoghq.benchmark"] +enableCustomAnnotationTracingOver: ["datadog.benchmark"] diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/A.java b/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/A.java deleted file mode 100644 index 34465b7b89..0000000000 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/A.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.datadoghq.benchmark.classes; - -public interface A { - void a(); -} diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/ClassRetransformingBenchmark.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/ClassRetransformingBenchmark.java similarity index 95% rename from dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/ClassRetransformingBenchmark.java rename to dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/ClassRetransformingBenchmark.java index fc4a8959d8..0b89027bef 100644 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/ClassRetransformingBenchmark.java +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/ClassRetransformingBenchmark.java @@ -1,7 +1,7 @@ -package com.datadoghq.benchmark; +package datadog.benchmark; -import com.datadoghq.benchmark.classes.TracedClass; -import com.datadoghq.benchmark.classes.UntracedClass; +import datadog.benchmark.classes.TracedClass; +import datadog.benchmark.classes.UntracedClass; import java.lang.instrument.Instrumentation; import java.lang.instrument.UnmodifiableClassException; import java.lang.reflect.Field; diff --git a/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/A.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/A.java new file mode 100644 index 0000000000..5db2f9007f --- /dev/null +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/A.java @@ -0,0 +1,5 @@ +package datadog.benchmark.classes; + +public interface A { + void a(); +} diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/B.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/B.java similarity index 52% rename from dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/B.java rename to dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/B.java index 7d823bfebf..6e45a51481 100644 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/B.java +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/B.java @@ -1,4 +1,4 @@ -package com.datadoghq.benchmark.classes; +package datadog.benchmark.classes; public interface B extends A { void b(); diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/C.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/C.java similarity index 52% rename from dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/C.java rename to dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/C.java index b13ceeb184..d124f05c42 100644 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/C.java +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/C.java @@ -1,4 +1,4 @@ -package com.datadoghq.benchmark.classes; +package datadog.benchmark.classes; public interface C extends B { void c(); diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/D.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/D.java similarity index 52% rename from dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/D.java rename to dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/D.java index 833b83ae81..ea8ffba11a 100644 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/D.java +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/D.java @@ -1,4 +1,4 @@ -package com.datadoghq.benchmark.classes; +package datadog.benchmark.classes; public interface D extends C { void d(); diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/E.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/E.java similarity index 52% rename from dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/E.java rename to dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/E.java index 3eb9b1f445..3ac6694578 100644 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/E.java +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/E.java @@ -1,4 +1,4 @@ -package com.datadoghq.benchmark.classes; +package datadog.benchmark.classes; public interface E extends D { void e(); diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/F.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/F.java similarity index 69% rename from dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/F.java rename to dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/F.java index 01ae85ec8b..b341841c16 100644 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/F.java +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/F.java @@ -1,4 +1,4 @@ -package com.datadoghq.benchmark.classes; +package datadog.benchmark.classes; public abstract class F implements E { public abstract void f(); diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/TracedClass.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/TracedClass.java similarity index 80% rename from dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/TracedClass.java rename to dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/TracedClass.java index b22f4fc237..4d39eec177 100644 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/TracedClass.java +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/TracedClass.java @@ -1,6 +1,6 @@ -package com.datadoghq.benchmark.classes; +package datadog.benchmark.classes; -import com.datadoghq.trace.Trace; +import datadog.trace.api.Trace; public class TracedClass extends UntracedClass { @Trace diff --git a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/UntracedClass.java b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/UntracedClass.java similarity index 85% rename from dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/UntracedClass.java rename to dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/UntracedClass.java index dd1ade768d..49bf506ea5 100644 --- a/dd-java-agent/benchmark/src/jmh/java/com/datadoghq/benchmark/classes/UntracedClass.java +++ b/dd-java-agent/benchmark/src/jmh/java/datadog/benchmark/classes/UntracedClass.java @@ -1,4 +1,4 @@ -package com.datadoghq.benchmark.classes; +package datadog.benchmark.classes; public class UntracedClass extends F { @Override diff --git a/dd-java-agent/benchmark/src/jmh/resources/dd-trace.yaml b/dd-java-agent/benchmark/src/jmh/resources/dd-trace.yaml index 1db6000f5c..22d9698b6f 100644 --- a/dd-java-agent/benchmark/src/jmh/resources/dd-trace.yaml +++ b/dd-java-agent/benchmark/src/jmh/resources/dd-trace.yaml @@ -1 +1 @@ -enableCustomAnnotationTracingOver: ["com.datadoghq.benchmark"] +enableCustomAnnotationTracingOver: ["datadog.benchmark"] diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle index 5f16a5b8a2..3c13a0a6da 100644 --- a/dd-java-agent/dd-java-agent.gradle +++ b/dd-java-agent/dd-java-agent.gradle @@ -10,14 +10,14 @@ apply from: "${rootDir}/gradle/jacoco.gradle" jacocoTestReport.dependsOn ':dd-java-agent-ittests:test' whitelistedInstructionClasses += whitelistedBranchClasses += [ - 'com.datadoghq.agent.*', - 'com.datadoghq.agent.integration.*', + 'datadog.agent.*', + 'datadog.agent.decorators.*', 'io.opentracing.contrib.*', 'dd.opentracing.contrib.*', ] dependencies { - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile project(':dd-trace-annotations') @@ -31,10 +31,10 @@ dependencies { testCompile deps.opentracingMock } -// add all subprojects under 'integrations' to the agent's dependencies +// add all subprojects under 'instrumentation' to the agent's dependencies Project java_agent_project = project subprojects { subProj -> - if (subProj.getPath().startsWith(java_agent_project.getPath() + ':integrations:')) { + if (subProj.getPath().startsWith(java_agent_project.getPath() + ':instrumentation:')) { java_agent_project.dependencies { compile(project(subProj.getPath())) } @@ -46,10 +46,9 @@ jar { manifest { attributes( - "Main-Class": "com.datadoghq.agent.DDJavaAgentInfo", - // I don't think we want to define this since we can't really load after startup: - //"Agent-Class": "com.datadoghq.trace.agent.TracingAgent", - "Premain-Class": "com.datadoghq.agent.TracingAgent", + "Main-Class": "datadog.trace.agent.DDJavaAgentInfo", + "Agent-Class": "datadog.trace.agent.TracingAgent", + "Premain-Class": "datadog.trace.agent.TracingAgent", "Can-Redefine-Classes": true, "Can-Retransform-Classes": true, ) @@ -61,24 +60,25 @@ shadowJar { mergeServiceFiles() // This triggers shadow to also apply the relocate rules below to the service files. - relocate 'org.slf4j', 'dd.slf4j' // Prevents conflict with other SLF4J instances. Important for premain. + relocate 'org.slf4j', 'datadog.slf4j' // Prevents conflict with other SLF4J instances. Important for premain. if (!project.hasProperty("disableShadowRelocate") || !disableShadowRelocate) { // These need to be relocated to prevent conflicts in case the regular dd-trace is already on the classpath. - relocate('com.datadoghq.trace', 'com.datadoghq.agent.tracer') { + relocate('datadog.trace.api', 'datadog.trace.agent.api') { // We want to ensure to not miss if a user is using the annotation. - exclude 'com.datadoghq.trace.Trace' + exclude 'datadog.trace.api.Trace' } + relocate('datadog.opentracing', 'datadog.trace.agent.api.opentracing') - relocate 'io.opentracing.contrib', 'dd.opentracing.contrib' + relocate 'io.opentracing.contrib', 'datadog.trace.agent.opentracing.contrib' - relocate 'org.yaml', 'dd.deps.org.yaml' - relocate 'org.msgpack', 'dd.deps.org.msgpack' - relocate 'com.fasterxml', 'dd.deps.com.fasterxml' + relocate 'org.yaml', 'datadog.trace.agent.deps.org.yaml' + relocate 'org.msgpack', 'datadog.trace.agent.deps.org.msgpack' + relocate 'com.fasterxml', 'datadog.trace.agent.deps.com.fasterxml' - relocate 'net.bytebuddy', 'dd.deps.net.bytebuddy' - relocate('com.google', 'dd.deps.com.google') { + relocate 'net.bytebuddy', 'datadog.trace.agent.deps.net.bytebuddy' + relocate('com.google', 'datadog.trace.agent.deps.com.google') { // This is used in the Cassandra Cluster.connectAsync signature so we can't relocate it. :fingers_crossed: exclude 'com.google.common.util.concurrent.ListenableFuture' } diff --git a/dd-java-agent/integrations/apache-httpclient-4.3/apache-httpclient-4.3.gradle b/dd-java-agent/instrumentation/apache-httpclient-4.3/apache-httpclient-4.3.gradle similarity index 97% rename from dd-java-agent/integrations/apache-httpclient-4.3/apache-httpclient-4.3.gradle rename to dd-java-agent/instrumentation/apache-httpclient-4.3/apache-httpclient-4.3.gradle index 21e4e288ba..1be5a4e5c1 100644 --- a/dd-java-agent/integrations/apache-httpclient-4.3/apache-httpclient-4.3.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient-4.3/apache-httpclient-4.3.gradle @@ -27,7 +27,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3' - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/apache-httpclient-4.3/src/main/java/dd/inst/apachehttpclient/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java similarity index 75% rename from dd-java-agent/integrations/apache-httpclient-4.3/src/main/java/dd/inst/apachehttpclient/ApacheHttpClientInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java index 4f61bcba27..27eeb178f4 100644 --- a/dd-java-agent/integrations/apache-httpclient-4.3/src/main/java/dd/inst/apachehttpclient/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java @@ -1,12 +1,13 @@ -package dd.inst.apachehttpclient; +package datadog.trace.instrumentation.apachehttpclient; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.named; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.util.GlobalTracer; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.asm.Advice; @@ -17,7 +18,7 @@ import org.apache.http.impl.execchain.ClientExecChain; public class ApacheHttpClientInstrumentation implements Instrumenter { @Override - public AgentBuilder instrument(AgentBuilder agentBuilder) { + public AgentBuilder instrument(final AgentBuilder agentBuilder) { return agentBuilder .type( named("org.apache.http.impl.client.HttpClientBuilder"), @@ -31,7 +32,9 @@ public class ApacheHttpClientInstrumentation implements Instrumenter { "org.apache.http.client.protocol.HttpClientContext", "org.apache.http.conn.routing.HttpRoute", "org.apache.http.impl.execchain.ClientExecChain")) - .transform(new HelperInjector("dd.inst.apachehttpclient.DDTracingClientExec")) + .transform( + new HelperInjector( + "datadog.trace.instrumentation.apachehttpclient.DDTracingClientExec")) .transform( DDAdvice.create() .advice( diff --git a/dd-java-agent/integrations/apache-httpclient-4.3/src/main/java/dd/inst/apachehttpclient/DDTracingClientExec.java b/dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/DDTracingClientExec.java similarity index 99% rename from dd-java-agent/integrations/apache-httpclient-4.3/src/main/java/dd/inst/apachehttpclient/DDTracingClientExec.java rename to dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/DDTracingClientExec.java index 7f337058a6..5675856701 100644 --- a/dd-java-agent/integrations/apache-httpclient-4.3/src/main/java/dd/inst/apachehttpclient/DDTracingClientExec.java +++ b/dd-java-agent/instrumentation/apache-httpclient-4.3/src/main/java/datadog/trace/instrumentation/apachehttpclient/DDTracingClientExec.java @@ -1,4 +1,4 @@ -package dd.inst.apachehttpclient; +package datadog.trace.instrumentation.apachehttpclient; import io.opentracing.ActiveSpan; import io.opentracing.Tracer; diff --git a/dd-java-agent/integrations/aws-sdk/aws-sdk.gradle b/dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle similarity index 95% rename from dd-java-agent/integrations/aws-sdk/aws-sdk.gradle rename to dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle index 6cd6ea5224..5ed377a2fe 100644 --- a/dd-java-agent/integrations/aws-sdk/aws-sdk.gradle +++ b/dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle @@ -21,7 +21,7 @@ dependencies { transitive = false } - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/aws-sdk/src/main/java/dd/inst/aws/AWSClientInstrumentation.java b/dd-java-agent/instrumentation/aws-sdk/src/main/java/datadog/trace/instrumentation/aws/AWSClientInstrumentation.java similarity index 89% rename from dd-java-agent/integrations/aws-sdk/src/main/java/dd/inst/aws/AWSClientInstrumentation.java rename to dd-java-agent/instrumentation/aws-sdk/src/main/java/datadog/trace/instrumentation/aws/AWSClientInstrumentation.java index 583f0d049e..7608137fa6 100644 --- a/dd-java-agent/integrations/aws-sdk/src/main/java/dd/inst/aws/AWSClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-sdk/src/main/java/datadog/trace/instrumentation/aws/AWSClientInstrumentation.java @@ -1,6 +1,6 @@ -package dd.inst.aws; +package datadog.trace.instrumentation.aws; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; @@ -8,9 +8,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.handlers.RequestHandler2; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.contrib.aws.TracingRequestHandler; import io.opentracing.util.GlobalTracer; import java.util.Arrays; diff --git a/dd-java-agent/integrations/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle b/dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle similarity index 98% rename from dd-java-agent/integrations/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle rename to dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle index 2c257a4aa2..f5407792e3 100644 --- a/dd-java-agent/integrations/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle +++ b/dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle @@ -37,7 +37,7 @@ dependencies { transitive = false } - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/datastax-cassandra-3.2/src/main/java/dd/inst/datastax/cassandra/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java similarity index 77% rename from dd-java-agent/integrations/datastax-cassandra-3.2/src/main/java/dd/inst/datastax/cassandra/CassandraClientInstrumentation.java rename to dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java index 3b983b0281..f500ef89a1 100644 --- a/dd-java-agent/integrations/datastax-cassandra-3.2/src/main/java/dd/inst/datastax/cassandra/CassandraClientInstrumentation.java +++ b/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java @@ -1,13 +1,16 @@ -package dd.inst.datastax.cassandra; +package datadog.trace.instrumentation.datastax.cassandra; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.isPrivate; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.datastax.driver.core.Session; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.Tracer; import io.opentracing.util.GlobalTracer; import java.lang.reflect.Constructor; @@ -17,7 +20,7 @@ import net.bytebuddy.asm.Advice; @AutoService(Instrumenter.class) public class CassandraClientInstrumentation implements Instrumenter { @Override - public AgentBuilder instrument(AgentBuilder agentBuilder) { + public AgentBuilder instrument(final AgentBuilder agentBuilder) { return agentBuilder .type( named("com.datastax.driver.core.Cluster$Manager"), @@ -68,8 +71,8 @@ public class CassandraClientInstrumentation implements Instrumenter { return; } - Class clazz = Class.forName("io.opentracing.contrib.cassandra.TracingSession"); - Constructor constructor = clazz.getDeclaredConstructor(Session.class, Tracer.class); + final Class clazz = Class.forName("io.opentracing.contrib.cassandra.TracingSession"); + final Constructor constructor = clazz.getDeclaredConstructor(Session.class, Tracer.class); constructor.setAccessible(true); session = (Session) constructor.newInstance(session, GlobalTracer.get()); } diff --git a/dd-java-agent/integrations/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy similarity index 96% rename from dd-java-agent/integrations/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy rename to dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy index 56225c1b97..186684990f 100644 --- a/dd-java-agent/integrations/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy +++ b/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy @@ -1,8 +1,8 @@ -import com.datadoghq.trace.DDBaseSpan -import com.datadoghq.trace.DDTracer import com.datastax.driver.core.Cluster import com.datastax.driver.core.Session -import dd.test.AgentTestRunner +import datadog.opentracing.DDBaseSpan +import datadog.opentracing.DDTracer +import datadog.trace.agent.test.AgentTestRunner import io.opentracing.tag.Tags import org.cassandraunit.utils.EmbeddedCassandraServerHelper diff --git a/dd-java-agent/integrations/jdbc/jdbc.gradle b/dd-java-agent/instrumentation/jdbc/jdbc.gradle similarity index 84% rename from dd-java-agent/integrations/jdbc/jdbc.gradle rename to dd-java-agent/instrumentation/jdbc/jdbc.gradle index 9a7a648aa8..f832c1a777 100644 --- a/dd-java-agent/integrations/jdbc/jdbc.gradle +++ b/dd-java-agent/instrumentation/jdbc/jdbc.gradle @@ -1,7 +1,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/ConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java similarity index 95% rename from dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/ConnectionInstrumentation.java rename to dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java index b4b3f1ad6c..ef28b63d94 100644 --- a/dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/ConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java @@ -1,4 +1,4 @@ -package dd.trace.instrumentation.jdbc; +package datadog.trace.instrumentation.jdbc; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; @@ -10,8 +10,8 @@ import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; import java.sql.Connection; import java.sql.PreparedStatement; import java.util.Map; diff --git a/dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java similarity index 95% rename from dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java rename to dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java index 7cabe8ef1c..c3a8dd5308 100644 --- a/dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java @@ -1,4 +1,4 @@ -package dd.trace.instrumentation.jdbc; +package datadog.trace.instrumentation.jdbc; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; @@ -8,10 +8,10 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; import io.opentracing.ActiveSpan; import io.opentracing.NoopActiveSpanSource; import io.opentracing.tag.Tags; diff --git a/dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java similarity index 94% rename from dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/StatementInstrumentation.java rename to dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java index 843d875e0d..d3c3760fee 100644 --- a/dd-java-agent/integrations/jdbc/src/main/java/dd/trace/instrumentation/jdbc/StatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java @@ -1,4 +1,4 @@ -package dd.trace.instrumentation.jdbc; +package datadog.trace.instrumentation.jdbc; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; @@ -8,10 +8,10 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; import io.opentracing.ActiveSpan; import io.opentracing.NoopActiveSpanSource; import io.opentracing.tag.Tags; diff --git a/dd-java-agent/integrations/jms-1/jms-1.gradle b/dd-java-agent/instrumentation/jms-1/jms-1.gradle similarity index 95% rename from dd-java-agent/integrations/jms-1/jms-1.gradle rename to dd-java-agent/instrumentation/jms-1/jms-1.gradle index ac5da34b20..633681b819 100644 --- a/dd-java-agent/integrations/jms-1/jms-1.gradle +++ b/dd-java-agent/instrumentation/jms-1/jms-1.gradle @@ -20,7 +20,7 @@ dependencies { compile deps.opentracing compile deps.autoservice - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') testCompile project(':dd-java-agent:testing') diff --git a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms/util/JmsUtil.java b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms/util/JmsUtil.java similarity index 95% rename from dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms/util/JmsUtil.java rename to dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms/util/JmsUtil.java index 1b74fe45eb..1d741d7f71 100644 --- a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms/util/JmsUtil.java +++ b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms/util/JmsUtil.java @@ -1,4 +1,4 @@ -package dd.inst.jms.util; +package datadog.trace.instrumentation.jms.util; import javax.jms.Destination; import javax.jms.Message; diff --git a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms/util/MessagePropertyTextMap.java b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms/util/MessagePropertyTextMap.java similarity index 96% rename from dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms/util/MessagePropertyTextMap.java rename to dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms/util/MessagePropertyTextMap.java index fc957cdf38..cd57aba2a2 100644 --- a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms/util/MessagePropertyTextMap.java +++ b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms/util/MessagePropertyTextMap.java @@ -1,4 +1,4 @@ -package dd.inst.jms.util; +package datadog.trace.instrumentation.jms.util; import io.opentracing.propagation.TextMap; import java.util.Enumeration; diff --git a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageConsumerInstrumentation.java similarity index 83% rename from dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageConsumerInstrumentation.java rename to dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageConsumerInstrumentation.java index ee44dd25fc..684ae3ff17 100644 --- a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageConsumerInstrumentation.java @@ -1,7 +1,7 @@ -package dd.inst.jms1; +package datadog.trace.instrumentation.jms1; -import static dd.inst.jms.util.JmsUtil.toResourceName; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -9,12 +9,12 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.inst.jms.util.MessagePropertyTextMap; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; +import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap; import io.opentracing.ActiveSpan; import io.opentracing.SpanContext; import io.opentracing.propagation.Format; @@ -30,7 +30,9 @@ import net.bytebuddy.asm.Advice; @AutoService(Instrumenter.class) public final class JMS1MessageConsumerInstrumentation implements Instrumenter { public static final HelperInjector JMS1_HELPER_INJECTOR = - new HelperInjector("dd.inst.jms.util.JmsUtil", "dd.inst.jms.util.MessagePropertyTextMap"); + new HelperInjector( + "datadog.trace.instrumentation.jms.util.JmsUtil", + "datadog.trace.instrumentation.jms.util.MessagePropertyTextMap"); @Override public AgentBuilder instrument(final AgentBuilder agentBuilder) { diff --git a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageListenerInstrumentation.java b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageListenerInstrumentation.java similarity index 88% rename from dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageListenerInstrumentation.java rename to dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageListenerInstrumentation.java index 860fb3285b..c788a56634 100644 --- a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageListenerInstrumentation.java @@ -1,7 +1,7 @@ -package dd.inst.jms1; +package datadog.trace.instrumentation.jms1; -import static dd.inst.jms.util.JmsUtil.toResourceName; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -9,11 +9,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.inst.jms.util.MessagePropertyTextMap; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; +import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap; import io.opentracing.ActiveSpan; import io.opentracing.SpanContext; import io.opentracing.propagation.Format; diff --git a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageProducerInstrumentation.java similarity index 92% rename from dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageProducerInstrumentation.java rename to dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageProducerInstrumentation.java index 55c5984b5d..7121a362f5 100644 --- a/dd-java-agent/integrations/jms-1/src/main/java/dd/inst/jms1/JMS1MessageProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-1/src/main/java/datadog/trace/instrumentation/jms1/JMS1MessageProducerInstrumentation.java @@ -1,7 +1,7 @@ -package dd.inst.jms1; +package datadog.trace.instrumentation.jms1; -import static dd.inst.jms.util.JmsUtil.toResourceName; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -9,11 +9,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.inst.jms.util.MessagePropertyTextMap; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; +import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap; import io.opentracing.ActiveSpan; import io.opentracing.propagation.Format; import io.opentracing.tag.Tags; diff --git a/dd-java-agent/integrations/jms-1/src/test/groovy/JMS1Test.groovy b/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy similarity index 99% rename from dd-java-agent/integrations/jms-1/src/test/groovy/JMS1Test.groovy rename to dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy index 64ad0d4572..56ae008043 100644 --- a/dd-java-agent/integrations/jms-1/src/test/groovy/JMS1Test.groovy +++ b/dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy @@ -1,4 +1,4 @@ -import dd.test.AgentTestRunner +import datadog.trace.agent.test.AgentTestRunner import org.apache.activemq.ActiveMQConnectionFactory import org.apache.activemq.ActiveMQMessageConsumer import org.apache.activemq.ActiveMQMessageProducer diff --git a/dd-java-agent/integrations/jms-2/jms-2.gradle b/dd-java-agent/instrumentation/jms-2/jms-2.gradle similarity index 89% rename from dd-java-agent/integrations/jms-2/jms-2.gradle rename to dd-java-agent/instrumentation/jms-2/jms-2.gradle index c318d88bc5..5ba90d61cf 100644 --- a/dd-java-agent/integrations/jms-2/jms-2.gradle +++ b/dd-java-agent/instrumentation/jms-2/jms-2.gradle @@ -15,7 +15,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { // use jms1 helpers - compile(project(':dd-java-agent:integrations:jms-1')) { + compile(project(':dd-java-agent:instrumentation:jms-1')) { transitive = false } compileOnly group: 'javax.jms', name: 'javax.jms-api', version: '2.0.1' @@ -24,7 +24,7 @@ dependencies { compile deps.opentracing compile deps.autoservice - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') testCompile project(':dd-java-agent:testing') diff --git a/dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageConsumerInstrumentation.java similarity index 83% rename from dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageConsumerInstrumentation.java rename to dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageConsumerInstrumentation.java index 645fbcc485..2ef79e1232 100644 --- a/dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageConsumerInstrumentation.java @@ -1,7 +1,7 @@ -package dd.inst.jms2; +package datadog.trace.instrumentation.jms2; -import static dd.inst.jms.util.JmsUtil.toResourceName; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -9,12 +9,12 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.inst.jms.util.MessagePropertyTextMap; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; +import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap; import io.opentracing.ActiveSpan; import io.opentracing.SpanContext; import io.opentracing.propagation.Format; @@ -30,7 +30,9 @@ import net.bytebuddy.asm.Advice; @AutoService(Instrumenter.class) public final class JMS2MessageConsumerInstrumentation implements Instrumenter { public static final HelperInjector JMS2_HELPER_INJECTOR = - new HelperInjector("dd.inst.jms.util.JmsUtil", "dd.inst.jms.util.MessagePropertyTextMap"); + new HelperInjector( + "datadog.trace.instrumentation.jms.util.JmsUtil", + "datadog.trace.instrumentation.jms.util.MessagePropertyTextMap"); @Override public AgentBuilder instrument(final AgentBuilder agentBuilder) { diff --git a/dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageListenerInstrumentation.java b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageListenerInstrumentation.java similarity index 88% rename from dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageListenerInstrumentation.java rename to dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageListenerInstrumentation.java index 5ccee8ff6b..40245abdab 100644 --- a/dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageListenerInstrumentation.java @@ -1,7 +1,7 @@ -package dd.inst.jms2; +package datadog.trace.instrumentation.jms2; -import static dd.inst.jms.util.JmsUtil.toResourceName; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -9,11 +9,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.inst.jms.util.MessagePropertyTextMap; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; +import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap; import io.opentracing.ActiveSpan; import io.opentracing.SpanContext; import io.opentracing.propagation.Format; diff --git a/dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageProducerInstrumentation.java similarity index 92% rename from dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageProducerInstrumentation.java rename to dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageProducerInstrumentation.java index d3797d898c..290797c399 100644 --- a/dd-java-agent/integrations/jms-2/src/main/java/dd/inst/jms2/JMS2MessageProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms-2/src/main/java/datadog/trace/instrumentation/jms2/JMS2MessageProducerInstrumentation.java @@ -1,7 +1,7 @@ -package dd.inst.jms2; +package datadog.trace.instrumentation.jms2; -import static dd.inst.jms.util.JmsUtil.toResourceName; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.instrumentation.jms.util.JmsUtil.toResourceName; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -9,11 +9,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.inst.jms.util.MessagePropertyTextMap; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; +import datadog.trace.instrumentation.jms.util.MessagePropertyTextMap; import io.opentracing.ActiveSpan; import io.opentracing.propagation.Format; import io.opentracing.tag.Tags; diff --git a/dd-java-agent/integrations/jms-2/src/test/groovy/JMS2Test.groovy b/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy similarity index 99% rename from dd-java-agent/integrations/jms-2/src/test/groovy/JMS2Test.groovy rename to dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy index 869ba42985..f1a10daa90 100644 --- a/dd-java-agent/integrations/jms-2/src/test/groovy/JMS2Test.groovy +++ b/dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy @@ -1,5 +1,5 @@ -import dd.test.AgentTestRunner import com.google.common.io.Files +import datadog.trace.agent.test.AgentTestRunner import org.hornetq.api.core.TransportConfiguration import org.hornetq.api.core.client.HornetQClient import org.hornetq.api.jms.HornetQJMSClient diff --git a/dd-java-agent/integrations/mongo-3.1/mongo-3.1.gradle b/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle similarity index 94% rename from dd-java-agent/integrations/mongo-3.1/mongo-3.1.gradle rename to dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle index 2d3bed6a33..11a79d9a08 100644 --- a/dd-java-agent/integrations/mongo-3.1/mongo-3.1.gradle +++ b/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle @@ -15,7 +15,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/mongo-3.1/src/main/java/dd/inst/mongo/DDTracingCommandListener.java b/dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/DDTracingCommandListener.java similarity index 98% rename from dd-java-agent/integrations/mongo-3.1/src/main/java/dd/inst/mongo/DDTracingCommandListener.java rename to dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/DDTracingCommandListener.java index b8e71bd942..8ed59c61ce 100644 --- a/dd-java-agent/integrations/mongo-3.1/src/main/java/dd/inst/mongo/DDTracingCommandListener.java +++ b/dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/DDTracingCommandListener.java @@ -1,10 +1,10 @@ -package dd.inst.mongo; +package datadog.trace.instrumentation.mongo; -import com.datadoghq.trace.DDTags; import com.mongodb.event.CommandFailedEvent; import com.mongodb.event.CommandListener; import com.mongodb.event.CommandStartedEvent; import com.mongodb.event.CommandSucceededEvent; +import datadog.trace.api.DDTags; import io.opentracing.Span; import io.opentracing.Tracer; import io.opentracing.tag.Tags; diff --git a/dd-java-agent/integrations/mongo-3.1/src/main/java/dd/inst/mongo/MongoClientInstrumentation.java b/dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClientInstrumentation.java similarity index 89% rename from dd-java-agent/integrations/mongo-3.1/src/main/java/dd/inst/mongo/MongoClientInstrumentation.java rename to dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClientInstrumentation.java index 2a8982eb17..db6c8c0234 100644 --- a/dd-java-agent/integrations/mongo-3.1/src/main/java/dd/inst/mongo/MongoClientInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClientInstrumentation.java @@ -1,4 +1,4 @@ -package dd.inst.mongo; +package datadog.trace.instrumentation.mongo; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -8,9 +8,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; import com.mongodb.MongoClientOptions; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.util.GlobalTracer; import java.lang.reflect.Modifier; import java.util.Collections; @@ -21,7 +21,7 @@ import net.bytebuddy.description.type.TypeDescription; @AutoService(Instrumenter.class) public final class MongoClientInstrumentation implements Instrumenter { public static final HelperInjector MONGO_HELPER_INJECTOR = - new HelperInjector("dd.inst.mongo.DDTracingCommandListener"); + new HelperInjector("datadog.trace.instrumentation.mongo.DDTracingCommandListener"); @Override public AgentBuilder instrument(final AgentBuilder agentBuilder) { diff --git a/dd-java-agent/integrations/mongo-3.1/src/test/java/dd/inst/mongo/MongoClientInstrumentationTest.java b/dd-java-agent/instrumentation/mongo-3.1/src/test/java/datadog/trace/instrumentation/mongo/MongoClientInstrumentationTest.java similarity index 79% rename from dd-java-agent/integrations/mongo-3.1/src/test/java/dd/inst/mongo/MongoClientInstrumentationTest.java rename to dd-java-agent/instrumentation/mongo-3.1/src/test/java/datadog/trace/instrumentation/mongo/MongoClientInstrumentationTest.java index fed631fd8e..3e3acefb9e 100644 --- a/dd-java-agent/integrations/mongo-3.1/src/test/java/dd/inst/mongo/MongoClientInstrumentationTest.java +++ b/dd-java-agent/instrumentation/mongo-3.1/src/test/java/datadog/trace/instrumentation/mongo/MongoClientInstrumentationTest.java @@ -1,14 +1,14 @@ -package dd.inst.mongo; +package datadog.trace.instrumentation.mongo; import static org.assertj.core.api.Java6Assertions.assertThat; -import com.datadoghq.trace.DDSpan; -import com.datadoghq.trace.DDTracer; import com.mongodb.ServerAddress; import com.mongodb.connection.ClusterId; import com.mongodb.connection.ConnectionDescription; import com.mongodb.connection.ServerId; import com.mongodb.event.CommandStartedEvent; +import datadog.opentracing.DDSpan; +import datadog.opentracing.DDTracer; import io.opentracing.tag.Tags; import java.util.Arrays; import java.util.List; @@ -39,14 +39,14 @@ public class MongoClientInstrumentationTest { @Test public void queryScrubbing() { // all "secret" strings should be scrubbed out of these queries - BsonDocument query1 = new BsonDocument("find", new BsonString("show")); + final BsonDocument query1 = new BsonDocument("find", new BsonString("show")); query1.put("stuff", new BsonString("secret")); - BsonDocument query2 = new BsonDocument("insert", new BsonString("table")); - BsonDocument query2_1 = new BsonDocument("count", new BsonString("show")); + final BsonDocument query2 = new BsonDocument("insert", new BsonString("table")); + final BsonDocument query2_1 = new BsonDocument("count", new BsonString("show")); query2_1.put("id", new BsonString("secret")); query2.put("docs", new BsonArray(Arrays.asList(new BsonString("secret"), query2_1))); - List queries = Arrays.asList(query1, query2); - for (BsonDocument query : queries) { + final List queries = Arrays.asList(query1, query2); + for (final BsonDocument query : queries) { final CommandStartedEvent cmd = new CommandStartedEvent(1, makeConnection(), "databasename", "query", query); diff --git a/dd-java-agent/integrations/mongo-async-3.3/mongo-async-3.3.gradle b/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle similarity index 84% rename from dd-java-agent/integrations/mongo-async-3.3/mongo-async-3.3.gradle rename to dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle index b1c213759c..26a09d4207 100644 --- a/dd-java-agent/integrations/mongo-async-3.3/mongo-async-3.3.gradle +++ b/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle @@ -14,12 +14,12 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { // use mongo listener - compile(project(':dd-java-agent:integrations:mongo-3.1')) { + compile(project(':dd-java-agent:instrumentation:mongo-3.1')) { transitive = false } compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2' - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/mongo-async-3.3/src/main/java/dd/inst/mongo/MongoAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/mongo-async-3.3/src/main/java/datadog/trace/instrumentation/mongo/MongoAsyncClientInstrumentation.java similarity index 94% rename from dd-java-agent/integrations/mongo-async-3.3/src/main/java/dd/inst/mongo/MongoAsyncClientInstrumentation.java rename to dd-java-agent/instrumentation/mongo-async-3.3/src/main/java/datadog/trace/instrumentation/mongo/MongoAsyncClientInstrumentation.java index e751924443..72439d6d03 100644 --- a/dd-java-agent/integrations/mongo-async-3.3/src/main/java/dd/inst/mongo/MongoAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo-async-3.3/src/main/java/datadog/trace/instrumentation/mongo/MongoAsyncClientInstrumentation.java @@ -1,4 +1,4 @@ -package dd.inst.mongo; +package datadog.trace.instrumentation.mongo; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -8,8 +8,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; import com.mongodb.async.client.MongoClientSettings; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.util.GlobalTracer; import java.lang.reflect.Modifier; import java.util.Collections; diff --git a/dd-java-agent/integrations/okhttp-3/okhttp-3.gradle b/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle similarity index 95% rename from dd-java-agent/integrations/okhttp-3/okhttp-3.gradle rename to dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle index a42c428dce..35880e87dc 100644 --- a/dd-java-agent/integrations/okhttp-3/okhttp-3.gradle +++ b/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle @@ -20,7 +20,7 @@ dependencies { transitive = false } - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/okhttp-3/src/main/java/dd/inst/okhttp3/OkHttp3Instrumentation.java b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java similarity index 90% rename from dd-java-agent/integrations/okhttp-3/src/main/java/dd/inst/okhttp3/OkHttp3Instrumentation.java rename to dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java index 162ea51cfd..ed9b0d760c 100644 --- a/dd-java-agent/integrations/okhttp-3/src/main/java/dd/inst/okhttp3/OkHttp3Instrumentation.java +++ b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java @@ -1,15 +1,15 @@ -package dd.inst.okhttp3; +package datadog.trace.instrumentation.okhttp3; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static io.opentracing.contrib.okhttp3.OkHttpClientSpanDecorator.STANDARD_TAGS; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.contrib.okhttp3.TracingInterceptor; import io.opentracing.util.GlobalTracer; import java.util.Collections; diff --git a/dd-java-agent/integrations/okhttp-3/src/test/groovy/OkHttp3Test.groovy b/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy similarity index 96% rename from dd-java-agent/integrations/okhttp-3/src/test/groovy/OkHttp3Test.groovy rename to dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy index 12c40e962f..8b3577c25b 100644 --- a/dd-java-agent/integrations/okhttp-3/src/test/groovy/OkHttp3Test.groovy +++ b/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy @@ -1,5 +1,5 @@ -import com.datadoghq.trace.DDTags -import dd.test.AgentTestRunner +import datadog.trace.api.DDTags +import datadog.trace.agent.test.AgentTestRunner import io.opentracing.tag.Tags import okhttp3.OkHttpClient import okhttp3.Request diff --git a/dd-java-agent/integrations/servlet-2/servlet-2.gradle b/dd-java-agent/instrumentation/servlet-2/servlet-2.gradle similarity index 94% rename from dd-java-agent/integrations/servlet-2/servlet-2.gradle rename to dd-java-agent/instrumentation/servlet-2/servlet-2.gradle index ae0f1fc874..497574f764 100644 --- a/dd-java-agent/integrations/servlet-2/servlet-2.gradle +++ b/dd-java-agent/instrumentation/servlet-2/servlet-2.gradle @@ -18,7 +18,7 @@ dependencies { transitive = false } - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/servlet-2/src/main/java/dd/inst/servlet2/FilterChain2Instrumentation.java b/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/FilterChain2Instrumentation.java similarity index 94% rename from dd-java-agent/integrations/servlet-2/src/main/java/dd/inst/servlet2/FilterChain2Instrumentation.java rename to dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/FilterChain2Instrumentation.java index c12601148c..007d889da1 100644 --- a/dd-java-agent/integrations/servlet-2/src/main/java/dd/inst/servlet2/FilterChain2Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/FilterChain2Instrumentation.java @@ -1,6 +1,6 @@ -package dd.inst.servlet2; +package datadog.trace.instrumentation.servlet2; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -9,9 +9,9 @@ import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.ActiveSpan; import io.opentracing.SpanContext; import io.opentracing.contrib.web.servlet.filter.HttpServletRequestExtractAdapter; diff --git a/dd-java-agent/integrations/servlet-2/src/main/java/dd/inst/servlet2/HttpServlet2Instrumentation.java b/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServlet2Instrumentation.java similarity index 93% rename from dd-java-agent/integrations/servlet-2/src/main/java/dd/inst/servlet2/HttpServlet2Instrumentation.java rename to dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServlet2Instrumentation.java index 11ac11efc5..a468825fa3 100644 --- a/dd-java-agent/integrations/servlet-2/src/main/java/dd/inst/servlet2/HttpServlet2Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServlet2Instrumentation.java @@ -1,6 +1,6 @@ -package dd.inst.servlet2; +package datadog.trace.instrumentation.servlet2; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isProtected; @@ -9,9 +9,9 @@ import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.ActiveSpan; import io.opentracing.SpanContext; import io.opentracing.contrib.web.servlet.filter.HttpServletRequestExtractAdapter; diff --git a/dd-java-agent/integrations/servlet-3/servlet-3.gradle b/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle similarity index 94% rename from dd-java-agent/integrations/servlet-3/servlet-3.gradle rename to dd-java-agent/instrumentation/servlet-3/servlet-3.gradle index d587b8cde7..cd054b36f2 100644 --- a/dd-java-agent/integrations/servlet-3/servlet-3.gradle +++ b/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle @@ -19,7 +19,7 @@ dependencies { transitive = false } - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/servlet-3/src/main/java/dd/inst/servlet3/FilterChain3Instrumentation.java b/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java similarity index 96% rename from dd-java-agent/integrations/servlet-3/src/main/java/dd/inst/servlet3/FilterChain3Instrumentation.java rename to dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java index 7b986e3a7c..f0b2530221 100644 --- a/dd-java-agent/integrations/servlet-3/src/main/java/dd/inst/servlet3/FilterChain3Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/FilterChain3Instrumentation.java @@ -1,6 +1,6 @@ -package dd.inst.servlet3; +package datadog.trace.instrumentation.servlet3; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -9,9 +9,9 @@ import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.ActiveSpan; import io.opentracing.SpanContext; import io.opentracing.contrib.web.servlet.filter.HttpServletRequestExtractAdapter; diff --git a/dd-java-agent/integrations/servlet-3/src/main/java/dd/inst/servlet3/HttpServlet3Instrumentation.java b/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java similarity index 96% rename from dd-java-agent/integrations/servlet-3/src/main/java/dd/inst/servlet3/HttpServlet3Instrumentation.java rename to dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java index ae36615b9d..81fb9bcafe 100644 --- a/dd-java-agent/integrations/servlet-3/src/main/java/dd/inst/servlet3/HttpServlet3Instrumentation.java +++ b/dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServlet3Instrumentation.java @@ -1,6 +1,6 @@ -package dd.inst.servlet3; +package datadog.trace.instrumentation.servlet3; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isProtected; @@ -9,9 +9,9 @@ import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.HelperInjector; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.HelperInjector; +import datadog.trace.agent.tooling.Instrumenter; import io.opentracing.ActiveSpan; import io.opentracing.SpanContext; import io.opentracing.contrib.web.servlet.filter.HttpServletRequestExtractAdapter; diff --git a/dd-java-agent/integrations/spring-web/spring-web.gradle b/dd-java-agent/instrumentation/spring-web/spring-web.gradle similarity index 95% rename from dd-java-agent/integrations/spring-web/spring-web.gradle rename to dd-java-agent/instrumentation/spring-web/spring-web.gradle index 85cf27beeb..b4042b3d3e 100644 --- a/dd-java-agent/integrations/spring-web/spring-web.gradle +++ b/dd-java-agent/instrumentation/spring-web/spring-web.gradle @@ -19,7 +19,7 @@ dependencies { // compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '2.5.6' // compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.4' - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/integrations/spring-web/src/main/java/dd/inst/springweb/SpringWebInstrumentation.java b/dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/SpringWebInstrumentation.java similarity index 90% rename from dd-java-agent/integrations/spring-web/src/main/java/dd/inst/springweb/SpringWebInstrumentation.java rename to dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/SpringWebInstrumentation.java index c9dda67d97..75cb684e63 100644 --- a/dd-java-agent/integrations/spring-web/src/main/java/dd/inst/springweb/SpringWebInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/SpringWebInstrumentation.java @@ -1,6 +1,6 @@ -package dd.inst.springweb; +package datadog.trace.instrumentation.springweb; -import static dd.trace.ClassLoaderMatcher.classLoaderHasClassWithField; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClassWithField; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -10,10 +10,10 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -import com.datadoghq.trace.DDTags; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDTags; import io.opentracing.ActiveSpan; import io.opentracing.util.GlobalTracer; import java.sql.PreparedStatement; diff --git a/dd-java-agent/integrations/trace-annotation/src/main/java/dd/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java similarity index 87% rename from dd-java-agent/integrations/trace-annotation/src/main/java/dd/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java rename to dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java index 1a534913f5..83da1ce943 100644 --- a/dd-java-agent/integrations/trace-annotation/src/main/java/dd/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java +++ b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java @@ -1,13 +1,13 @@ -package dd.trace.instrumentation.trace_annotation; +package datadog.trace.instrumentation.trace_annotation; import static net.bytebuddy.matcher.ElementMatchers.declaresMethod; import static net.bytebuddy.matcher.ElementMatchers.hasSuperType; import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith; -import com.datadoghq.trace.Trace; import com.google.auto.service.AutoService; -import dd.trace.DDAdvice; -import dd.trace.Instrumenter; +import datadog.trace.agent.tooling.DDAdvice; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.Trace; import io.opentracing.ActiveSpan; import io.opentracing.tag.Tags; import io.opentracing.util.GlobalTracer; @@ -39,7 +39,7 @@ public final class TraceAnnotationInstrumentation implements Instrumenter { final Trace trace = method.getAnnotation(Trace.class); String operationName = trace == null ? null : trace.operationName(); if (operationName == null || operationName.isEmpty()) { - operationName = method.getDeclaringClass().getName() + "." + method.getName(); + operationName = method.getDeclaringClass().getSimpleName() + "." + method.getName(); } return GlobalTracer.get().buildSpan(operationName).startActive(); diff --git a/dd-java-agent/integrations/trace-annotation/trace-annotation.gradle b/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle similarity index 87% rename from dd-java-agent/integrations/trace-annotation/trace-annotation.gradle rename to dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle index fcff7da5f5..4cc002a9cf 100644 --- a/dd-java-agent/integrations/trace-annotation/trace-annotation.gradle +++ b/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle @@ -1,7 +1,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-trace-annotations') compile project(':dd-java-agent:tooling') diff --git a/dd-java-agent/src/main/java/com/datadoghq/agent/DDJavaAgentInfo.java b/dd-java-agent/src/main/java/datadog/trace/agent/DDJavaAgentInfo.java similarity index 96% rename from dd-java-agent/src/main/java/com/datadoghq/agent/DDJavaAgentInfo.java rename to dd-java-agent/src/main/java/datadog/trace/agent/DDJavaAgentInfo.java index 776b2b9c76..39d7000501 100644 --- a/dd-java-agent/src/main/java/com/datadoghq/agent/DDJavaAgentInfo.java +++ b/dd-java-agent/src/main/java/datadog/trace/agent/DDJavaAgentInfo.java @@ -1,4 +1,4 @@ -package com.datadoghq.agent; +package datadog.trace.agent; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/dd-java-agent/src/main/java/com/datadoghq/agent/TracingAgent.java b/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java similarity index 87% rename from dd-java-agent/src/main/java/com/datadoghq/agent/TracingAgent.java rename to dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java index ed1d94c8b7..f193703e24 100644 --- a/dd-java-agent/src/main/java/com/datadoghq/agent/TracingAgent.java +++ b/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datadoghq.agent; +package datadog.trace.agent; -import com.datadoghq.trace.DDTraceAnnotationsInfo; -import com.datadoghq.trace.DDTraceInfo; +import datadog.opentracing.DDTraceOTInfo; +import datadog.trace.agent.tooling.AgentInstaller; +import datadog.trace.api.DDTraceAnnotationsInfo; import io.opentracing.Tracer; import io.opentracing.contrib.tracerresolver.TracerResolver; import io.opentracing.util.GlobalTracer; @@ -27,7 +28,7 @@ import lombok.extern.slf4j.Slf4j; /** Entry point for initializing the agent. */ @Slf4j public class TracingAgent { - public static void premain(String agentArgs, final Instrumentation inst) throws Exception { + public static void premain(final String agentArgs, final Instrumentation inst) throws Exception { log.debug("Using premain for loading {}", TracingAgent.class.getName()); AgentInstaller.installBytebuddyAgent(inst); logVersionInfo(); @@ -46,7 +47,7 @@ public class TracingAgent { // version classes log important info // in static initializers DDJavaAgentInfo.VERSION.toString(); - DDTraceInfo.VERSION.toString(); + DDTraceOTInfo.VERSION.toString(); DDTraceAnnotationsInfo.VERSION.toString(); } diff --git a/dd-java-agent/src/test/resources/supported-version-test.yaml b/dd-java-agent/src/test/resources/supported-version-test.yaml deleted file mode 100644 index 34aa8a5791..0000000000 --- a/dd-java-agent/src/test/resources/supported-version-test.yaml +++ /dev/null @@ -1,39 +0,0 @@ -unsupportedRuleOne: - - artifact: artifact-1 - - - artifact: artifact-2 - identifying_present_classes: - identifying_missing_classes: - -unsupportedRuleTwo: - - artifact: artifact-1 - supported_version: 2\.3\. - identifying_present_classes: - com.datadoghq.agent.InstrumentationCheckerTest$DemoClass1: missingMethod - -supportedRuleOne: - - artifact: artifact-3 - supported_version: 5\..* - identifying_present_classes: - com.datadoghq.agent.InstrumentationCheckerTest$DemoClass1: - com.datadoghq.agent.InstrumentationCheckerTest$DemoClass2: - com.datadoghq.agent.InstrumentationCheckerTest$DemoClass3: - -supportedRuleTwo: - - artifact: artifact-1 - supported_version: 1\.2\.3\..* - identifying_present_classes: - com.datadoghq.agent.InstrumentationCheckerTest$DemoClass1: testMethod - com.datadoghq.agent.InstrumentationCheckerTest$DemoClass2: - - - artifact: artifact-2 - supported_version: 4\..* - identifying_present_classes: - com.datadoghq.agent.InstrumentationCheckerTest$DemoClass3: missingMethod - -unsupportedRuleThree: - - artifact: foo - supported_version: 1 - identifying_present_classes: - com.datadoghq.agent.InstrumentationCheckerTest$DemoClass1: - com.datadoghq.agent.InstrumentationCheckerTest$MissingClass: diff --git a/dd-java-agent/testing/src/main/java/dd/test/AgentTestRunner.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/AgentTestRunner.java similarity index 85% rename from dd-java-agent/testing/src/main/java/dd/test/AgentTestRunner.java rename to dd-java-agent/testing/src/main/java/datadog/trace/agent/test/AgentTestRunner.java index aa719407da..ac75816b35 100644 --- a/dd-java-agent/testing/src/main/java/dd/test/AgentTestRunner.java +++ b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/AgentTestRunner.java @@ -1,8 +1,9 @@ -package dd.test; +package datadog.trace.agent.test; -import com.datadoghq.agent.AgentInstaller; -import com.datadoghq.trace.DDTracer; -import com.datadoghq.trace.writer.ListWriter; +import datadog.opentracing.DDTracer; +import datadog.trace.agent.tooling.AgentInstaller; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.writer.ListWriter; import io.opentracing.Tracer; import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.Instrumentation; @@ -22,8 +23,8 @@ import spock.lang.Specification; * This will cause the following to occur before test startup: * *
    - *
  • All {@link dd.trace.Instrumenter}s on the test classpath will be applied. Matching - * preloaded classes will be retransformed. + *
  • All {@link Instrumenter}s on the test classpath will be applied. Matching preloaded classes + * will be retransformed. *
  • {@link AgentTestRunner#TEST_WRITER} will be registerd with the global tracer and available * in an initialized state. *
diff --git a/dd-java-agent/testing/src/main/java/dd/test/TestUtils.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/TestUtils.java similarity index 73% rename from dd-java-agent/testing/src/main/java/dd/test/TestUtils.java rename to dd-java-agent/testing/src/main/java/datadog/trace/agent/test/TestUtils.java index 25fcb2a3e6..c94f497cbc 100644 --- a/dd-java-agent/testing/src/main/java/dd/test/TestUtils.java +++ b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/TestUtils.java @@ -1,6 +1,6 @@ -package dd.test; +package datadog.trace.agent.test; -import com.datadoghq.agent.Utils; +import datadog.trace.agent.tooling.Utils; import io.opentracing.ActiveSpan; import io.opentracing.Tracer; import io.opentracing.util.GlobalTracer; @@ -29,7 +29,7 @@ public class TestUtils { } } - public static void registerOrReplaceGlobalTracer(Tracer tracer) { + public static void registerOrReplaceGlobalTracer(final Tracer tracer) { try { GlobalTracer.register(tracer); } catch (final Exception e) { @@ -39,7 +39,7 @@ public class TestUtils { field = GlobalTracer.class.getDeclaredField("tracer"); field.setAccessible(true); field.set(null, tracer); - } catch (Exception e2) { + } catch (final Exception e2) { throw new IllegalStateException(e2); } finally { if (null != field) { @@ -54,12 +54,12 @@ public class TestUtils { } public static Object runUnderTrace( - final String rootOperationName, Callable r) { - ActiveSpan rootSpan = GlobalTracer.get().buildSpan(rootOperationName).startActive(); + final String rootOperationName, final Callable r) { + final ActiveSpan rootSpan = GlobalTracer.get().buildSpan(rootOperationName).startActive(); try { try { return r.call(); - } catch (Exception e) { + } catch (final Exception e) { throw new IllegalStateException(e); } } finally { @@ -67,10 +67,10 @@ public class TestUtils { } } - public static boolean isClassLoaded(String className, ClassLoader classLoader) { + public static boolean isClassLoaded(final String className, final ClassLoader classLoader) { try { findLoadedClassMethod.setAccessible(true); - Class loadedClass = (Class) findLoadedClassMethod.invoke(classLoader, className); + final Class loadedClass = (Class) findLoadedClassMethod.invoke(classLoader, className); return null != loadedClass && loadedClass.getClassLoader() == classLoader; } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { throw new IllegalStateException(e); @@ -88,13 +88,13 @@ public class TestUtils { * @return the location of the newly created jar. * @throws IOException */ - public static URL createJarWithClasses(Class... classes) throws IOException { + public static URL createJarWithClasses(final Class... classes) throws IOException { final File tmpJar = File.createTempFile(UUID.randomUUID().toString() + "", ".jar"); tmpJar.deleteOnExit(); final Manifest manifest = new Manifest(); - JarOutputStream target = new JarOutputStream(new FileOutputStream(tmpJar), manifest); - for (Class clazz : classes) { + final JarOutputStream target = new JarOutputStream(new FileOutputStream(tmpJar), manifest); + for (final Class clazz : classes) { addToJar(clazz, target); } target.close(); @@ -102,17 +102,18 @@ public class TestUtils { return tmpJar.toURI().toURL(); } - private static void addToJar(Class clazz, JarOutputStream jarOutputStream) throws IOException { + private static void addToJar(final Class clazz, final JarOutputStream jarOutputStream) + throws IOException { InputStream inputStream = null; try { - JarEntry entry = new JarEntry(Utils.getResourceName(clazz.getName())); + final JarEntry entry = new JarEntry(Utils.getResourceName(clazz.getName())); jarOutputStream.putNextEntry(entry); inputStream = clazz.getClassLoader().getResourceAsStream(Utils.getResourceName(clazz.getName())); - byte[] buffer = new byte[1024]; + final byte[] buffer = new byte[1024]; while (true) { - int count = inputStream.read(buffer); + final int count = inputStream.read(buffer); if (count == -1) { break; } diff --git a/dd-java-agent/testing/testing.gradle b/dd-java-agent/testing/testing.gradle index 13a3e262af..a91ff452a9 100644 --- a/dd-java-agent/testing/testing.gradle +++ b/dd-java-agent/testing/testing.gradle @@ -7,6 +7,6 @@ dependencies { compile deps.opentracing compile deps.spock - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') } diff --git a/dd-java-agent/tooling/src/main/java/com/datadoghq/agent/AgentInstaller.java b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java similarity index 89% rename from dd-java-agent/tooling/src/main/java/com/datadoghq/agent/AgentInstaller.java rename to dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java index 1efc883589..e50dd1bce1 100644 --- a/dd-java-agent/tooling/src/main/java/com/datadoghq/agent/AgentInstaller.java +++ b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java @@ -1,14 +1,13 @@ -package com.datadoghq.agent; +package datadog.trace.agent.tooling; -import static dd.trace.ClassLoaderMatcher.classLoaderWithName; -import static dd.trace.ClassLoaderMatcher.isReflectionClassLoader; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderWithName; +import static datadog.trace.agent.tooling.ClassLoaderMatcher.isReflectionClassLoader; import static net.bytebuddy.matcher.ElementMatchers.any; import static net.bytebuddy.matcher.ElementMatchers.isBootstrapClassLoader; import static net.bytebuddy.matcher.ElementMatchers.nameContains; import static net.bytebuddy.matcher.ElementMatchers.nameMatches; import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith; -import dd.trace.Instrumenter; import java.lang.instrument.Instrumentation; import java.util.ServiceLoader; import lombok.extern.slf4j.Slf4j; @@ -22,8 +21,7 @@ import net.bytebuddy.utility.JavaModule; public class AgentInstaller { /** - * Install the core bytebuddy agent along with all implementations of {@link - * dd.trace.Instrumenter}. + * Install the core bytebuddy agent along with all implementations of {@link Instrumenter}. * * @param inst Java Instrumentation used to install bytebuddy * @return the agent's class transformer @@ -34,10 +32,9 @@ public class AgentInstaller { .disableClassFormatChanges() .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION) .with(new LoggingListener()) - .ignore(nameStartsWith("com.datadoghq.agent.integration")) - .or(nameStartsWith("dd.trace")) - .or(nameStartsWith("dd.inst")) - .or(nameStartsWith("dd.deps")) + .ignore(nameStartsWith("datadog.trace.")) + .or(nameStartsWith("datadog.opentracing.")) + .or(nameStartsWith("datadog.slf4j.")) .or(nameStartsWith("java.")) .or(nameStartsWith("com.sun.")) .or(nameStartsWith("sun.")) diff --git a/dd-java-agent/tooling/src/main/java/dd/trace/ClassLoaderMatcher.java b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/ClassLoaderMatcher.java similarity index 98% rename from dd-java-agent/tooling/src/main/java/dd/trace/ClassLoaderMatcher.java rename to dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/ClassLoaderMatcher.java index ef74999504..d1d141c93a 100644 --- a/dd-java-agent/tooling/src/main/java/dd/trace/ClassLoaderMatcher.java +++ b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/ClassLoaderMatcher.java @@ -1,4 +1,4 @@ -package dd.trace; +package datadog.trace.agent.tooling; import java.util.WeakHashMap; import net.bytebuddy.matcher.ElementMatcher; diff --git a/dd-java-agent/tooling/src/main/java/dd/trace/DDAdvice.java b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/DDAdvice.java similarity index 95% rename from dd-java-agent/tooling/src/main/java/dd/trace/DDAdvice.java rename to dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/DDAdvice.java index 89844525f3..bce90f5e92 100644 --- a/dd-java-agent/tooling/src/main/java/dd/trace/DDAdvice.java +++ b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/DDAdvice.java @@ -1,6 +1,5 @@ -package dd.trace; +package datadog.trace.agent.tooling; -import com.datadoghq.agent.Utils; import net.bytebuddy.agent.builder.AgentBuilder; import net.bytebuddy.agent.builder.AgentBuilder.LocationStrategy; import net.bytebuddy.dynamic.ClassFileLocator; diff --git a/dd-java-agent/tooling/src/main/java/dd/trace/ExceptionHandlers.java b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java similarity index 95% rename from dd-java-agent/tooling/src/main/java/dd/trace/ExceptionHandlers.java rename to dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java index 3189765afd..00a993b1a7 100644 --- a/dd-java-agent/tooling/src/main/java/dd/trace/ExceptionHandlers.java +++ b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java @@ -1,4 +1,4 @@ -package dd.trace; +package datadog.trace.agent.tooling; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.implementation.bytecode.StackManipulation; diff --git a/dd-java-agent/tooling/src/main/java/dd/trace/HelperInjector.java b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java similarity index 94% rename from dd-java-agent/tooling/src/main/java/dd/trace/HelperInjector.java rename to dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java index 5f8099acf8..08c163fb2e 100644 --- a/dd-java-agent/tooling/src/main/java/dd/trace/HelperInjector.java +++ b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java @@ -1,6 +1,5 @@ -package dd.trace; +package datadog.trace.agent.tooling; -import com.datadoghq.agent.Utils; import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -27,7 +26,7 @@ public class HelperInjector implements Transformer { * Construct HelperInjector. * * @param helperClassNames binary names of the helper classes to inject. These class names must be - * resolvable by the classloader returned by dd.trace.DDAdvice#getAgentClassLoader() + * resolvable by the classloader returned by DDAdvice#getAgentClassLoader() */ public HelperInjector(final String... helperClassNames) { this.helperClassNames = new HashSet<>(Arrays.asList(helperClassNames)); diff --git a/dd-java-agent/tooling/src/main/java/dd/trace/Instrumenter.java b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java similarity index 78% rename from dd-java-agent/tooling/src/main/java/dd/trace/Instrumenter.java rename to dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java index 70df3b6e8b..629364a23e 100644 --- a/dd-java-agent/tooling/src/main/java/dd/trace/Instrumenter.java +++ b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java @@ -1,4 +1,4 @@ -package dd.trace; +package datadog.trace.agent.tooling; import net.bytebuddy.agent.builder.AgentBuilder; diff --git a/dd-java-agent/tooling/src/main/java/com/datadoghq/agent/Utils.java b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/Utils.java similarity index 75% rename from dd-java-agent/tooling/src/main/java/com/datadoghq/agent/Utils.java rename to dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/Utils.java index 442fb6bf21..536aa0868f 100644 --- a/dd-java-agent/tooling/src/main/java/com/datadoghq/agent/Utils.java +++ b/dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/Utils.java @@ -1,4 +1,4 @@ -package com.datadoghq.agent; +package datadog.trace.agent.tooling; public class Utils { /** Return the classloader the core agent is running on. */ @@ -7,7 +7,7 @@ public class Utils { } /** com.foo.Bar -> com/foo/Bar.class */ - public static String getResourceName(String className) { + public static String getResourceName(final String className) { return className.replace('.', '/') + ".class"; } diff --git a/dd-java-agent/tooling/src/test/groovy/dd/test/HelperClass.java b/dd-java-agent/tooling/src/test/groovy/datadog/trace/agent/test/HelperClass.java similarity index 65% rename from dd-java-agent/tooling/src/test/groovy/dd/test/HelperClass.java rename to dd-java-agent/tooling/src/test/groovy/datadog/trace/agent/test/HelperClass.java index 0deefbf9ff..91ed6a4271 100644 --- a/dd-java-agent/tooling/src/test/groovy/dd/test/HelperClass.java +++ b/dd-java-agent/tooling/src/test/groovy/datadog/trace/agent/test/HelperClass.java @@ -1,4 +1,4 @@ -package dd.test; +package datadog.trace.agent.test; /** Used by {@link HelperInjectionTest} */ class HelperClass {} diff --git a/dd-java-agent/tooling/src/test/groovy/dd/test/HelperInjectionTest.groovy b/dd-java-agent/tooling/src/test/groovy/datadog/trace/agent/test/HelperInjectionTest.groovy similarity index 90% rename from dd-java-agent/tooling/src/test/groovy/dd/test/HelperInjectionTest.groovy rename to dd-java-agent/tooling/src/test/groovy/datadog/trace/agent/test/HelperInjectionTest.groovy index e5221c618a..8ee475779a 100644 --- a/dd-java-agent/tooling/src/test/groovy/dd/test/HelperInjectionTest.groovy +++ b/dd-java-agent/tooling/src/test/groovy/datadog/trace/agent/test/HelperInjectionTest.groovy @@ -1,11 +1,10 @@ -package dd.test +package datadog.trace.agent.test -import com.datadoghq.agent.Utils -import dd.trace.HelperInjector -import java.lang.reflect.Method +import datadog.trace.agent.tooling.HelperInjector +import datadog.trace.agent.tooling.Utils import spock.lang.Specification -import static net.bytebuddy.matcher.ElementMatchers.* +import java.lang.reflect.Method class HelperInjectionTest extends Specification { @@ -13,7 +12,7 @@ class HelperInjectionTest extends Specification { setup: String helperClassName = HelperInjectionTest.getPackage().getName() + '.HelperClass' HelperInjector injector = new HelperInjector(helperClassName) - URLClassLoader emptyLoader = new URLClassLoader(new URL[0], (ClassLoader)null) + URLClassLoader emptyLoader = new URLClassLoader(new URL[0], (ClassLoader) null) when: emptyLoader.loadClass(helperClassName) @@ -31,7 +30,7 @@ class HelperInjectionTest extends Specification { cleanup: emptyLoader?.close() } - + private static boolean isClassLoaded(String className, ClassLoader classLoader) { final Method findLoadedClassMethod = ClassLoader.getDeclaredMethod("findLoadedClass", String) try { diff --git a/dd-trace-annotations/src/main/java/com/datadoghq/trace/DDTraceAnnotationsInfo.java b/dd-trace-annotations/src/main/java/datadog/trace/api/DDTraceAnnotationsInfo.java similarity index 91% rename from dd-trace-annotations/src/main/java/com/datadoghq/trace/DDTraceAnnotationsInfo.java rename to dd-trace-annotations/src/main/java/datadog/trace/api/DDTraceAnnotationsInfo.java index 4ed3c82c6b..b0830763ab 100644 --- a/dd-trace-annotations/src/main/java/com/datadoghq/trace/DDTraceAnnotationsInfo.java +++ b/dd-trace-annotations/src/main/java/datadog/trace/api/DDTraceAnnotationsInfo.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace; +package datadog.trace.api; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -28,7 +28,7 @@ public class DDTraceAnnotationsInfo { log.info("dd-trace-annotations - version: {}", v); } - public static void main(String... args) { + public static void main(final String... args) { System.out.println(VERSION); } } diff --git a/dd-trace-annotations/src/main/java/com/datadoghq/trace/Trace.java b/dd-trace-annotations/src/main/java/datadog/trace/api/Trace.java similarity index 94% rename from dd-trace-annotations/src/main/java/com/datadoghq/trace/Trace.java rename to dd-trace-annotations/src/main/java/datadog/trace/api/Trace.java index 70d71e8c7d..8da196487a 100644 --- a/dd-trace-annotations/src/main/java/com/datadoghq/trace/Trace.java +++ b/dd-trace-annotations/src/main/java/datadog/trace/api/Trace.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace; +package datadog.trace.api; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/dd-trace-examples/dropwizard-mongo-client/src/main/resources/configuration.yaml b/dd-trace-examples/dropwizard-mongo-client/src/main/resources/configuration.yaml deleted file mode 100644 index fc42844e8e..0000000000 --- a/dd-trace-examples/dropwizard-mongo-client/src/main/resources/configuration.yaml +++ /dev/null @@ -1,5 +0,0 @@ -logging: - level: INFO - loggers: - "com.datadoghq.trace": DEBUG - "io.opentracing": DEBUG \ No newline at end of file diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle index 7661d6f3a2..fbfae0903f 100644 --- a/dd-trace-java.gradle +++ b/dd-trace-java.gradle @@ -15,7 +15,7 @@ plugins { allprojects { group = 'com.datadoghq' - version = '0.2.13-SNAPSHOT' + version = '0.3.0.RC1-SNAPSHOT' apply from: "${rootDir}/gradle/dependencies.gradle" } diff --git a/dd-trace/README.md b/dd-trace-ot/README.md similarity index 100% rename from dd-trace/README.md rename to dd-trace-ot/README.md diff --git a/dd-trace/dd-trace.gradle b/dd-trace-ot/dd-trace-ot.gradle similarity index 87% rename from dd-trace/dd-trace.gradle rename to dd-trace-ot/dd-trace-ot.gradle index 698b33fd17..58d3de82d5 100644 --- a/dd-trace/dd-trace.gradle +++ b/dd-trace-ot/dd-trace-ot.gradle @@ -2,7 +2,7 @@ plugins { id "me.champeau.gradle.jmh" version "0.4.4" } -description = 'dd-trace' +description = 'dd-trace-ot' apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/publish.gradle" @@ -10,13 +10,11 @@ apply from: "${rootDir}/gradle/jacoco.gradle" minimumBranchCoverage = 0.3 minimumInstructionCoverage = 0.5 whitelistedInstructionClasses += whitelistedBranchClasses += [ - 'com.datadoghq.trace.integration.*', - 'com.datadoghq.trace.resolver.DecoratorsConfig', - 'com.datadoghq.trace.writer.ListWriter', - 'com.datadoghq.trace.DDTags', - 'com.datadoghq.trace.DDTraceInfo', - 'com.datadoghq.trace.util.Clock', - 'com.datadoghq.trace.resolver.FactoryUtils', + 'datadog.opentracing.decorators.*', + 'datadog.trace.api.writer.ListWriter', + 'datadog.trace.api.DDTags', + 'datadog.trace.api.DDTraceInfo', + 'datadog.trace.api.util.Clock', ] dependencies { diff --git a/dd-trace/docs/opentracing-api.md b/dd-trace-ot/docs/opentracing-api.md similarity index 100% rename from dd-trace/docs/opentracing-api.md rename to dd-trace-ot/docs/opentracing-api.md diff --git a/dd-trace/src/jmh/java/com/datadoghq/trace/DDTraceBenchmark.java b/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java similarity index 93% rename from dd-trace/src/jmh/java/com/datadoghq/trace/DDTraceBenchmark.java rename to dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java index 398edc4026..b1188cecbb 100644 --- a/dd-trace/src/jmh/java/com/datadoghq/trace/DDTraceBenchmark.java +++ b/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java @@ -1,6 +1,7 @@ -package com.datadoghq.trace; +package datadog.trace; -import com.datadoghq.trace.writer.ListWriter; +import datadog.opentracing.DDTracer; +import datadog.trace.api.writer.ListWriter; import io.opentracing.ActiveSpan; import io.opentracing.Span; import io.opentracing.Tracer; diff --git a/dd-trace/src/jmh/reports/2017-07-18.using-array-copy.txt b/dd-trace-ot/src/jmh/reports/2017-07-18.using-array-copy.txt similarity index 100% rename from dd-trace/src/jmh/reports/2017-07-18.using-array-copy.txt rename to dd-trace-ot/src/jmh/reports/2017-07-18.using-array-copy.txt diff --git a/dd-trace/src/jmh/reports/2017-07-18.using-linked-queue.txt b/dd-trace-ot/src/jmh/reports/2017-07-18.using-linked-queue.txt similarity index 100% rename from dd-trace/src/jmh/reports/2017-07-18.using-linked-queue.txt rename to dd-trace-ot/src/jmh/reports/2017-07-18.using-linked-queue.txt diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDBaseSpan.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDBaseSpan.java similarity index 98% rename from dd-trace/src/main/java/com/datadoghq/trace/DDBaseSpan.java rename to dd-trace-ot/src/main/java/datadog/opentracing/DDBaseSpan.java index 6efd243f9d..00fc0884c9 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/DDBaseSpan.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDBaseSpan.java @@ -1,8 +1,9 @@ -package com.datadoghq.trace; +package datadog.opentracing; -import com.datadoghq.trace.util.Clock; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonIgnore; +import datadog.trace.api.DDTags; +import datadog.trace.api.util.Clock; import io.opentracing.BaseSpan; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDSpan.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java similarity index 84% rename from dd-trace/src/main/java/com/datadoghq/trace/DDSpan.java rename to dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java index 9dc6ffefbd..5307594d81 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/DDSpan.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java @@ -1,12 +1,10 @@ -package com.datadoghq.trace; +package datadog.opentracing; import io.opentracing.Span; /** * Represents an in-flight span in the opentracing system. * - *

- * *

Spans are created by the {@link DDTracer#buildSpan}. This implementation adds some features * according to the DD agent. */ @@ -18,7 +16,7 @@ public class DDSpan extends DDBaseSpan implements Span { * @param timestampMicro if set, use this time instead of the auto-generated time * @param context the context */ - protected DDSpan(long timestampMicro, DDSpanContext context) { + protected DDSpan(final long timestampMicro, final DDSpanContext context) { super(timestampMicro, context); } diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java similarity index 98% rename from dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java rename to dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java index a7a5f66c6c..514b984f21 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java @@ -1,8 +1,9 @@ -package com.datadoghq.trace; +package datadog.opentracing; -import com.datadoghq.trace.integration.AbstractDecorator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.collect.Maps; +import datadog.opentracing.decorators.AbstractDecorator; +import datadog.trace.api.DDTags; import io.opentracing.tag.Tags; import java.util.Collections; import java.util.HashMap; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDTraceInfo.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTraceOTInfo.java similarity index 79% rename from dd-trace/src/main/java/com/datadoghq/trace/DDTraceInfo.java rename to dd-trace-ot/src/main/java/datadog/opentracing/DDTraceOTInfo.java index 5d76b62c14..8568eb75ee 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/DDTraceInfo.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTraceOTInfo.java @@ -1,11 +1,11 @@ -package com.datadoghq.trace; +package datadog.opentracing; import java.io.BufferedReader; import java.io.InputStreamReader; import lombok.extern.slf4j.Slf4j; @Slf4j -public class DDTraceInfo { +public class DDTraceOTInfo { public static final String JAVA_VERSION = System.getProperty("java.version", "unknown"); public static final String JAVA_VM_NAME = System.getProperty("java.vm.name", "unknown"); @@ -20,7 +20,7 @@ public class DDTraceInfo { final BufferedReader br = new BufferedReader( new InputStreamReader( - DDTraceInfo.class.getResourceAsStream("/dd-trace.version"), "UTF-8")); + DDTraceOTInfo.class.getResourceAsStream("/dd-trace-ot.version"), "UTF-8")); for (int c = br.read(); c != -1; c = br.read()) sb.append((char) c); v = sb.toString().trim(); @@ -31,7 +31,7 @@ public class DDTraceInfo { log.info("dd-trace - version: {}", v); } - public static void main(String... args) { + public static void main(final String... args) { System.out.println(VERSION); } } diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java similarity index 96% rename from dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java rename to dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java index 9a0a7ee286..b33ce7cef6 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java @@ -1,13 +1,16 @@ -package com.datadoghq.trace; +package datadog.opentracing; -import com.datadoghq.trace.integration.AbstractDecorator; -import com.datadoghq.trace.propagation.Codec; -import com.datadoghq.trace.propagation.HTTPCodec; -import com.datadoghq.trace.resolver.DDDecoratorsFactory; -import com.datadoghq.trace.sampling.AllSampler; -import com.datadoghq.trace.sampling.Sampler; -import com.datadoghq.trace.writer.Writer; import com.fasterxml.jackson.annotation.JsonIgnore; +import datadog.opentracing.decorators.AbstractDecorator; +import datadog.opentracing.decorators.DDDecoratorsFactory; +import datadog.opentracing.propagation.Codec; +import datadog.opentracing.propagation.HTTPCodec; +import datadog.trace.api.DDTags; +import datadog.trace.api.DDTraceConfig; +import datadog.trace.api.Service; +import datadog.trace.api.sampling.AllSampler; +import datadog.trace.api.sampling.Sampler; +import datadog.trace.api.writer.Writer; import io.opentracing.ActiveSpan; import io.opentracing.ActiveSpanSource; import io.opentracing.BaseSpan; @@ -24,7 +27,7 @@ import java.util.Queue; import java.util.concurrent.ThreadLocalRandom; import lombok.extern.slf4j.Slf4j; -/** DDTracer makes it easy to send traces and span to DD using the OpenTracing integration. */ +/** DDTracer makes it easy to send traces and span to DD using the OpenTracing API. */ @Slf4j public class DDTracer extends ThreadLocalActiveSpanSource implements io.opentracing.Tracer { diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/AbstractDecorator.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/AbstractDecorator.java similarity index 93% rename from dd-trace/src/main/java/com/datadoghq/trace/integration/AbstractDecorator.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/AbstractDecorator.java index b026326093..c054fdeb2b 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/integration/AbstractDecorator.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/AbstractDecorator.java @@ -1,7 +1,7 @@ -package com.datadoghq.trace.integration; +package datadog.opentracing.decorators; -import com.datadoghq.trace.DDSpanContext; -import com.datadoghq.trace.DDTags; +import datadog.opentracing.DDSpanContext; +import datadog.trace.api.DDTags; /** * Span decorators are called when new tags are written and proceed to various remappings and diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBStatementAsResourceName.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBStatementAsResourceName.java similarity index 90% rename from dd-trace/src/main/java/com/datadoghq/trace/integration/DBStatementAsResourceName.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBStatementAsResourceName.java index 4f199f5f0f..e90d419f21 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBStatementAsResourceName.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBStatementAsResourceName.java @@ -1,7 +1,7 @@ -package com.datadoghq.trace.integration; +package datadog.opentracing.decorators; -import com.datadoghq.trace.DDSpanContext; -import com.datadoghq.trace.DDTags; +import datadog.opentracing.DDSpanContext; +import datadog.trace.api.DDTags; import io.opentracing.tag.Tags; public class DBStatementAsResourceName extends AbstractDecorator { diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBTypeDecorator.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java similarity index 89% rename from dd-trace/src/main/java/com/datadoghq/trace/integration/DBTypeDecorator.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java index 3761ef875c..6f932b3771 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBTypeDecorator.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java @@ -1,7 +1,7 @@ -package com.datadoghq.trace.integration; +package datadog.opentracing.decorators; -import com.datadoghq.trace.DDSpanContext; -import com.datadoghq.trace.DDTags; +import datadog.opentracing.DDSpanContext; +import datadog.trace.api.DDTags; import io.opentracing.tag.Tags; /** diff --git a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDDecoratorsFactory.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java similarity index 90% rename from dd-trace/src/main/java/com/datadoghq/trace/resolver/DDDecoratorsFactory.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java index 363fe08540..228ef0de46 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDDecoratorsFactory.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java @@ -1,6 +1,6 @@ -package com.datadoghq.trace.resolver; +package datadog.opentracing.decorators; -import com.datadoghq.trace.integration.AbstractDecorator; +import datadog.trace.api.util.ConfigUtils; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; @@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j; public class DDDecoratorsFactory { public static final String CONFIG_PATH = "dd-trace-decorators"; - public static String DECORATORS_PACKAGE = "com.datadoghq.trace.integration."; + public static String DECORATORS_PACKAGE = "datadog.opentracing.decorators."; /** * Create decorators from configuration @@ -70,7 +70,7 @@ public class DDDecoratorsFactory { public static List createFromResources() { List result = new ArrayList<>(); final DecoratorsConfig config = - FactoryUtils.loadConfigFromResource(CONFIG_PATH, DecoratorsConfig.class); + ConfigUtils.loadConfigFromResource(CONFIG_PATH, DecoratorsConfig.class); if (config != null) { result = DDDecoratorsFactory.create(config.getDecorators()); } diff --git a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DecoratorsConfig.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DecoratorsConfig.java similarity index 98% rename from dd-trace/src/main/java/com/datadoghq/trace/resolver/DecoratorsConfig.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/DecoratorsConfig.java index 815747726b..43ccb1462a 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DecoratorsConfig.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DecoratorsConfig.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace.resolver; +package datadog.opentracing.decorators; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/ErrorFlag.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/ErrorFlag.java similarity index 85% rename from dd-trace/src/main/java/com/datadoghq/trace/integration/ErrorFlag.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/ErrorFlag.java index 8008e2c8dd..333cb8c307 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/integration/ErrorFlag.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/ErrorFlag.java @@ -1,6 +1,6 @@ -package com.datadoghq.trace.integration; +package datadog.opentracing.decorators; -import com.datadoghq.trace.DDSpanContext; +import datadog.opentracing.DDSpanContext; import io.opentracing.tag.Tags; public class ErrorFlag extends AbstractDecorator { diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPComponent.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/HTTPComponent.java similarity index 85% rename from dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPComponent.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/HTTPComponent.java index b1d6eacec6..378b17d2c2 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPComponent.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/HTTPComponent.java @@ -1,7 +1,7 @@ -package com.datadoghq.trace.integration; +package datadog.opentracing.decorators; -import com.datadoghq.trace.DDSpanContext; -import com.datadoghq.trace.DDTags; +import datadog.opentracing.DDSpanContext; +import datadog.trace.api.DDTags; import io.opentracing.tag.Tags; /** diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/OperationDecorator.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/OperationDecorator.java similarity index 89% rename from dd-trace/src/main/java/com/datadoghq/trace/integration/OperationDecorator.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/OperationDecorator.java index f66c103550..e35da8e64f 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/integration/OperationDecorator.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/OperationDecorator.java @@ -1,13 +1,13 @@ -package com.datadoghq.trace.integration; +package datadog.opentracing.decorators; -import com.datadoghq.trace.DDSpanContext; +import datadog.opentracing.DDSpanContext; import io.opentracing.tag.Tags; import java.util.HashMap; import java.util.Map; /** * This span decorator is a simple mapping to override the operation DB tags. The operation name of - * DB integration are handled by the DBTypeDecorator + * DB decorators are handled by the DBTypeDecorator */ public class OperationDecorator extends AbstractDecorator { diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/Status404Decorator.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/Status404Decorator.java similarity index 82% rename from dd-trace/src/main/java/com/datadoghq/trace/integration/Status404Decorator.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/Status404Decorator.java index e0fde29f27..12281ffed3 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/integration/Status404Decorator.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/Status404Decorator.java @@ -1,6 +1,6 @@ -package com.datadoghq.trace.integration; +package datadog.opentracing.decorators; -import com.datadoghq.trace.DDTags; +import datadog.trace.api.DDTags; import io.opentracing.tag.Tags; /** This span decorator protect against spam on the resource name */ diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/URLAsResourceName.java similarity index 94% rename from dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java rename to dd-trace-ot/src/main/java/datadog/opentracing/decorators/URLAsResourceName.java index 7f06c910c7..cf4e066e7f 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/URLAsResourceName.java @@ -1,9 +1,9 @@ -package com.datadoghq.trace.integration; +package datadog.opentracing.decorators; -import com.datadoghq.trace.DDSpanContext; -import com.datadoghq.trace.DDTags; -import com.datadoghq.trace.resolver.FactoryUtils; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import datadog.opentracing.DDSpanContext; +import datadog.trace.api.DDTags; +import datadog.trace.api.util.ConfigUtils; import io.opentracing.tag.Tags; import java.net.MalformedURLException; import java.util.ArrayList; @@ -29,7 +29,7 @@ public class URLAsResourceName extends AbstractDecorator { this.setSetTag(DDTags.RESOURCE_NAME); try { - final Config config = FactoryUtils.loadConfigFromResource(configPath, Config.class); + final Config config = ConfigUtils.loadConfigFromResource(configPath, Config.class); for (final Config.Rule pattern : config.urlResourcePatterns) { patterns.add(pattern); } diff --git a/dd-trace/src/main/java/com/datadoghq/trace/propagation/Codec.java b/dd-trace-ot/src/main/java/datadog/opentracing/propagation/Codec.java similarity index 95% rename from dd-trace/src/main/java/com/datadoghq/trace/propagation/Codec.java rename to dd-trace-ot/src/main/java/datadog/opentracing/propagation/Codec.java index 47a753f29f..a89d45cc38 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/propagation/Codec.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/propagation/Codec.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.datadoghq.trace.propagation; +package datadog.opentracing.propagation; -import com.datadoghq.trace.DDSpanContext; +import datadog.opentracing.DDSpanContext; /** A codec is a simple object that can encode and decode a span context through a carrier */ public interface Codec { diff --git a/dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java b/dd-trace-ot/src/main/java/datadog/opentracing/propagation/HTTPCodec.java similarity index 96% rename from dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java rename to dd-trace-ot/src/main/java/datadog/opentracing/propagation/HTTPCodec.java index 42f53971ed..c8b2693c53 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/propagation/HTTPCodec.java @@ -1,6 +1,6 @@ -package com.datadoghq.trace.propagation; +package datadog.opentracing.propagation; -import com.datadoghq.trace.DDSpanContext; +import datadog.opentracing.DDSpanContext; import io.opentracing.propagation.TextMap; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java b/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerResolver.java similarity index 91% rename from dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java rename to dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerResolver.java index c57ebbc22f..c3fe2c7166 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerResolver.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/resolver/DDTracerResolver.java @@ -1,7 +1,7 @@ -package com.datadoghq.trace.resolver; +package datadog.opentracing.resolver; -import com.datadoghq.trace.DDTracer; import com.google.auto.service.AutoService; +import datadog.opentracing.DDTracer; import io.opentracing.NoopTracerFactory; import io.opentracing.Tracer; import io.opentracing.contrib.tracerresolver.TracerResolver; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDTags.java b/dd-trace-ot/src/main/java/datadog/trace/api/DDTags.java similarity index 95% rename from dd-trace/src/main/java/com/datadoghq/trace/DDTags.java rename to dd-trace-ot/src/main/java/datadog/trace/api/DDTags.java index 7cb1530840..41547f5f26 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/DDTags.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/DDTags.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace; +package datadog.trace.api; public class DDTags { public static final String SPAN_TYPE = "span.type"; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDTraceConfig.java b/dd-trace-ot/src/main/java/datadog/trace/api/DDTraceConfig.java similarity index 92% rename from dd-trace/src/main/java/com/datadoghq/trace/DDTraceConfig.java rename to dd-trace-ot/src/main/java/datadog/trace/api/DDTraceConfig.java index c104d5b412..bd0920a4fd 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/DDTraceConfig.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/DDTraceConfig.java @@ -1,8 +1,9 @@ -package com.datadoghq.trace; +package datadog.trace.api; -import com.datadoghq.trace.sampling.Sampler; -import com.datadoghq.trace.writer.DDAgentWriter; -import com.datadoghq.trace.writer.Writer; +import datadog.opentracing.DDTracer; +import datadog.trace.api.sampling.Sampler; +import datadog.trace.api.writer.DDAgentWriter; +import datadog.trace.api.writer.Writer; import java.util.Properties; /** diff --git a/dd-trace/src/main/java/com/datadoghq/trace/Service.java b/dd-trace-ot/src/main/java/datadog/trace/api/Service.java similarity index 97% rename from dd-trace/src/main/java/com/datadoghq/trace/Service.java rename to dd-trace-ot/src/main/java/datadog/trace/api/Service.java index 8a495304c8..3ef5606de0 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/Service.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/Service.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace; +package datadog.trace.api; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/sampling/AbstractSampler.java b/dd-trace-ot/src/main/java/datadog/trace/api/sampling/AbstractSampler.java similarity index 93% rename from dd-trace/src/main/java/com/datadoghq/trace/sampling/AbstractSampler.java rename to dd-trace-ot/src/main/java/datadog/trace/api/sampling/AbstractSampler.java index b34b6b767a..af041a5bf8 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/sampling/AbstractSampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/sampling/AbstractSampler.java @@ -1,6 +1,6 @@ -package com.datadoghq.trace.sampling; +package datadog.trace.api.sampling; -import com.datadoghq.trace.DDBaseSpan; +import datadog.opentracing.DDBaseSpan; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/sampling/AllSampler.java b/dd-trace-ot/src/main/java/datadog/trace/api/sampling/AllSampler.java similarity index 77% rename from dd-trace/src/main/java/com/datadoghq/trace/sampling/AllSampler.java rename to dd-trace-ot/src/main/java/datadog/trace/api/sampling/AllSampler.java index b4f25cfb9a..1eaca49d0d 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/sampling/AllSampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/sampling/AllSampler.java @@ -1,6 +1,6 @@ -package com.datadoghq.trace.sampling; +package datadog.trace.api.sampling; -import com.datadoghq.trace.DDBaseSpan; +import datadog.opentracing.DDBaseSpan; /** Sampler that always says yes... */ public class AllSampler extends AbstractSampler { diff --git a/dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java b/dd-trace-ot/src/main/java/datadog/trace/api/sampling/RateSampler.java similarity index 94% rename from dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java rename to dd-trace-ot/src/main/java/datadog/trace/api/sampling/RateSampler.java index a799947898..e920319032 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/sampling/RateSampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/sampling/RateSampler.java @@ -1,7 +1,7 @@ -package com.datadoghq.trace.sampling; +package datadog.trace.api.sampling; -import com.datadoghq.trace.DDBaseSpan; import com.google.auto.service.AutoService; +import datadog.opentracing.DDBaseSpan; import lombok.extern.slf4j.Slf4j; /** diff --git a/dd-trace/src/main/java/com/datadoghq/trace/sampling/Sampler.java b/dd-trace-ot/src/main/java/datadog/trace/api/sampling/Sampler.java similarity index 92% rename from dd-trace/src/main/java/com/datadoghq/trace/sampling/Sampler.java rename to dd-trace-ot/src/main/java/datadog/trace/api/sampling/Sampler.java index 725b9c33b8..94032992ef 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/sampling/Sampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/sampling/Sampler.java @@ -1,7 +1,7 @@ -package com.datadoghq.trace.sampling; +package datadog.trace.api.sampling; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.DDTraceConfig; +import datadog.opentracing.DDBaseSpan; +import datadog.trace.api.DDTraceConfig; import java.util.Properties; import lombok.extern.slf4j.Slf4j; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/util/Clock.java b/dd-trace-ot/src/main/java/datadog/trace/api/util/Clock.java similarity index 96% rename from dd-trace/src/main/java/com/datadoghq/trace/util/Clock.java rename to dd-trace-ot/src/main/java/datadog/trace/api/util/Clock.java index dc8f456297..8115eb1b18 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/util/Clock.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/util/Clock.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace.util; +package datadog.trace.api.util; import java.util.concurrent.TimeUnit; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/resolver/FactoryUtils.java b/dd-trace-ot/src/main/java/datadog/trace/api/util/ConfigUtils.java similarity index 95% rename from dd-trace/src/main/java/com/datadoghq/trace/resolver/FactoryUtils.java rename to dd-trace-ot/src/main/java/datadog/trace/api/util/ConfigUtils.java index af86f24e49..72d96a8b6b 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/resolver/FactoryUtils.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/util/ConfigUtils.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace.resolver; +package datadog.trace.api.util; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; @@ -7,7 +7,7 @@ import java.net.URL; import lombok.extern.slf4j.Slf4j; @Slf4j -public class FactoryUtils { +public class ConfigUtils { private static final ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory()); diff --git a/dd-trace/src/main/java/com/datadoghq/trace/writer/DDAgentWriter.java b/dd-trace-ot/src/main/java/datadog/trace/api/writer/DDAgentWriter.java similarity index 94% rename from dd-trace/src/main/java/com/datadoghq/trace/writer/DDAgentWriter.java rename to dd-trace-ot/src/main/java/datadog/trace/api/writer/DDAgentWriter.java index 930adf726e..5693ebf922 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/writer/DDAgentWriter.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/writer/DDAgentWriter.java @@ -1,9 +1,9 @@ -package com.datadoghq.trace.writer; +package datadog.trace.api.writer; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.Service; import com.google.auto.service.AutoService; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import datadog.opentracing.DDBaseSpan; +import datadog.trace.api.Service; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; @@ -76,7 +76,7 @@ public class DDAgentWriter implements Writer { } /* (non-Javadoc) - * @see com.datadoghq.trace.Writer#write(java.util.List) + * @see datadog.trace.Writer#write(java.util.List) */ @Override public void write(final List> trace) { @@ -90,7 +90,7 @@ public class DDAgentWriter implements Writer { } /* (non-Javadoc) - * @see com.datadoghq.trace.Writer#writeServices(java.util.List) + * @see datadog.trace.Writer#writeServices(java.util.List) */ @Override public void writeServices(final Map services) { @@ -112,7 +112,7 @@ public class DDAgentWriter implements Writer { } /* (non-Javadoc) - * @see com.datadoghq.trace.writer.Writer#start() + * @see datadog.trace.api.writer.Writer#start() */ @Override public void start() { @@ -121,7 +121,7 @@ public class DDAgentWriter implements Writer { } /* (non-Javadoc) - * @see com.datadoghq.trace.Writer#close() + * @see datadog.trace.Writer#close() */ @Override public void close() { diff --git a/dd-trace/src/main/java/com/datadoghq/trace/writer/DDApi.java b/dd-trace-ot/src/main/java/datadog/trace/api/writer/DDApi.java similarity index 95% rename from dd-trace/src/main/java/com/datadoghq/trace/writer/DDApi.java rename to dd-trace-ot/src/main/java/datadog/trace/api/writer/DDApi.java index fe09121cc5..57573cc6d9 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/writer/DDApi.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/writer/DDApi.java @@ -1,10 +1,10 @@ -package com.datadoghq.trace.writer; +package datadog.trace.api.writer; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.DDTraceInfo; -import com.datadoghq.trace.Service; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.util.concurrent.RateLimiter; +import datadog.opentracing.DDBaseSpan; +import datadog.opentracing.DDTraceOTInfo; +import datadog.trace.api.Service; import java.io.IOException; import java.io.OutputStream; import java.net.HttpURLConnection; @@ -122,9 +122,9 @@ public class DDApi { httpCon.setRequestMethod("PUT"); httpCon.setRequestProperty("Content-Type", "application/msgpack"); httpCon.setRequestProperty("Datadog-Meta-Lang", "java"); - httpCon.setRequestProperty("Datadog-Meta-Lang-Version", DDTraceInfo.JAVA_VERSION); - httpCon.setRequestProperty("Datadog-Meta-Lang-Interpreter", DDTraceInfo.JAVA_VM_NAME); - httpCon.setRequestProperty("Datadog-Meta-Tracer-Version", DDTraceInfo.VERSION); + httpCon.setRequestProperty("Datadog-Meta-Lang-Version", DDTraceOTInfo.JAVA_VERSION); + httpCon.setRequestProperty("Datadog-Meta-Lang-Interpreter", DDTraceOTInfo.JAVA_VM_NAME); + httpCon.setRequestProperty("Datadog-Meta-Tracer-Version", DDTraceOTInfo.VERSION); return httpCon; } diff --git a/dd-trace/src/main/java/com/datadoghq/trace/writer/ListWriter.java b/dd-trace-ot/src/main/java/datadog/trace/api/writer/ListWriter.java similarity index 93% rename from dd-trace/src/main/java/com/datadoghq/trace/writer/ListWriter.java rename to dd-trace-ot/src/main/java/datadog/trace/api/writer/ListWriter.java index 4d8e6fc6a6..521493eb7c 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/writer/ListWriter.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/writer/ListWriter.java @@ -1,7 +1,7 @@ -package com.datadoghq.trace.writer; +package datadog.trace.api.writer; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.Service; +import datadog.opentracing.DDBaseSpan; +import datadog.trace.api.Service; import java.util.LinkedList; import java.util.List; import java.util.Map; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/writer/LoggingWriter.java b/dd-trace-ot/src/main/java/datadog/trace/api/writer/LoggingWriter.java similarity index 86% rename from dd-trace/src/main/java/com/datadoghq/trace/writer/LoggingWriter.java rename to dd-trace-ot/src/main/java/datadog/trace/api/writer/LoggingWriter.java index 4dd867b3b4..b1522576a7 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/writer/LoggingWriter.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/writer/LoggingWriter.java @@ -1,8 +1,8 @@ -package com.datadoghq.trace.writer; +package datadog.trace.api.writer; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.Service; import com.google.auto.service.AutoService; +import datadog.opentracing.DDBaseSpan; +import datadog.trace.api.Service; import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/writer/Writer.java b/dd-trace-ot/src/main/java/datadog/trace/api/writer/Writer.java similarity index 93% rename from dd-trace/src/main/java/com/datadoghq/trace/writer/Writer.java rename to dd-trace-ot/src/main/java/datadog/trace/api/writer/Writer.java index 6cd0893a05..21f4e13755 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/writer/Writer.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/writer/Writer.java @@ -1,8 +1,8 @@ -package com.datadoghq.trace.writer; +package datadog.trace.api.writer; -import com.datadoghq.trace.DDBaseSpan; -import com.datadoghq.trace.DDTraceConfig; -import com.datadoghq.trace.Service; +import datadog.opentracing.DDBaseSpan; +import datadog.trace.api.DDTraceConfig; +import datadog.trace.api.Service; import java.util.List; import java.util.Map; import java.util.Properties; diff --git a/dd-trace/src/main/java/com/datadoghq/trace/writer/WriterQueue.java b/dd-trace-ot/src/main/java/datadog/trace/api/writer/WriterQueue.java similarity index 98% rename from dd-trace/src/main/java/com/datadoghq/trace/writer/WriterQueue.java rename to dd-trace-ot/src/main/java/datadog/trace/api/writer/WriterQueue.java index 2232361adb..7f015045a1 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/writer/WriterQueue.java +++ b/dd-trace-ot/src/main/java/datadog/trace/api/writer/WriterQueue.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace.writer; +package datadog.trace.api.writer; import java.util.ArrayList; import java.util.List; diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy similarity index 93% rename from dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy index 9ff8915dac..7831060774 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy @@ -1,9 +1,9 @@ -package com.datadoghq.trace.integration +package datadog.opentracing.decorators -import com.datadoghq.trace.DDSpanContext -import com.datadoghq.trace.DDTracer -import com.datadoghq.trace.SpanFactory -import com.datadoghq.trace.writer.LoggingWriter +import datadog.opentracing.DDSpanContext +import datadog.opentracing.DDTracer +import datadog.trace.SpanFactory +import datadog.trace.api.writer.LoggingWriter import io.opentracing.tag.StringTag import io.opentracing.tag.Tags import spock.lang.Specification diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/integration/URLAsResourceNameTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy similarity index 98% rename from dd-trace/src/test/groovy/com/datadoghq/trace/integration/URLAsResourceNameTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy index 6de233c114..1cac33db4c 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/integration/URLAsResourceNameTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy @@ -1,4 +1,4 @@ -package com.datadoghq.trace.integration +package datadog.opentracing.decorators import spock.lang.Specification diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/ActiveSpanContinuationTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/ActiveSpanContinuationTest.groovy similarity index 97% rename from dd-trace/src/test/groovy/com/datadoghq/trace/ActiveSpanContinuationTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/trace/ActiveSpanContinuationTest.groovy index 926ec51db3..e62a36f62a 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/ActiveSpanContinuationTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/ActiveSpanContinuationTest.groovy @@ -1,6 +1,7 @@ -package com.datadoghq.trace +package datadog.trace -import com.datadoghq.trace.writer.ListWriter +import datadog.opentracing.DDTracer +import datadog.trace.api.writer.ListWriter import io.opentracing.util.ThreadLocalActiveSpan import spock.lang.Ignore import spock.lang.Specification diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/DDSpanContextTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy similarity index 98% rename from dd-trace/src/test/groovy/com/datadoghq/trace/DDSpanContextTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy index 9404d384bc..97fdd30d1b 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/DDSpanContextTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy @@ -1,5 +1,6 @@ -package com.datadoghq.trace +package datadog.trace +import datadog.trace.api.DDTags import spock.lang.Specification class DDSpanContextTest extends Specification { diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/DDTraceConfigTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy similarity index 93% rename from dd-trace/src/test/groovy/com/datadoghq/trace/DDTraceConfigTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy index 2d3a3f2ec7..3bd7297323 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/DDTraceConfigTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy @@ -1,17 +1,19 @@ -package com.datadoghq.trace +package datadog.trace -import com.datadoghq.trace.sampling.AllSampler -import com.datadoghq.trace.sampling.RateSampler -import com.datadoghq.trace.writer.DDAgentWriter -import com.datadoghq.trace.writer.ListWriter -import com.datadoghq.trace.writer.LoggingWriter +import datadog.opentracing.DDTracer +import datadog.trace.api.DDTraceConfig +import datadog.trace.api.sampling.AllSampler +import datadog.trace.api.sampling.RateSampler +import datadog.trace.api.writer.DDAgentWriter +import datadog.trace.api.writer.ListWriter +import datadog.trace.api.writer.LoggingWriter import spock.lang.Specification import spock.lang.Unroll import java.lang.reflect.Field import java.lang.reflect.Modifier -import static com.datadoghq.trace.DDTraceConfig.* +import static datadog.trace.api.DDTraceConfig.* class DDTraceConfigTest extends Specification { static originalEnvMap diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/ServiceTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/ServiceTest.groovy similarity index 89% rename from dd-trace/src/test/groovy/com/datadoghq/trace/ServiceTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/trace/ServiceTest.groovy index b2799b30e5..6cd3290d51 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/ServiceTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/ServiceTest.groovy @@ -1,7 +1,9 @@ -package com.datadoghq.trace +package datadog.trace -import com.datadoghq.trace.sampling.AllSampler -import com.datadoghq.trace.writer.DDAgentWriter +import datadog.opentracing.DDTracer +import datadog.trace.api.Service +import datadog.trace.api.sampling.AllSampler +import datadog.trace.api.writer.DDAgentWriter import spock.lang.Specification import static org.mockito.ArgumentMatchers.any diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/SpanFactory.groovy similarity index 83% rename from dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy rename to dd-trace-ot/src/test/groovy/datadog/trace/SpanFactory.groovy index 45970d33f5..10e7c4ed22 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/SpanFactory.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/SpanFactory.groovy @@ -1,4 +1,8 @@ -package com.datadoghq.trace +package datadog.trace + +import datadog.opentracing.DDSpan +import datadog.opentracing.DDSpanContext +import datadog.opentracing.DDTracer class SpanFactory { static newSpanOf(long timestampMicro) { diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDAgentWriterTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy similarity index 92% rename from dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDAgentWriterTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy index a4917b46b3..7d3921ffb4 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDAgentWriterTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy @@ -1,9 +1,9 @@ -package com.datadoghq.trace.writer +package datadog.trace.api.writer -import com.datadoghq.trace.DDBaseSpan +import datadog.opentracing.DDBaseSpan import spock.lang.Specification -import static com.datadoghq.trace.SpanFactory.newSpanOf +import static datadog.trace.SpanFactory.newSpanOf import static org.mockito.Mockito.mock import static org.mockito.Mockito.verifyNoMoreInteractions diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDApiTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy similarity index 98% rename from dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDApiTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy index c5c55655c2..8345b8b6e0 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/DDApiTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy @@ -1,9 +1,9 @@ -package com.datadoghq.trace.writer +package datadog.trace.api.writer -import com.datadoghq.trace.Service -import com.datadoghq.trace.SpanFactory +import datadog.trace.SpanFactory import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper +import datadog.trace.api.Service import org.msgpack.jackson.dataformat.MessagePackFactory import ratpack.http.Headers import ratpack.http.MediaType diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/WriterQueueTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy similarity index 99% rename from dd-trace/src/test/groovy/com/datadoghq/trace/writer/WriterQueueTest.groovy rename to dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy index 629e18e42a..8f78d88246 100644 --- a/dd-trace/src/test/groovy/com/datadoghq/trace/writer/WriterQueueTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy @@ -1,4 +1,4 @@ -package com.datadoghq.trace.writer +package datadog.trace.api.writer import spock.lang.Specification diff --git a/dd-trace/src/test/java/com/datadoghq/trace/DDSpanBuilderTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDSpanBuilderTest.java similarity index 97% rename from dd-trace/src/test/java/com/datadoghq/trace/DDSpanBuilderTest.java rename to dd-trace-ot/src/test/java/datadog/opentracing/DDSpanBuilderTest.java index ef587d97df..f53654451e 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/DDSpanBuilderTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDSpanBuilderTest.java @@ -1,10 +1,11 @@ -package com.datadoghq.trace; +package datadog.opentracing; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import datadog.trace.api.DDTags; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -112,9 +113,9 @@ public class DDSpanBuilderTest { final long tick = System.currentTimeMillis(); span = tracer.buildSpan(expectedName).withServiceName("foo").startManual(); - // Give a range of +/- 2 millis + // Give a range of +/- 5 millis assertThat(span.getStartTime()) - .isBetween(MILLISECONDS.toNanos(tick - 2), MILLISECONDS.toNanos(tick + 2)); + .isBetween(MILLISECONDS.toNanos(tick - 5), MILLISECONDS.toNanos(tick + 5)); } @Test diff --git a/dd-trace/src/test/java/com/datadoghq/trace/DDSpanSerializationTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDSpanSerializationTest.java similarity index 96% rename from dd-trace/src/test/java/com/datadoghq/trace/DDSpanSerializationTest.java rename to dd-trace-ot/src/test/java/datadog/opentracing/DDSpanSerializationTest.java index 2e2cc7f872..3731020141 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/DDSpanSerializationTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDSpanSerializationTest.java @@ -1,9 +1,10 @@ -package com.datadoghq.trace; +package datadog.opentracing; import static org.assertj.core.api.Assertions.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Maps; +import datadog.trace.api.DDTags; import java.util.HashMap; import java.util.Map; import org.junit.Before; diff --git a/dd-trace/src/test/java/com/datadoghq/trace/DDSpanTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDSpanTest.java similarity index 98% rename from dd-trace/src/test/java/com/datadoghq/trace/DDSpanTest.java rename to dd-trace-ot/src/test/java/datadog/opentracing/DDSpanTest.java index b1ce079615..0462fe986e 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/DDSpanTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDSpanTest.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace; +package datadog.opentracing; import static org.assertj.core.api.Assertions.assertThat; diff --git a/dd-trace/src/test/java/com/datadoghq/trace/DDTracerTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java similarity index 89% rename from dd-trace/src/test/java/com/datadoghq/trace/DDTracerTest.java rename to dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java index bf507c65d2..cdfb97c6ff 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/DDTracerTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java @@ -1,4 +1,4 @@ -package com.datadoghq.trace; +package datadog.opentracing; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -6,8 +6,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.datadoghq.trace.sampling.RateSampler; -import com.datadoghq.trace.writer.Writer; +import datadog.trace.api.sampling.RateSampler; +import datadog.trace.api.writer.Writer; import java.util.ArrayList; import java.util.LinkedList; import java.util.Queue; diff --git a/dd-trace/src/test/java/com/datadoghq/trace/propagation/HTTPCodecTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/propagation/HTTPCodecTest.java similarity index 96% rename from dd-trace/src/test/java/com/datadoghq/trace/propagation/HTTPCodecTest.java rename to dd-trace-ot/src/test/java/datadog/opentracing/propagation/HTTPCodecTest.java index 24764306df..1030798759 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/propagation/HTTPCodecTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/propagation/HTTPCodecTest.java @@ -1,8 +1,8 @@ -package com.datadoghq.trace.propagation; +package datadog.opentracing.propagation; import static org.assertj.core.api.Java6Assertions.assertThat; -import com.datadoghq.trace.DDSpanContext; +import datadog.opentracing.DDSpanContext; import io.opentracing.propagation.TextMapExtractAdapter; import io.opentracing.propagation.TextMapInjectAdapter; import java.util.HashMap; diff --git a/dd-trace/src/test/java/com/datadoghq/trace/resolver/TracerResolverTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/resolver/TracerResolverTest.java similarity index 90% rename from dd-trace/src/test/java/com/datadoghq/trace/resolver/TracerResolverTest.java rename to dd-trace-ot/src/test/java/datadog/opentracing/resolver/TracerResolverTest.java index 015d37d211..1511696dc1 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/resolver/TracerResolverTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/resolver/TracerResolverTest.java @@ -1,11 +1,11 @@ -package com.datadoghq.trace.resolver; +package datadog.opentracing.resolver; import static org.assertj.core.api.Assertions.assertThat; -import com.datadoghq.trace.DDTracer; -import com.datadoghq.trace.integration.AbstractDecorator; -import com.datadoghq.trace.integration.HTTPComponent; -import com.datadoghq.trace.integration.URLAsResourceName; +import datadog.opentracing.DDTracer; +import datadog.opentracing.decorators.AbstractDecorator; +import datadog.opentracing.decorators.HTTPComponent; +import datadog.opentracing.decorators.URLAsResourceName; import io.opentracing.NoopTracerFactory; import io.opentracing.Tracer; import io.opentracing.contrib.tracerresolver.TracerResolver; diff --git a/dd-trace/src/test/java/com/datadoghq/trace/sampling/AllSamplerTest.java b/dd-trace-ot/src/test/java/datadog/trace/api/sampling/AllSamplerTest.java similarity index 88% rename from dd-trace/src/test/java/com/datadoghq/trace/sampling/AllSamplerTest.java rename to dd-trace-ot/src/test/java/datadog/trace/api/sampling/AllSamplerTest.java index a6e674fb0a..531ba0f903 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/sampling/AllSamplerTest.java +++ b/dd-trace-ot/src/test/java/datadog/trace/api/sampling/AllSamplerTest.java @@ -1,10 +1,10 @@ -package com.datadoghq.trace.sampling; +package datadog.trace.api.sampling; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.datadoghq.trace.DDSpan; +import datadog.opentracing.DDSpan; import java.util.HashMap; import java.util.Map; import java.util.regex.Pattern; @@ -28,7 +28,7 @@ public class AllSamplerTest { @Test public void testSkipTagPatternSampler() { - Map tags = new HashMap<>(); + final Map tags = new HashMap<>(); mockSpan = mock(DDSpan.class); when(mockSpan.getTags()).thenReturn(tags).thenReturn(tags); diff --git a/dd-trace/src/test/java/com/datadoghq/trace/RateSamplerTest.java b/dd-trace-ot/src/test/java/datadog/trace/api/sampling/RateSamplerTest.java similarity index 89% rename from dd-trace/src/test/java/com/datadoghq/trace/RateSamplerTest.java rename to dd-trace-ot/src/test/java/datadog/trace/api/sampling/RateSamplerTest.java index 4dac5b0d19..babc0a5067 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/RateSamplerTest.java +++ b/dd-trace-ot/src/test/java/datadog/trace/api/sampling/RateSamplerTest.java @@ -1,10 +1,9 @@ -package com.datadoghq.trace; +package datadog.trace.api.sampling; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import com.datadoghq.trace.sampling.RateSampler; -import com.datadoghq.trace.sampling.Sampler; +import datadog.opentracing.DDSpan; import org.junit.Test; public class RateSamplerTest { diff --git a/dd-trace/src/test/resources/dd-trace-decorators.yaml b/dd-trace-ot/src/test/resources/dd-trace-decorators.yaml similarity index 100% rename from dd-trace/src/test/resources/dd-trace-decorators.yaml rename to dd-trace-ot/src/test/resources/dd-trace-decorators.yaml diff --git a/dd-trace/src/test/resources/dd-trace.version b/dd-trace-ot/src/test/resources/dd-trace-ot.version similarity index 100% rename from dd-trace/src/test/resources/dd-trace.version rename to dd-trace-ot/src/test/resources/dd-trace-ot.version diff --git a/dd-trace/src/test/resources/dd-url-patterns.yaml b/dd-trace-ot/src/test/resources/dd-url-patterns.yaml similarity index 100% rename from dd-trace/src/test/resources/dd-url-patterns.yaml rename to dd-trace-ot/src/test/resources/dd-url-patterns.yaml diff --git a/dd-trace/src/test/resources/logback.xml b/dd-trace-ot/src/test/resources/logback.xml similarity index 100% rename from dd-trace/src/test/resources/logback.xml rename to dd-trace-ot/src/test/resources/logback.xml diff --git a/dd-trace-examples/README.md b/examples/README.md similarity index 100% rename from dd-trace-examples/README.md rename to examples/README.md diff --git a/dd-trace-examples/dropwizard-mongo-client/README.md b/examples/dropwizard-mongo-client/README.md similarity index 98% rename from dd-trace-examples/dropwizard-mongo-client/README.md rename to examples/dropwizard-mongo-client/README.md index cd7c1f5f8b..bd672538fb 100644 --- a/dd-trace-examples/dropwizard-mongo-client/README.md +++ b/examples/dropwizard-mongo-client/README.md @@ -17,7 +17,7 @@ all libraries and examples launching from the ``dd-trace-java`` root folder: Then you can start all services via Docker: ```bash -cd dd-trace-examples/dropwizard-mongo-client +cd examples/dropwizard-mongo-client DD_API_KEY= docker-compose up -d ``` diff --git a/dd-trace-examples/dropwizard-mongo-client/docker-compose.yml b/examples/dropwizard-mongo-client/docker-compose.yml similarity index 100% rename from dd-trace-examples/dropwizard-mongo-client/docker-compose.yml rename to examples/dropwizard-mongo-client/docker-compose.yml diff --git a/dd-trace-examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle b/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle similarity index 82% rename from dd-trace-examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle rename to examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle index 96707d4884..60dbcaf179 100644 --- a/dd-trace-examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle +++ b/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle @@ -8,7 +8,7 @@ apply from: "${rootDir}/gradle/jacoco.gradle" version = 'demo' description = 'dropwizard-mongo-client' -mainClassName = 'com.datadoghq.example.dropwizard.BookApplication' +mainClassName = 'datadog.example.dropwizard.BookApplication' applicationDefaultJvmArgs = ["-Ddd.service.name=dropwizard-example"] @@ -16,7 +16,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 dependencies { - compile project(':dd-trace') + compile project(':dd-trace-ot') compile project(':dd-trace-annotations') compile deps.opentracing @@ -28,7 +28,7 @@ dependencies { jar { manifest { - attributes 'Main-Class': 'com.datadoghq.example.dropwizard.BookApplication' + attributes 'Main-Class': 'datadog.example.dropwizard.BookApplication' } } diff --git a/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar b/examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar rename to examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.jar diff --git a/dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties b/examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from dd-trace-examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties rename to examples/dropwizard-mongo-client/gradle/wrapper/gradle-wrapper.properties diff --git a/dd-trace-examples/dropwizard-mongo-client/gradlew b/examples/dropwizard-mongo-client/gradlew similarity index 100% rename from dd-trace-examples/dropwizard-mongo-client/gradlew rename to examples/dropwizard-mongo-client/gradlew diff --git a/dd-trace-examples/dropwizard-mongo-client/gradlew.bat b/examples/dropwizard-mongo-client/gradlew.bat similarity index 100% rename from dd-trace-examples/dropwizard-mongo-client/gradlew.bat rename to examples/dropwizard-mongo-client/gradlew.bat diff --git a/dd-trace-examples/rest-spark/src/main/resources/configuration.yaml b/examples/dropwizard-mongo-client/out/production/resources/configuration.yaml similarity index 65% rename from dd-trace-examples/rest-spark/src/main/resources/configuration.yaml rename to examples/dropwizard-mongo-client/out/production/resources/configuration.yaml index c331dc9baa..295673f037 100644 --- a/dd-trace-examples/rest-spark/src/main/resources/configuration.yaml +++ b/examples/dropwizard-mongo-client/out/production/resources/configuration.yaml @@ -1,5 +1,5 @@ logging: level: INFO loggers: - "com.datadoghq.trace": DEBUG + "datadog.trace": DEBUG "io.opentracing": DEBUG diff --git a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/BookApplication.java b/examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/BookApplication.java similarity index 58% rename from dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/BookApplication.java rename to examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/BookApplication.java index 0474b0f6c8..8602784b2c 100644 --- a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/BookApplication.java +++ b/examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/BookApplication.java @@ -1,13 +1,13 @@ -package com.datadoghq.example.dropwizard; +package datadog.example.dropwizard; -import com.datadoghq.example.dropwizard.resources.SimpleCrudResource; +import datadog.example.dropwizard.resources.SimpleCrudResource; import io.dropwizard.Application; import io.dropwizard.Configuration; import io.dropwizard.setup.Bootstrap; import io.dropwizard.setup.Environment; public class BookApplication extends Application { - public static void main(String[] args) throws Exception { + public static void main(final String[] args) throws Exception { new BookApplication().run(args); } @@ -17,12 +17,12 @@ public class BookApplication extends Application { } @Override - public void initialize(Bootstrap bootstrap) { + public void initialize(final Bootstrap bootstrap) { // nothing to do yet } @Override - public void run(Configuration configuration, Environment environment) { + public void run(final Configuration configuration, final Environment environment) { environment.jersey().register(new SimpleCrudResource()); } diff --git a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/api/Book.java b/examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/api/Book.java similarity index 81% rename from dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/api/Book.java rename to examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/api/Book.java index 8f695828b7..abe23640d7 100644 --- a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/api/Book.java +++ b/examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/api/Book.java @@ -1,4 +1,4 @@ -package com.datadoghq.example.dropwizard.api; +package datadog.example.dropwizard.api; import com.fasterxml.jackson.annotation.JsonProperty; import org.bson.Document; @@ -9,13 +9,13 @@ public class Book { private final int numberPages; private final String IsbnCode; - public Book(String isbnCode, String title, int numberPages) { + public Book(final String isbnCode, final String title, final int numberPages) { this.title = title; this.numberPages = numberPages; IsbnCode = isbnCode; } - public Book(Document d) { + public Book(final Document d) { this(d.getString("isbn"), d.getString("title"), d.getInteger("page").intValue()); } diff --git a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/client/TracedClient.java b/examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/client/TracedClient.java similarity index 62% rename from dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/client/TracedClient.java rename to examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/client/TracedClient.java index 9d0fef232f..36fe313ee9 100644 --- a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/client/TracedClient.java +++ b/examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/client/TracedClient.java @@ -1,7 +1,7 @@ -package com.datadoghq.example.dropwizard.client; +package datadog.example.dropwizard.client; -import com.datadoghq.trace.DDTags; -import com.datadoghq.trace.Trace; +import datadog.trace.api.DDTags; +import datadog.trace.api.Trace; import io.opentracing.ActiveSpan; import io.opentracing.Tracer; import io.opentracing.util.GlobalTracer; @@ -17,20 +17,20 @@ import okhttp3.Response; */ public class TracedClient { - public static void main(String[] args) throws Exception { + public static void main(final String[] args) throws Exception { executeCall(); System.out.println("After execute"); } @Trace private static void executeCall() throws IOException { - Tracer tracer = GlobalTracer.get(); - ActiveSpan activeSpan = tracer.activeSpan(); + final Tracer tracer = GlobalTracer.get(); + final ActiveSpan activeSpan = tracer.activeSpan(); activeSpan.setTag(DDTags.SERVICE_NAME, "http.client"); - OkHttpClient client = new OkHttpClient().newBuilder().build(); - Request request = new Request.Builder().url("http://localhost:8080/demo/").build(); - Response response = client.newCall(request).execute(); + final OkHttpClient client = new OkHttpClient().newBuilder().build(); + final Request request = new Request.Builder().url("http://localhost:8080/demo/").build(); + final Response response = client.newCall(request).execute(); if (!response.isSuccessful()) throw new IOException("Unexpected code " + response); System.out.println(response.body().string()); diff --git a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/resources/SimpleCrudResource.java b/examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/resources/SimpleCrudResource.java similarity index 96% rename from dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/resources/SimpleCrudResource.java rename to examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/resources/SimpleCrudResource.java index df084814e2..e7dab297d0 100644 --- a/dd-trace-examples/dropwizard-mongo-client/src/main/java/com/datadoghq/example/dropwizard/resources/SimpleCrudResource.java +++ b/examples/dropwizard-mongo-client/src/main/java/datadog/example/dropwizard/resources/SimpleCrudResource.java @@ -1,11 +1,11 @@ -package com.datadoghq.example.dropwizard.resources; +package datadog.example.dropwizard.resources; -import com.datadoghq.example.dropwizard.api.Book; -import com.datadoghq.trace.Trace; import com.google.common.base.Optional; import com.mongodb.MongoClient; import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; +import datadog.example.dropwizard.api.Book; +import datadog.trace.api.Trace; import io.opentracing.ActiveSpan; import io.opentracing.util.GlobalTracer; import java.util.ArrayList; diff --git a/examples/dropwizard-mongo-client/src/main/resources/configuration.yaml b/examples/dropwizard-mongo-client/src/main/resources/configuration.yaml new file mode 100644 index 0000000000..295673f037 --- /dev/null +++ b/examples/dropwizard-mongo-client/src/main/resources/configuration.yaml @@ -0,0 +1,5 @@ +logging: + level: INFO + loggers: + "datadog.trace": DEBUG + "io.opentracing": DEBUG diff --git a/dd-trace-examples/rest-spark/README.md b/examples/rest-spark/README.md similarity index 98% rename from dd-trace-examples/rest-spark/README.md rename to examples/rest-spark/README.md index 2cd2685854..610c6210e7 100644 --- a/dd-trace-examples/rest-spark/README.md +++ b/examples/rest-spark/README.md @@ -18,7 +18,7 @@ all libraries and examples launching from the ``dd-trace-java`` root folder: Then you can prepare the distributable version of the ``rest-spark`` as follows: ```bash -cd dd-trace-examples/rest-spark +cd examples/rest-spark ./gradlew installDist ``` diff --git a/dd-trace-examples/rest-spark/docker-compose.yml b/examples/rest-spark/docker-compose.yml similarity index 100% rename from dd-trace-examples/rest-spark/docker-compose.yml rename to examples/rest-spark/docker-compose.yml diff --git a/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.jar b/examples/rest-spark/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.jar rename to examples/rest-spark/gradle/wrapper/gradle-wrapper.jar diff --git a/dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.properties b/examples/rest-spark/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from dd-trace-examples/rest-spark/gradle/wrapper/gradle-wrapper.properties rename to examples/rest-spark/gradle/wrapper/gradle-wrapper.properties diff --git a/dd-trace-examples/rest-spark/gradlew b/examples/rest-spark/gradlew similarity index 100% rename from dd-trace-examples/rest-spark/gradlew rename to examples/rest-spark/gradlew diff --git a/dd-trace-examples/rest-spark/gradlew.bat b/examples/rest-spark/gradlew.bat similarity index 100% rename from dd-trace-examples/rest-spark/gradlew.bat rename to examples/rest-spark/gradlew.bat diff --git a/examples/rest-spark/out/production/resources/configuration.yaml b/examples/rest-spark/out/production/resources/configuration.yaml new file mode 100644 index 0000000000..295673f037 --- /dev/null +++ b/examples/rest-spark/out/production/resources/configuration.yaml @@ -0,0 +1,5 @@ +logging: + level: INFO + loggers: + "datadog.trace": DEBUG + "io.opentracing": DEBUG diff --git a/dd-trace-examples/rest-spark/rest-spark.gradle b/examples/rest-spark/rest-spark.gradle similarity index 82% rename from dd-trace-examples/rest-spark/rest-spark.gradle rename to examples/rest-spark/rest-spark.gradle index 24fccd4c7e..86e7484ed5 100644 --- a/dd-trace-examples/rest-spark/rest-spark.gradle +++ b/examples/rest-spark/rest-spark.gradle @@ -8,14 +8,14 @@ apply from: "${rootDir}/gradle/jacoco.gradle" version = 'demo' description = 'rest-spark' -mainClassName = 'com.datadoghq.example.restspark.SparkApplication' +mainClassName = 'datadog.example.restspark.SparkApplication' applicationDefaultJvmArgs = ["-Ddd.service.name=rest-spark"] sourceCompatibility = 1.8 targetCompatibility = 1.8 dependencies { - compile project(':dd-trace') + compile project(':dd-trace-ot') compile 'com.sparkjava:spark-core:2.6.0' compile 'org.mongodb:mongodb-driver:3.4.2' @@ -29,7 +29,7 @@ dependencies { jar { manifest { - attributes 'Main-Class': 'com.datadoghq.example.restspark.SparkApplication' + attributes 'Main-Class': 'datadog.example.restspark.SparkApplication' } } diff --git a/dd-trace-examples/rest-spark/src/main/java/com/datadoghq/example/restspark/MongoDriver.java b/examples/rest-spark/src/main/java/datadog/example/restspark/MongoDriver.java similarity index 91% rename from dd-trace-examples/rest-spark/src/main/java/com/datadoghq/example/restspark/MongoDriver.java rename to examples/rest-spark/src/main/java/datadog/example/restspark/MongoDriver.java index 2cc407dafe..3e50bad460 100644 --- a/dd-trace-examples/rest-spark/src/main/java/com/datadoghq/example/restspark/MongoDriver.java +++ b/examples/rest-spark/src/main/java/datadog/example/restspark/MongoDriver.java @@ -1,4 +1,4 @@ -package com.datadoghq.example.restspark; +package datadog.example.restspark; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; diff --git a/dd-trace-examples/rest-spark/src/main/java/com/datadoghq/example/restspark/SparkApplication.java b/examples/rest-spark/src/main/java/datadog/example/restspark/SparkApplication.java similarity index 98% rename from dd-trace-examples/rest-spark/src/main/java/com/datadoghq/example/restspark/SparkApplication.java rename to examples/rest-spark/src/main/java/datadog/example/restspark/SparkApplication.java index 87ba9596f8..797df5b23b 100644 --- a/dd-trace-examples/rest-spark/src/main/java/com/datadoghq/example/restspark/SparkApplication.java +++ b/examples/rest-spark/src/main/java/datadog/example/restspark/SparkApplication.java @@ -1,4 +1,4 @@ -package com.datadoghq.example.restspark; +package datadog.example.restspark; import static spark.Spark.get; diff --git a/examples/rest-spark/src/main/resources/configuration.yaml b/examples/rest-spark/src/main/resources/configuration.yaml new file mode 100644 index 0000000000..295673f037 --- /dev/null +++ b/examples/rest-spark/src/main/resources/configuration.yaml @@ -0,0 +1,5 @@ +logging: + level: INFO + loggers: + "datadog.trace": DEBUG + "io.opentracing": DEBUG diff --git a/dd-trace-examples/spring-boot-jdbc/README.md b/examples/spring-boot-jdbc/README.md similarity index 92% rename from dd-trace-examples/spring-boot-jdbc/README.md rename to examples/spring-boot-jdbc/README.md index e43407fec1..425e153b2a 100644 --- a/dd-trace-examples/spring-boot-jdbc/README.md +++ b/examples/spring-boot-jdbc/README.md @@ -17,7 +17,7 @@ all libraries and examples launching from the ``dd-trace-java`` root folder: Then you can launch the Datadog agent as follows: ```bash -cd dd-trace-examples/spring-boot-jdbc +cd examples/spring-boot-jdbc DD_API_KEY= docker-compose up -d ``` @@ -31,7 +31,7 @@ To launch the application, just: ``` *Note: The ``bootRun`` Gradle command appends automatically the ``-javaagent`` argument, so that you don't need to specify -the path of the Java Agent. Gradle executes the ``:dd-trace-examples:spring-boot-jdbc:bootRun`` task until you +the path of the Java Agent. Gradle executes the ``:examples:spring-boot-jdbc:bootRun`` task until you stop it.* Or as an executable jar: diff --git a/dd-trace-examples/spring-boot-jdbc/docker-compose.yml b/examples/spring-boot-jdbc/docker-compose.yml similarity index 100% rename from dd-trace-examples/spring-boot-jdbc/docker-compose.yml rename to examples/spring-boot-jdbc/docker-compose.yml diff --git a/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar b/examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar rename to examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.jar diff --git a/dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.properties b/examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from dd-trace-examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.properties rename to examples/spring-boot-jdbc/gradle/wrapper/gradle-wrapper.properties diff --git a/dd-trace-examples/spring-boot-jdbc/gradlew b/examples/spring-boot-jdbc/gradlew similarity index 100% rename from dd-trace-examples/spring-boot-jdbc/gradlew rename to examples/spring-boot-jdbc/gradlew diff --git a/dd-trace-examples/spring-boot-jdbc/gradlew.bat b/examples/spring-boot-jdbc/gradlew.bat similarity index 100% rename from dd-trace-examples/spring-boot-jdbc/gradlew.bat rename to examples/spring-boot-jdbc/gradlew.bat diff --git a/dd-trace-examples/spring-boot-jdbc/src/main/resources/application.properties b/examples/spring-boot-jdbc/out/production/resources/application.properties similarity index 85% rename from dd-trace-examples/spring-boot-jdbc/src/main/resources/application.properties rename to examples/spring-boot-jdbc/out/production/resources/application.properties index bee9bc11eb..57104fffac 100644 --- a/dd-trace-examples/spring-boot-jdbc/src/main/resources/application.properties +++ b/examples/spring-boot-jdbc/out/production/resources/application.properties @@ -4,4 +4,4 @@ spring.datasource.url=jdbc:h2:mem:spring-test;DB_CLOSE_ON_EXIT=FALSE # set the logging level logging.level.root=INFO -logging.level.com.datadoghq.trace=DEBUG +logging.level.datadog.trace=DEBUG diff --git a/dd-trace-examples/spring-boot-jdbc/spring-boot-jdbc.gradle b/examples/spring-boot-jdbc/spring-boot-jdbc.gradle similarity index 95% rename from dd-trace-examples/spring-boot-jdbc/spring-boot-jdbc.gradle rename to examples/spring-boot-jdbc/spring-boot-jdbc.gradle index 13f0377389..94339af63a 100644 --- a/dd-trace-examples/spring-boot-jdbc/spring-boot-jdbc.gradle +++ b/examples/spring-boot-jdbc/spring-boot-jdbc.gradle @@ -17,7 +17,7 @@ dependencies { } bootRepackage { - mainClass = 'com.datadoghq.examples.Application' + mainClass = 'datadog.examples.Application' } bootRun { diff --git a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/Application.java b/examples/spring-boot-jdbc/src/main/java/datadog/examples/Application.java similarity index 89% rename from dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/Application.java rename to examples/spring-boot-jdbc/src/main/java/datadog/examples/Application.java index 2a2db70135..fc172fef99 100644 --- a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/Application.java +++ b/examples/spring-boot-jdbc/src/main/java/datadog/examples/Application.java @@ -1,4 +1,4 @@ -package com.datadoghq.examples; +package datadog.examples; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/ApplicationConfig.java b/examples/spring-boot-jdbc/src/main/java/datadog/examples/ApplicationConfig.java similarity index 94% rename from dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/ApplicationConfig.java rename to examples/spring-boot-jdbc/src/main/java/datadog/examples/ApplicationConfig.java index 571af289cf..a7ed055465 100644 --- a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/ApplicationConfig.java +++ b/examples/spring-boot-jdbc/src/main/java/datadog/examples/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.datadoghq.examples; +package datadog.examples; import org.apache.http.impl.client.HttpClientBuilder; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/entities/User.java b/examples/spring-boot-jdbc/src/main/java/datadog/examples/entities/User.java similarity index 94% rename from dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/entities/User.java rename to examples/spring-boot-jdbc/src/main/java/datadog/examples/entities/User.java index 0ab8215f9d..420978c92b 100644 --- a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/entities/User.java +++ b/examples/spring-boot-jdbc/src/main/java/datadog/examples/entities/User.java @@ -1,4 +1,4 @@ -package com.datadoghq.examples.entities; +package datadog.examples.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/entities/UserRepository.java b/examples/spring-boot-jdbc/src/main/java/datadog/examples/entities/UserRepository.java similarity index 86% rename from dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/entities/UserRepository.java rename to examples/spring-boot-jdbc/src/main/java/datadog/examples/entities/UserRepository.java index aee1325362..6ebf1900c3 100644 --- a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/entities/UserRepository.java +++ b/examples/spring-boot-jdbc/src/main/java/datadog/examples/entities/UserRepository.java @@ -1,4 +1,4 @@ -package com.datadoghq.examples.entities; +package datadog.examples.entities; import org.springframework.data.repository.CrudRepository; diff --git a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/resources/DBResource.java b/examples/spring-boot-jdbc/src/main/java/datadog/examples/resources/DBResource.java similarity index 91% rename from dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/resources/DBResource.java rename to examples/spring-boot-jdbc/src/main/java/datadog/examples/resources/DBResource.java index a9f822323a..5b5503b46a 100644 --- a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/resources/DBResource.java +++ b/examples/spring-boot-jdbc/src/main/java/datadog/examples/resources/DBResource.java @@ -1,7 +1,7 @@ -package com.datadoghq.examples.resources; +package datadog.examples.resources; -import com.datadoghq.examples.entities.User; -import com.datadoghq.examples.entities.UserRepository; +import datadog.examples.entities.User; +import datadog.examples.entities.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/resources/HomeResource.java b/examples/spring-boot-jdbc/src/main/java/datadog/examples/resources/HomeResource.java similarity index 94% rename from dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/resources/HomeResource.java rename to examples/spring-boot-jdbc/src/main/java/datadog/examples/resources/HomeResource.java index c0fbc74f19..893603c3f8 100644 --- a/dd-trace-examples/spring-boot-jdbc/src/main/java/com/datadoghq/examples/resources/HomeResource.java +++ b/examples/spring-boot-jdbc/src/main/java/datadog/examples/resources/HomeResource.java @@ -1,4 +1,4 @@ -package com.datadoghq.examples.resources; +package datadog.examples.resources; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/examples/spring-boot-jdbc/src/main/resources/application.properties b/examples/spring-boot-jdbc/src/main/resources/application.properties new file mode 100644 index 0000000000..57104fffac --- /dev/null +++ b/examples/spring-boot-jdbc/src/main/resources/application.properties @@ -0,0 +1,7 @@ +# you must set the following so that OpenTracing traced driver is used +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:spring-test;DB_CLOSE_ON_EXIT=FALSE + +# set the logging level +logging.level.root=INFO +logging.level.datadog.trace=DEBUG diff --git a/gradle/java.gradle b/gradle/java.gradle index 78496ce514..d99e1227c6 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -104,3 +104,12 @@ if (project.hasProperty("removeJarVersionNumbers") && removeJarVersionNumbers) { apply from: "$rootDir/gradle/checkstyle.gradle" apply from: "$rootDir/gradle/codenarc.gradle" + + +plugins.withType(BasePlugin) { + project.afterEvaluate { + def deleteTasks = tasks.withType(Delete) + project.tasks.findByPath('clean') + def otherTasks = tasks - deleteTasks + otherTasks*.mustRunAfter deleteTasks + } +} diff --git a/settings.gradle b/settings.gradle index f4e82cf306..93a25bdef6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ rootProject.name = 'dd-trace-java' -include ':dd-trace' +include ':dd-trace-ot' include ':dd-java-agent' include ':dd-java-agent:benchmark' include ':dd-java-agent:benchmark-integration' @@ -8,26 +8,27 @@ include ':dd-java-agent:benchmark-integration:jetty-perftest' include ':dd-java-agent:testing' include ':dd-java-agent:tooling' include ':dd-java-agent-ittests' -include ':dd-trace-examples:dropwizard-mongo-client' -include ':dd-trace-examples:spring-boot-jdbc' -include ':dd-trace-examples:rest-spark' -include ':dd-trace-examples' include ':dd-trace-annotations' -// integrations: -include ':dd-java-agent:integrations:apache-httpclient-4.3' -include ':dd-java-agent:integrations:aws-sdk' -include ':dd-java-agent:integrations:datastax-cassandra-3.2' -include ':dd-java-agent:integrations:jdbc' -include ':dd-java-agent:integrations:jms-1' -include ':dd-java-agent:integrations:jms-2' -include ':dd-java-agent:integrations:mongo-3.1' -include ':dd-java-agent:integrations:mongo-async-3.3' -include ':dd-java-agent:integrations:okhttp-3' -include ':dd-java-agent:integrations:servlet-2' -include ':dd-java-agent:integrations:servlet-3' -include ':dd-java-agent:integrations:spring-web' -include ':dd-java-agent:integrations:trace-annotation' +// examples +include ':examples:dropwizard-mongo-client' +include ':examples:spring-boot-jdbc' +include ':examples:rest-spark' + +// instrumentation: +include ':dd-java-agent:instrumentation:apache-httpclient-4.3' +include ':dd-java-agent:instrumentation:aws-sdk' +include ':dd-java-agent:instrumentation:datastax-cassandra-3.2' +include ':dd-java-agent:instrumentation:jdbc' +include ':dd-java-agent:instrumentation:jms-1' +include ':dd-java-agent:instrumentation:jms-2' +include ':dd-java-agent:instrumentation:mongo-3.1' +include ':dd-java-agent:instrumentation:mongo-async-3.3' +include ':dd-java-agent:instrumentation:okhttp-3' +include ':dd-java-agent:instrumentation:servlet-2' +include ':dd-java-agent:instrumentation:servlet-3' +include ':dd-java-agent:instrumentation:spring-web' +include ':dd-java-agent:instrumentation:trace-annotation' def setBuildFile(project) { project.buildFileName = "${project.name}.gradle" From 6d3d88987b95e1dfd687c64dd8c9ec7cda1511a9 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 8 Jan 2018 13:48:10 +1000 Subject: [PATCH 2/2] Rename dd-trace-annotations to dd-trace-api And move DDTags over to it. Move some `datadog.trace.api` classes over to `datadog.trace.common`. Other misc renaming. --- README.md | 16 ++++++++-------- .../dd-java-agent-ittests.gradle | 4 ++-- .../httpclient/ApacheHttpClientTest.groovy | 2 +- .../jdbc/JDBCInstrumentationTest.groovy | 2 +- .../integration/servlet/JettyServletTest.groovy | 5 +++-- .../integration/servlet/TomcatServletTest.groovy | 2 +- .../trace/agent/ShadowPackageRenamingTest.java | 2 +- .../annotation/TraceAnnotationsTest.java | 2 +- .../MongoAsyncClientInstrumentationTest.java | 2 +- .../MongoClientInstrumentationTest.java | 2 +- dd-java-agent/benchmark/benchmark.gradle | 2 +- dd-java-agent/dd-java-agent.gradle | 15 ++++++++------- .../trace-annotation/trace-annotation.gradle | 2 +- .../java/datadog/trace/agent/TracingAgent.java | 4 ++-- .../trace/agent/test/AgentTestRunner.java | 2 +- .../dd-trace-api.gradle | 2 +- .../src/main/java/datadog/trace/api/DDTags.java | 0 .../java/datadog/trace/api/DDTraceApiInfo.java | 7 +++---- .../src/main/java/datadog/trace/api/Trace.java | 0 dd-trace-ot/dd-trace-ot.gradle | 6 +++--- .../jmh/java/datadog/trace/DDTraceBenchmark.java | 2 +- .../java/datadog/opentracing/DDBaseSpan.java | 2 +- .../main/java/datadog/opentracing/DDTracer.java | 10 +++++----- .../decorators/DDDecoratorsFactory.java | 2 +- .../decorators/URLAsResourceName.java | 2 +- .../trace/{api => common}/DDTraceConfig.java | 10 ++++++---- .../datadog/trace/{api => common}/Service.java | 2 +- .../sampling/AbstractSampler.java | 2 +- .../{api => common}/sampling/AllSampler.java | 2 +- .../{api => common}/sampling/RateSampler.java | 4 +++- .../trace/{api => common}/sampling/Sampler.java | 4 ++-- .../trace/{api => common}/util/Clock.java | 6 +++++- .../trace/{api => common}/util/ConfigUtils.java | 2 +- .../{api => common}/writer/DDAgentWriter.java | 8 +++++--- .../trace/{api => common}/writer/DDApi.java | 4 ++-- .../trace/{api => common}/writer/ListWriter.java | 4 ++-- .../{api => common}/writer/LoggingWriter.java | 4 ++-- .../trace/{api => common}/writer/Writer.java | 6 +++--- .../{api => common}/writer/WriterQueue.java | 6 +++++- .../decorators/SpanDecoratorTest.groovy | 2 +- .../trace/ActiveSpanContinuationTest.groovy | 2 +- .../datadog/trace/DDTraceConfigTest.groovy | 14 +++++++------- .../test/groovy/datadog/trace/ServiceTest.groovy | 6 +++--- .../trace/api/writer/DDAgentWriterTest.groovy | 3 +++ .../datadog/trace/api/writer/DDApiTest.groovy | 5 +++-- .../trace/api/writer/WriterQueueTest.groovy | 1 + .../java/datadog/opentracing/DDTracerTest.java | 4 ++-- .../trace/api/sampling/AllSamplerTest.java | 1 + .../trace/api/sampling/RateSamplerTest.java | 2 ++ .../dropwizard-mongo-client.gradle | 2 +- settings.gradle | 2 +- 51 files changed, 114 insertions(+), 91 deletions(-) rename dd-trace-annotations/dd-trace-annotations.gradle => dd-trace-api/dd-trace-api.gradle (84%) rename {dd-trace-ot => dd-trace-api}/src/main/java/datadog/trace/api/DDTags.java (100%) rename dd-trace-annotations/src/main/java/datadog/trace/api/DDTraceAnnotationsInfo.java => dd-trace-api/src/main/java/datadog/trace/api/DDTraceApiInfo.java (74%) rename {dd-trace-annotations => dd-trace-api}/src/main/java/datadog/trace/api/Trace.java (100%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/DDTraceConfig.java (93%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/Service.java (97%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/sampling/AbstractSampler.java (96%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/sampling/AllSampler.java (88%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/sampling/RateSampler.java (96%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/sampling/Sampler.java (94%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/util/Clock.java (95%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/util/ConfigUtils.java (97%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/writer/DDAgentWriter.java (98%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/writer/DDApi.java (98%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/writer/ListWriter.java (95%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/writer/LoggingWriter.java (90%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/writer/Writer.java (95%) rename dd-trace-ot/src/main/java/datadog/trace/{api => common}/writer/WriterQueue.java (97%) diff --git a/README.md b/README.md index 37ea2b15a2..262c1c590a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ These three things help you instrument Java applications: **Note:** dd-java-agent is considered experimental. Some integrations may not activate in all cases. Additional manual instrumentation using the [Opentracing API](https://github.com/opentracing/opentracing-java) is strongly encouraged. -**[Datadog Tracer](https://github.com/DataDog/dd-trace-java/tree/master/dd-trace)**: an OpenTracing-compatible library that lets you trace any piece of your Java code, not just whole methods. +**[Datadog Tracer](https://github.com/DataDog/dd-trace-java/tree/master/dd-trace-ot)**: an OpenTracing-compatible library that lets you trace any piece of your Java code, not just whole methods. **[Datadog APM Agent](https://github.com/DataDog/datadog-trace-agent)**: a (non-Java) service that runs on your application servers, accepting trace data from the Datadog Java Agent and/or Datadog Tracer and sending it to Datadog. (The APM Agent is not part of this repo; it's the same Agent to which all Datadog tracers—Go, Python, etc—send data) @@ -91,12 +91,12 @@ The Java Agent lets you add a `@Trace` annotation to any method to measure its e #### Setup -Add the `dd-trace-annotations` dependency to your project. For Maven, add this to pom.xml: +Add the `dd-trace-api` dependency to your project. For Maven, add this to pom.xml: ```xml com.datadoghq - dd-trace-annotations + dd-trace-api {version} ``` @@ -104,7 +104,7 @@ Add the `dd-trace-annotations` dependency to your project. For Maven, add this t For gradle, add: ```gradle -compile group: 'com.datadoghq', name: 'dd-trace-annotations', version: {version} +compile group: 'com.datadoghq', name: 'dd-trace-api', version: {version} ``` The Java Agent lets you use `@Trace` not just for `com.example.myproject`, but also for any application whose name _begins_ like that, e.g. `com.example.myproject.foobar`. If you're tempted to list something like `["com", "io"]` to avoid having to fuss with this configuration as you add new projects, be careful; providing `@Trace`-ability to too many applications could hurt your package's build time. @@ -133,7 +133,7 @@ When you don't pass an `operationName`, the Java Agent sets it to the method nam ### Manual Instrumentation -You can use the Datadog Tracer (`dd-trace`) library to measure execution times for specific pieces of code. This lets you trace your application more precisely than you can with the Java Agent alone. +You can use the Datadog Tracer (`dd-trace-ot`) library to measure execution times for specific pieces of code. This lets you trace your application more precisely than you can with the Java Agent alone. #### Setup @@ -157,7 +157,7 @@ For Maven, add this to pom.xml: com.datadoghq - dd-trace + dd-trace-ot ${dd-trace-java.version} ``` @@ -167,14 +167,14 @@ For gradle, add: ``` compile group: 'io.opentracing', name: 'opentracing-api', version: "0.30.0" compile group: 'io.opentracing', name: 'opentracing-util', version: "0.30.0" -compile group: 'com.datadoghq', name: 'dd-trace', version: "${dd-trace-java.version}" +compile group: 'com.datadoghq', name: 'dd-trace-ot', version: "${dd-trace-java.version}" ``` Configure your application using environment variables or system properties as discussed in the [config](#configuration) section. #### Examples -Rather than referencing classes directly from `dd-trace` (other than registering `DDTracer`), we strongly suggest using the [OpenTracing API](https://github.com/opentracing/opentracing-java). +Rather than referencing classes directly from `dd-trace-ot` (other than registering `DDTracer`), we strongly suggest using the [OpenTracing API](https://github.com/opentracing/opentracing-java). [Additional documentation on the api](docs/opentracing-api.md) is also available. Let's look at a simple example. diff --git a/dd-java-agent-ittests/dd-java-agent-ittests.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle index 9ceaf9787e..99e8c5ade4 100644 --- a/dd-java-agent-ittests/dd-java-agent-ittests.gradle +++ b/dd-java-agent-ittests/dd-java-agent-ittests.gradle @@ -6,7 +6,7 @@ evaluationDependsOn(':dd-java-agent:tooling') compileTestJava.dependsOn tasks.getByPath(':dd-java-agent:tooling:testClasses') dependencies { - testCompile project(':dd-trace-annotations') + testCompile project(':dd-trace-api') testCompile project(':dd-trace-ot') testCompile deps.opentracingMock @@ -58,7 +58,7 @@ test { } if (project.hasProperty("disableShadowRelocate") && disableShadowRelocate) { - exclude 'com/datadoghq/agent/ShadowPackageRenamingTest.class' + exclude 'datadog/trace/agent/ShadowPackageRenamingTest.class' } } diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy index fbac6232a5..a11e75ecaf 100644 --- a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/httpclient/ApacheHttpClientTest.groovy @@ -4,7 +4,7 @@ import datadog.opentracing.DDBaseSpan import datadog.opentracing.DDTracer import datadog.trace.agent.integration.TestHttpServer import datadog.trace.agent.test.TestUtils -import datadog.trace.api.writer.ListWriter +import datadog.trace.common.writer.ListWriter import io.opentracing.tag.Tags import org.apache.http.HttpResponse import org.apache.http.client.HttpClient diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy index 4fc39a57be..67f782c285 100644 --- a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/jdbc/JDBCInstrumentationTest.groovy @@ -2,7 +2,7 @@ package datadog.trace.agent.integration.jdbc import datadog.opentracing.DDTracer import datadog.trace.agent.test.TestUtils -import datadog.trace.api.writer.ListWriter +import datadog.trace.common.writer.ListWriter import org.apache.derby.jdbc.EmbeddedDriver import org.h2.Driver import org.hsqldb.jdbc.JDBCDriver diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/JettyServletTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/JettyServletTest.groovy index 3ac72ed9e0..62d491fad4 100644 --- a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/JettyServletTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/JettyServletTest.groovy @@ -2,7 +2,7 @@ package datadog.trace.agent.integration.servlet import datadog.opentracing.DDBaseSpan import datadog.opentracing.DDTracer -import datadog.trace.api.writer.ListWriter +import datadog.trace.common.writer.ListWriter import io.opentracing.util.GlobalTracer import okhttp3.Interceptor import okhttp3.OkHttpClient @@ -15,6 +15,7 @@ import spock.lang.Unroll import java.lang.reflect.Field import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit class JettyServletTest extends Specification { @@ -27,7 +28,7 @@ class JettyServletTest extends Specification { @Override Response intercept(Interceptor.Chain chain) throws IOException { def response = chain.proceed(chain.request()) - JettyServletTest.latch.await() + JettyServletTest.latch.await(10, TimeUnit.SECONDS) // don't block forever or test never fails. return response } }) diff --git a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TomcatServletTest.groovy b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TomcatServletTest.groovy index 936f85f164..9b00cf603e 100644 --- a/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TomcatServletTest.groovy +++ b/dd-java-agent-ittests/src/test/groovy/datadog/trace/agent/integration/servlet/TomcatServletTest.groovy @@ -2,7 +2,7 @@ package datadog.trace.agent.integration.servlet import com.google.common.io.Files import datadog.opentracing.DDTracer -import datadog.trace.api.writer.ListWriter +import datadog.trace.common.writer.ListWriter import io.opentracing.util.GlobalTracer import okhttp3.OkHttpClient import okhttp3.Request diff --git a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/ShadowPackageRenamingTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/ShadowPackageRenamingTest.java index 5774c37727..a2c95b6018 100644 --- a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/ShadowPackageRenamingTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/ShadowPackageRenamingTest.java @@ -15,7 +15,7 @@ public class ShadowPackageRenamingTest { final String agentGuavaDep = ddClass .getClassLoader() - .loadClass("datadog.trace.agent.deps." + MapMaker.class.getName()) + .loadClass("datadog.trace.agent.deps.google.common.collect.MapMaker") .getProtectionDomain() .getCodeSource() .getLocation() diff --git a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/instrumentation/annotation/TraceAnnotationsTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/instrumentation/annotation/TraceAnnotationsTest.java index 7ae9ce0937..c3415aa93d 100644 --- a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/instrumentation/annotation/TraceAnnotationsTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/instrumentation/annotation/TraceAnnotationsTest.java @@ -7,7 +7,7 @@ import datadog.opentracing.DDTracer; import datadog.opentracing.decorators.ErrorFlag; import datadog.trace.agent.test.SayTracedHello; import datadog.trace.agent.test.TestUtils; -import datadog.trace.api.writer.ListWriter; +import datadog.trace.common.writer.ListWriter; import io.opentracing.util.GlobalTracer; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java index e7e587fe28..8928af993a 100644 --- a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoAsyncClientInstrumentationTest.java @@ -11,7 +11,7 @@ import com.mongodb.async.client.MongoDatabase; import datadog.opentracing.DDBaseSpan; import datadog.opentracing.DDTracer; import datadog.trace.agent.test.TestUtils; -import datadog.trace.api.writer.ListWriter; +import datadog.trace.common.writer.ListWriter; import io.opentracing.tag.Tags; import java.net.InetAddress; import java.nio.ByteBuffer; diff --git a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java index 710a58b90f..79db3a7e51 100644 --- a/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java +++ b/dd-java-agent-ittests/src/test/java/datadog/trace/agent/integration/MongoClientInstrumentationTest.java @@ -6,7 +6,7 @@ import com.mongodb.client.MongoDatabase; import datadog.opentracing.DDBaseSpan; import datadog.opentracing.DDTracer; import datadog.trace.agent.test.TestUtils; -import datadog.trace.api.writer.ListWriter; +import datadog.trace.common.writer.ListWriter; import de.flapdoodle.embed.mongo.MongodExecutable; import de.flapdoodle.embed.mongo.MongodProcess; import de.flapdoodle.embed.mongo.MongodStarter; diff --git a/dd-java-agent/benchmark/benchmark.gradle b/dd-java-agent/benchmark/benchmark.gradle index 011783bcd0..3a44bd9445 100644 --- a/dd-java-agent/benchmark/benchmark.gradle +++ b/dd-java-agent/benchmark/benchmark.gradle @@ -5,7 +5,7 @@ plugins { apply from: "${rootDir}/gradle/java.gradle" dependencies { - jmh project(':dd-trace-annotations') + jmh project(':dd-trace-api') jmh group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.7.6' // Add a bunch of dependencies so instrumentation is not disabled. diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle index 3c13a0a6da..b59e047970 100644 --- a/dd-java-agent/dd-java-agent.gradle +++ b/dd-java-agent/dd-java-agent.gradle @@ -19,7 +19,7 @@ whitelistedInstructionClasses += whitelistedBranchClasses += [ dependencies { compile project(':dd-trace-ot') compile project(':dd-java-agent:tooling') - compile project(':dd-trace-annotations') + compile project(':dd-trace-api') compile deps.bytebuddy @@ -69,16 +69,17 @@ shadowJar { // We want to ensure to not miss if a user is using the annotation. exclude 'datadog.trace.api.Trace' } - relocate('datadog.opentracing', 'datadog.trace.agent.api.opentracing') + relocate 'datadog.trace.common', 'datadog.trace.agent.common' + relocate 'datadog.opentracing', 'datadog.trace.agent.ot' relocate 'io.opentracing.contrib', 'datadog.trace.agent.opentracing.contrib' - relocate 'org.yaml', 'datadog.trace.agent.deps.org.yaml' - relocate 'org.msgpack', 'datadog.trace.agent.deps.org.msgpack' - relocate 'com.fasterxml', 'datadog.trace.agent.deps.com.fasterxml' + relocate 'org.yaml', 'datadog.trace.agent.deps.yaml' + relocate 'org.msgpack', 'datadog.trace.agent.deps.msgpack' + relocate 'com.fasterxml', 'datadog.trace.agent.deps.fasterxml' - relocate 'net.bytebuddy', 'datadog.trace.agent.deps.net.bytebuddy' - relocate('com.google', 'datadog.trace.agent.deps.com.google') { + relocate 'net.bytebuddy', 'datadog.trace.agent.deps.bytebuddy' + relocate('com.google', 'datadog.trace.agent.deps.google') { // This is used in the Cassandra Cluster.connectAsync signature so we can't relocate it. :fingers_crossed: exclude 'com.google.common.util.concurrent.ListenableFuture' } diff --git a/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle b/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle index 4cc002a9cf..e7bf55041b 100644 --- a/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle +++ b/dd-java-agent/instrumentation/trace-annotation/trace-annotation.gradle @@ -2,7 +2,7 @@ apply from: "${rootDir}/gradle/java.gradle" dependencies { compile project(':dd-trace-ot') - compile project(':dd-trace-annotations') + compile project(':dd-trace-api') compile project(':dd-java-agent:tooling') compile deps.bytebuddy diff --git a/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java b/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java index f193703e24..510d6d41bf 100644 --- a/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java +++ b/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java @@ -18,7 +18,7 @@ package datadog.trace.agent; import datadog.opentracing.DDTraceOTInfo; import datadog.trace.agent.tooling.AgentInstaller; -import datadog.trace.api.DDTraceAnnotationsInfo; +import datadog.trace.api.DDTraceApiInfo; import io.opentracing.Tracer; import io.opentracing.contrib.tracerresolver.TracerResolver; import io.opentracing.util.GlobalTracer; @@ -48,7 +48,7 @@ public class TracingAgent { // in static initializers DDJavaAgentInfo.VERSION.toString(); DDTraceOTInfo.VERSION.toString(); - DDTraceAnnotationsInfo.VERSION.toString(); + DDTraceApiInfo.VERSION.toString(); } /** Register a global tracer if no global tracer is already registered. */ diff --git a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/AgentTestRunner.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/AgentTestRunner.java index ac75816b35..ec974b328b 100644 --- a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/AgentTestRunner.java +++ b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/AgentTestRunner.java @@ -3,7 +3,7 @@ package datadog.trace.agent.test; import datadog.opentracing.DDTracer; import datadog.trace.agent.tooling.AgentInstaller; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.api.writer.ListWriter; +import datadog.trace.common.writer.ListWriter; import io.opentracing.Tracer; import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.Instrumentation; diff --git a/dd-trace-annotations/dd-trace-annotations.gradle b/dd-trace-api/dd-trace-api.gradle similarity index 84% rename from dd-trace-annotations/dd-trace-annotations.gradle rename to dd-trace-api/dd-trace-api.gradle index b2f3b9530e..5e68f0eff5 100644 --- a/dd-trace-annotations/dd-trace-annotations.gradle +++ b/dd-trace-api/dd-trace-api.gradle @@ -2,7 +2,7 @@ apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/jacoco.gradle" -description = 'dd-trace-annotations' +description = 'dd-trace-api' dependencies { compile deps.slf4j testCompile deps.junit diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/DDTags.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java similarity index 100% rename from dd-trace-ot/src/main/java/datadog/trace/api/DDTags.java rename to dd-trace-api/src/main/java/datadog/trace/api/DDTags.java diff --git a/dd-trace-annotations/src/main/java/datadog/trace/api/DDTraceAnnotationsInfo.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTraceApiInfo.java similarity index 74% rename from dd-trace-annotations/src/main/java/datadog/trace/api/DDTraceAnnotationsInfo.java rename to dd-trace-api/src/main/java/datadog/trace/api/DDTraceApiInfo.java index b0830763ab..3fd6f0ff64 100644 --- a/dd-trace-annotations/src/main/java/datadog/trace/api/DDTraceAnnotationsInfo.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/DDTraceApiInfo.java @@ -5,7 +5,7 @@ import java.io.InputStreamReader; import lombok.extern.slf4j.Slf4j; @Slf4j -public class DDTraceAnnotationsInfo { +public class DDTraceApiInfo { public static final String VERSION; static { @@ -16,8 +16,7 @@ public class DDTraceAnnotationsInfo { final BufferedReader br = new BufferedReader( new InputStreamReader( - DDTraceAnnotationsInfo.class.getResourceAsStream("/dd-trace-annotations.version"), - "UTF-8")); + DDTraceApiInfo.class.getResourceAsStream("/dd-trace-api.version"), "UTF-8")); for (int c = br.read(); c != -1; c = br.read()) sb.append((char) c); v = sb.toString().trim(); @@ -25,7 +24,7 @@ public class DDTraceAnnotationsInfo { v = "unknown"; } VERSION = v; - log.info("dd-trace-annotations - version: {}", v); + log.info("dd-trace-api - version: {}", v); } public static void main(final String... args) { diff --git a/dd-trace-annotations/src/main/java/datadog/trace/api/Trace.java b/dd-trace-api/src/main/java/datadog/trace/api/Trace.java similarity index 100% rename from dd-trace-annotations/src/main/java/datadog/trace/api/Trace.java rename to dd-trace-api/src/main/java/datadog/trace/api/Trace.java diff --git a/dd-trace-ot/dd-trace-ot.gradle b/dd-trace-ot/dd-trace-ot.gradle index 58d3de82d5..fa14e46701 100644 --- a/dd-trace-ot/dd-trace-ot.gradle +++ b/dd-trace-ot/dd-trace-ot.gradle @@ -11,13 +11,13 @@ minimumBranchCoverage = 0.3 minimumInstructionCoverage = 0.5 whitelistedInstructionClasses += whitelistedBranchClasses += [ 'datadog.opentracing.decorators.*', - 'datadog.trace.api.writer.ListWriter', + 'datadog.trace.common.writer.ListWriter', + 'datadog.trace.common.util.Clock', 'datadog.trace.api.DDTags', - 'datadog.trace.api.DDTraceInfo', - 'datadog.trace.api.util.Clock', ] dependencies { + compile project(':dd-trace-api') compile deps.opentracing compile group: 'io.opentracing.contrib', name: 'opentracing-tracerresolver', version: '0.1.0' diff --git a/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java b/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java index b1188cecbb..15551c630d 100644 --- a/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java +++ b/dd-trace-ot/src/jmh/java/datadog/trace/DDTraceBenchmark.java @@ -1,7 +1,7 @@ package datadog.trace; import datadog.opentracing.DDTracer; -import datadog.trace.api.writer.ListWriter; +import datadog.trace.common.writer.ListWriter; import io.opentracing.ActiveSpan; import io.opentracing.Span; import io.opentracing.Tracer; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDBaseSpan.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDBaseSpan.java index 00fc0884c9..b961aab924 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDBaseSpan.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDBaseSpan.java @@ -3,7 +3,7 @@ package datadog.opentracing; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonIgnore; import datadog.trace.api.DDTags; -import datadog.trace.api.util.Clock; +import datadog.trace.common.util.Clock; import io.opentracing.BaseSpan; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java index b33ce7cef6..b3bc989daf 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java @@ -6,11 +6,11 @@ import datadog.opentracing.decorators.DDDecoratorsFactory; import datadog.opentracing.propagation.Codec; import datadog.opentracing.propagation.HTTPCodec; import datadog.trace.api.DDTags; -import datadog.trace.api.DDTraceConfig; -import datadog.trace.api.Service; -import datadog.trace.api.sampling.AllSampler; -import datadog.trace.api.sampling.Sampler; -import datadog.trace.api.writer.Writer; +import datadog.trace.common.DDTraceConfig; +import datadog.trace.common.Service; +import datadog.trace.common.sampling.AllSampler; +import datadog.trace.common.sampling.Sampler; +import datadog.trace.common.writer.Writer; import io.opentracing.ActiveSpan; import io.opentracing.ActiveSpanSource; import io.opentracing.BaseSpan; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java index 228ef0de46..c85e1433fb 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java @@ -1,6 +1,6 @@ package datadog.opentracing.decorators; -import datadog.trace.api.util.ConfigUtils; +import datadog.trace.common.util.ConfigUtils; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/URLAsResourceName.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/URLAsResourceName.java index cf4e066e7f..c696c96cb8 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/URLAsResourceName.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/URLAsResourceName.java @@ -3,7 +3,7 @@ package datadog.opentracing.decorators; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import datadog.opentracing.DDSpanContext; import datadog.trace.api.DDTags; -import datadog.trace.api.util.ConfigUtils; +import datadog.trace.common.util.ConfigUtils; import io.opentracing.tag.Tags; import java.net.MalformedURLException; import java.util.ArrayList; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/DDTraceConfig.java b/dd-trace-ot/src/main/java/datadog/trace/common/DDTraceConfig.java similarity index 93% rename from dd-trace-ot/src/main/java/datadog/trace/api/DDTraceConfig.java rename to dd-trace-ot/src/main/java/datadog/trace/common/DDTraceConfig.java index bd0920a4fd..1ba0ecae85 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/DDTraceConfig.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/DDTraceConfig.java @@ -1,15 +1,17 @@ -package datadog.trace.api; +package datadog.trace.common; import datadog.opentracing.DDTracer; -import datadog.trace.api.sampling.Sampler; -import datadog.trace.api.writer.DDAgentWriter; -import datadog.trace.api.writer.Writer; +import datadog.trace.common.sampling.Sampler; +import datadog.trace.common.writer.DDAgentWriter; +import datadog.trace.common.writer.Writer; import java.util.Properties; /** * Config gives priority to system properties and falls back to environment variables. It also * includes default values to ensure a valid config. * + *

+ * *

System properties are {@link DDTraceConfig#PREFIX}'ed. Environment variables are the same as * the system property, but uppercased with '.' -> '_'. */ diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/Service.java b/dd-trace-ot/src/main/java/datadog/trace/common/Service.java similarity index 97% rename from dd-trace-ot/src/main/java/datadog/trace/api/Service.java rename to dd-trace-ot/src/main/java/datadog/trace/common/Service.java index 3ef5606de0..668a29d8b9 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/Service.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/Service.java @@ -1,4 +1,4 @@ -package datadog.trace.api; +package datadog.trace.common; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/sampling/AbstractSampler.java b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/AbstractSampler.java similarity index 96% rename from dd-trace-ot/src/main/java/datadog/trace/api/sampling/AbstractSampler.java rename to dd-trace-ot/src/main/java/datadog/trace/common/sampling/AbstractSampler.java index af041a5bf8..e81d487993 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/sampling/AbstractSampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/AbstractSampler.java @@ -1,4 +1,4 @@ -package datadog.trace.api.sampling; +package datadog.trace.common.sampling; import datadog.opentracing.DDBaseSpan; import java.util.HashMap; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/sampling/AllSampler.java b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/AllSampler.java similarity index 88% rename from dd-trace-ot/src/main/java/datadog/trace/api/sampling/AllSampler.java rename to dd-trace-ot/src/main/java/datadog/trace/common/sampling/AllSampler.java index 1eaca49d0d..1075fde125 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/sampling/AllSampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/AllSampler.java @@ -1,4 +1,4 @@ -package datadog.trace.api.sampling; +package datadog.trace.common.sampling; import datadog.opentracing.DDBaseSpan; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/sampling/RateSampler.java b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateSampler.java similarity index 96% rename from dd-trace-ot/src/main/java/datadog/trace/api/sampling/RateSampler.java rename to dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateSampler.java index e920319032..9e6518546a 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/sampling/RateSampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateSampler.java @@ -1,4 +1,4 @@ -package datadog.trace.api.sampling; +package datadog.trace.common.sampling; import com.google.auto.service.AutoService; import datadog.opentracing.DDBaseSpan; @@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j; /** * This sampler sample the traces at a predefined rate. * + *

+ * *

Keep (100 * `sample_rate`)% of the traces. It samples randomly, its main purpose is to reduce * the integration footprint. */ diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/sampling/Sampler.java b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/Sampler.java similarity index 94% rename from dd-trace-ot/src/main/java/datadog/trace/api/sampling/Sampler.java rename to dd-trace-ot/src/main/java/datadog/trace/common/sampling/Sampler.java index 94032992ef..23af235089 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/sampling/Sampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/Sampler.java @@ -1,7 +1,7 @@ -package datadog.trace.api.sampling; +package datadog.trace.common.sampling; import datadog.opentracing.DDBaseSpan; -import datadog.trace.api.DDTraceConfig; +import datadog.trace.common.DDTraceConfig; import java.util.Properties; import lombok.extern.slf4j.Slf4j; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/util/Clock.java b/dd-trace-ot/src/main/java/datadog/trace/common/util/Clock.java similarity index 95% rename from dd-trace-ot/src/main/java/datadog/trace/api/util/Clock.java rename to dd-trace-ot/src/main/java/datadog/trace/common/util/Clock.java index 8115eb1b18..33800b2346 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/util/Clock.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/util/Clock.java @@ -1,4 +1,4 @@ -package datadog.trace.api.util; +package datadog.trace.common.util; import java.util.concurrent.TimeUnit; @@ -7,6 +7,10 @@ import java.util.concurrent.TimeUnit; * *

* + *

+ * + *

+ * *

The JDK provides two clocks: *

  • one in nanoseconds, for precision, but it can only use to measure durations *
  • one in milliseconds, for accuracy, useful to provide epoch time diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/util/ConfigUtils.java b/dd-trace-ot/src/main/java/datadog/trace/common/util/ConfigUtils.java similarity index 97% rename from dd-trace-ot/src/main/java/datadog/trace/api/util/ConfigUtils.java rename to dd-trace-ot/src/main/java/datadog/trace/common/util/ConfigUtils.java index 72d96a8b6b..4682917553 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/util/ConfigUtils.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/util/ConfigUtils.java @@ -1,4 +1,4 @@ -package datadog.trace.api.util; +package datadog.trace.common.util; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/writer/DDAgentWriter.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java similarity index 98% rename from dd-trace-ot/src/main/java/datadog/trace/api/writer/DDAgentWriter.java rename to dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java index 5693ebf922..d44405d7eb 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/writer/DDAgentWriter.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java @@ -1,9 +1,9 @@ -package datadog.trace.api.writer; +package datadog.trace.common.writer; import com.google.auto.service.AutoService; import com.google.common.util.concurrent.ThreadFactoryBuilder; import datadog.opentracing.DDBaseSpan; -import datadog.trace.api.Service; +import datadog.trace.common.Service; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; @@ -20,6 +20,8 @@ import lombok.extern.slf4j.Slf4j; * This writer write provided traces to the a DD agent which is most of time located on the same * host. * + *

    + * *

    It handles writes asynchronuously so the calling threads are automatically released. However, * if too much spans are collected the writers can reach a state where it is forced to drop incoming * spans. @@ -112,7 +114,7 @@ public class DDAgentWriter implements Writer { } /* (non-Javadoc) - * @see datadog.trace.api.writer.Writer#start() + * @see Writer#start() */ @Override public void start() { diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/writer/DDApi.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDApi.java similarity index 98% rename from dd-trace-ot/src/main/java/datadog/trace/api/writer/DDApi.java rename to dd-trace-ot/src/main/java/datadog/trace/common/writer/DDApi.java index 57573cc6d9..d29ea601f4 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/writer/DDApi.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDApi.java @@ -1,10 +1,10 @@ -package datadog.trace.api.writer; +package datadog.trace.common.writer; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.util.concurrent.RateLimiter; import datadog.opentracing.DDBaseSpan; import datadog.opentracing.DDTraceOTInfo; -import datadog.trace.api.Service; +import datadog.trace.common.Service; import java.io.IOException; import java.io.OutputStream; import java.net.HttpURLConnection; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/writer/ListWriter.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/ListWriter.java similarity index 95% rename from dd-trace-ot/src/main/java/datadog/trace/api/writer/ListWriter.java rename to dd-trace-ot/src/main/java/datadog/trace/common/writer/ListWriter.java index 521493eb7c..f23c5224c4 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/writer/ListWriter.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/ListWriter.java @@ -1,7 +1,7 @@ -package datadog.trace.api.writer; +package datadog.trace.common.writer; import datadog.opentracing.DDBaseSpan; -import datadog.trace.api.Service; +import datadog.trace.common.Service; import java.util.LinkedList; import java.util.List; import java.util.Map; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/writer/LoggingWriter.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/LoggingWriter.java similarity index 90% rename from dd-trace-ot/src/main/java/datadog/trace/api/writer/LoggingWriter.java rename to dd-trace-ot/src/main/java/datadog/trace/common/writer/LoggingWriter.java index b1522576a7..3cbd4d5823 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/writer/LoggingWriter.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/LoggingWriter.java @@ -1,8 +1,8 @@ -package datadog.trace.api.writer; +package datadog.trace.common.writer; import com.google.auto.service.AutoService; import datadog.opentracing.DDBaseSpan; -import datadog.trace.api.Service; +import datadog.trace.common.Service; import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/writer/Writer.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/Writer.java similarity index 95% rename from dd-trace-ot/src/main/java/datadog/trace/api/writer/Writer.java rename to dd-trace-ot/src/main/java/datadog/trace/common/writer/Writer.java index 21f4e13755..9c48379151 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/writer/Writer.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/Writer.java @@ -1,8 +1,8 @@ -package datadog.trace.api.writer; +package datadog.trace.common.writer; import datadog.opentracing.DDBaseSpan; -import datadog.trace.api.DDTraceConfig; -import datadog.trace.api.Service; +import datadog.trace.common.DDTraceConfig; +import datadog.trace.common.Service; import java.util.List; import java.util.Map; import java.util.Properties; diff --git a/dd-trace-ot/src/main/java/datadog/trace/api/writer/WriterQueue.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/WriterQueue.java similarity index 97% rename from dd-trace-ot/src/main/java/datadog/trace/api/writer/WriterQueue.java rename to dd-trace-ot/src/main/java/datadog/trace/common/writer/WriterQueue.java index 7f015045a1..1ead96a243 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/api/writer/WriterQueue.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/WriterQueue.java @@ -1,4 +1,4 @@ -package datadog.trace.api.writer; +package datadog.trace.common.writer; import java.util.ArrayList; import java.util.List; @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadLocalRandom; * *

    * + *

    + * + *

    + * *

    This class implements a specific behavior when it's full. Each new item added will replace an * exisiting one, at a random place/index. The class is backed by an ArrayList in order to perform * efficient random remove. diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy index 7831060774..3225958c1a 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy @@ -3,7 +3,7 @@ package datadog.opentracing.decorators import datadog.opentracing.DDSpanContext import datadog.opentracing.DDTracer import datadog.trace.SpanFactory -import datadog.trace.api.writer.LoggingWriter +import datadog.trace.common.writer.LoggingWriter import io.opentracing.tag.StringTag import io.opentracing.tag.Tags import spock.lang.Specification diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/ActiveSpanContinuationTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/ActiveSpanContinuationTest.groovy index e62a36f62a..05a4602a61 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/ActiveSpanContinuationTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/ActiveSpanContinuationTest.groovy @@ -1,7 +1,7 @@ package datadog.trace import datadog.opentracing.DDTracer -import datadog.trace.api.writer.ListWriter +import datadog.trace.common.writer.ListWriter import io.opentracing.util.ThreadLocalActiveSpan import spock.lang.Ignore import spock.lang.Specification diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy index 3bd7297323..6353c2fdb4 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/DDTraceConfigTest.groovy @@ -1,19 +1,19 @@ package datadog.trace import datadog.opentracing.DDTracer -import datadog.trace.api.DDTraceConfig -import datadog.trace.api.sampling.AllSampler -import datadog.trace.api.sampling.RateSampler -import datadog.trace.api.writer.DDAgentWriter -import datadog.trace.api.writer.ListWriter -import datadog.trace.api.writer.LoggingWriter +import datadog.trace.common.DDTraceConfig +import datadog.trace.common.sampling.AllSampler +import datadog.trace.common.sampling.RateSampler +import datadog.trace.common.writer.DDAgentWriter +import datadog.trace.common.writer.ListWriter +import datadog.trace.common.writer.LoggingWriter import spock.lang.Specification import spock.lang.Unroll import java.lang.reflect.Field import java.lang.reflect.Modifier -import static datadog.trace.api.DDTraceConfig.* +import static datadog.trace.common.DDTraceConfig.* class DDTraceConfigTest extends Specification { static originalEnvMap diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/ServiceTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/ServiceTest.groovy index 6cd3290d51..27e528acfb 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/ServiceTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/ServiceTest.groovy @@ -1,9 +1,9 @@ package datadog.trace import datadog.opentracing.DDTracer -import datadog.trace.api.Service -import datadog.trace.api.sampling.AllSampler -import datadog.trace.api.writer.DDAgentWriter +import datadog.trace.common.Service +import datadog.trace.common.sampling.AllSampler +import datadog.trace.common.writer.DDAgentWriter import spock.lang.Specification import static org.mockito.ArgumentMatchers.any diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy index 7d3921ffb4..801cd8bf7e 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy @@ -1,6 +1,9 @@ package datadog.trace.api.writer import datadog.opentracing.DDBaseSpan +import datadog.trace.common.writer.DDAgentWriter +import datadog.trace.common.writer.DDApi +import datadog.trace.common.writer.WriterQueue import spock.lang.Specification import static datadog.trace.SpanFactory.newSpanOf diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy index 8345b8b6e0..2987248721 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy @@ -1,9 +1,10 @@ package datadog.trace.api.writer -import datadog.trace.SpanFactory import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import datadog.trace.api.Service +import datadog.trace.SpanFactory +import datadog.trace.common.Service +import datadog.trace.common.writer.DDApi import org.msgpack.jackson.dataformat.MessagePackFactory import ratpack.http.Headers import ratpack.http.MediaType diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy index 8f78d88246..3ffb787cab 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/WriterQueueTest.groovy @@ -1,5 +1,6 @@ package datadog.trace.api.writer +import datadog.trace.common.writer.WriterQueue import spock.lang.Specification import java.util.concurrent.Phaser diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java index cdfb97c6ff..010523d406 100644 --- a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java @@ -6,8 +6,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import datadog.trace.api.sampling.RateSampler; -import datadog.trace.api.writer.Writer; +import datadog.trace.common.sampling.RateSampler; +import datadog.trace.common.writer.Writer; import java.util.ArrayList; import java.util.LinkedList; import java.util.Queue; diff --git a/dd-trace-ot/src/test/java/datadog/trace/api/sampling/AllSamplerTest.java b/dd-trace-ot/src/test/java/datadog/trace/api/sampling/AllSamplerTest.java index 531ba0f903..618ae6701b 100644 --- a/dd-trace-ot/src/test/java/datadog/trace/api/sampling/AllSamplerTest.java +++ b/dd-trace-ot/src/test/java/datadog/trace/api/sampling/AllSamplerTest.java @@ -5,6 +5,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import datadog.opentracing.DDSpan; +import datadog.trace.common.sampling.AllSampler; import java.util.HashMap; import java.util.Map; import java.util.regex.Pattern; diff --git a/dd-trace-ot/src/test/java/datadog/trace/api/sampling/RateSamplerTest.java b/dd-trace-ot/src/test/java/datadog/trace/api/sampling/RateSamplerTest.java index babc0a5067..eb4bdfceee 100644 --- a/dd-trace-ot/src/test/java/datadog/trace/api/sampling/RateSamplerTest.java +++ b/dd-trace-ot/src/test/java/datadog/trace/api/sampling/RateSamplerTest.java @@ -4,6 +4,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import datadog.opentracing.DDSpan; +import datadog.trace.common.sampling.RateSampler; +import datadog.trace.common.sampling.Sampler; import org.junit.Test; public class RateSamplerTest { diff --git a/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle b/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle index 60dbcaf179..24a9bd4545 100644 --- a/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle +++ b/examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle @@ -17,7 +17,7 @@ targetCompatibility = 1.8 dependencies { compile project(':dd-trace-ot') - compile project(':dd-trace-annotations') + compile project(':dd-trace-api') compile deps.opentracing diff --git a/settings.gradle b/settings.gradle index 93a25bdef6..c06825e249 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ include ':dd-java-agent:benchmark-integration:jetty-perftest' include ':dd-java-agent:testing' include ':dd-java-agent:tooling' include ':dd-java-agent-ittests' -include ':dd-trace-annotations' +include ':dd-trace-api' // examples include ':examples:dropwizard-mongo-client'