Switch JDK 23->24

Author: jbachorik

.github/actions/extract_versions/action.yml

@@ -13,15 +13,19 @@ runs:
         # Extract Java version
         ${{ env.JAVA_TEST_HOME }}/bin/java -version
         JAVA_VERSION=$(${{ env.JAVA_TEST_HOME }}/bin/java -version 2>&1 | awk -F '"' '/version/ {
-              split($2, v, "[._]");
-              if (v[1] == "1") {
-              # Java 8 or older: Include major, minor, and update
-              printf "%s.%s.%s\n", v[2], v[3], v[4]
-            } else {
-              # Java 9 or newer: Major, minor, and patch
-              printf "%s.%s.%s\n", v[1], v[2], v[3]
-            }
-          }')
+          split($2, v, "[._]");
+          if (v[2] == "") {
+            # Version is like "24": assume it is major only and add .0.0
+            printf "%s.0.0\n", v[1]
+          } else if (v[1] == "1") {
+            # Java 8 or older: Format is "1.major.minor_update"
+            printf "%s.%s.%s\n", v[2], v[3], v[4]
+          } else {
+            # Java 9 or newer: Format is "major.minor.patch"
+            printf "%s.%s.%s\n", v[1], v[2], v[3]
+          }
+        }')
+        echo "JAVA_VERSION=${JAVA_VERSION}"
         echo "JAVA_VERSION=${JAVA_VERSION}" >> $GITHUB_ENV
 
         # Extract Gradle version from gradle-wrapper.properties

.github/actions/setup_cached_java/action.yml

@@ -72,5 +72,3 @@ runs:
           echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
           echo "JAVA_TEST_HOME=$JAVA_TEST_HOME" >> $GITHUB_ENV
           echo "PATH=$JAVA_HOME/bin:$PATH" >> $GITHUB_ENV
-          
-          ldd $JAVA_HOME/bin/java

.github/scripts/test_alpine_aarch64.sh

@@ -1,6 +1,7 @@
 #! /bin/sh
 
 set -e
+set +x
 
 export KEEP_JFRS=true
 export TEST_COMMIT="${1}"
@@ -15,11 +16,14 @@ export PATH="${JAVA_HOME}/bin":${PATH}
 # due to env hell in GHA containers, we need to re-do the logic from Extract Versions here
 JAVA_VERSION=$("${JAVA_TEST_HOME}/bin/java" -version 2>&1 | awk -F '"' '/version/ {
   split($2, v, "[._]");
-  if (v[1] == "1") {
-    # Java 8 or older: Include major, minor, and update
+  if (v[2] == "") {
+    # Version is like "24": assume it is major only and add .0.0
+    printf "%s.0.0\n", v[1]
+  } else if (v[1] == "1") {
+    # Java 8 or older: Format is "1.major.minor_update"
     printf "%s.%s.%s\n", v[2], v[3], v[4]
   } else {
-    # Java 9 or newer: Major, minor, and patch
+    # Java 9 or newer: Format is "major.minor.patch"
     printf "%s.%s.%s\n", v[1], v[2], v[3]
   }
 }')

.github/workflows/cache_java.yml

@@ -24,11 +24,11 @@ env:
   JAVA_17_J9_VERSION: 17.0.13
   JAVA_21_VERSION: 21.0.6
   JAVA_21_J9_VERSION: 21.0.5
-  JAVA_23_VERSION: 23.0.2
+  JAVA_24_VERSION: 24
 
   JAVA_17_GRAAL_VERSION: 17.0.12
   JAVA_21_GRAAL_VERSION: 21.0.6
-  JAVA_23_GRAAL_VERSION: 23.0.2
+  JAVA_24_GRAAL_VERSION: 24
 
   # https://gist.github.com/wavezhang/ba8425f24a968ec9b2a8619d7c2d86a6?permalink_comment_id=4444663#gistcomment-4444663
   # jdk1.8.0_361
@@ -53,8 +53,8 @@ env:
   JAVA_17_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/17.0.14+10/bellsoft-jdk17.0.14+10-linux-aarch64-musl-lite.tar.gz"
   JAVA_21_MUSL_URL: "https://download.bell-sw.com/java/21.0.6+10/bellsoft-jdk21.0.6+10-linux-x64-musl-lite.tar.gz"
   JAVA_21_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/21.0.6+10/bellsoft-jdk21.0.6+10-linux-aarch64-musl-lite.tar.gz"
-  JAVA_23_MUSL_URL: "https://download.bell-sw.com/java/23.0.2+9/bellsoft-jdk23.0.2+9-linux-x64-musl-lite.tar.gz"
-  JAVA_23_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/23.0.2+9/bellsoft-jdk23.0.2+9-linux-aarch64-musl-lite.tar.gz"
+  JAVA_24_MUSL_URL: "https://download.bell-sw.com/java/24+37/bellsoft-jdk24+37-linux-x64-musl-lite.tar.gz"
+  JAVA_24_MUSL_AARCH64_URL: "https://download.bell-sw.com/java/24+37/bellsoft-jdk24+37-linux-aarch64-musl-lite.tar.gz"
 
 permissions:
   contents: read
@@ -146,7 +146,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java_variant: [ "8", "8-orcl", "8-zing", "8-j9", "8-ibm", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "23", "23-graal" ]
+        java_variant: [ "8", "8-orcl", "8-zing", "8-j9", "8-ibm", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "24", "24-graal" ]
     steps:
       - uses: actions/checkout@v3
       - name: Try restore cache JDK ${{ matrix.java_variant }}
@@ -205,7 +205,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "23-librca" ]
+        java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "24-librca" ]
     steps:
       - uses: actions/checkout@v3
       - name: Setup OS
@@ -255,7 +255,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java_variant: [ "8", "8-zing", "8-j9", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "23", "23-graal" ]
+        java_variant: [ "8", "8-zing", "8-j9", "11", "11-zing", "11-j9", "17", "17-zing", "17-j9", "17-graal", "21", "21-j9", "21-zing", "21-graal", "24", "24-graal" ]
     steps:
       - uses: actions/checkout@v3
       - name: Cache JDK ${{ matrix.java_variant }}
@@ -312,7 +312,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "23-librca" ]
+        java_variant: [ "8-librca", "11-librca", "17-librca", "21-librca", "24-librca" ]
     steps:
       - uses: actions/checkout@v3
       - name: Setup OS

.github/workflows/test_workflow.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [ "8", "8-orcl", "8-j9", "8-zing", "8-ibm", "11", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "23", "23-graal" ]
+        java_version: [ "8", "8-orcl", "8-j9", "8-zing", "8-ibm", "11", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "24", "24-graal" ]
         config: ${{ fromJson(inputs.configuration) }}
     runs-on: ubuntu-latest
     timeout-minutes: 180
@@ -116,7 +116,7 @@ jobs:
     strategy:
      fail-fast: false
      matrix:
-       java_version: [ "8-librca", "11-librca", "17-librca", "21-librca", "23-librca" ]
+       java_version: [ "8-librca", "11-librca", "17-librca", "21-librca", "24-librca" ]
        config: ${{ fromJson(inputs.configuration) }}
     runs-on: ubuntu-latest
     container:
@@ -163,16 +163,20 @@ jobs:
 
           # due to env hell in GHA containers, we need to re-do the logic from Extract Versions here
           JAVA_VERSION=$(${{ env.JAVA_TEST_HOME }}/bin/java -version 2>&1 | awk -F '"' '/version/ {
-              split($2, v, "[._]");
-              if (v[1] == "1") {
-              # Java 8 or older: Include major, minor, and update
+            split($2, v, "[._]");
+            if (v[2] == "") {
+              # Version is like "24": assume it is major only and add .0.0
+              printf "%s.0.0\n", v[1]
+            } else if (v[1] == "1") {
+              # Java 8 or older: Format is "1.major.minor_update"
               printf "%s.%s.%s\n", v[2], v[3], v[4]
             } else {
-              # Java 9 or newer: Major, minor, and patch
+              # Java 9 or newer: Format is "major.minor.patch"
               printf "%s.%s.%s\n", v[1], v[2], v[3]
             }
           }')
           export JAVA_VERSION
+          echo "JAVA_VERSION=${JAVA_VERSION}"
 
           ./gradlew -PCI -PkeepJFRs :ddprof-test:test${{ matrix.config }} --no-daemon --parallel --build-cache --no-watch-fs
           EXIT_CODE=$?
@@ -208,7 +212,7 @@ jobs:
       matrix:
         # java_version: [ "8", "8-j9", "8-zing", "11", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "23", "23-graal" ]
         # FIXME: Hotspot 8 and 11 versions are rather crashy in ASGCT on aarch64, so we are skipping them for now
-        java_version: [ "8-j9", "8-zing", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "23", "23-graal" ]
+        java_version: [ "8-j9", "8-zing", "11-j9", "11-zing", "17", "17-j9", "17-zing", "17-graal", "21", "21-zing", "21-graal", "24", "24-graal" ]
         config: ${{ fromJson(inputs.configuration) }}
     runs-on:
       group: ARM LINUX SHARED
@@ -308,7 +312,7 @@ jobs:
      strategy:
        fail-fast: false
        matrix:
-         java_version: [ "8-librca", "11-librca", "17-librca", "21-librca", "23-librca" ]
+         java_version: [ "8-librca", "11-librca", "17-librca", "21-librca", "24-librca" ]
          config: ${{ fromJson(inputs.configuration) }}
      runs-on:
        group: ARM LINUX SHARED
@@ -341,7 +345,7 @@ jobs:
        - name: Test
          run: |
            set +e
-                
+           # the effective JAVA_VERSION is computed in the test_alpine_aarch64.sh script
            docker run --cpus 4 --rm -v /tmp:/tmp -v "${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" alpine:3.21 /bin/sh -c "
              \"$GITHUB_WORKSPACE/.github/scripts/test_alpine_aarch64.sh\" \
              \"${{ github.sha }}\" \"musl/${{ matrix.java_version }}-${{ matrix.config }}-aarch64\" \

ddprof-test/src/test/java/com/datadoghq/profiler/alloc/AllocationProfilerTest.java

@@ -29,8 +29,11 @@ public void shouldGetObjectAllocationSamples() throws InterruptedException {
     runTests(target1, target2);
     IItemCollection allocations = verifyEvents("datadog.ObjectSample");
     // FIXME when more tests are ported to this structure
-     assertAllocations(allocations, int[].class, target1, target2);
-     assertAllocations(allocations, Integer[].class, target1, target2);
+    if (!Platform.isMusl()) {
+      // JOL on musl seems to be locking up randomly
+      assertAllocations(allocations, int[].class, target1, target2);
+      assertAllocations(allocations, Integer[].class, target1, target2);
+    }
   }
 
   private static void assertAllocations(IItemCollection allocations, Class<?> clazz, AllocatingTarget... targets) {
@@ -75,7 +78,10 @@ private void allocate(Random random) {
       } else {
         object = new Integer[128 * 1000];
       }
-      get(object.getClass()).addAndGet(GraphLayout.parseInstance(object).totalSize());
+      if (!Platform.isMusl()) {
+        // JOL does not work that well with musl
+        get(object.getClass()).addAndGet(GraphLayout.parseInstance(object).totalSize());
+      }
       sink = object;
     }