Merge branch 'main' into pfournillon/improve-container-tests

Author: kaahos

.gitlab/reliability/.gitlab-ci.yml

@@ -41,7 +41,7 @@ variables:
       - out.log
     reports:
       dotenv: build.env
-    expire_in: 1 day
+    expire_in: 7 days
 
 reliability-amd64:
   extends: .reliability_job
@@ -99,7 +99,7 @@ reliability-aarch64:
       - out.log
     reports:
       dotenv: build.env
-    expire_in: 1 day
+    expire_in: 7 days
 
 reliability-chaos-amd64:
   extends: .reliability_chaos_job

AGENTS.md

@@ -51,7 +51,7 @@ object ConfigurationPresets {
                 configureTsan(this, currentPlatform, currentArch, version, rootDir, compiler)
             }
             register("fuzzer") {
-                configureFuzzer(this, currentPlatform, currentArch, version, rootDir)
+                configureFuzzer(this, currentPlatform, currentArch, version, rootDir, compiler)
             }
         }
 
@@ -222,9 +222,13 @@ object ConfigurationPresets {
                     // HeapBaseMinAddress is not accepted by JDK <= 11 (constraint violation);
                     // those JDKs rely on the vm.mmap_rnd_bits=8 CI-level mitigation instead.
                     if (PlatformUtils.testJvmMajorVersion() >= 12) {
+                        // HeapBaseMinAddress=64MB leaves ~1.9GB of address space below the
+                        // shadow region (0x7fff7000); 1024m keeps heap+CompressedClassSpace
+                        // well within that margin while giving forkEvery-restarted JVMs
+                        // enough headroom to avoid "Java heap space" OOMs seen in nightly CI.
                         config.testJvmArgs.addAll(listOf(
                             "-XX:HeapBaseMinAddress=0x4000000",
-                            "-Xmx512m",
+                            "-Xmx1024m",
                             "-XX:CompressedClassSpaceSize=256m"
                         ))
                     }
@@ -309,7 +313,8 @@ object ConfigurationPresets {
         platform: Platform,
         architecture: Architecture,
         version: String,
-        rootDir: File
+        rootDir: File,
+        compiler: String = "gcc"
     ) {
         config.platform.set(platform)
         config.architecture.set(architecture)
@@ -335,7 +340,28 @@ object ConfigurationPresets {
         when (platform) {
             Platform.LINUX -> {
                 config.compilerArgs.set(fuzzerCompilerArgs + commonLinuxCompilerArgs(version))
-                config.linkerArgs.set(commonLinuxLinkerArgs() + fuzzerLinkerArgs)
+
+                // commonLinuxLinkerArgs() carries -Wl,-z,defs, which forbids the
+                // undefined __asan_*/__ubsan_* symbols the instrumented objects
+                // reference. -fsanitize=address only links the runtime into
+                // executables, not shared libraries, so the fuzzer .so needs the
+                // runtime linked explicitly — same treatment (and rationale) as the
+                // asan config. On clang this resolves both __asan_* and __ubsan_*
+                // from one clang_rt.asan runtime; on gcc it adds -lubsan.
+                val libasan = PlatformUtils.locateLibasan(compiler)
+                val fuzzerRuntimeArgs = if (libasan != null) {
+                    val asanLibDir = File(libasan).parent
+                    val asanLibName = File(libasan).nameWithoutExtension.removePrefix("lib")
+                    val ubsanLibs = if (asanLibName.startsWith("clang_rt")) emptyList()
+                                    else listOf("-lubsan")
+                    listOf("-L$asanLibDir", "-l$asanLibName",
+                           "-Wl,-rpath,$asanLibDir") +
+                    ubsanLibs +
+                    fuzzerLinkerArgs
+                } else {
+                    fuzzerLinkerArgs
+                }
+                config.linkerArgs.set(commonLinuxLinkerArgs() + fuzzerRuntimeArgs)
 
                 config.testEnvironment.apply {
                     put("ASAN_OPTIONS", "allocator_may_return_null=1:detect_stack_use_after_return=0:handle_segv=0:abort_on_error=1:symbolize=1:suppressions=$rootDir/gradle/sanitizers/asan.supp")

build-logic/conventions/src/main/kotlin/com/datadoghq/native/config/ConfigurationPresets.kt

@@ -321,7 +321,7 @@ class ProfilerTestPlugin : Plugin<Project> {
                         // https://github.com/eclipse-openj9/openj9/issues/23514
                         !PlatformUtils.isTestJvmJ9()
                     }
-                    // The ASAN test JVM is pinned to -Xmx512m (see ConfigurationPresets.kt)
+                    // The ASAN test JVM is pinned to -Xmx1024m (see ConfigurationPresets.kt)
                     // to keep the heap below ASan's shadow-memory region. Without forking,
                     // Gradle reuses one JVM for the whole suite, and per-test allocations
                     // (JFR recordings, JMC object models) accumulate until it OOMs late in

build-logic/conventions/src/main/kotlin/com/datadoghq/profiler/ProfilerTestPlugin.kt

@@ -8,6 +8,10 @@
 
 #include <string.h>
 #include "hotspot/hotspotStackFrame.h"
+// The VMNMethod accessors used below are inline in vmStructs.h and assert via crashProtectionActive()
+// / cast_to(), both of which are defined in vmStructs.inline.h. Without this include, assertion-enabled
+// builds (the gtest targets) leave those symbols unresolved at link time.
+#include "hotspot/vmStructs.inline.h"
 
 static inline bool isSTP(instruction_t insn) {
     // stp  xn, xm, [sp, #-imm]!

ddprof-lib/src/main/cpp/hotspot/hotspotStackFrame_aarch64.cpp

@@ -8,6 +8,9 @@
 
 #include <string.h>
 #include "hotspot/hotspotStackFrame.h"
+// See the note in hotspotStackFrame_aarch64.cpp: the VMNMethod accessors need vmStructs.inline.h
+// for crashProtectionActive() / cast_to() so assertion-enabled builds link.
+#include "hotspot/vmStructs.inline.h"
 
 __attribute__((no_sanitize("address"))) bool HotspotStackFrame::unwindStub(instruction_t* entry, const char* name, uintptr_t& pc, uintptr_t& sp, uintptr_t& fp) {
     instruction_t* ip = (instruction_t*)pc;