From de920b4469983a52ca11cba6849de4253d3ef7a9 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Fri, 9 Aug 2024 01:43:38 +0100 Subject: [PATCH] Relocate embedded jpountz classes to avoid conflict with flat class-path when using GraalVM native-images --- dd-java-agent/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index 35ca9820275..708d9096600 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -48,8 +48,9 @@ ext.generalShadowJarConfig = { // Prevents conflict with other SLF4J instances. Important for premain. relocate 'org.slf4j', 'datadog.slf4j' - // Prevents conflict with other JCTools instances + // Prevent conflicts with flat class-path when using GraalVM native-images relocate 'org.jctools', 'datadog.jctools' + relocate 'net.jpountz', 'datadog.jpountz' // rewrite dependencies calling Logger.getLogger relocate 'java.util.logging.Logger', 'datadog.trace.bootstrap.PatchLogger'