From e8ebf4b8a2aae348a4171a6e0229ff5545410f83 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 7 Mar 2021 20:12:00 -0800 Subject: [PATCH] Update example distro to 1.0.0 (#2507) --- examples/distro/build.gradle | 2 +- examples/distro/gradle/instrumentation.gradle | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 11c9e0a4ab..0fb38b13a9 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -9,7 +9,7 @@ subprojects { ext { versions = [ opentelemetry : "1.0.0", - opentelemetryJavaagent: "0.17.0", + opentelemetryJavaagent: "1.0.0", bytebuddy : "1.10.18", guava : "30.1-jre" ] diff --git a/examples/distro/gradle/instrumentation.gradle b/examples/distro/gradle/instrumentation.gradle index a178fe3bd5..c8f6f8ce80 100644 --- a/examples/distro/gradle/instrumentation.gradle +++ b/examples/distro/gradle/instrumentation.gradle @@ -40,13 +40,11 @@ shadowJar { tasks.withType(Test).configureEach { jvmArgs "-Dotel.javaagent.debug=true" jvmArgs "-javaagent:${configurations.testAgent.files.first().absolutePath}" - jvmArgs "-Dotel.initializer.jar=${shadowJar.archiveFile.get().asFile.absolutePath}" - jvmArgs "-Dinternal.testing.disable.global.library.ignores=true" - // always run with the thread propagation debugger to help track down sporadic test failures - jvmArgs "-Dotel.threadPropagationDebugger=true" - jvmArgs "-Dotel.internal.failOnContextLeak=true" + jvmArgs "-Dotel.javaagent.experimental.initializer.jar=${shadowJar.archiveFile.get().asFile.absolutePath}" + jvmArgs "-Dotel.javaagent.testing.additional-library-ignores.enabled=false" + jvmArgs "-Dotel.javaagent.testing.fail-on-context-leak=true" // prevent sporadic gradle deadlocks, see SafeLogger for more details - jvmArgs "-Dotel.internal.enableTransformSafeLogging=true" + jvmArgs "-Dotel.javaagent.testing.transform-safe-logging.enabled=true" dependsOn shadowJar