Merge pull request #6018 from luneo7/okhttp-relocate

Relocate OkHttp to avoid conflicts
DataDog · Oct 19, 2023 · 0fecc32 · 0fecc32
2 parents 71f86a5 + 91c127b
commit 0fecc32
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
@@ -48,6 +48,14 @@ ext.generalShadowJarConfig = {
   // rewrite dependencies calling Logger.getLogger
   relocate 'java.util.logging.Logger', 'datadog.trace.bootstrap.PatchLogger'
 
+  final String projectName = "${project.name}"
+
+  // Prevents conflict with other OkHttp instances, but don't relocate instrumentation
+  if (!projectName.equals('instrumentation')) {
+    relocate 'okhttp3', 'datadog.okhttp3'
+    relocate 'okio',  'datadog.okio'
+  }
+
   if (!project.hasProperty("disableShadowRelocate") || !disableShadowRelocate) {
     // shadow OT impl to prevent casts to implementation
     relocate 'datadog.trace.common', 'datadog.trace.agent.common'

diff --git a/.../java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java b/.../java/datadog/trace/instrumentation/graal/nativeimage/LinkAtBuildTimeInstrumentation.java
@@ -30,7 +30,7 @@ public static void onExit(
         @Advice.Argument(0) Class<?> declaringClass,
         @Advice.Return(readOnly = false) boolean linkAtBuildTime) {
       // skip AndroidPlatform from build-time linking because we're not building on Android
-      if ("okhttp3.internal.platform.AndroidPlatform".equals(declaringClass.getName())) {
+      if ("datadog.okhttp3.internal.platform.AndroidPlatform".equals(declaringClass.getName())) {
         linkAtBuildTime = false;
       }
     }

diff --git a/...java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java b/...java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java
@@ -37,7 +37,7 @@ public static void onExit() {
         "dd-trace-api.version",
         "trace/dd-trace-core.version",
         "shared/dogstatsd/version.properties",
-        "shared/okhttp3/internal/publicsuffix/publicsuffixes.gz"
+        "shared/datadog/okhttp3/internal/publicsuffix/publicsuffixes.gz"
       };
 
       for (String original : tracerResources) {

diff --git a/...test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy b/...test/groovy/datadog/trace/agent/integration/classloading/ShadowPackageRenamingTest.groovy
@@ -17,7 +17,7 @@ class ShadowPackageRenamingTest extends Specification {
     final URL agentOkioDep =
       ddClass
       .getClassLoader()
-      .loadClass("okio.BufferedSink")
+      .loadClass("datadog.okio.BufferedSink")
       .getProtectionDomain()
       .getCodeSource()
       .getLocation()