Fix the annotation region format parsing on JDK 24/25

Author: jbachorik

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCache.java

@@ -66,10 +66,7 @@ static class AnnotatedRegion {
   public List<SmapEntryEvent> getEvents() {
     long prevTimestamp = lastTimestamp;
     long thisTimestamp = System.nanoTime();
-    // 500ms should be enough not to recollect the data when both single and aggregated events are
-    // enabled
-    // Also, this is short enough to avoid having stalled smap data reported
-    if (thisTimestamp - prevTimestamp > 500_000_000L) {
+    if (thisTimestamp - prevTimestamp > ttl) {
       if (UPDATER.compareAndSet(this, prevTimestamp, thisTimestamp)) {
         int currentIdx = INDEX_UPDATER.updateAndGet(this, x -> (x + 1) % 2);
         List<SmapEntryEvent> eventList = (List<SmapEntryEvent>) events[currentIdx];
@@ -92,14 +89,16 @@ static AnnotatedRegion fromAnnotatedEntry(String line, int javaVersion) {
       // Java 24-25
       // 0x0000000448800000-0x000000049d800000   1426063360 rw-p   1425514496 0 4K com  JAVAHEAP
 
+      // unify the format of address range for Java 23 and 24+
+      line = line.replace(" - ", "-");
       boolean isVsyscall =
           line.startsWith("0x" + VSYSCALL_START_ADDRESS_STR); // can't be parsed to Long safely(?)
       long startAddress = -1;
       int dashIndex = line.indexOf('-');
       if (dashIndex > 0) {
-        startAddress = isVsyscall ? -0x1000 - 1 : Long.decode(line.substring(0, dashIndex - 1));
+        startAddress = isVsyscall ? -0x1000 - 1 : Long.decode(line.substring(0, dashIndex));
         String description = extractElement(line, descIndex, dashIndex + 1);
-        if (description == null || description.isEmpty()) {
+        if (description == null || description.isEmpty() || "-".equals(description)) {
           return new AnnotatedRegion(startAddress, "UNDEFINED");
         } else if (description.startsWith("STACK")) {
           return new AnnotatedRegion(startAddress, "STACK");
@@ -139,7 +138,7 @@ static String extractElement(String line, int index, int from) {
         wsCount++;
       }
     }
-    return wsCount == index ? line.substring(fromIndex, tillIndex).trim() : null;
+    return wsCount <= index ? line.substring(fromIndex, tillIndex).trim() : null;
   }
 
   private static boolean isSmapHeader(String line) {

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryFactoryTest.java

@@ -25,20 +25,27 @@ void testAnnotatedRegionsSanity(int javaVersion) throws Exception {
                 Objects.requireNonNull(
                     SmapEntryFactory.class.getResourceAsStream(
                         "/smap/annotated_regions_" + javaVersion + ".txt"))))) {
+
+      long sentinel = 0x1000000420000000L;
       String line = null;
       Set<String> descs = new HashSet<>();
+      boolean sentinelFound = false;
+
       while ((line = br.readLine()) != null) {
         SmapEntryCache.AnnotatedRegion region =
             SmapEntryCache.fromAnnotatedEntry(line, javaVersion);
         if (line.startsWith("0x")) {
           assertNotNull(region);
           descs.add(region.description);
+          sentinelFound |= region.startAddress == sentinel;
         }
       }
+      assertTrue(sentinelFound, "Sentinel address not found");
       assertTrue(descs.contains("JAVAHEAP"), "JAVAHEAP not found");
       assertTrue(descs.contains("GC"), "GC not found");
       assertTrue(descs.contains("META"), "META not found");
       assertTrue(descs.contains("STACK"), "STACK not found");
+      assertTrue(descs.contains("UNDEFINED"), "UNDEFINED not found");
     }
   }
 

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/resources/smap/annotated_regions_23.txt

@@ -16,7 +16,8 @@ Memory mappings:
 (*) - Mapping contains data from multiple regions
 
 size          prot offset  What
-0x0000000420000000 - 0x000000043b000000   452984832  rw-p 00000000    JAVAHEAP 
+0x1000000420000000 - 0x100000043b000000   452984832  rw-p 00000000    JAVAHEAP
+0x0000000420000000 - 0x000000043b000000   452984832  rw-p 00000000    JAVAHEAP
 0x000000043b000000 - 0x000000045b000000   536870912  ---p 00000000    JAVAHEAP 
 0x000000045b000000 - 0x0000000491000000   905969664  rw-p 00000000    JAVAHEAP 
 0x0000000491000000 - 0x00000004c9000000   939524096  ---p 00000000    JAVAHEAP 

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/resources/smap/annotated_regions_24.txt

@@ -30,6 +30,7 @@ file:            file mapped, if mapping is not anonymous
 
 from               to                        vsize prot          rss      hugetlb pgsz notes            info                                  file
 ========================================================================================================================================================================
+0x1000000420000000-0x100000043b000000   452984832  rw-p     00000000            0 4K   com              JAVAHEAP
 0x0000000448800000-0x000000049d800000   1426063360 rw-p   1425514496            0 4K   com              JAVAHEAP                              -
 0x000000049d800000-0x0000000800000000  14537457664 ---p            0            0 4K   -                JAVAHEAP                              -
 0x0000561c39706000-0x0000561c39707000         4096 r--p         4096            0 4K   com              -                                     /home/bits/.sdkman/candidates/java/24.0.2-librca/bin/java