open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move agent api classes to bootstrap package so they're not anal… (#1208) 

Move agent api classes to bootstrap package so they're not analyzed by muzzle
This commit is contained in:
Tyler Benson 2020-02-11 07:36:45 -08:00 committed by GitHub
parent f2d8c8e6b9 51bffa2e8a
commit 829e8f6442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
350 changed files with 795 additions and 821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/instrumentation/api/AgentPropagation.java → dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.api; package datadog.trace.bootstrap.instrumentation.api;
import datadog.trace.context.TraceScope; import datadog.trace.context.TraceScope;

2
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/instrumentation/api/AgentScope.java → dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScope.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.api; package datadog.trace.bootstrap.instrumentation.api;
import java.io.Closeable; import java.io.Closeable;

2
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/instrumentation/api/AgentSpan.java → dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.api; package datadog.trace.bootstrap.instrumentation.api;
public interface AgentSpan { public interface AgentSpan {
AgentSpan setTag(String key, boolean value); AgentSpan setTag(String key, boolean value);

4
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/instrumentation/api/AgentTracer.java → dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java
View File

@ -1,8 +1,8 @@
package datadog.trace.instrumentation.api; package datadog.trace.bootstrap.instrumentation.api;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan.Context;
import datadog.trace.context.TraceScope; import datadog.trace.context.TraceScope;
import datadog.trace.context.TraceScope.Continuation; import datadog.trace.context.TraceScope.Continuation;
import datadog.trace.instrumentation.api.AgentSpan.Context;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
public class AgentTracer { public class AgentTracer {

2
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/instrumentation/api/Tags.java → dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.api; package datadog.trace.bootstrap.instrumentation.api;
// standard tag names (and span kind values) from OpenTracing (see io.opentracing.tag.Tags) // standard tag names (and span kind values) from OpenTracing (see io.opentracing.tag.Tags)
public class Tags { public class Tags {

2
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBInfo.java → dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.jdbc; package datadog.trace.bootstrap.instrumentation.jdbc;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;

7
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCConnectionUrlParser.java → dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.jdbc; package datadog.trace.bootstrap.instrumentation.jdbc;
import static datadog.trace.instrumentation.jdbc.DBInfo.DEFAULT; import static datadog.trace.bootstrap.instrumentation.jdbc.DBInfo.DEFAULT;
import datadog.trace.bootstrap.ExceptionLogger; import datadog.trace.bootstrap.ExceptionLogger;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -16,7 +16,8 @@ import java.util.regex.Pattern;
/** /**
* Structured as an enum instead of a class hierarchy to allow iterating through the parsers * Structured as an enum instead of a class hierarchy to allow iterating through the parsers
* automatically without having to maintain a separate list of parsers. * automatically without having to maintain a separate list of parsers. This is put in the bootstrap
* project to keep the Muzzle generated dependency references smaller.
*/ */
public enum JDBCConnectionUrlParser { public enum JDBCConnectionUrlParser {
GENERIC_URL_LIKE() { GENERIC_URL_LIKE() {

2
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ThreadLocalContext.java
View File

@ -1,6 +1,6 @@
package datadog.trace.bootstrap.instrumentation.rmi; package datadog.trace.bootstrap.instrumentation.rmi;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
public class ThreadLocalContext { public class ThreadLocalContext {
public static final ThreadLocalContext THREAD_LOCAL_CONTEXT = new ThreadLocalContext(); public static final ThreadLocalContext THREAD_LOCAL_CONTEXT = new ThreadLocalContext();

4
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/BaseDecorator.java
View File

@ -2,8 +2,8 @@ package datadog.trace.agent.decorator;
import datadog.trace.api.Config; import datadog.trace.api.Config;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.Inet4Address; import java.net.Inet4Address;

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/ClientDecorator.java
View File

@ -1,7 +1,7 @@
package datadog.trace.agent.decorator; package datadog.trace.agent.decorator;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
public abstract class ClientDecorator extends BaseDecorator { public abstract class ClientDecorator extends BaseDecorator {

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/DatabaseClientDecorator.java
View File

@ -2,7 +2,7 @@ package datadog.trace.agent.decorator;
import datadog.trace.api.Config; import datadog.trace.api.Config;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
public abstract class DatabaseClientDecorator<CONNECTION> extends ClientDecorator { public abstract class DatabaseClientDecorator<CONNECTION> extends ClientDecorator {

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/HttpClientDecorator.java
View File

@ -3,7 +3,7 @@ package datadog.trace.agent.decorator;
import datadog.trace.api.Config; import datadog.trace.api.Config;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/HttpServerDecorator.java
View File

@ -3,7 +3,7 @@ package datadog.trace.agent.decorator;
import datadog.trace.api.Config; import datadog.trace.api.Config;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/OrmClientDecorator.java
View File

@ -1,7 +1,7 @@
package datadog.trace.agent.decorator; package datadog.trace.agent.decorator;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
public abstract class OrmClientDecorator extends DatabaseClientDecorator { public abstract class OrmClientDecorator extends DatabaseClientDecorator {

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/ServerDecorator.java
View File

@ -1,7 +1,7 @@
package datadog.trace.agent.decorator; package datadog.trace.agent.decorator;
import datadog.trace.api.Config; import datadog.trace.api.Config;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
public abstract class ServerDecorator extends BaseDecorator { public abstract class ServerDecorator extends BaseDecorator {

10
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/OpenTracing32.java
View File

@ -6,12 +6,12 @@ import static io.opentracing.propagation.Format.Builtin.TEXT_MAP_INJECT;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import datadog.trace.api.interceptor.MutableSpan; import datadog.trace.api.interceptor.MutableSpan;
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation.Getter;
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI;
import datadog.trace.context.TraceScope; import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.api.AgentPropagation;
import datadog.trace.instrumentation.api.AgentPropagation.Getter;
import datadog.trace.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.AgentTracer.TracerAPI;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.SpanContext; import io.opentracing.SpanContext;

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/TracerInstaller.java
View File

@ -2,7 +2,7 @@ package datadog.trace.agent.tooling;
import datadog.opentracing.DDTracer; import datadog.opentracing.DDTracer;
import datadog.trace.api.Config; import datadog.trace.api.Config;
import datadog.trace.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j

4
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/BaseDecoratorTest.groovy
View File

@ -2,8 +2,8 @@ package datadog.trace.agent.decorator
import datadog.trace.agent.test.utils.ConfigUtils import datadog.trace.agent.test.utils.ConfigUtils
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.AgentScope import datadog.trace.bootstrap.instrumentation.api.AgentScope
import datadog.trace.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentSpan
import datadog.trace.util.test.DDSpecification import datadog.trace.util.test.DDSpecification
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import spock.lang.Shared import spock.lang.Shared

2
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/ClientDecoratorTest.groovy
View File

@ -1,7 +1,7 @@
package datadog.trace.agent.decorator package datadog.trace.agent.decorator
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentSpan
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
class ClientDecoratorTest extends BaseDecoratorTest { class ClientDecoratorTest extends BaseDecoratorTest {

2
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/DatabaseClientDecoratorTest.groovy
View File

@ -2,7 +2,7 @@ package datadog.trace.agent.decorator
import datadog.trace.api.Config import datadog.trace.api.Config
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentSpan
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import static datadog.trace.agent.test.utils.ConfigUtils.withConfigOverride import static datadog.trace.agent.test.utils.ConfigUtils.withConfigOverride

2
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpClientDecoratorTest.groovy
View File

@ -2,7 +2,7 @@ package datadog.trace.agent.decorator
import datadog.trace.api.Config import datadog.trace.api.Config
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentSpan
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import spock.lang.Shared import spock.lang.Shared

2
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpServerDecoratorTest.groovy
View File

@ -2,7 +2,7 @@ package datadog.trace.agent.decorator
import datadog.trace.api.Config import datadog.trace.api.Config
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentSpan
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import static datadog.trace.agent.test.utils.ConfigUtils.withConfigOverride import static datadog.trace.agent.test.utils.ConfigUtils.withConfigOverride

2
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/ServerDecoratorTest.groovy
View File

@ -2,7 +2,7 @@ package datadog.trace.agent.decorator
import datadog.trace.api.Config import datadog.trace.api.Config
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentSpan
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
class ServerDecoratorTest extends BaseDecoratorTest { class ServerDecoratorTest extends BaseDecoratorTest {

2
dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
View File

@ -4,7 +4,7 @@ import akka.stream.testkit.TestSubscriber.Probe
import akka.stream.testkit.javadsl.TestSink import akka.stream.testkit.javadsl.TestSink
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import play.inject.guice.GuiceApplicationBuilder import play.inject.guice.GuiceApplicationBuilder
import spock.lang.Shared import spock.lang.Shared

12
dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java
View File

@ -1,9 +1,9 @@
package datadog.trace.instrumentation.akkahttp; package datadog.trace.instrumentation.akkahttp;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator.DECORATE;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@ -14,9 +14,9 @@ import akka.http.scaladsl.model.HttpResponse;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.CallDepthThreadLocalMap;
import datadog.trace.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

14
dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java
View File

@ -1,11 +1,11 @@
package datadog.trace.instrumentation.akkahttp; package datadog.trace.instrumentation.akkahttp;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator.DECORATE; import static datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator.DECORATE;
import static datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders.GETTER; import static datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders.GETTER;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.activeScope;
import static datadog.trace.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@ -14,10 +14,10 @@ import akka.http.scaladsl.model.HttpResponse;
import akka.stream.Materializer; import akka.stream.Materializer;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.Tags;
import datadog.trace.context.TraceScope; import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
dd-java-agent/instrumentation/akka-http-10.0/src/main/java8/datadog/trace/instrumentation/akkahttp/AkkaHttpServerHeaders.java
View File

@ -2,7 +2,7 @@ package datadog.trace.instrumentation.akkahttp;
import akka.http.javadsl.model.HttpHeader; import akka.http.javadsl.model.HttpHeader;
import akka.http.scaladsl.model.HttpRequest; import akka.http.scaladsl.model.HttpRequest;
import datadog.trace.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;

2
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
View File

@ -7,7 +7,7 @@ import akka.stream.ActorMaterializer
import datadog.trace.agent.test.base.HttpClientTest import datadog.trace.agent.test.base.HttpClientTest
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator import datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import spock.lang.Shared import spock.lang.Shared
class AkkaHttpClientInstrumentationTest extends HttpClientTest<AkkaHttpClientDecorator> { class AkkaHttpClientInstrumentationTest extends HttpClientTest<AkkaHttpClientDecorator> {

2
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
View File

@ -3,7 +3,7 @@ import datadog.trace.agent.test.base.HttpServerTest
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator import datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS

8
dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java
View File

@ -1,11 +1,11 @@
package datadog.trace.instrumentation.apachehttpasyncclient; package datadog.trace.instrumentation.apachehttpasyncclient;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.DECORATE;
import static datadog.trace.instrumentation.apachehttpasyncclient.HttpHeadersInjectAdapter.SETTER; import static datadog.trace.instrumentation.apachehttpasyncclient.HttpHeadersInjectAdapter.SETTER;
import static datadog.trace.instrumentation.api.AgentTracer.activeScope;
import static datadog.trace.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -14,8 +14,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.context.TraceScope; import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.api.AgentSpan;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;

2
dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.apachehttpasyncclient; package datadog.trace.instrumentation.apachehttpasyncclient;
import datadog.trace.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
import org.apache.http.HttpRequest; import org.apache.http.HttpRequest;
public class HttpHeadersInjectAdapter implements AgentPropagation.Setter<HttpRequest> { public class HttpHeadersInjectAdapter implements AgentPropagation.Setter<HttpRequest> {

10
dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
View File

@ -1,11 +1,11 @@
package datadog.trace.instrumentation.apachehttpclient; package datadog.trace.instrumentation.apachehttpclient;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientDecorator.DECORATE;
import static datadog.trace.instrumentation.apachehttpclient.HttpHeadersInjectAdapter.SETTER; import static datadog.trace.instrumentation.apachehttpclient.HttpHeadersInjectAdapter.SETTER;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan;
import static net.bytebuddy.matcher.ElementMatchers.isAbstract; import static net.bytebuddy.matcher.ElementMatchers.isAbstract;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -17,8 +17,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.CallDepthThreadLocalMap;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.apachehttpclient; package datadog.trace.instrumentation.apachehttpclient;
import datadog.trace.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.HttpUriRequest;
public class HttpHeadersInjectAdapter implements AgentPropagation.Setter<HttpUriRequest> { public class HttpHeadersInjectAdapter implements AgentPropagation.Setter<HttpUriRequest> {

2
dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java
View File

@ -13,7 +13,7 @@ import com.amazonaws.Request;
import com.amazonaws.handlers.RequestHandler2; import com.amazonaws.handlers.RequestHandler2;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;

2
dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java
View File

@ -7,7 +7,7 @@ import com.amazonaws.Response;
import datadog.trace.agent.decorator.HttpClientDecorator; import datadog.trace.agent.decorator.HttpClientDecorator;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ContextStore;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Map; import java.util.Map;

2
dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/RequestMeta.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.aws.v0; package datadog.trace.instrumentation.aws.v0;
import com.amazonaws.handlers.HandlerContextKey; import com.amazonaws.handlers.HandlerContextKey;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import lombok.Data; import lombok.Data;
@Data @Data

8
dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.aws.v0; package datadog.trace.instrumentation.aws.v0;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.aws.v0.RequestMeta.SCOPE_CONTEXT_KEY; import static datadog.trace.instrumentation.aws.v0.RequestMeta.SCOPE_CONTEXT_KEY;
import com.amazonaws.AmazonWebServiceRequest; import com.amazonaws.AmazonWebServiceRequest;
@ -9,8 +9,8 @@ import com.amazonaws.Request;
import com.amazonaws.Response; import com.amazonaws.Response;
import com.amazonaws.handlers.RequestHandler2; import com.amazonaws.handlers.RequestHandler2;
import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ContextStore;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
/** Tracing Request Handler */ /** Tracing Request Handler */
public class TracingRequestHandler extends RequestHandler2 { public class TracingRequestHandler extends RequestHandler2 {

4
dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy
View File

@ -30,7 +30,7 @@ import com.amazonaws.services.sqs.model.CreateQueueRequest
import com.amazonaws.services.sqs.model.SendMessageRequest import com.amazonaws.services.sqs.model.SendMessageRequest
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.apache.http.conn.HttpHostConnectException import org.apache.http.conn.HttpHostConnectException
import org.apache.http.impl.execchain.RequestAbortedException import org.apache.http.impl.execchain.RequestAbortedException
import spock.lang.AutoCleanup import spock.lang.AutoCleanup
@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicReference
import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
import static datadog.trace.agent.test.utils.PortUtils.UNUSABLE_PORT import static datadog.trace.agent.test.utils.PortUtils.UNUSABLE_PORT
import static datadog.trace.instrumentation.api.AgentTracer.activeSpan import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
class AWSClientTest extends AgentTestRunner { class AWSClientTest extends AgentTestRunner {

4
dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test_before_1_11_106/groovy/AWSClientTest.groovy
View File

@ -17,7 +17,7 @@ import com.amazonaws.services.s3.AmazonS3Client
import com.amazonaws.services.s3.S3ClientOptions import com.amazonaws.services.s3.S3ClientOptions
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.apache.http.conn.HttpHostConnectException import org.apache.http.conn.HttpHostConnectException
import org.apache.http.impl.execchain.RequestAbortedException import org.apache.http.impl.execchain.RequestAbortedException
import spock.lang.AutoCleanup import spock.lang.AutoCleanup
@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference
import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
import static datadog.trace.agent.test.utils.PortUtils.UNUSABLE_PORT import static datadog.trace.agent.test.utils.PortUtils.UNUSABLE_PORT
import static datadog.trace.instrumentation.api.AgentTracer.activeSpan import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
class AWSClientTest extends AgentTestRunner { class AWSClientTest extends AgentTestRunner {

2
dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.aws.v2; package datadog.trace.instrumentation.aws.v2;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.instrumentation.api.AgentTracer.activeScope; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;

2
dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java8/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java
View File

@ -2,7 +2,7 @@ package datadog.trace.instrumentation.aws.v2;
import datadog.trace.agent.decorator.HttpClientDecorator; import datadog.trace.agent.decorator.HttpClientDecorator;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.net.URI; import java.net.URI;
import software.amazon.awssdk.awscore.AwsResponse; import software.amazon.awssdk.awscore.AwsResponse;
import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.SdkRequest;

8
dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java8/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
View File

@ -1,11 +1,11 @@
package datadog.trace.instrumentation.aws.v2; package datadog.trace.instrumentation.aws.v2;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.aws.v2.AwsSdkClientDecorator.DECORATE; import static datadog.trace.instrumentation.aws.v2.AwsSdkClientDecorator.DECORATE;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.function.Consumer; import java.util.function.Consumer;
import software.amazon.awssdk.core.client.builder.SdkClientBuilder; import software.amazon.awssdk.core.client.builder.SdkClientBuilder;
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration; import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;

2
dd-java-agent/instrumentation/aws-java-sdk-2.2/src/test/groovy/AwsClientTest.groovy
View File

@ -1,6 +1,6 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
import software.amazon.awssdk.core.ResponseInputStream import software.amazon.awssdk.core.ResponseInputStream

2
dd-java-agent/instrumentation/couchbase-2.0/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseOnSubscribe.java
View File

@ -3,7 +3,7 @@ package datadog.trace.instrumentation.couchbase.client;
import static datadog.trace.instrumentation.couchbase.client.CouchbaseClientDecorator.DECORATE; import static datadog.trace.instrumentation.couchbase.client.CouchbaseClientDecorator.DECORATE;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.rxjava.TracedOnSubscribe; import datadog.trace.instrumentation.rxjava.TracedOnSubscribe;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import rx.Observable; import rx.Observable;

2
dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/util/AbstractCouchbaseTest.groovy
View File

@ -17,7 +17,7 @@ import datadog.trace.agent.test.asserts.TraceAssert
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.Config import datadog.trace.api.Config
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import groovy.transform.stc.ClosureParams import groovy.transform.stc.ClosureParams
import groovy.transform.stc.SimpleType import groovy.transform.stc.SimpleType
import spock.lang.Shared import spock.lang.Shared

6
dd-java-agent/instrumentation/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.couchbase.client; package datadog.trace.instrumentation.couchbase.client;
import static datadog.trace.instrumentation.api.AgentTracer.activeScope; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope;
import static datadog.trace.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
@ -13,8 +13,8 @@ import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ContextStore;
import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.bootstrap.InstrumentationContext;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.context.TraceScope; import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.api.AgentSpan;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;

4
dd-java-agent/instrumentation/couchbase-2.6/src/main/java/datadog/trace/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java
View File

@ -13,8 +13,8 @@ import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ContextStore;
import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.bootstrap.InstrumentationContext;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;

2
dd-java-agent/instrumentation/couchbase-2.6/src/test/groovy/CouchbaseSpanUtil.groovy
View File

@ -1,7 +1,7 @@
import datadog.opentracing.DDSpan import datadog.opentracing.DDSpan
import datadog.trace.agent.test.asserts.TraceAssert import datadog.trace.agent.test.asserts.TraceAssert
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
class CouchbaseSpanUtil { class CouchbaseSpanUtil {
// Reusable span assertion method. Cannot directly override AbstractCouchbaseTest.assertCouchbaseSpan because // Reusable span assertion method. Cannot directly override AbstractCouchbaseTest.assertCouchbaseSpan because

4
dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
View File

@ -5,8 +5,8 @@ import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Session; import com.datastax.driver.core.Session;
import datadog.trace.agent.decorator.DatabaseClientDecorator; import datadog.trace.agent.decorator.DatabaseClientDecorator;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
public class CassandraClientDecorator extends DatabaseClientDecorator<Session> { public class CassandraClientDecorator extends DatabaseClientDecorator<Session> {
public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator(); public static final CassandraClientDecorator DECORATE = new CassandraClientDecorator();

8
dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
View File

@ -1,8 +1,8 @@
package datadog.trace.instrumentation.datastax.cassandra; package datadog.trace.instrumentation.datastax.cassandra;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.datastax.cassandra.CassandraClientDecorator.DECORATE; import static datadog.trace.instrumentation.datastax.cassandra.CassandraClientDecorator.DECORATE;
import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.BoundStatement;
@ -17,8 +17,8 @@ import com.datastax.driver.core.Statement;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;

2
dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
View File

@ -5,7 +5,7 @@ import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.asserts.TraceAssert import datadog.trace.agent.test.asserts.TraceAssert
import datadog.trace.api.Config import datadog.trace.api.Config
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.cassandraunit.utils.EmbeddedCassandraServerHelper import org.cassandraunit.utils.EmbeddedCassandraServerHelper
import spock.lang.Shared import spock.lang.Shared

12
dd-java-agent/instrumentation/dropwizard/dropwizard-views/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java
View File

@ -1,9 +1,9 @@
package datadog.trace.instrumentation.dropwizard.view; package datadog.trace.instrumentation.dropwizard.view;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -15,9 +15,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
import io.dropwizard.views.View; import io.dropwizard.views.View;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;

2
dd-java-agent/instrumentation/dropwizard/dropwizard-views/src/test/groovy/ViewRenderTest.groovy
View File

@ -1,5 +1,5 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import io.dropwizard.views.View import io.dropwizard.views.View
import io.dropwizard.views.freemarker.FreemarkerViewRenderer import io.dropwizard.views.freemarker.FreemarkerViewRenderer
import io.dropwizard.views.mustache.MustacheViewRenderer import io.dropwizard.views.mustache.MustacheViewRenderer

2
dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy
View File

@ -3,7 +3,7 @@ import datadog.trace.agent.test.asserts.TraceAssert
import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.agent.test.base.HttpServerTest
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator import datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator
import datadog.trace.instrumentation.servlet3.Servlet3Decorator import datadog.trace.instrumentation.servlet3.Servlet3Decorator
import io.dropwizard.Application import io.dropwizard.Application

2
dd-java-agent/instrumentation/elasticsearch/rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import org.apache.http.HttpHost import org.apache.http.HttpHost
import org.apache.http.client.config.RequestConfig import org.apache.http.client.config.RequestConfig

8
dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.elasticsearch5; package datadog.trace.instrumentation.elasticsearch5;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@ -13,8 +13,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;

2
dd-java-agent/instrumentation/elasticsearch/rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/RestResponseListener.java
View File

@ -2,7 +2,7 @@ package datadog.trace.instrumentation.elasticsearch5;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseListener; import org.elasticsearch.client.ResponseListener;

2
dd-java-agent/instrumentation/elasticsearch/rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import org.apache.http.HttpHost import org.apache.http.HttpHost
import org.apache.http.client.config.RequestConfig import org.apache.http.client.config.RequestConfig

2
dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import org.apache.http.HttpHost import org.apache.http.HttpHost
import org.apache.http.client.config.RequestConfig import org.apache.http.client.config.RequestConfig

8
dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.elasticsearch6_4; package datadog.trace.instrumentation.elasticsearch6_4;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@ -13,8 +13,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;

2
dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/RestResponseListener.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.elasticsearch6_4; package datadog.trace.instrumentation.elasticsearch6_4;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator; import datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseListener; import org.elasticsearch.client.ResponseListener;

2
dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import org.apache.http.HttpHost import org.apache.http.HttpHost
import org.apache.http.client.config.RequestConfig import org.apache.http.client.config.RequestConfig

4
dd-java-agent/instrumentation/elasticsearch/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java
View File

@ -2,8 +2,8 @@ package datadog.trace.instrumentation.elasticsearch;
import datadog.trace.agent.decorator.DatabaseClientDecorator; import datadog.trace.agent.decorator.DatabaseClientDecorator;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
public class ElasticsearchRestClientDecorator extends DatabaseClientDecorator { public class ElasticsearchRestClientDecorator extends DatabaseClientDecorator {

2
dd-java-agent/instrumentation/elasticsearch/src/main/java/datadog/trace/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java
View File

@ -3,7 +3,7 @@ package datadog.trace.instrumentation.elasticsearch;
import datadog.trace.agent.decorator.DatabaseClientDecorator; import datadog.trace.agent.decorator.DatabaseClientDecorator;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
public class ElasticsearchTransportClientDecorator extends DatabaseClientDecorator { public class ElasticsearchTransportClientDecorator extends DatabaseClientDecorator {
public static final ElasticsearchTransportClientDecorator DECORATE = public static final ElasticsearchTransportClientDecorator DECORATE =

2
dd-java-agent/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.settings.Settings

2
dd-java-agent/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.client.transport.TransportClient
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils

2
dd-java-agent/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy
View File

@ -3,7 +3,7 @@ package springdata
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.springframework.context.ApplicationContext import org.springframework.context.ApplicationContext
import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared import spock.lang.Shared

2
dd-java-agent/instrumentation/elasticsearch/transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy
View File

@ -4,7 +4,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.search.SearchResponse import org.elasticsearch.action.search.SearchResponse
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.settings.Settings

8
dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.elasticsearch2; package datadog.trace.instrumentation.elasticsearch2;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@ -12,8 +12,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;

4
dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java
View File

@ -3,8 +3,8 @@ package datadog.trace.instrumentation.elasticsearch2;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionResponse;

2
dd-java-agent/instrumentation/elasticsearch/transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.settings.Settings

2
dd-java-agent/instrumentation/elasticsearch/transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.client.transport.TransportClient
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils

2
dd-java-agent/instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy
View File

@ -3,7 +3,7 @@ package springdata
import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.springframework.context.ApplicationContext import org.springframework.context.ApplicationContext
import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared import spock.lang.Shared

2
dd-java-agent/instrumentation/elasticsearch/transport-2/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy
View File

@ -4,7 +4,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.search.SearchResponse import org.elasticsearch.action.search.SearchResponse
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.settings.Settings

8
dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.elasticsearch5_3; package datadog.trace.instrumentation.elasticsearch5_3;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@ -12,8 +12,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;

4
dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java
View File

@ -3,8 +3,8 @@ package datadog.trace.instrumentation.elasticsearch5_3;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionResponse;

2
dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.settings.Settings

2
dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.client.transport.TransportClient
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils

2
dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
View File

@ -4,7 +4,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.opentracing.DDSpan import datadog.opentracing.DDSpan
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.AnnotationConfigApplicationContext
import spock.lang.Shared import spock.lang.Shared

2
dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy
View File

@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSet
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.search.SearchResponse import org.elasticsearch.action.search.SearchResponse
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.settings.Settings

8
dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.elasticsearch5; package datadog.trace.instrumentation.elasticsearch5;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@ -12,8 +12,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;

4
dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java
View File

@ -3,8 +3,8 @@ package datadog.trace.instrumentation.elasticsearch5;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionResponse;

2
dd-java-agent/instrumentation/elasticsearch/transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.settings.Settings

2
dd-java-agent/instrumentation/elasticsearch/transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.client.transport.TransportClient
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils

8
dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.elasticsearch6; package datadog.trace.instrumentation.elasticsearch6;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@ -12,8 +12,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;

4
dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java
View File

@ -3,8 +3,8 @@ package datadog.trace.instrumentation.elasticsearch6;
import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionResponse;

2
dd-java-agent/instrumentation/elasticsearch/transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.settings.Settings

2
dd-java-agent/instrumentation/elasticsearch/transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy
View File

@ -2,7 +2,7 @@ import com.anotherchrisberry.spock.extensions.retry.RetryOnFailure
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.utils.PortUtils import datadog.trace.agent.test.utils.PortUtils
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.client.transport.TransportClient
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils

12
dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java
View File

@ -1,9 +1,9 @@
package datadog.trace.instrumentation.finatra; package datadog.trace.instrumentation.finatra;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.finatra.FinatraDecorator.DECORATE; import static datadog.trace.instrumentation.finatra.FinatraDecorator.DECORATE;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@ -21,9 +21,9 @@ import com.twitter.util.FutureEventListener;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.Config; import datadog.trace.api.Config;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.Tags;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;

2
dd-java-agent/instrumentation/finatra-2.9/src/test/groovy/FinatraServerTest.groovy
View File

@ -6,7 +6,7 @@ import datadog.opentracing.DDSpan
import datadog.trace.agent.test.asserts.TraceAssert import datadog.trace.agent.test.asserts.TraceAssert
import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.agent.test.base.HttpServerTest
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.instrumentation.finatra.FinatraDecorator import datadog.trace.instrumentation.finatra.FinatraDecorator
import java.util.concurrent.TimeoutException import java.util.concurrent.TimeoutException

2
dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy
View File

@ -2,7 +2,7 @@ import datadog.trace.agent.test.asserts.TraceAssert
import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.agent.test.base.HttpServerTest
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.instrumentation.servlet3.Servlet3Decorator import datadog.trace.instrumentation.servlet3.Servlet3Decorator
import org.apache.catalina.servlets.DefaultServlet import org.apache.catalina.servlets.DefaultServlet
import org.glassfish.embeddable.BootstrapProperties import org.glassfish.embeddable.BootstrapProperties

10
dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java
View File

@ -1,8 +1,8 @@
package datadog.trace.instrumentation.googlehttpclient; package datadog.trace.instrumentation.googlehttpclient;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.propagate; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.googlehttpclient.GoogleHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.googlehttpclient.GoogleHttpClientDecorator.DECORATE;
import static datadog.trace.instrumentation.googlehttpclient.HeadersInjectAdapter.SETTER; import static datadog.trace.instrumentation.googlehttpclient.HeadersInjectAdapter.SETTER;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -17,8 +17,8 @@ import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ContextStore;
import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.bootstrap.InstrumentationContext;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/HeadersInjectAdapter.java
View File

@ -1,7 +1,7 @@
package datadog.trace.instrumentation.googlehttpclient; package datadog.trace.instrumentation.googlehttpclient;
import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpRequest;
import datadog.trace.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
public class HeadersInjectAdapter implements AgentPropagation.Setter<HttpRequest> { public class HeadersInjectAdapter implements AgentPropagation.Setter<HttpRequest> {

2
dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/RequestState.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.googlehttpclient; package datadog.trace.instrumentation.googlehttpclient;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import lombok.Data; import lombok.Data;
import lombok.NonNull; import lombok.NonNull;

2
dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy
View File

@ -5,7 +5,7 @@ import com.google.api.client.http.javanet.NetHttpTransport
import datadog.trace.agent.test.base.HttpClientTest import datadog.trace.agent.test.base.HttpClientTest
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags import datadog.trace.api.DDTags
import datadog.trace.instrumentation.api.Tags import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.instrumentation.googlehttpclient.GoogleHttpClientDecorator import datadog.trace.instrumentation.googlehttpclient.GoogleHttpClientDecorator
import spock.lang.Shared import spock.lang.Shared

12
dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java
View File

@ -1,9 +1,9 @@
package datadog.trace.instrumentation.grizzly; package datadog.trace.instrumentation.grizzly;
import static datadog.trace.agent.decorator.HttpServerDecorator.DD_SPAN_ATTRIBUTE; import static datadog.trace.agent.decorator.HttpServerDecorator.DD_SPAN_ATTRIBUTE;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.propagate; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.grizzly.GrizzlyDecorator.DECORATE; import static datadog.trace.instrumentation.grizzly.GrizzlyDecorator.DECORATE;
import static datadog.trace.instrumentation.grizzly.GrizzlyRequestExtractAdapter.GETTER; import static datadog.trace.instrumentation.grizzly.GrizzlyRequestExtractAdapter.GETTER;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
@ -13,9 +13,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.instrumentation.api.AgentSpan.Context; import datadog.trace.bootstrap.instrumentation.api.AgentSpan.Context;
import java.util.Map; import java.util.Map;
import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.description.method.MethodDescription;

2
dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyRequestExtractAdapter.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.grizzly; package datadog.trace.instrumentation.grizzly;
import datadog.trace.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
import org.glassfish.grizzly.http.server.Request; import org.glassfish.grizzly.http.server.Request;
public class GrizzlyRequestExtractAdapter implements AgentPropagation.Getter<Request> { public class GrizzlyRequestExtractAdapter implements AgentPropagation.Getter<Request> {

2
dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java
View File

@ -2,7 +2,7 @@ package datadog.trace.instrumentation.grpc.client;
import datadog.trace.agent.decorator.ClientDecorator; import datadog.trace.agent.decorator.ClientDecorator;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.grpc.Status; import io.grpc.Status;
public class GrpcClientDecorator extends ClientDecorator { public class GrpcClientDecorator extends ClientDecorator {

2
dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcInjectAdapter.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.grpc.client; package datadog.trace.instrumentation.grpc.client;
import datadog.trace.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
import io.grpc.Metadata; import io.grpc.Metadata;
public final class GrpcInjectAdapter implements AgentPropagation.Setter<Metadata> { public final class GrpcInjectAdapter implements AgentPropagation.Setter<Metadata> {

10
dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/TracingClientInterceptor.java
View File

@ -1,14 +1,14 @@
package datadog.trace.instrumentation.grpc.client; package datadog.trace.instrumentation.grpc.client;
import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.instrumentation.api.AgentTracer.propagate; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
import static datadog.trace.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.DECORATE; import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.DECORATE;
import static datadog.trace.instrumentation.grpc.client.GrpcInjectAdapter.SETTER; import static datadog.trace.instrumentation.grpc.client.GrpcInjectAdapter.SETTER;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import datadog.trace.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import io.grpc.CallOptions; import io.grpc.CallOptions;
import io.grpc.Channel; import io.grpc.Channel;
import io.grpc.ClientCall; import io.grpc.ClientCall;

Some files were not shown because too many files have changed in this diff Show More