From f3bb22d8df55722c286e8dbe71da440a1e715aa7 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Thu, 29 Aug 2019 18:20:09 -0400 Subject: [PATCH] Revert addition of tests. Too many issues --- .../trace/agent/tooling/AgentInstaller.java | 3 +- .../agent/tooling/AgentInstallerTest.groovy | 18 --------- .../trace/agent/test/BadInstrumentation.java | 26 ------------- .../trace/agent/test/GoodInstrumentation.java | 37 ------------------- .../datadog/trace/agent/test/TestClass.java | 7 ---- 5 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/AgentInstallerTest.groovy delete mode 100644 dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadInstrumentation.java delete mode 100644 dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/GoodInstrumentation.java delete mode 100644 dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestClass.java diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java index 1d0f152974..26ae102c88 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java @@ -80,8 +80,7 @@ public class AgentInstaller { "datadog.trace.bootstrap.instrumentation.java.concurrent.RunnableWrapper") .or( named( - "datadog.trace.bootstrap.instrumentation.java.concurrent.CallableWrapper") - .or(nameStartsWith("datadog.trace.agent.test")))))) + "datadog.trace.bootstrap.instrumentation.java.concurrent.CallableWrapper"))))) .or(nameStartsWith("datadog.opentracing.")) .or(nameStartsWith("datadog.slf4j.")) .or(nameStartsWith("net.bytebuddy.")) diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/AgentInstallerTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/AgentInstallerTest.groovy deleted file mode 100644 index a09c97fe17..0000000000 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/AgentInstallerTest.groovy +++ /dev/null @@ -1,18 +0,0 @@ -package datadog.trace.agent.tooling - -import datadog.trace.agent.test.AgentTestRunner -import datadog.trace.agent.test.TestClass - -class AgentInstallerTest extends AgentTestRunner { - - def "Exception in instrumentation is limited to that instrumentation"() { - given: - TestClass instance = new TestClass() - - when: - String returnValue = instance.doSomething() - - then: - returnValue == "overridden value" - } -} diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadInstrumentation.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadInstrumentation.java deleted file mode 100644 index 0dd5e9abb8..0000000000 --- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadInstrumentation.java +++ /dev/null @@ -1,26 +0,0 @@ -package datadog.trace.agent.test; - -import com.google.auto.service.AutoService; -import datadog.trace.agent.tooling.Instrumenter; -import java.util.Collections; -import java.util.Map; -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.description.type.TypeDescription; -import net.bytebuddy.matcher.ElementMatcher; - -@AutoService(Instrumenter.class) -public class BadInstrumentation extends Instrumenter.Default { - public BadInstrumentation() { - super("bad-test-instrumentation"); - } - - @Override - public ElementMatcher typeMatcher() { - throw new RuntimeException("Test Exception"); - } - - @Override - public Map, String> transformers() { - return Collections.emptyMap(); - } -} diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/GoodInstrumentation.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/GoodInstrumentation.java deleted file mode 100644 index 490d8d823b..0000000000 --- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/GoodInstrumentation.java +++ /dev/null @@ -1,37 +0,0 @@ -package datadog.trace.agent.test; - -import static java.util.Collections.singletonMap; -import static net.bytebuddy.matcher.ElementMatchers.named; - -import com.google.auto.service.AutoService; -import datadog.trace.agent.tooling.Instrumenter; -import java.util.Map; -import net.bytebuddy.asm.Advice; -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.description.type.TypeDescription; -import net.bytebuddy.matcher.ElementMatcher; - -@AutoService(Instrumenter.class) -public class GoodInstrumentation extends Instrumenter.Default { - - public GoodInstrumentation() { - super("good-test-instrumentation"); - } - - @Override - public ElementMatcher typeMatcher() { - return named(TestClass.class.getName()); - } - - @Override - public Map, String> transformers() { - return singletonMap(named("doSomething"), GoodInstrumentationAdvice.class.getName()); - } - - public static class GoodInstrumentationAdvice { - @Advice.OnMethodExit - public static void changeReturn(@Advice.Return(readOnly = false) String originalValue) { - originalValue = "overridden value"; - } - } -} diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestClass.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestClass.java deleted file mode 100644 index 9eb4a55ca9..0000000000 --- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestClass.java +++ /dev/null @@ -1,7 +0,0 @@ -package datadog.trace.agent.test; - -public class TestClass { - public String doSomething() { - return "original value"; - } -}