Merge pull request #5379 from DataDog/jpbempel/fix-duplicate-this-arg

Fix `this` duplicate serialization in snapshot
DataDog · Jun 14, 2023 · c28320c · c28320c
2 parents 5eb4d6d + 646b67c
commit c28320c
Show file tree

Hide file tree

Showing 7 changed files with 195 additions and 254 deletions.
diff --git a/...r/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java b/...r/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/ProbeRateLimiter.java
@@ -52,6 +52,11 @@ public static void resetGlobalRate() {
     setGlobalSnapshotRate(DEFAULT_GLOBAL_LOG_RATE);
   }
 
+  public static void resetAll() {
+    PROBE_SAMPLERS.clear();
+    resetGlobalRate();
+  }
+
   private static AdaptiveSampler createSampler(double rate) {
     if (rate < 1) {
       int intRate = (int) Math.round(rate * 10);

diff --git a/...ava-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java b/...ava-agent/agent-debugger/src/main/java/com/datadog/debugger/util/MoshiSnapshotHelper.java
@@ -149,23 +149,6 @@ public void toJson(JsonWriter jsonWriter, CapturedContext capturedContext) throw
       jsonWriter.beginObject();
       jsonWriter.name(ARGUMENTS);
       jsonWriter.beginObject();
-      if (capturedContext.getFields() != null && !capturedContext.getFields().isEmpty()) {
-        jsonWriter.name(THIS);
-        jsonWriter.beginObject();
-        jsonWriter.name(TYPE);
-        jsonWriter.value(capturedContext.getThisClassName());
-        jsonWriter.name(FIELDS);
-        jsonWriter.beginObject();
-        SerializationResult result =
-            toJsonCapturedValues(
-                jsonWriter,
-                capturedContext.getFields(),
-                capturedContext.getLimits(),
-                timeoutChecker);
-        jsonWriter.endObject(); // FIELDS
-        handleSerializationResult(jsonWriter, result);
-        jsonWriter.endObject(); // THIS
-      }
       SerializationResult resultArgs =
           toJsonCapturedValues(
               jsonWriter,
@@ -194,7 +177,7 @@ private void handleSerializationResult(JsonWriter jsonWriter, SerializationResul
       for (SerializationResult result : results) {
         switch (result) {
           case OK:
-            return;
+            break;
           case FIELD_COUNT:
             {
               if (!fieldCountReported) {

diff --git a/...va-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java b/...va-agent/agent-debugger/src/main/java/com/datadog/debugger/util/SerializerWithLimits.java
@@ -208,6 +208,7 @@ private void serializeObjectValue(Object value, Limits limits) throws Exception
     tokenWriter.objectPrologue(value);
     Class<?> currentClass = value.getClass();
     int processedFieldCount = 0;
+    NotCapturedReason reason = null;
     classLoop:
     do {
       Field[] fields = currentClass.getDeclaredFields();
@@ -221,7 +222,7 @@ private void serializeObjectValue(Object value, Limits limits) throws Exception
           onField(field, fieldValue, limits);
           processedFieldCount++;
           if (processedFieldCount >= limits.maxFieldCount) {
-            tokenWriter.notCaptured(NotCapturedReason.FIELD_COUNT);
+            reason = NotCapturedReason.FIELD_COUNT;
             break classLoop;
           }
         } catch (Exception e) {
@@ -230,6 +231,9 @@ private void serializeObjectValue(Object value, Limits limits) throws Exception
       }
     } while ((currentClass = currentClass.getSuperclass()) != null);
     tokenWriter.objectEpilogue(value);
+    if (reason != null) {
+      tokenWriter.notCaptured(reason);
+    }
   }
 
   private void onField(Field field, Object value, Limits limits) throws Exception {

diff --git a/...a-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java b/...a-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
@@ -89,7 +89,7 @@ public void after() {
     if (currentTransformer != null) {
       instr.removeTransformer(currentTransformer);
     }
-    ProbeRateLimiter.resetGlobalRate();
+    ProbeRateLimiter.resetAll();
     Assertions.assertFalse(DebuggerContext.isInProbe());
   }
 

diff --git a/...agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java b/...agent-debugger/src/test/java/com/datadog/debugger/agent/LogProbesInstrumentationTest.java
@@ -17,6 +17,7 @@
 import datadog.trace.bootstrap.debugger.MethodLocation;
 import datadog.trace.bootstrap.debugger.ProbeId;
 import datadog.trace.bootstrap.debugger.ProbeImplementation;
+import datadog.trace.bootstrap.debugger.ProbeRateLimiter;
 import java.io.IOException;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
@@ -45,6 +46,7 @@ public void after() {
     if (currentTransformer != null) {
       instr.removeTransformer(currentTransformer);
     }
+    ProbeRateLimiter.resetAll();
   }
 
   @Test
@@ -316,7 +318,7 @@ public void lineTemplateThisLog() throws IOException, URISyntaxException {
     Assertions.assertEquals(42, result);
     Snapshot snapshot = assertOneSnapshot(listener);
     assertEquals(
-        "this is log line for this={STATIC_STR=strStatic, intValue=48, doubleValue=3.14, strValue=done, strList=..., ...}",
+        "this is log line for this={STATIC_STR=strStatic, intValue=48, doubleValue=3.14, strValue=done, strList=...}, ...",
         snapshot.getMessage());
   }