Update ByteBuddy (open-telemetry#3254)

* Update ByteBuddy * spotless
robododge · Jun 17, 2021 · 69ae771 · 69ae771
1 parent 470ccb8
commit 69ae771
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/dependencyManagement/dependencyManagement.gradle.kts b/dependencyManagement/dependencyManagement.gradle.kts
@@ -53,7 +53,7 @@ val DEPENDENCY_SETS = listOf(
   ),
   DependencySet(
     "net.bytebuddy",
-    "1.10.18",
+    "1.11.2",
     listOf("byte-buddy", "byte-buddy-agent")
   ),
   DependencySet(

diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/HelperInjector.java
@@ -225,8 +225,9 @@ private void ensureModuleCanReadHelperModules(JavaModule target) {
 
           if (!target.canRead(helperModule)) {
             log.debug("Adding module read from {} to {}", target, helperModule);
-            target.modify(
+            ClassInjector.UsingInstrumentation.redefineModule(
                 AgentInstaller.getInstrumentation(),
+                target,
                 Collections.singleton(helperModule),
                 Collections.emptyMap(),
                 Collections.emptyMap(),

diff --git a/.../src/main/java/io/opentelemetry/javaagent/tooling/bytebuddy/AgentCachingPoolStrategy.java b/.../src/main/java/io/opentelemetry/javaagent/tooling/bytebuddy/AgentCachingPoolStrategy.java
@@ -100,6 +100,12 @@ public final TypePool typePool(ClassFileLocator classFileLocator, ClassLoader cl
     return createCachingTypePool(loaderHash, loaderRef, classFileLocator);
   }
 
+  @Override
+  public final TypePool typePool(
+      ClassFileLocator classFileLocator, ClassLoader classLoader, String name) {
+    return typePool(classFileLocator, classLoader);
+  }
+
   private TypePool.CacheProvider createCacheProvider(
       int loaderHash, WeakReference<ClassLoader> loaderRef) {
     return new SharedResolutionCacheAdapter(loaderHash, loaderRef, sharedResolutionCache);