From ebff4fad7a0902cc69e1e819f369f8e8668d13b9 Mon Sep 17 00:00:00 2001
From: jean-philippe bempel <jean-philippe.bempel@datadoghq.com>
Date: Tue, 9 Jul 2024 13:33:00 +0200
Subject: [PATCH] Remove dead code

add test for merging capture limits
---
 .../debugger/agent/DebuggerTransformer.java   | 12 ------------
 .../debugger/agent/CapturedSnapshotTest.java  | 19 +++++++++++++++++++
 .../agent/DebuggerTransformerTest.java        |  1 -
 ...panDecorationProbeInstrumentationTest.java |  2 --
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java
index 2c0bb114d85..290bddbd0f7 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java
@@ -628,18 +628,6 @@ private ProbeDefinition selectReferenceDefinition(
         .build();
   }
 
-  private LogProbe.Sampling mergeSampling(
-      LogProbe.Sampling current, LogProbe.Sampling newSampling) {
-    if (current == null) {
-      return newSampling;
-    }
-    if (newSampling == null) {
-      return current;
-    }
-    return new LogProbe.Sampling(
-        Math.max(current.getSnapshotsPerSecond(), newSampling.getSnapshotsPerSecond()));
-  }
-
   private LogProbe.Capture mergeCapture(LogProbe.Capture current, LogProbe.Capture newCapture) {
     if (current == null) {
       return newCapture;
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
index b2f14d4bbea..2ebfe25daf6 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
@@ -721,6 +721,25 @@ public void fieldExtractorDepth1() throws IOException, URISyntaxException {
     assertEquals(DEPTH_REASON, simpleDataFields.get("listValue").getNotCapturedReason());
   }
 
+  @Test
+  public void fieldExtractorDuplicateUnionDepth() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot04";
+    LogProbe.Builder builder = createProbeBuilder(PROBE_ID, CLASS_NAME, "createSimpleData", "()");
+    LogProbe probe1 = builder.capture(0, 100, 50, Limits.DEFAULT_FIELD_COUNT).build();
+    LogProbe probe2 = builder.capture(3, 100, 50, Limits.DEFAULT_FIELD_COUNT).build();
+    TestSnapshotListener listener = installProbes(CLASS_NAME, probe1, probe2);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.onClass(testClass).call("main", "").get();
+    assertEquals(143, result);
+    List<Snapshot> snapshots = assertSnapshots(listener, 2);
+    CapturedContext.CapturedValue simpleData =
+        snapshots.get(0).getCaptures().getReturn().getLocals().get("simpleData");
+    Map<String, CapturedContext.CapturedValue> simpleDataFields = getFields(simpleData);
+    assertEquals(4, simpleDataFields.size());
+    assertEquals("foo", simpleDataFields.get("strValue").getValue());
+    assertEquals(42, simpleDataFields.get("intValue").getValue());
+  }
+
   @Test
   public void fieldExtractorCount2() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot04";
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
index e9447a92065..78b4aeecd91 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java
@@ -385,7 +385,6 @@ <T extends ProbeDefinition> T createMock(
     ProbeDefinition mock = mock(clazz);
     doAnswer(
             invocation -> {
-              // invocationOrder.add(mock);
               return InstrumentationResult.Status.INSTALLED;
             })
         .when(mock)
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
index 6c234aef530..fc2a82f9d69 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SpanDecorationProbeInstrumentationTest.java
@@ -331,7 +331,6 @@ PROBE_ID2, ACTIVE, singletonList(decoration2), CLASS_NAME, "process", null, null
             .probeId(PROBE_ID3)
             .where(CLASS_NAME, "process")
             .captureSnapshot(true)
-            .sampling(3.0)
             .capture(1, 50, 50, 10)
             .build();
     LogProbe logProbe2 =
@@ -339,7 +338,6 @@ PROBE_ID2, ACTIVE, singletonList(decoration2), CLASS_NAME, "process", null, null
             .probeId(PROBE_ID4)
             .where(CLASS_NAME, "process")
             .captureSnapshot(true)
-            .sampling(10.0)
             .capture(5, 200, 200, 30)
             .build();
     Configuration configuration =