Merge branch 'master' into gyuheon0h/jvm-ldpreload-reset

Author: gyuheon0h

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java

@@ -730,7 +730,6 @@ private void processCaptureExpressions(CapturedContext context, LogStatus logSta
                   captureExpression.getName(), Object.class.getTypeName(), null));
         } else {
           if (captureExpression.capture != null) {
-            Value.toCapturedSnapshot(captureExpression.getName(), result);
             context.addCaptureExpression(
                 Value.toCapturedSnapshot(
                     captureExpression.getName(),
@@ -740,8 +739,20 @@ private void processCaptureExpressions(CapturedContext context, LogStatus logSta
                     captureExpression.capture.maxLength,
                     captureExpression.capture.maxFieldCount));
           } else {
-            context.addCaptureExpression(
-                Value.toCapturedSnapshot(captureExpression.getName(), result));
+            // inherit from probe capture field because no specific capture
+            if (capture != null) {
+              context.addCaptureExpression(
+                  Value.toCapturedSnapshot(
+                      captureExpression.getName(),
+                      result,
+                      capture.maxReferenceDepth,
+                      capture.maxCollectionSize,
+                      capture.maxLength,
+                      capture.maxFieldCount));
+            } else {
+              context.addCaptureExpression(
+                  Value.toCapturedSnapshot(captureExpression.getName(), result));
+            }
           }
         }
       } catch (EvaluationException ex) {

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java

@@ -3028,6 +3028,47 @@ public void captureExpressionsWithCaptureLimits() throws IOException, URISyntaxE
     assertEquals("depth", fldValue.getNotCapturedReason());
   }
 
+  @Test
+  public void captureExpressionsWithInheritedCaptureLimits()
+      throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot08";
+    LogProbe probe =
+        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", null)
+            .evaluateAt(MethodLocation.EXIT)
+            .captureSnapshot(false)
+            .capture(new LogProbe.Capture(1, 10, 3, 1))
+            .captureExpressions(
+                Arrays.asList(
+                    new LogProbe.CaptureExpression(
+                        "typed_fld_fld_msg",
+                        new ValueScript(
+                            DSL.getMember(
+                                DSL.getMember(DSL.getMember(DSL.ref("typed"), "fld"), "fld"),
+                                "msg"),
+                            "typed.fld.fld.msg"),
+                        null),
+                    new LogProbe.CaptureExpression(
+                        "typed", new ValueScript(DSL.ref("typed"), "typed"), null)))
+            .build();
+    TestSnapshotListener listener = installProbes(probe);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.onClass(testClass).call("main", "1").get();
+    assertEquals(3, result);
+    Snapshot snapshot = assertOneSnapshot(listener);
+    CapturedContext.CapturedValue msgValue =
+        deserializeCapturedValue(
+            snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed_fld_fld_msg"));
+    assertEquals("hel", msgValue.getValue());
+    assertEquals("truncated", msgValue.getNotCapturedReason());
+    CapturedContext.CapturedValue typedValue =
+        deserializeCapturedValue(
+            snapshot.getCaptures().getReturn().getCaptureExpressions().get("typed"));
+    Map<String, CapturedContext.CapturedValue> fields =
+        (Map<String, CapturedContext.CapturedValue>) typedValue.getValue();
+    CapturedContext.CapturedValue fldValue = fields.get("fld");
+    assertEquals("depth", fldValue.getNotCapturedReason());
+  }
+
   @Test
   public void methodParametersAttribute() throws Exception {
     final String CLASS_NAME = "CapturedSnapshot01";

dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/PayloadTagsProcessor.java

@@ -212,40 +212,40 @@ public boolean visitPrimitive(PathCursor path) {
 
     private boolean notRedacted(PathCursor path) {
       if (redactionRules.findMatching(path) != null) {
-        collectedTags.put(path.toString(tagPrefix), REDACTED);
+        collectedTags.set(path.toString(tagPrefix), REDACTED);
         return false;
       }
       return true;
     }
 
     @Override
     public void booleanValue(PathCursor path, boolean value) {
-      collectedTags.put(path.toString(tagPrefix), value);
+      collectedTags.set(path.toString(tagPrefix), value);
     }
 
     @Override
     public void stringValue(PathCursor path, String value) {
-      collectedTags.put(path.toString(tagPrefix), value);
+      collectedTags.set(path.toString(tagPrefix), value);
     }
 
     @Override
     public void intValue(PathCursor path, int value) {
-      collectedTags.put(path.toString(tagPrefix), value);
+      collectedTags.set(path.toString(tagPrefix), value);
     }
 
     @Override
     public void longValue(PathCursor path, long value) {
-      collectedTags.put(path.toString(tagPrefix), value);
+      collectedTags.set(path.toString(tagPrefix), value);
     }
 
     @Override
     public void doubleValue(PathCursor path, double value) {
-      collectedTags.put(path.toString(tagPrefix), value);
+      collectedTags.set(path.toString(tagPrefix), value);
     }
 
     @Override
     public void nullValue(PathCursor path) {
-      collectedTags.put(path.toString(tagPrefix), null);
+      collectedTags.set(path.toString(tagPrefix), null);
     }
 
     @Override
@@ -257,7 +257,7 @@ public boolean keepCollectingTags() {
       if (collectedTags.size() < maxTags) {
         return true;
       }
-      collectedTags.put(DD_PAYLOAD_TAGS_INCOMPLETE, true);
+      collectedTags.set(DD_PAYLOAD_TAGS_INCOMPLETE, true);
       return false;
     }
 

dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/RemoteHostnameAdder.java

@@ -9,15 +9,32 @@
 public final class RemoteHostnameAdder extends TagsPostProcessor {
   private final Supplier<String> hostnameSupplier;
 
+  private TagMap.Entry cachedHostEntry = null;
+
   public RemoteHostnameAdder(Supplier<String> hostnameSupplier) {
     this.hostnameSupplier = hostnameSupplier;
   }
 
   @Override
   public void processTags(
       TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
-    if (spanContext.getSpanId() == spanContext.getRootSpanId()) {
-      unsafeTags.put(DDTags.TRACER_HOST, hostnameSupplier.get());
+    if (spanContext.getSpanId() != spanContext.getRootSpanId()) {
+      return;
+    }
+
+    String hostname = hostnameSupplier.get();
+    if (hostname == null) {
+      return;
     }
+
+    TagMap.Entry cachedHostEntry = this.cachedHostEntry;
+    if (cachedHostEntry != null && hostname.equals(cachedHostEntry.objectValue())) {
+      unsafeTags.set(cachedHostEntry);
+      return;
+    }
+
+    TagMap.Entry newEntry = TagMap.Entry.create(DDTags.TRACER_HOST, hostname);
+    unsafeTags.set(newEntry);
+    this.cachedHostEntry = newEntry;
   }
 }