connect Test to TestSession if present

lib/datadog/ci.rb

@@ -59,9 +59,10 @@ def active_test_session
       end
 
       # Return a {Datadog::CI::Test ci_test} that will trace a test called `test_name`.
-      # Raises an error if a test is already active. If there is an active test session,
-      # the new test will be connected to the session. The test will inherit service name and tags from
-      # the running test session if none provided.
+      # Raises an error if a test is already active.
+      # If there is an active test session, the new test will be connected to the session.
+      # The test will inherit service name and tags from the running test session if not provided
+      # in parameters.
       #
       # You could trace your test using a <tt>do-block</tt> like:
       #

lib/datadog/ci/ext/test.rb

@@ -17,6 +17,9 @@ module Test
         TAG_TRAITS = "test.traits"
         TAG_TYPE = "test.type"
 
+        # those tags are special and they are used to conrrelate tests with the test sessions, suites, and modules
+        TAG_TEST_SESSION_ID = "_test.session_id"
+
         # tags that can be inherited from the test session
         INHERITABLE_TAGS = [TAG_FRAMEWORK, TAG_FRAMEWORK_VERSION, TAG_TYPE].freeze
 

lib/datadog/ci/recorder.rb

@@ -60,6 +60,7 @@ def trace_test(test_name, service_name: nil, operation_name: "test", tags: {}, &
         }
 
         tags[Ext::Test::TAG_NAME] = test_name
+        tags[Ext::Test::TAG_TEST_SESSION_ID] = test_session.id if test_session
 
         if block
           Datadog::Tracing.trace(operation_name, **span_options) do |tracer_span, trace|

lib/datadog/ci/span.rb

@@ -15,6 +15,11 @@ def initialize(tracer_span)
         @tracer_span = tracer_span
       end
 
+      # @return [Integer] the ID of the span.
+      def id
+        tracer_span.id
+      end
+
       # @return [String] the name of the span.
       def name
         tracer_span.name

sig/datadog/ci/ext/test.rbs

@@ -22,6 +22,8 @@ module Datadog
 
         TAG_TYPE: String
 
+        TAG_TEST_SESSION_ID: String
+
         INHERITABLE_TAGS: Array[String]
 
         TAG_OS_ARCHITECTURE: String

sig/datadog/ci/span.rbs

@@ -7,6 +7,8 @@ module Datadog
 
       def initialize: (Datadog::Tracing::SpanOperation tracer_span) -> void
 
+      def id: () -> Integer
+
       def name: () -> String
 
       def service: () -> String

spec/datadog/ci/recorder_spec.rb

@@ -120,18 +120,27 @@
       end
 
       context "when test session is active" do
+        let(:test_session_id) { 42 }
         let(:inheritable_tags) { {"test.framework" => "my framework"} }
+
         let(:test_session_service) { "my-test-service" }
         let(:test_session) do
-          instance_double(Datadog::CI::TestSession, service: test_session_service, inheritable_tags: inheritable_tags)
+          instance_double(
+            Datadog::CI::TestSession,
+            service: test_session_service,
+            inheritable_tags: inheritable_tags,
+            id: test_session_id
+          )
         end
 
         before do
           allow(recorder).to receive(:active_test_session).and_return(test_session)
         end
 
         context "when service name and tags are not given" do
-          let(:expected_tags) { {"test.framework" => "my framework", "test.name" => test_name} }
+          let(:expected_tags) do
+            {"test.framework" => "my framework", "test.name" => test_name, "_test.session_id" => test_session_id}
+          end
 
           subject(:trace) do
             recorder.trace_test(
@@ -165,7 +174,9 @@
 
         context "when service name and tags are given" do
           let(:tags) { {"test.framework" => "special test framework"} }
-          let(:expected_tags) { {"test.framework" => "special test framework", "test.name" => test_name} }
+          let(:expected_tags) do
+            {"test.framework" => "special test framework", "test.name" => test_name, "_test.session_id" => test_session_id}
+          end
 
           subject(:trace) do
             recorder.trace_test(