Merge pull request #228 from DataDog/anmarchenko/remove_identity_monk…

…ey_patch [SDTEST-756] remove monkey patch of core identity module
DataDog · Sep 6, 2024 · 2a4a16c · 2a4a16c
2 parents e2151ad + 3d8c2ee
commit 2a4a16c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 42 deletions.
diff --git a/lib/datadog/ci/configuration/components.rb b/lib/datadog/ci/configuration/components.rb
@@ -20,7 +20,6 @@
 require_relative "../test_visibility/transport"
 require_relative "../transport/adapters/telemetry_webmock_safe_adapter"
 require_relative "../transport/api/builder"
-require_relative "../utils/identity"
 require_relative "../utils/parsing"
 require_relative "../utils/test_run"
 require_relative "../worker"
@@ -285,12 +284,8 @@ def configure_telemetry(settings)
           settings.telemetry.shutdown_timeout_seconds = 60.0
 
           begin
-            require "datadog/core/environment/identity"
             require "datadog/core/telemetry/http/adapters/net"
 
-            # patch gem's identity to report datadog-ci library version instead of datadog gem version
-            Core::Environment::Identity.include(CI::Utils::Identity)
-
             # patch gem's telemetry transport layer to use Net::HTTP instead of WebMock's Net::HTTP
             Core::Telemetry::Http::Adapters::Net.include(CI::Transport::Adapters::TelemetryWebmockSafeAdapter)
           rescue => e

diff --git a/lib/datadog/ci/utils/identity.rb b/lib/datadog/ci/utils/identity.rb
diff --git a/sig/datadog/ci/utils/identity.rbs b/sig/datadog/ci/utils/identity.rbs
diff --git a/spec/datadog/ci/configuration/components_spec.rb b/spec/datadog/ci/configuration/components_spec.rb
@@ -159,10 +159,6 @@
                   expect(settings.telemetry).to have_received(:enabled=).with(true)
                 end
 
-                it "patches Core::Environment::Identity module to replace the library version" do
-                  expect(Datadog::Core::Environment::Identity.gem_datadog_version).to eq(Datadog::CI::VERSION::STRING)
-                end
-
                 it "patches Datadog::Core::Telemetry::Http::Adapters::Net" do
                   expect(Datadog::Core::Telemetry::Http::Adapters::Net).to be < Datadog::CI::Transport::Adapters::TelemetryWebmockSafeAdapter
                 end