final unit tests changes

mhlidd · mhlidd · commit 3b1c41a06f30 · 2025-01-30T11:33:20.000-05:00
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java b/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java
@@ -153,34 +153,30 @@ private static final class DumpDrain
       private static final Predicate<Element> NOT_PENDING_TRACE =
           element -> !(element instanceof PendingTrace);
 
-      private volatile List<Element> DATA = new ArrayList<>();
+      private volatile List<Element> data = new ArrayList<>();
       private int index = 0;
 
       @Override
       public void accept(Element pendingTrace) {
-        DATA.add(pendingTrace);
+        data.add(pendingTrace);
       }
 
       @Override
       public Element get() {
-        if (index < DATA.size()) {
-          return DATA.get(index++);
+        if (index < data.size()) {
+          return data.get(index++);
         }
         return null; // Should never reach here or else queue may break according to
         // MessagePassingQueue docs
       }
 
       public List<Element> collectTraces() {
-        DATA.removeIf(NOT_PENDING_TRACE);
+        List<Element> traces = data;
+        data = new ArrayList<>();
+        traces.removeIf(NOT_PENDING_TRACE);
         // Storing oldest traces first
-        DATA.sort(TRACE_BY_START_TIME.reversed());
-        List<Element> orderedTraces = DATA;
-        DATA = new ArrayList<>();
-        return orderedTraces;
-      }
-
-      public void clear() {
-        DATA.clear();
+        traces.sort(TRACE_BY_START_TIME);
+        return traces;
       }
     }
 
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy
@@ -14,6 +14,7 @@ import datadog.trace.core.monitor.HealthMetrics
 import datadog.trace.core.propagation.PropagationTags
 import datadog.trace.core.scopemanager.ContinuableScopeManager
 import datadog.trace.test.util.DDSpecification
+import groovy.json.JsonSlurper
 import spock.lang.Subject
 import spock.lang.Timeout
 import spock.util.concurrent.PollingConditions
@@ -448,17 +449,21 @@ class PendingTraceBufferTest extends DDSpecification {
     }
   }
 
-  def "testing tracer flare dump"() {
+  def "testing tracer flare dump with multiple traces"() {
     setup:
     TracerFlare.addReporter {} // exercises default methods
     def dumpReporter = Mock(PendingTraceBuffer.TracerDump)
     TracerFlare.addReporter(dumpReporter)
-    def trace = factory.create(DDTraceId.ONE)
-    def parent = newSpanOf(trace, UNSET, System.currentTimeMillis() * 1000)
-    def child = newSpanOf(parent)
+    def trace1 = factory.create(DDTraceId.ONE)
+    def parent1 = newSpanOf(trace1, UNSET, System.currentTimeMillis() * 1000)
+    def child1 = newSpanOf(parent1)
+    def trace2 = factory.create(DDTraceId.from(2))
+    def parent2 = newSpanOf(trace2, UNSET, System.currentTimeMillis() * 2000)
+    def child2 = newSpanOf(parent2)
 
     when:
-    parent.finish()
+    parent1.finish()
+    parent2.finish()
     buffer.start()
     def entries = buildAndExtractZip()
 
@@ -467,14 +472,25 @@ class PendingTraceBufferTest extends DDSpecification {
     1 * dumpReporter.addReportToFlare(_)
     1 * dumpReporter.cleanupAfterFlare()
     entries.size() == 1
+    def pendingTraceText = entries["pending_traces.txt"] as String
     (entries["pending_traces.txt"] as String).startsWith('[{"service":"fakeService","name":"fakeOperation","resource":"fakeResource","trace_id":1,"span_id":1,"parent_id":0') // Rest of dump is timestamp specific
 
+    def parsedTraces = pendingTraceText.split('\n').collect { new JsonSlurper().parseText(it) }.flatten()
+    parsedTraces.size() == 2
+    parsedTraces[0]["trace_id"] == 1 //Asserting both traces exist
+    parsedTraces[1]["trace_id"] == 2
+    parsedTraces[0]["start"] < parsedTraces[1]["start"] //Asserting the dump has the oldest trace first
+
+
     then:
-    child.finish()
+    child1.finish()
+    child2.finish()
 
     then:
-    trace.size() == 0
-    trace.pendingReferenceCount == 0
+    trace1.size() == 0
+    trace1.pendingReferenceCount == 0
+    trace2.size() == 0
+    trace2.pendingReferenceCount == 0
   }
 
 
