open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* Fix sun.misc.Unsafe generation on jdk17

* remove jmxremote argument for now

* spotless

* remove unneeded annotation
This commit is contained in:
Lauri Tulmin 2021-11-02 16:05:51 +02:00 committed by GitHub
parent 12ec0fa481
commit b3d9ae8268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
javaagent-tooling/javaagent-tooling-java9/src/main/java/io/opentelemetry/javaagent/tooling/SunMiscUnsafeGenerator.java
View File

@ -195,8 +195,10 @@ class SunMiscUnsafeGenerator {
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);
}

10
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy
View File

@ -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 {
}