Skip to content

Test against JDK 21 too #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbachorik merged 1 commit into from
Dec 18, 2023
Merged

Test against JDK 21 too #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions ddprof-test/src/test/java/com/datadoghq/profiler/AbstractProfilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion ddprof-test/src/test/java/com/datadoghq/profiler/jfr/CpuDumpSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion ...of-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down