move CI.trace logic to Recorder

DataDog · Nov 1, 2023 · bbe95ff · bbe95ff
1 parent 48f976b
commit bbe95ff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/lib/datadog/ci.rb b/lib/datadog/ci.rb
@@ -25,18 +25,8 @@ def trace_test(test_name, service_name: nil, operation_name: nil, tags: {})
       end
     end
 
-    def trace(span_type, span_name, span_options = {})
-      span_options[:resource] = span_name
-      span_options[:span_type] = span_type
-
-      if block_given?
-        ::Datadog::Tracing.trace(span_name, **span_options) do |tracer_span|
-          yield Span.new(tracer_span)
-        end
-      else
-        tracer_span = Datadog::Tracing.trace(span_name, **span_options)
-        Span.new(tracer_span)
-      end
+    def trace(span_type, span_name, &block)
+      Recorder.trace(span_type, span_name, &block)
     end
   end
 end

diff --git a/lib/datadog/ci/recorder.rb b/lib/datadog/ci/recorder.rb
@@ -36,6 +36,22 @@ def self.trace_test(test_name, service_name: nil, operation_name: nil, tags: {})
         end
       end
 
+      def self.trace(span_type, span_name)
+        span_options = {
+          resource: span_name,
+          span_type: span_type
+        }
+
+        if block_given?
+          ::Datadog::Tracing.trace(span_name, **span_options) do |tracer_span|
+            yield Span.new(tracer_span)
+          end
+        else
+          tracer_span = Datadog::Tracing.trace(span_name, **span_options)
+          Span.new(tracer_span)
+        end
+      end
+
       # Adds tags to a CI test span.
       def self.set_tags!(trace, span, tags = {})
         tags ||= {}