Test against JDK 21 too (#54)

DataDog · Dec 18, 2023 · 7c3100d · 7c3100d
1 parent 9e76c6d
commit 7c3100d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
     if: needs.check-for-pr.outputs.skip != 'true'
     strategy:
       matrix:
-        java_version: [8u362+9, 11.0.18+10, 17.0.6+10, 20.0.1+10]
+        java_version: [8u362+9, 11.0.18+10, 17.0.6+10, 21.0.1+12]
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:
@@ -86,7 +86,7 @@ jobs:
     if: needs.check-for-pr.outputs.skip != 'true'
     strategy:
       matrix:
-        java_version: [11, 17]
+        java_version: [11, 17, 21]
     runs-on: ubuntu-22.04
     timeout-minutes: 180
     steps:
@@ -226,7 +226,7 @@ jobs:
     if: needs.check-for-pr.outputs.skip != 'true'
     strategy:
       matrix:
-        java_version: [8u362+9, 11.0.18+10, 17.0.6+10, 20.0.1+10]
+        java_version: [8u362+9, 11.0.18+10, 17.0.6+10, 21.0.1+12]
     runs-on: ubuntu-latest
     timeout-minutes: 10
     container:
@@ -278,7 +278,7 @@ jobs:
     if: needs.check-for-pr.outputs.skip != 'true'
     strategy:
       matrix:
-        java_version: [ 8, 11, 17 ]
+        java_version: [ 8, 11, 17, 21 ]
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:
@@ -304,6 +304,9 @@ jobs:
           elif [ "${{ matrix.java_version }}" = "17" ]; then
             # jdk 17.0.7
             curl -L --fail "https://cdn.azul.com/zing-zvm/ZVM23.05.0.0/zing23.05.0.0-2-jdk17.0.7-linux_x64.tar.gz" | sudo tar -xvzf - -C /usr/lib/jvm/zing --strip-components 1
+          elif [ "${{ matrix.java_version }}" = "21" ]; then
+            # jdk 21.0.2
+            curl -L --fail "https://cdn.azul.com/zing-zvm/ZVM23.10.0.0/zing23.10.0.0-3-jdk21.0.1-linux_x64.tar.gz" | sudo tar -xvzf - -C /usr/lib/jvm/zing --strip-components 1
           fi
           # rename the bundled libstdc++.so to avoid conflicts with the system one
           sudo mv /usr/lib/jvm/zing/etc/libc++/libstdc++.so.6 /usr/lib/jvm/zing/etc/libc++/libstdc++.so.6.bak

diff --git a/ddprof-test/src/test/java/com/datadoghq/profiler/AbstractProfilerTest.java b/ddprof-test/src/test/java/com/datadoghq/profiler/AbstractProfilerTest.java
@@ -40,6 +40,7 @@ public abstract class AbstractProfilerTest {
 
   private boolean stopped = true;
 
+  public static final String LAMBDA_QUALIFIER = Platform.isJavaVersionAtLeast(21) ? "$$Lambda." : "$$Lambda$";
   public static final IQuantity ZERO_BYTES = BYTE.quantity(0);
   public static final IAttribute<IQuantity> SIZE = attr("size", "size", "", BYTE.getContentType());
   public static final IAttribute<IQuantity> WEIGHT = attr("weight", "weight", "weight", NUMBER);

diff --git a/ddprof-test/src/test/java/com/datadoghq/profiler/jfr/CpuDumpSmokeTest.java b/ddprof-test/src/test/java/com/datadoghq/profiler/jfr/CpuDumpSmokeTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junitpioneer.jupiter.RetryingTest;
 
 public class CpuDumpSmokeTest extends JfrDumpTest {
 
@@ -10,7 +11,7 @@ protected String getProfilerCommand() {
         return "cpu=1ms,cstack=fp";
     }
 
-    @Test
+    @RetryingTest(3)
     @Timeout(value = 60)
     public void test() throws Exception {
         runTest("datadog.ExecutionSample");

diff --git a/...of-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java b/...of-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java
@@ -48,7 +48,7 @@ public void test() {
         }
         assertTrue(result != 0);
         stopProfiler();
-        String lambdaName = getClass().getName() + "$$Lambda$";
+        String lambdaName = getClass().getName() + LAMBDA_QUALIFIER;
         String lambdaStateName = getClass().getName() + ".lambda$pingPong$";
         for (IItemIterable wallclockSamples : verifyEvents("datadog.MethodSample")) {
             IMemberAccessor<String, IItem> frameAccessor = JdkAttributes.STACK_TRACE_STRING.getAccessor(wallclockSamples.getType());