Separate out spans' call to fetch_spans.

Author: sarahchen6

spec/datadog/tracing/contrib/sucker_punch/patcher_spec.rb

@@ -53,7 +53,7 @@ def perform(action = :none, **_)
 
   def check_span_count_eq(count)
     mutex.synchronize do
-      try_wait_until { fetch_spans_without_sorting.length == count }
+      try_wait_until { fetch_spans.length == count }
     end
   end
 

spec/datadog/tracing/contrib/support/tracer_helpers.rb

@@ -11,6 +11,10 @@ module Contrib
   # For contrib, we only allow one tracer to be active:
   # the global tracer in +Datadog::Tracing+.
   module TracerHelpers
+    def mutex
+      @mutex ||= Mutex.new
+    end
+
     # Returns the current tracer instance
     def tracer
       Datadog::Tracing.send(:tracer)
@@ -23,7 +27,9 @@ def traces
 
     # Returns spans and caches it (similar to +let(:spans)+).
     def spans
-      @spans ||= fetch_spans
+      mutex.synchronize do
+        @spans ||= fetch_spans_without_sorting
+      end
     end
 
     # Retrieves all traces in the current tracer instance.
@@ -35,39 +41,44 @@ def fetch_traces(tracer = self.tracer)
     # Retrieves and sorts all spans in the current tracer instance.
     # This method does not cache its results.
     def fetch_spans(tracer = self.tracer)
-      traces = fetch_traces(tracer)
-      traces.collect(&:spans).flatten.sort! do |a, b|
-        if a.name == b.name
-          if a.resource == b.resource
-            if a.start_time == b.start_time
-              a.end_time <=> b.end_time
+      mutex.synchronize do
+        traces = fetch_traces(tracer)
+        spans = traces.collect(&:spans)
+        spans.flatten.sort! do |a, b|
+          if a.name == b.name
+            if a.resource == b.resource
+              if a.start_time == b.start_time
+                a.end_time <=> b.end_time
+              else
+                a.start_time <=> b.start_time
+              end
             else
-              a.start_time <=> b.start_time
+              a.resource <=> b.resource
             end
           else
-            a.resource <=> b.resource
+            a.name <=> b.name
           end
-        else
-          a.name <=> b.name
         end
       end
     end
 
     def fetch_spans_without_sorting(tracer = self.tracer)
       traces = fetch_traces(tracer)
-      spans = traces.collect(&:spans)
+      spans = traces.map { |trace| trace.instance_variable_get(:@spans) || [] }
       spans.flatten # gets spans for every trace in the tracer instance
     end
 
     # Remove all traces from the current tracer instance and
     # busts cache of +#spans+ and +#span+.
     def clear_traces!
-      tracer.instance_variable_set(:@traces, [])
+      mutex.synchronize do
+        tracer.instance_variable_set(:@traces, [])
 
-      @traces = nil
-      @trace = nil
-      @spans = nil
-      @span = nil
+        @traces = nil
+        @trace = nil
+        @spans = nil
+        @span = nil
+      end
     end
 
     RSpec.configure do |config|