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

Be more specific about thread assertion.

This commit is contained in:
Tyler Benson 2019-08-20 09:32:05 -07:00
parent 8c1dbfe7cb
commit 28f4038122
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
buildSrc/src/main/groovy/MuzzlePlugin.groovy
View File

@ -22,6 +22,7 @@ import org.gradle.api.Task
import org.gradle.api.model.ObjectFactory import org.gradle.api.model.ObjectFactory
import java.lang.reflect.Method import java.lang.reflect.Method
import java.security.SecureClassLoader
import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.atomic.AtomicReference
/** /**
@ -33,7 +34,6 @@ class MuzzlePlugin implements Plugin<Project> {
*/ */
private static final List<RemoteRepository> MUZZLE_REPOS private static final List<RemoteRepository> MUZZLE_REPOS
private static final AtomicReference<ClassLoader> TOOLING_LOADER = new AtomicReference<>() private static final AtomicReference<ClassLoader> TOOLING_LOADER = new AtomicReference<>()
private static final AtomicReference<Set<Thread>> ALLOWED_THREADS = new AtomicReference<>()
static { static {
RemoteRepository central = new RemoteRepository.Builder("central", "default", "http://central.maven.org/maven2/").build() RemoteRepository central = new RemoteRepository.Builder("central", "default", "http://central.maven.org/maven2/").build()
MUZZLE_REPOS = new ArrayList<RemoteRepository>(Arrays.asList(central)) MUZZLE_REPOS = new ArrayList<RemoteRepository>(Arrays.asList(central))
@ -132,8 +132,6 @@ class MuzzlePlugin implements Plugin<Project> {
def loader = new URLClassLoader(ddUrls.toArray(new URL[0]), (ClassLoader) null) def loader = new URLClassLoader(ddUrls.toArray(new URL[0]), (ClassLoader) null)
assert TOOLING_LOADER.compareAndSet(null, loader) assert TOOLING_LOADER.compareAndSet(null, loader)
loader.loadClass("datadog.trace.agent.tooling.AgentTooling").getMethod("init").invoke(null) loader.loadClass("datadog.trace.agent.tooling.AgentTooling").getMethod("init").invoke(null)
assert ALLOWED_THREADS.compareAndSet(null, new HashSet<Thread>(Arrays.asList(Thread.getThreads())))
assert ALLOWED_THREADS.get().size() > 0
return TOOLING_LOADER.get() return TOOLING_LOADER.get()
} else { } else {
return toolingLoader return toolingLoader
@ -275,16 +273,23 @@ class MuzzlePlugin implements Plugin<Project> {
def muzzleTask = instrumentationProject.task(taskName) { def muzzleTask = instrumentationProject.task(taskName) {
doLast { doLast {
final ClassLoader userCL = createClassLoaderForTask(instrumentationProject, bootstrapProject, taskName)
final ClassLoader instrumentationCL = createInstrumentationClassloader(instrumentationProject, toolingProject) final ClassLoader instrumentationCL = createInstrumentationClassloader(instrumentationProject, toolingProject)
// find all instrumenters, get muzzle, and assert def ccl = Thread.currentThread().contextClassLoader
Method assertionMethod = instrumentationCL.loadClass('datadog.trace.agent.tooling.muzzle.MuzzleVersionScanPlugin') def bogusLoader = new SecureClassLoader()
.getMethod('assertInstrumentationMuzzled', ClassLoader.class, ClassLoader.class, boolean.class) Thread.currentThread().contextClassLoader = bogusLoader
assertionMethod.invoke(null, instrumentationCL, userCL, muzzleDirective.assertPass) final ClassLoader userCL = createClassLoaderForTask(instrumentationProject, bootstrapProject, taskName)
try {
// find all instrumenters, get muzzle, and assert
Method assertionMethod = instrumentationCL.loadClass('datadog.trace.agent.tooling.muzzle.MuzzleVersionScanPlugin')
.getMethod('assertInstrumentationMuzzled', ClassLoader.class, ClassLoader.class, boolean.class)
assertionMethod.invoke(null, instrumentationCL, userCL, muzzleDirective.assertPass)
} finally {
Thread.currentThread().contextClassLoader = ccl
}
for (Thread thread : Thread.getThreads()) { for (Thread thread : Thread.getThreads()) {
if (!ALLOWED_THREADS.get().contains(thread)) { if (thread.contextClassLoader == bogusLoader || thread.contextClassLoader == instrumentationCL || thread.contextClassLoader == userCL) {
throw new GradleException("Task $taskName has spawned a thread: $thread. This will prevent GC of dynamic muzzle classes. Aborting muzzle run.") throw new GradleException("Task $taskName has spawned a thread: $thread with classloader $thread.contextClassLoader. This will prevent GC of dynamic muzzle classes. Aborting muzzle run.")
} }
} }
} }

6
dd-java-agent/instrumentation/servlet-3/servlet-3.gradle
View File

@ -39,6 +39,8 @@ dependencies {
// TODO: we need to setup separate test for Jetty 10 when that is released. // TODO: we need to setup separate test for Jetty 10 when that is released.
latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+' latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+' latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '+'
latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '+' // FIXME: 9.0.24 seems to have changed something...
latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.22'
latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.0.22'
} }