From ddf5069ebbadf102cb48b3c74c77264ba898247a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 17:17:16 +0000
Subject: [PATCH 1/4] build: bump version.byte-buddy from 1.15.11 to 1.17.0

Bumps `version.byte-buddy` from 1.15.11 to 1.17.0.

Updates `net.bytebuddy:byte-buddy` from 1.15.11 to 1.17.0
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.11...byte-buddy-1.17.0)

Updates `net.bytebuddy:byte-buddy-agent` from 1.9.16 to 1.17.0
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.9.16...byte-buddy-1.17.0)

Updates `net.bytebuddy:byte-buddy-dep` from 1.15.11 to 1.17.0
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.11...byte-buddy-1.17.0)

---
updated-dependencies:
- dependency-name: net.bytebuddy:byte-buddy
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: net.bytebuddy:byte-buddy-agent
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: net.bytebuddy:byte-buddy-dep
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 integration-tests/runtime-attach/runtime-attach-app/pom.xml | 2 +-
 pom.xml                                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration-tests/runtime-attach/runtime-attach-app/pom.xml b/integration-tests/runtime-attach/runtime-attach-app/pom.xml
index ea00c5596b..d2369a17e5 100644
--- a/integration-tests/runtime-attach/runtime-attach-app/pom.xml
+++ b/integration-tests/runtime-attach/runtime-attach-app/pom.xml
@@ -31,7 +31,7 @@
             <!-- known old version of byte-buddy added intentionally to the app classpath -->
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy-agent</artifactId>
-            <version>1.9.16</version>
+            <version>1.17.0</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 41cf08ac34..509a700806 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
         <version.jetty-server>9.4.11.v20180605</version.jetty-server>
         <version.json-schema-validator>1.5.3</version.json-schema-validator>
         <!-- Byte Buddy and ASM must be kept in sync -->
-        <version.byte-buddy>1.15.11</version.byte-buddy>
+        <version.byte-buddy>1.17.0</version.byte-buddy>
         <version.asm>9.7.1</version.asm>
         <version.cucumber>5.4.0</version.cucumber>
 

From de18724c43a90583f6d71a014662dd9fb57123b5 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Tue, 4 Feb 2025 09:41:25 +0100
Subject: [PATCH 2/4] restore old version

---
 integration-tests/runtime-attach/runtime-attach-app/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/runtime-attach/runtime-attach-app/pom.xml b/integration-tests/runtime-attach/runtime-attach-app/pom.xml
index d2369a17e5..ea00c5596b 100644
--- a/integration-tests/runtime-attach/runtime-attach-app/pom.xml
+++ b/integration-tests/runtime-attach/runtime-attach-app/pom.xml
@@ -31,7 +31,7 @@
             <!-- known old version of byte-buddy added intentionally to the app classpath -->
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy-agent</artifactId>
-            <version>1.17.0</version>
+            <version>1.9.16</version>
         </dependency>
     </dependencies>
 

From be954fa62969085a119e281ea7c60bb2b0e94973 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Tue, 4 Feb 2025 10:27:20 +0100
Subject: [PATCH 3/4] update shade + force asm version

---
 pom.xml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 509a700806..cfc1a7adc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -615,7 +615,25 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.6.0</version>
+                    <dependencies>
+                        <!-- work-around to support java 24 bytecode -->
+                        <dependency>
+                            <groupId>org.ow2.asm</groupId>
+                            <artifactId>asm</artifactId>
+                            <version>${version.asm}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.ow2.asm</groupId>
+                            <artifactId>asm-commons</artifactId>
+                            <version>${version.asm}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.ow2.asm</groupId>
+                            <artifactId>asm-tree</artifactId>
+                            <version>${version.asm}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>

From ddf4ba2ae1b8790dbab99e848b4e32bc673440b4 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:17:03 +0100
Subject: [PATCH 4/4] add new dependency to agent packages

---
 .../main/java/co/elastic/apm/agent/common/util/AgentInfo.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java b/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java
index dbd2b1a9de..648d78f575 100644
--- a/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java
+++ b/apm-agent-common/src/main/java/co/elastic/apm/agent/common/util/AgentInfo.java
@@ -37,7 +37,8 @@ public class AgentInfo {
         "com.lmax.disruptor",
         "com.dslplatform.json",
         "com.googlecode.concurrentlinkedhashmap",
-        "co.elastic.otel"
+        "co.elastic.otel",
+        "codes.rafael.asmjdkbridge"
     ));
 
     private static final Set<String> agentRootPackages = new HashSet<>(Arrays.asList(