Fix sun.misc.Unsafe generation on jdk17 (#4558)

* Fix sun.misc.Unsafe generation on jdk17 * remove jmxremote argument for now * spotless * remove unneeded annotation
open-telemetry · Nov 2, 2021 · b3d9ae8 · b3d9ae8
1 parent 12ec0fa
commit b3d9ae8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...ooling-java9/src/main/java/io/opentelemetry/javaagent/tooling/SunMiscUnsafeGenerator.java b/...ooling-java9/src/main/java/io/opentelemetry/javaagent/tooling/SunMiscUnsafeGenerator.java
@@ -195,8 +195,10 @@ private void addMethods() {
     addMethod("arrayIndexScale", int.class, Class.class);
     addMethod("addressSize", int.class);
     addMethod("pageSize", int.class);
-    addMethod("defineAnonymousClass", Class.class, Class.class, byte[].class, Object[].class);
     addMethod("getLoadAverage", int.class, double[].class, int.class);
+    // defineAnonymousClass was removed in jdk17
+    addOptionalMethod(
+        "defineAnonymousClass", Class.class, Class.class, byte[].class, Object[].class);
     // this method is missing from internal unsafe in some jdk11 versions
     addOptionalMethod("invokeCleaner", void.class, ByteBuffer.class);
   }

diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy
@@ -6,8 +6,7 @@
 package io.opentelemetry.smoketest
 
 // jetty test with java module system
-@AppServer(version = "11.0.7", jdk = "11")
-class JettyJpmsSmokeTest extends AppServerTest {
+abstract class JettyJpmsSmokeTest extends AppServerTest {
 
   @Override
   protected String getTargetImagePrefix() {
@@ -20,3 +19,10 @@ class JettyJpmsSmokeTest extends AppServerTest {
     return ["java", "-jar", "/server/start.jar", "--jpms"]
   }
 }
+
+@AppServer(version = "11.0.7", jdk = "11")
+class Jetty11JpmsJdk11 extends JettyJpmsSmokeTest {
+}
+@AppServer(version = "11.0.7", jdk = "17")
+class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {
+}