fix(deps): update byte buddy packages to v1.18.9 - abandoned (#18878)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>

Author: 3 people

.github/scripts/check-package-names.sh

@@ -30,6 +30,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
   if [[ "$dir" == "instrumentation/rxjava/rxjava-1.0/library/src/main/java/rx" ]]; then
     continue
   fi
+  if [[ "$dir" == "instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/main/java/org/elasticsearch/client" ]]; then
+    continue
+  fi
 
   # some common modules don't have any base version (might have a variant instead, ex: javax)
   # - jdbc

conventions/build.gradle.kts

@@ -71,7 +71,7 @@ dependencies {
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.11.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.18.8")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.18.9")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.0")

dependencyManagement/build.gradle.kts

@@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.1"
 val errorProneVersion = "2.49.0"
-val byteBuddyVersion = "1.18.8"
+val byteBuddyVersion = "1.18.9"
 val asmVersion = "9.10.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"

gradle-plugins/build.gradle.kts

@@ -25,7 +25,7 @@ configurations.named("compileOnly") {
   extendsFrom(bbGradlePlugin)
 }
 
-val byteBuddyVersion = "1.18.8"
+val byteBuddyVersion = "1.18.9"
 val aetherVersion = "1.1.0"
 
 dependencies {

instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/RestClientWrapper.java

@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.description.modifier.Visibility;
+import net.bytebuddy.dynamic.loading.ClassInjector;
 import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
 import net.bytebuddy.implementation.InvocationHandlerAdapter;
 import org.apache.http.Header;
@@ -29,6 +30,7 @@
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseListener;
 import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientPackageAccess;
 
 class RestClientWrapper {
   private static final Class<?> proxyClass = createProxyClass();
@@ -112,7 +114,11 @@ private static Class<?> createProxyClass() {
                   return method.invoke(target, args);
                 }))
         .make()
-        .load(RestClient.class.getClassLoader(), ClassLoadingStrategy.Default.INJECTION)
+        .load(
+            RestClient.class.getClassLoader(),
+            ClassInjector.UsingReflection.isAvailable()
+                ? ClassLoadingStrategy.Default.INJECTION
+                : ClassLoadingStrategy.UsingLookup.of(RestClientPackageAccess.getLookup()))
         .getLoaded();
   }
 

instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/main/java/org/elasticsearch/client/RestClientPackageAccess.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.elasticsearch.client;
+
+import java.lang.invoke.MethodHandles;
+
+public final class RestClientPackageAccess {
+
+  public static MethodHandles.Lookup getLookup() {
+    return MethodHandles.lookup();
+  }
+
+  private RestClientPackageAccess() {}
+}

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/test/HelperInjectionTest.java

@@ -9,23 +9,18 @@
 import static io.opentelemetry.instrumentation.test.utils.GcUtils.awaitGc;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import io.opentelemetry.javaagent.bootstrap.InjectedClassHelper;
 import io.opentelemetry.javaagent.tooling.AgentInstaller;
 import io.opentelemetry.javaagent.tooling.HelperInjector;
-import io.opentelemetry.javaagent.tooling.Utils;
 import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.time.Duration;
 import java.util.concurrent.atomic.AtomicReference;
 import net.bytebuddy.agent.ByteBuddyAgent;
-import net.bytebuddy.description.type.TypeDescription;
-import net.bytebuddy.dynamic.ClassFileLocator;
-import net.bytebuddy.dynamic.loading.ClassInjector;
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("UnnecessaryAsync")
@@ -121,34 +116,4 @@ void helpersInjectedOnBootstrapClassloader() throws Exception {
 
     assertThat(helperClass.getClassLoader()).isEqualTo(bootstrapClassloader);
   }
-
-  @Test
-  void checkHardReferencesOnClassInjection() throws Exception {
-    String helperClassName = HelperInjectionTest.class.getPackage().getName() + ".HelperClass";
-
-    // Copied from HelperInjector:
-    ClassFileLocator locator = ClassFileLocator.ForClassLoader.of(Utils.getAgentClassLoader());
-    byte[] classBytes = locator.locate(helperClassName).resolve();
-    TypeDescription typeDesc = new TypeDescription.Latent(helperClassName, 0, null, emptyList());
-
-    AtomicReference<URLClassLoader> emptyLoader =
-        new AtomicReference<>(new URLClassLoader(new URL[0], null));
-    AtomicReference<ClassInjector> injector =
-        new AtomicReference<>(new ClassInjector.UsingReflection(emptyLoader.get()));
-    injector.get().inject(singletonMap(typeDesc, classBytes));
-
-    WeakReference<ClassInjector> injectorRef = new WeakReference<>(injector.get());
-    injector.set(null);
-
-    awaitGc(injectorRef, Duration.ofSeconds(10));
-
-    assertThat(injectorRef.get()).isNull();
-
-    WeakReference<URLClassLoader> loaderRef = new WeakReference<>(emptyLoader.get());
-    emptyLoader.set(null);
-
-    awaitGc(loaderRef, Duration.ofSeconds(10));
-
-    assertThat(loaderRef.get()).isNull();
-  }
 }