From 3f22322a94d067bd2e37c9bfa7810f68cd0f6a0c Mon Sep 17 00:00:00 2001
From: Stuart McCulloch <stuart.mcculloch@datadoghq.com>
Date: Fri, 25 Apr 2025 10:51:04 +0100
Subject: [PATCH] byte-buddy now ships classes optimized for Java8+ under
 META-INF/versions/9 since we target Java8+ we can promote these classes over
 the pre-Java8 ones

---
 dd-java-agent/build.gradle | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
index afe6ff2f2cf..093a203fbca 100644
--- a/dd-java-agent/build.gradle
+++ b/dd-java-agent/build.gradle
@@ -99,6 +99,16 @@ def includeShadowJar(TaskProvider<ShadowJar> shadowJarTask, String jarname) {
       rename '(^.*)\\.class$', '$1.classdata'
       // Rename LICENSE file since it clashes with license dir on non-case sensitive FSs (i.e. Mac)
       rename '^LICENSE$', 'LICENSE.renamed'
+      if (jarname == 'inst') {
+        // byte-buddy now ships classes optimized for Java8+ under META-INF/versions/9
+        // since we target Java8+ we can promote these classes over the pre-Java8 ones
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        eachFile {
+          if (it.path.contains('META-INF/versions/9/net/bytebuddy')) {
+            it.path = it.path.replace('META-INF/versions/9/', '')
+          }
+        }
+      }
     }
   }