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

Revert addition of tests. Too many issues

This commit is contained in:
Laplie Anderson 2019-08-29 18:20:09 -04:00
parent ae9f8e15dd
commit f3bb22d8df
5 changed files with 1 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
View File

@ -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."))

18
dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/AgentInstallerTest.groovy
View File

@ -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"
}
}

26
dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/BadInstrumentation.java
View File

@ -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<? super TypeDescription> typeMatcher() {
throw new RuntimeException("Test Exception");
}
@Override
public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() {
return Collections.emptyMap();
}
}

37
dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/GoodInstrumentation.java
View File

@ -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<? super TypeDescription> typeMatcher() {
return named(TestClass.class.getName());
}
@Override
public Map<? extends ElementMatcher<? super MethodDescription>, 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";
}
}
}

7
dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/TestClass.java
View File

@ -1,7 +0,0 @@
package datadog.trace.agent.test;
public class TestClass {
public String doSomething() {
return "original value";
}
}