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

Remove isolated agent test runner notes

This commit is contained in:
Andrew Kent 2018-03-15 12:11:51 -07:00
parent 28a350d7c1
commit eac73467a7
3 changed files with 8 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
dd-java-agent/testing/src/main/java/datadog/trace/agent/test/AgentTestRunner.java
View File

@ -156,95 +156,4 @@ public abstract class AgentTestRunner extends Specification {
final JavaModule module,
final boolean loaded) {}
}
// TODO: remove in a separate commit
// Notes for running agent on isolated classloader.
/*
final File bootstrapJar = createBootstrapJar();
final File agentJar = createAgentJar();
instrumentation.appendToBootstrapClassLoaderSearch(new JarFile(bootstrapJar));
final ClassLoader agentClassLoader = createDatadogClassLoader(bootstrapJar, agentJar);
final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(agentClassLoader);
{ // install agent
final Class<?> agentInstallerClass =
agentClassLoader.loadClass("datadog.trace.agent.tooling.AgentInstaller");
final Class<?> listenerArrayClass =
Array.newInstance(agentClassLoader.loadClass("net.bytebuddy.agent.builder.AgentBuilder$Listener"), 0).getClass();
final Class<?> errorListenerClass =
agentClassLoader.loadClass(AgentTestRunner.class.getName()+ "$ErrorCountingListener");
final Method agentInstallerMethod =
agentInstallerClass.getMethod("installBytebuddyAgent", Instrumentation.class, listenerArrayClass);
final Object listeners = Array.newInstance(errorListenerClass, 1);
Array.set(listeners, 0, errorListenerClass.newInstance());
activeTransformer = (ClassFileTransformer) agentInstallerMethod.invoke(null, instrumentation, listeners);
}
} finally {
Thread.currentThread().setContextClassLoader(contextLoader);
}
*/
/*
private static File createAgentJar() throws IOException {
final ClassLoader loader = AgentTestRunner.class.getClassLoader();
final ClassPath testCP = ClassPath.from(loader);
Set<String> agentClasses = new HashSet<String>();
for (ClassPath.ClassInfo info : testCP.getAllClasses()) {
boolean isAgentClass = true;
for (int i = 0; i < TEST_BOOTSTRAP.length; ++i) {
if (info.getName().startsWith(TEST_BOOTSTRAP[i])) {
isAgentClass = false;
break;
}
}
if (info.getName().startsWith("org.junit")
|| info.getName().startsWith("junit")
|| info.getName().startsWith("org.mockito")
|| info.getName().startsWith("org.assertj")
|| info.getName().startsWith("org.omg")
|| info.getName().startsWith("lombok")
|| info.getName().startsWith("org.spockframework")
|| info.getName().startsWith("spock")
|| info.getName().startsWith("java")
|| info.getName().startsWith("sun")
|| info.getName().startsWith("jdk")
|| info.getName().startsWith("com.intellij")
|| info.getName().startsWith("org.jetbrains")
|| info.getName().startsWith("com.oracle")
|| info.getName().startsWith("com.sun")
|| info.getName().startsWith("ratpack")
|| info.getName().startsWith("org.codehaus.groovy")
|| info.getName().startsWith("org.groovy")
|| info.getName().startsWith("groovy")) {
isAgentClass = false;
}
if (isAgentClass) {
agentClasses.add(info.getResourceName());
}
}
for (ClassPath.ResourceInfo resource : testCP.getResources()) {
if (resource.getResourceName().startsWith("META-INF/services/")) {
agentClasses.add(resource.getResourceName());
}
}
final File file = new File(TestUtils.createJarWithClasses(loader, agentClasses.toArray(new String[0])).getFile());
return file;
}
private static ClassLoader createDatadogClassLoader(File bootstrapJar, File toolingJar)
throws Exception {
final ClassLoader agentParent = ClassLoader.getSystemClassLoader().getParent();
Class<?> loaderClass =
ClassLoader.getSystemClassLoader().loadClass("datadog.trace.bootstrap.DatadogClassLoader");
Constructor constructor =
loaderClass.getDeclaredConstructor(URL.class, URL.class, ClassLoader.class);
return (ClassLoader)
constructor.newInstance(
bootstrapJar.toURI().toURL(), toolingJar.toURI().toURL(), agentParent);
}
*/
}

4
dd-java-agent/testing/src/main/java/datadog/trace/agent/test/SpockRunner.java
View File

@ -112,9 +112,7 @@ public class SpockRunner extends Sputnik {
TestUtils.createJarWithClasses(loader, bootstrapClasses.toArray(new String[0])).getFile());
}
/**
* Run test classes in a classloader which loads test classes before delegating.
*/
/** Run test classes in a classloader which loads test classes before delegating. */
private static class InstrumentationClassLoader extends java.lang.ClassLoader {
final ClassLoader parent;
final String shadowPrefix;

9
dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy
View File

@ -1,5 +1,4 @@
import datadog.trace.agent.test.TestUtils
import datadog.trace.agent.tooling.AgentInstaller
import java.lang.reflect.Field
@ -7,15 +6,19 @@ import datadog.trace.agent.test.AgentTestRunner
class AgentTestRunnerTest extends AgentTestRunner {
private static final ClassLoader BOOTSTRAP_CLASSLOADER = null
private static final boolean OT_LOADED_IN_CLINIT
private static final boolean AGENT_INSTALLED_IN_CLINIT
static {
// when test class initializes, opentracing should be set up, but not the agent.
assert io.opentracing.Tracer.getClassLoader() == BOOTSTRAP_CLASSLOADER
assert getAgentTransformer() == null
OT_LOADED_IN_CLINIT = io.opentracing.Tracer.getClassLoader() == BOOTSTRAP_CLASSLOADER
AGENT_INSTALLED_IN_CLINIT = getAgentTransformer() != null
}
def "classpath setup"() {
expect:
OT_LOADED_IN_CLINIT
!AGENT_INSTALLED_IN_CLINIT
io.opentracing.Tracer.getClassLoader() == BOOTSTRAP_CLASSLOADER
TEST_TRACER == TestUtils.getUnderlyingGlobalTracer()
getAgentTransformer() != null