Build with jdk21 (#11219)

open-telemetry · May 1, 2024 · dfc79eb · dfc79eb
1 parent c92955f
commit dfc79eb
Show file tree

Hide file tree

Showing 30 changed files with 131 additions and 62 deletions.
diff --git a/.github/workflows/auto-update-otel-sdk.yml b/.github/workflows/auto-update-otel-sdk.yml
@@ -69,7 +69,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -68,7 +68,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -138,7 +138,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Increase gradle daemon heap size
         run: |
@@ -220,7 +220,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       # vaadin 14 tests fail with node 18
       - name: Set up Node
@@ -335,7 +335,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Set up Gradle cache
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -388,7 +388,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -411,7 +411,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Set up Gradle cache
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3

diff --git a/.github/workflows/owasp-dependency-check-daily.yml b/.github/workflows/owasp-dependency-check-daily.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Increase gradle daemon heap size
         run: |

diff --git a/.github/workflows/pr-smoke-test-fake-backend-images.yml b/.github/workflows/pr-smoke-test-fake-backend-images.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
@@ -49,7 +49,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

diff --git a/.github/workflows/pr-smoke-test-servlet-images.yml b/.github/workflows/pr-smoke-test-servlet-images.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Set up Gradle cache
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

diff --git a/.github/workflows/publish-smoke-test-fake-backend-images.yml b/.github/workflows/publish-smoke-test-fake-backend-images.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Login to GitHub package registry
         uses: docker/login-action@v3
@@ -55,7 +55,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Login to GitHub package registry
         uses: azure/docker-login@v1

diff --git a/.github/workflows/publish-smoke-test-servlet-images.yml b/.github/workflows/publish-smoke-test-servlet-images.yml
@@ -57,7 +57,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Login to GitHub package registry
         uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -83,7 +83,7 @@ jobs:
       - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

diff --git a/.github/workflows/reusable-muzzle.yml b/.github/workflows/reusable-muzzle.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2

diff --git a/.github/workflows/reusable-smoke-test-images.yml b/.github/workflows/reusable-smoke-test-images.yml
@@ -47,7 +47,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Login to GitHub package registry
         if: inputs.publish

diff --git a/.github/workflows/reusable-test-indy.yml b/.github/workflows/reusable-test-indy.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Increase gradle daemon heap size
         run: |

diff --git a/.github/workflows/reusable-test-latest-deps.yml b/.github/workflows/reusable-test-latest-deps.yml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: temurin
-          java-version: 17.0.6
+          java-version: 21
 
       - name: Increase gradle daemon heap size
         run: |

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ and discuss your ideas or propose the changes you wish to make.
 
 ## Building
 
-This project requires Java 17 to build and run tests. Newer JDK's may work, but this version is used in CI.
+This project requires Java 21 to build and run tests. Newer JDK's may work, but this version is used in CI.
 
 Some instrumentations and tests may put constraints on which java versions they support.
 See [Running the tests](./docs/contributing/running-tests.md) for more details.
@@ -22,7 +22,7 @@ the Sonatype OSS snapshots repository at `https://oss.sonatype.org/content/repos
 
 ### Building from source
 
-Build using Java 17:
+Build using Java 21:
 
 ```bash
 java -version

diff --git a/conventions/src/main/kotlin/io/opentelemetry/instrumentation/gradle/OtelJavaExtension.kt b/conventions/src/main/kotlin/io/opentelemetry/instrumentation/gradle/OtelJavaExtension.kt
@@ -10,6 +10,7 @@ import org.gradle.api.provider.Property
 
 abstract class OtelJavaExtension {
   abstract val minJavaVersionSupported: Property<JavaVersion>
+  abstract val maxJavaVersionSupported: Property<JavaVersion>
 
   abstract val maxJavaVersionForTests: Property<JavaVersion>
 

diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -27,12 +27,15 @@ afterEvaluate {
 }
 
 // Version to use to compile code and run tests.
-val DEFAULT_JAVA_VERSION = JavaVersion.VERSION_17
+val DEFAULT_JAVA_VERSION = JavaVersion.VERSION_21
 
 java {
   toolchain {
     languageVersion.set(
-      otelJava.minJavaVersionSupported.map { JavaLanguageVersion.of(Math.max(it.majorVersion.toInt(), DEFAULT_JAVA_VERSION.majorVersion.toInt())) }
+      otelJava.minJavaVersionSupported.map {
+        val defaultJavaVersion = otelJava.maxJavaVersionSupported.getOrElse(DEFAULT_JAVA_VERSION).majorVersion.toInt()
+        JavaLanguageVersion.of(Math.max(it.majorVersion.toInt(), defaultJavaVersion))
+      }
     )
   }
 
@@ -69,18 +72,30 @@ tasks.withType<JavaCompile>().configureEach {
           "-Xlint:-processing",
           // We suppress the "options" warning because it prevents compilation on modern JDKs
           "-Xlint:-options",
+          // jdk21 generates more serial warnings than previous versions
+          "-Xlint:-serial",
 
           // Fail build on any warning
           "-Werror"
         )
       )
+      val defaultJavaVersion = otelJava.maxJavaVersionSupported.getOrElse(DEFAULT_JAVA_VERSION).majorVersion.toInt()
+      if (Math.max(otelJava.minJavaVersionSupported.get().majorVersion.toInt(), defaultJavaVersion) >= 21) {
+        // new warning in jdk21
+        compilerArgs.add("-Xlint:-this-escape")
+      }
     }
 
     encoding = "UTF-8"
 
     if (name.contains("Test")) {
       // serialVersionUID is basically guaranteed to be useless in tests
       compilerArgs.add("-Xlint:-serial")
+      // when code is compiled with jdk 21 and executed with jdk 8, the -parameters flag is needed to avoid
+      // java.lang.reflect.MalformedParametersException: Invalid parameter name ""
+      // when junit calls java.lang.reflect.Executable.getParameters() on the constructor of a
+      // non-static nested test class
+      compilerArgs.add("-parameters")
     }
   }
 }

diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts
@@ -36,6 +36,8 @@ tasks {
           "--add-exports",
           "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
           "--add-exports",
+          "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+          "--add-exports",
           "jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
           "--add-exports",
           "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",

diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/testing/build.gradle.kts b/instrumentation/apache-httpclient/apache-httpclient-4.3/testing/build.gradle.kts
@@ -2,6 +2,16 @@ plugins {
   id("otel.java-conventions")
 }
 
+tasks {
+  compileJava {
+    // when code is compiled with jdk 21 and executed with jdk 8 -parameters flag is needed to avoid
+    // java.lang.reflect.MalformedParametersException: Invalid parameter name ""
+    // when junit calls java.lang.reflect.Executable.getParameters() on the constructor of a
+    // non-static nested test class
+    options.compilerArgs.add("-parameters")
+  }
+}
+
 dependencies {
   api(project(":testing-common"))
 

diff --git a/...a/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/SanitizationTest.java b/...a/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/SanitizationTest.java
@@ -31,7 +31,7 @@ void sanitizeCql(String original, String expected) {
     when(exchange.getIn()).thenReturn(message);
 
     String actualSanitized = decorator.getStatement(exchange, null);
-    assertEquals(actualSanitized, expected);
+    assertEquals(expected, actualSanitized);
   }
 
   @ParameterizedTest
@@ -45,7 +45,7 @@ void sanitizeJdbc(String original, String expected) {
     when(exchange.getIn()).thenReturn(message);
 
     String actualSanitized = decorator.getStatement(exchange, null);
-    assertEquals(actualSanitized, expected);
+    assertEquals(expected, actualSanitized);
   }
 
   @ParameterizedTest
@@ -60,7 +60,7 @@ void sanitizeSql(String original, String expected) {
     when(exchange.getIn()).thenReturn(message);
 
     String actualSanitized = decorator.getStatement(exchange, null);
-    assertEquals(actualSanitized, expected);
+    assertEquals(expected, actualSanitized);
   }
 
   static class SqlArgs implements ArgumentsProvider {

diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
@@ -28,6 +28,13 @@ muzzle {
   }
 }
 
+if (findProperty("testLatestDeps") as Boolean) {
+  // when running on jdk 21 Elasticsearch53SpringRepositoryTest occasionally fails with timeout
+  otelJava {
+    maxJavaVersionSupported.set(JavaVersion.VERSION_17)
+  }
+}
+
 dependencies {
   compileOnly("org.elasticsearch.client:transport:5.3.0") {
     isTransitive = false

diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/executors/ExecutorInstrumentationTest.java b/...ava/io/opentelemetry/javaagent/instrumentation/executors/ExecutorInstrumentationTest.java
@@ -7,8 +7,6 @@
 
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -26,8 +24,6 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 abstract class ExecutorInstrumentationTest<T extends ExecutorService>
@@ -51,24 +47,6 @@ static class ThreadPoolExecutorTest extends ExecutorInstrumentationTest<ThreadPo
     }
   }
 
-  @EnabledForJreRange(min = JRE.JAVA_21)
-  static class VirtualThreadExecutorTest extends ExecutorInstrumentationTest<ExecutorService> {
-    VirtualThreadExecutorTest() {
-      super(newVirtualThreadPerTaskExecutor());
-    }
-
-    private static ExecutorService newVirtualThreadPerTaskExecutor() {
-      Method newVirtualThreadPerTaskExecutor;
-      try {
-        newVirtualThreadPerTaskExecutor =
-            Executors.class.getMethod("newVirtualThreadPerTaskExecutor");
-        return (ExecutorService) newVirtualThreadPerTaskExecutor.invoke(null);
-      } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
-        throw new IllegalStateException("Should not happen on Java 21+", e);
-      }
-    }
-  }
-
   static class WorkStealingPoolTest extends ExecutorInstrumentationTest<ExecutorService> {
     public WorkStealingPoolTest() {
       super(Executors.newWorkStealingPool(2));