From 917deb19becdab0d3ef8192febf417d6995ee4d1 Mon Sep 17 00:00:00 2001 From: heathkd Date: Fri, 14 Feb 2020 19:53:27 -0500 Subject: [PATCH] change imports to use bootstrap api package --- .../springdata/SpringRepositoryInstrumentation.java | 8 ++++---- .../springscheduling/SpringSchedulingDecorator.java | 2 +- .../springscheduling/SpringSchedulingInstrumentation.java | 8 ++++---- .../src/test/groovy/SpringSchedulingTest.groovy | 2 +- .../spring-scheduling-3.1/src/test/java/IntervalTask.java | 5 ++--- .../spring-scheduling-3.1/src/test/java/TriggerTask.java | 5 ++--- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java b/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java index 7e93ea6575..b06a699291 100644 --- a/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java @@ -2,8 +2,8 @@ package datadog.trace.instrumentation.springdata; -import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; -import static datadog.trace.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.springdata.SpringDataDecorator.DECORATOR; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.isInterface; @@ -12,8 +12,8 @@ import static net.bytebuddy.matcher.ElementMatchers.not; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.instrumentation.api.AgentScope; -import datadog.trace.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.Method; import java.util.Collections; import java.util.Map; diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingDecorator.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingDecorator.java index 169bfd9e41..39e84a681b 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingDecorator.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingDecorator.java @@ -2,7 +2,7 @@ package datadog.trace.instrumentation.springscheduling; import datadog.trace.agent.decorator.BaseDecorator; import datadog.trace.api.DDTags; -import datadog.trace.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.support.ScheduledMethodRunnable; diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java index 1e1a59307f..e167432380 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java @@ -1,7 +1,7 @@ package datadog.trace.instrumentation.springscheduling; -import static datadog.trace.instrumentation.api.AgentTracer.activateSpan; -import static datadog.trace.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.springscheduling.SpringSchedulingDecorator.DECORATE; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; @@ -12,8 +12,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.instrumentation.api.AgentScope; -import datadog.trace.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.Map; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.method.MethodDescription; diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy index e91b86bf1c..92c4aa4e04 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy @@ -1,5 +1,5 @@ import datadog.trace.agent.test.AgentTestRunner -import datadog.trace.instrumentation.api.Tags +import datadog.trace.bootstrap.instrumentation.api.Tags import org.springframework.context.annotation.AnnotationConfigApplicationContext class SpringSchedulingTest extends AgentTestRunner { diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/IntervalTask.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/IntervalTask.java index 4f186e9e27..4858ad2003 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/IntervalTask.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/IntervalTask.java @@ -1,8 +1,7 @@ -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; @Component public class IntervalTask implements Runnable { diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/TriggerTask.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/TriggerTask.java index c2d296c397..dc434f539f 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/TriggerTask.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/test/java/TriggerTask.java @@ -1,8 +1,7 @@ -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; @Component public class TriggerTask implements Runnable {