Increase memory sampling to try and avoid flaky tests

jbachorik · jbachorik · commit a8601b3a3542 · 2025-02-17T14:38:41.000+01:00
diff --git a/ddprof-test/src/test/java/com/datadoghq/profiler/jfr/ObjectSampleDumpSmokeTest.java b/ddprof-test/src/test/java/com/datadoghq/profiler/jfr/ObjectSampleDumpSmokeTest.java
@@ -15,7 +15,7 @@ protected boolean isPlatformSupported() {
 
     @Override
     protected String getProfilerCommand() {
-        return "memory=1024:a";
+        return "memory=128:a";
     }
 
     @RetryingTest(5)
diff --git a/ddprof-test/src/test/java/com/datadoghq/profiler/memleak/GCGenerationsTest.java b/ddprof-test/src/test/java/com/datadoghq/profiler/memleak/GCGenerationsTest.java
@@ -20,37 +20,20 @@
 public class GCGenerationsTest extends AbstractProfilerTest {
     @Override
     protected String getProfilerCommand() {
-        return "generations=true,cstack=fp";
+        return "memory=128,generations=true,cstack=fp";
     }
 
     @Override
     protected boolean isPlatformSupported() {
         return !(Platform.isJavaVersion(8) || Platform.isJ9() || Platform.isZing());
     }
 
-    @RetryingTest(5)
+    @RetryingTest(10)
     public void shouldGetLiveObjectSamples() throws InterruptedException {
         MemLeakTarget target1 = new MemLeakTarget();
         MemLeakTarget target2 = new MemLeakTarget();
         runTests(target1, target2);
-        IItemCollection allocations = verifyEvents("datadog.HeapLiveObject");
-
-//        assertAllocations(allocations, int[].class, target1, target2);
-//        assertAllocations(allocations, Integer[].class, target1, target2);
-    }
-
-    private static void assertAllocations(IItemCollection allocations, Class<?> clazz, MemLeakTarget... targets) {
-        long allocated = 0;
-        for (MemLeakTarget target : targets) {
-            allocated += target.getAllocated(clazz);
-        }
-        IItemCollection allocationsByType = allocations.apply(allocatedTypeFilter(clazz.getCanonicalName()));
-        assertTrue(allocationsByType.hasItems());
-        long recorded = allocationsByType.getAggregate(Aggregators.sum(SCALED_SIZE)).longValue();
-        long absoluteError = Math.abs(recorded - allocated);
-        assertTrue(absoluteError < allocated / 10,
-                String.format("allocation samples should be within 10pct tolerance of allocated memory (recorded %d, allocated %d)",
-                        recorded, allocated));
+        verifyEvents("datadog.HeapLiveObject");
     }
 
     public static class MemLeakTarget extends ClassValue<AtomicLong> implements Runnable {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ protected boolean isPlatformSupported() {`
`15`	`15`
`16`	`16`	`@Override`
`17`	`17`	`protected String getProfilerCommand() {`
`18`		`- return "memory=1024:a";`
	`18`	`+ return "memory=128:a";`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@RetryingTest(5)`