Fix failing test (#3269)

This commit is contained in:
Trask Stalnaker 2021-06-12 01:37:04 -07:00 committed by GitHub
parent e118c469be
commit bec9966e30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 0 deletions

View File

@ -38,6 +38,8 @@ shadowJar {
} }
tasks.withType(Test).configureEach { tasks.withType(Test).configureEach {
inputs.file(shadowJar.archiveFile)
jvmArgs "-Dotel.javaagent.debug=true" jvmArgs "-Dotel.javaagent.debug=true"
jvmArgs "-javaagent:${configurations.testAgent.files.first().absolutePath}" jvmArgs "-javaagent:${configurations.testAgent.files.first().absolutePath}"
jvmArgs "-Dotel.javaagent.experimental.initializer.jar=${shadowJar.archiveFile.get().asFile.absolutePath}" jvmArgs "-Dotel.javaagent.experimental.initializer.jar=${shadowJar.archiveFile.get().asFile.absolutePath}"

View File

@ -44,6 +44,10 @@ public class ExtensionClassLoader extends URLClassLoader {
System.getenv("OTEL_JAVAAGENT_EXPERIMENTAL_INITIALIZER_JAR")))); System.getenv("OTEL_JAVAAGENT_EXPERIMENTAL_INITIALIZER_JAR"))));
// TODO when logging is configured add warning about deprecated property // TODO when logging is configured add warning about deprecated property
if (extension.isEmpty()) {
return parent;
}
List<ClassLoader> delegates = new ArrayList<>(extension.size()); List<ClassLoader> delegates = new ArrayList<>(extension.size());
for (URL url : extension) { for (URL url : extension) {
delegates.add(getDelegate(parent, url)); delegates.add(getDelegate(parent, url));

View File

@ -133,6 +133,8 @@ dependencies {
} }
tasks.withType(Test).configureEach { tasks.withType(Test).configureEach {
inputs.file(shadowJar.archiveFile)
jvmArgs "-Dotel.javaagent.debug=true" jvmArgs "-Dotel.javaagent.debug=true"
doFirst { doFirst {

View File

@ -88,6 +88,8 @@ dependencies {
afterEvaluate { afterEvaluate {
tasks.withType(Test).configureEach { tasks.withType(Test).configureEach {
inputs.file(shadowJar.archiveFile)
jvmArgs "-Dotel.javaagent.debug=true" jvmArgs "-Dotel.javaagent.debug=true"
jvmArgs "-javaagent:${shadowJar.archiveFile.get().asFile.absolutePath}" jvmArgs "-javaagent:${shadowJar.archiveFile.get().asFile.absolutePath}"