rspec instrumentation doesn't use public API anymore

lib/datadog/ci/contrib/rspec/example.rb

@@ -34,10 +34,10 @@ def run(*args)
 
               if ci_queue?
                 suite_name = "#{suite_name} (ci-queue running example [#{test_name}])"
-                test_suite_span = CI.start_test_suite(suite_name)
+                test_suite_span = test_visibility_component.start_test_suite(suite_name)
               end
 
-              CI.trace_test(
+              test_visibility_component.trace_test(
                 test_name,
                 suite_name,
                 tags: {
@@ -99,6 +99,10 @@ def datadog_configuration
               Datadog.configuration.ci[:rspec]
             end
 
+            def test_visibility_component
+              Datadog.send(:components).test_visibility
+            end
+
             def ci_queue?
               !!defined?(::RSpec::Queue::ExampleExtension) &&
                 self.class.ancestors.include?(::RSpec::Queue::ExampleExtension)

lib/datadog/ci/contrib/rspec/example_group.rb

@@ -21,7 +21,7 @@ def run(reporter = ::RSpec::Core::NullReporter)
               return super unless top_level?
 
               suite_name = "#{description} at #{file_path}"
-              test_suite = Datadog::CI.start_test_suite(suite_name)
+              test_suite = test_visibility_component.start_test_suite(suite_name)
 
               success = super
               return success unless test_suite
@@ -44,6 +44,10 @@ def run(reporter = ::RSpec::Core::NullReporter)
             def datadog_configuration
               Datadog.configuration.ci[:rspec]
             end
+
+            def test_visibility_component
+              Datadog.send(:components).test_visibility
+            end
           end
         end
       end

lib/datadog/ci/contrib/rspec/knapsack_pro/runner.rb

@@ -18,15 +18,15 @@ def knapsack__run_specs(*args)
                 return super if ::RSpec.configuration.dry_run?
                 return super unless datadog_configuration[:enabled]
 
-                test_session = CI.start_test_session(
+                test_session = test_visibility_component.start_test_session(
                   tags: {
                     CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
                     CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::RSpec::Integration.version.to_s
                   },
                   service: datadog_configuration[:service_name]
                 )
 
-                test_module = CI.start_test_module(Ext::FRAMEWORK)
+                test_module = test_visibility_component.start_test_module(Ext::FRAMEWORK)
 
                 result = super
                 return result unless test_module && test_session
@@ -49,6 +49,10 @@ def knapsack__run_specs(*args)
               def datadog_configuration
                 Datadog.configuration.ci[:rspec]
               end
+
+              def test_visibility_component
+                Datadog.send(:components).test_visibility
+              end
             end
           end
         end

lib/datadog/ci/contrib/rspec/runner.rb

@@ -18,15 +18,15 @@ def run_specs(*args)
               return super if ::RSpec.configuration.dry_run?
               return super unless datadog_configuration[:enabled]
 
-              test_session = CI.start_test_session(
+              test_session = test_visibility_component.start_test_session(
                 tags: {
                   CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
                   CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::RSpec::Integration.version.to_s
                 },
                 service: datadog_configuration[:service_name]
               )
 
-              test_module = CI.start_test_module(Ext::FRAMEWORK)
+              test_module = test_visibility_component.start_test_module(Ext::FRAMEWORK)
 
               result = super
               return result unless test_module && test_session
@@ -49,6 +49,10 @@ def run_specs(*args)
             def datadog_configuration
               Datadog.configuration.ci[:rspec]
             end
+
+            def test_visibility_component
+              Datadog.send(:components).test_visibility
+            end
           end
         end
       end

sig/datadog/ci/contrib/rspec/example.rbs

@@ -13,6 +13,7 @@ module Datadog
 
             def fetch_top_level_example_group: () -> Hash[Symbol, untyped]
             def datadog_configuration: () -> untyped
+            def test_visibility_component: () -> Datadog::CI::TestVisibility::Component
             def ci_queue?: () -> bool
           end
         end

sig/datadog/ci/contrib/rspec/example_group.rbs

@@ -13,6 +13,8 @@ module Datadog
             private
 
             def datadog_configuration: () -> untyped
+
+            def test_visibility_component: () -> Datadog::CI::TestVisibility::Component
           end
         end
       end

sig/datadog/ci/contrib/rspec/knapsack_pro/runner.rbs

@@ -14,6 +14,8 @@ module Datadog
               private
 
               def datadog_configuration: () -> untyped
+
+              def test_visibility_component: () -> Datadog::CI::TestVisibility::Component
             end
           end
         end

sig/datadog/ci/contrib/rspec/runner.rbs

@@ -13,6 +13,8 @@ module Datadog
             private
 
             def datadog_configuration: () -> untyped
+
+            def test_visibility_component: () -> Datadog::CI::TestVisibility::Component
           end
         end
       end

spec/datadog/ci/contrib/ci_queue_rspec/instrumentation_spec.rb

@@ -3,6 +3,14 @@
 require "securerandom"
 
 RSpec.describe "RSpec instrumentation with Shopify's ci-queue runner" do
+  before do
+    # expect that public manual API isn't used
+    expect(Datadog::CI).to receive(:start_test_session).never
+    expect(Datadog::CI).to receive(:start_test_module).never
+    expect(Datadog::CI).to receive(:start_test_suite).never
+    expect(Datadog::CI).to receive(:start_test).never
+  end
+
   include_context "CI mode activated" do
     let(:integration_name) { :rspec }
   end

spec/datadog/ci/contrib/knapsack_rspec/instrumentation_spec.rb

@@ -2,6 +2,14 @@
 require "fileutils"
 
 RSpec.describe "RSpec instrumentation with Knapsack Pro runner in queue mode" do
+  before do
+    # expect that public manual API isn't used
+    expect(Datadog::CI).to receive(:start_test_session).never
+    expect(Datadog::CI).to receive(:start_test_module).never
+    expect(Datadog::CI).to receive(:start_test_suite).never
+    expect(Datadog::CI).to receive(:start_test).never
+  end
+
   include_context "CI mode activated" do
     let(:integration_name) { :rspec }
   end

spec/datadog/ci/contrib/knapsack_rspec_go/instrumentation_spec.rb

@@ -2,6 +2,14 @@
 require "fileutils"
 
 RSpec.describe "Knapsack Pro runner when Datadog::CI is configured during the knapsack run like in rspec_go rake task" do
+  before do
+    # expect that public manual API isn't used
+    expect(Datadog::CI).to receive(:start_test_session).never
+    expect(Datadog::CI).to receive(:start_test_module).never
+    expect(Datadog::CI).to receive(:start_test_suite).never
+    expect(Datadog::CI).to receive(:start_test).never
+  end
+
   # Yields to a block in a new RSpec global context. All RSpec
   # test configuration and execution should be wrapped in this method.
   def with_new_rspec_environment

spec/datadog/ci/contrib/rspec/instrumentation_spec.rb

@@ -1,6 +1,14 @@
 require "time"
 
 RSpec.describe "RSpec hooks" do
+  before do
+    # expect that public manual API isn't used
+    expect(Datadog::CI).to receive(:start_test_session).never
+    expect(Datadog::CI).to receive(:start_test_module).never
+    expect(Datadog::CI).to receive(:start_test_suite).never
+    expect(Datadog::CI).to receive(:start_test).never
+  end
+
   # Yields to a block in a new RSpec global context. All RSpec
   # test configuration and execution should be wrapped in this method.
   def with_new_rspec_environment
@@ -109,7 +117,7 @@ def rspec_session_run(
         :source_file,
         "spec/datadog/ci/contrib/rspec/instrumentation_spec.rb"
       )
-      expect(first_test_span).to have_test_tag(:source_start, "82")
+      expect(first_test_span).to have_test_tag(:source_start, "90")
       expect(first_test_span).to have_test_tag(
         :codeowners,
         "[\"@DataDog/ruby-guild\", \"@DataDog/ci-app-libraries\"]"