From 19164c2b065be87fb6ec6984d9762efa4db5fa3d Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Tue, 22 Jul 2025 11:04:53 +0200 Subject: [PATCH 1/2] Exclude BoundMethodHandleMetadataSizeTest from running on IBM JDK 8 --- .../profiler/metadata/BoundMethodHandleMetadataSizeTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ddprof-test/src/test/java/com/datadoghq/profiler/metadata/BoundMethodHandleMetadataSizeTest.java b/ddprof-test/src/test/java/com/datadoghq/profiler/metadata/BoundMethodHandleMetadataSizeTest.java index 0786e32b..890d3e61 100644 --- a/ddprof-test/src/test/java/com/datadoghq/profiler/metadata/BoundMethodHandleMetadataSizeTest.java +++ b/ddprof-test/src/test/java/com/datadoghq/profiler/metadata/BoundMethodHandleMetadataSizeTest.java @@ -22,6 +22,7 @@ protected String getProfilerCommand() { @Test public void test() throws Throwable { assumeFalse(Platform.isJ9() && isAsan()); // running this test on j9 and asan is weirdly crashy + assumeFalse(Platform.isJ9() && Platform.isJavaVersion(8)); // geting crash-failur in CI reliable; remove once that is fixed assumeFalse(Platform.isJ9() && Platform.isJavaVersion(17)); // JVMTI::GetClassSignature() is reliably crashing on a valid 'class' instance assumeFalse(Platform.isAarch64() && Platform.isMusl() && !Platform.isJavaVersionAtLeast(11)); // aarch64 + musl + jdk 8 will crash very often registerCurrentThreadForWallClockProfiling(); From 3307907e40c2996bc53ce915eb76666e195fdcf3 Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Wed, 23 Jul 2025 17:48:12 +0200 Subject: [PATCH 2/2] Fix AP commit lock --- ddprof-lib/build.gradle | 2 +- gradle/ap-lock.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ddprof-lib/build.gradle b/ddprof-lib/build.gradle index 51438cbc..8c40747a 100644 --- a/ddprof-lib/build.gradle +++ b/ddprof-lib/build.gradle @@ -270,7 +270,7 @@ def cloneAPTask = tasks.register('cloneAsyncProfiler') { if (!targetDir.exists()) { println "Cloning missing async-profiler git subdirectory..." exec { - commandLine 'git', 'clone', '--branch', branch_lock, '--depth', '1', 'https://github.com/datadog/async-profiler.git', targetDir.absolutePath + commandLine 'git', 'clone', '--branch', branch_lock, 'https://github.com/datadog/async-profiler.git', targetDir.absolutePath } exec { workingDir targetDir.absolutePath diff --git a/gradle/ap-lock.properties b/gradle/ap-lock.properties index d78228b8..62c8ba03 100644 --- a/gradle/ap-lock.properties +++ b/gradle/ap-lock.properties @@ -1,2 +1,2 @@ branch=dd/master -commit=b034e4c3141d0632fd60bc452d7532d84adad572 \ No newline at end of file +commit=87b7b42ec65be0a00a67e3f9451fb8e4d472b188 \ No newline at end of file