From b8a928fbe5745b6ee4f829ce50f6a45dec5ed230 Mon Sep 17 00:00:00 2001
From: Stuart McCulloch <stuart.mcculloch@datadoghq.com>
Date: Wed, 29 Jan 2025 20:52:43 +0000
Subject: [PATCH] Make jnr-unixsocket an explicit dependency of dd-trace-ot

---
 dd-trace-ot/build.gradle                              | 11 ++++++-----
 test-published-dependencies/ot-is-shaded/build.gradle |  3 ---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dd-trace-ot/build.gradle b/dd-trace-ot/build.gradle
index 6ea5a0e422d..e6865047c8d 100644
--- a/dd-trace-ot/build.gradle
+++ b/dd-trace-ot/build.gradle
@@ -48,6 +48,8 @@ dependencies {
   api group: 'io.opentracing.contrib', name: 'opentracing-tracerresolver', version: '0.1.6'
 
   api libs.slf4j
+  api libs.jnr.unixsocket
+
   implementation project(':dd-trace-ot:correlation-id-injection')
 
   testImplementation project(":dd-java-agent:testing")
@@ -96,16 +98,15 @@ shadowJar {
     exclude(dependency('io.opentracing:'))
     exclude(dependency('io.opentracing.contrib:'))
     exclude(dependency('org.slf4j:'))
+    exclude(dependency('com.github.jnr:'))
   }
 
   relocate('com.', 'ddtrot.com.') {
-    // don't relocate native methods
-    exclude('com.kenai.jffi.*')
-    exclude('com.kenai.jffi.internal.*')
+    // leave our PatchInit class shaded even though its not used in this deployment
+    // unfortunately the shadow plugin doesn't let us completely remove this class
+    exclude('%regex[com/kenai/jffi/(?!PatchInit)[^/]*]')
   }
   relocate('dogstatsd/', 'ddtrot/dogstatsd/')
-  relocate('jni/', 'ddtrot/jni/')
-  relocate('jnr/', 'ddtrot/jnr/')
   relocate('okhttp3.', 'ddtrot.okhttp3.')
   relocate('okio.', 'ddtrot.okio.')
   relocate('org.', 'ddtrot.org.') {
diff --git a/test-published-dependencies/ot-is-shaded/build.gradle b/test-published-dependencies/ot-is-shaded/build.gradle
index 1b5451238af..1342c8e24d0 100644
--- a/test-published-dependencies/ot-is-shaded/build.gradle
+++ b/test-published-dependencies/ot-is-shaded/build.gradle
@@ -91,9 +91,6 @@ tasks.register('checkJarContents', CheckJarContentsTask) {
     '^[^/]*\\.version$',
     '^DDSketch.proto$',
     '^META-INF/.*$',
-    '^com/$',
-    '^com/kenai/$',
-    '^com/kenai/jffi/.*$',
     '^datadog/.*$',
     '^ddtrot/.*$'
   ]