clean up "CI mode activated" shared context and remove hacky access t…

…o Core internals

spec/datadog/ci/contrib/cucumber/formatter_spec.rb → spec/datadog/ci/contrib/cucumber/instrumentation_spec.rb

@@ -6,7 +6,10 @@
 RSpec.describe "Cucumber formatter" do
   extend ConfigurationHelpers
 
-  include_context "CI mode activated"
+  include_context "CI mode activated" do
+    let(:integration_name) { :cucumber }
+    let(:integration_options) { {service_name: "jalapenos"} }
+  end
 
   # Cucumber runtime setup
   let(:existing_runtime) { Cucumber::Runtime.new(runtime_options) }
@@ -27,12 +30,6 @@
     end
   end
 
-  before do
-    Datadog.configure do |c|
-      c.ci.instrument :cucumber, service_name: "jalapenos"
-    end
-  end
-
   context "executing a test suite" do
     let(:args) { ["spec/datadog/ci/contrib/cucumber/cucumber.features"] }
 

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

@@ -5,15 +5,14 @@
 require_relative "../support/spec_helper"
 
 RSpec.describe "Minitest hooks" do
-  include_context "CI mode activated"
+  include_context "CI mode activated" do
+    let(:integration_name) { :minitest }
+    let(:integration_options) { {service_name: "ltest"} }
+  end
 
   before do
     # required to call .runnable_methods
     Minitest.seed = 1
-
-    Datadog.configure do |c|
-      c.ci.instrument :minitest, service_name: "ltest"
-    end
   end
 
   it "creates span for test" do

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

@@ -3,12 +3,9 @@
 require_relative "../support/spec_helper"
 
 RSpec.describe "RSpec hooks" do
-  include_context "CI mode activated"
-
-  before do
-    Datadog.configure do |c|
-      c.ci.instrument :rspec, service_name: "lspec"
-    end
+  include_context "CI mode activated" do
+    let(:integration_name) { :rspec }
+    let(:integration_options) { {service_name: "lspec"} }
   end
 
   # Yields to a block in a new RSpec global context. All RSpec

spec/datadog/ci/contrib/support/mode_helpers.rb

@@ -1,20 +1,15 @@
 RSpec.shared_context "CI mode activated" do
-  let(:settings) do
-    Datadog::Core::Configuration::Settings.new.tap do |settings|
-      settings.ci.enabled = true
-    end
-  end
-
-  let(:components) { Datadog::Core::Configuration::Components.new(settings) }
+  let(:integration_name) { :override_me }
+  let(:integration_options) { {} }
 
   before do
-    # TODO: this is a very hacky way that messes with Core's internals
-    allow_any_instance_of(Datadog::Core::Configuration).to receive(:configuration).and_return(settings)
-
-    allow(Datadog::Tracing)
-      .to receive(:tracer)
-      .and_return(components.tracer)
+    Datadog.configure do |c|
+      c.ci.enabled = true
+      c.ci.instrument integration_name, integration_options
+    end
   end
 
-  after { components.shutdown! }
+  after do
+    ::Datadog::Tracing.shutdown!
+  end
 end