delete active_remote

Author: p

lib/datadog/core/remote.rb

@@ -4,21 +4,6 @@ module Datadog
   module Core
     # Module to interact with core remote component
     module Remote
-      class << self
-        def active_remote
-          remote
-        end
-
-        private
-
-        def components
-          Datadog.send(:components)
-        end
-
-        def remote
-          components.remote
-        end
-      end
     end
   end
 end

lib/datadog/core/remote/tie.rb

@@ -11,12 +11,13 @@ module Tie
         )
 
         def self.boot
-          return if Datadog::Core::Remote.active_remote.nil?
+          active_remote = Datadog.send(:components, allow_initialization: false).remote
+          return if active_remote.nil?
 
           barrier = nil
 
           t = Datadog::Core::Utils::Time.measure do
-            barrier = Datadog::Core::Remote.active_remote.barrier(:once)
+            barrier = active_remote.barrier(:once)
           end
 
           # steep does not permit the next line due to

lib/datadog/core/remote/tie/tracing.rb

@@ -13,13 +13,14 @@ def self.tag(boot, span)
             return if boot.nil?
             return if span.nil?
 
-            return if Datadog::Core::Remote.active_remote.nil?
+            active_remote = Datadog.send(:components, allow_initialization: false).remote
+            return if active_remote.nil?
 
             # TODO: this is not thread-consistent
-            ready = Datadog::Core::Remote.active_remote.healthy
+            ready = active_remote.healthy
             status = ready ? 'ready' : 'disconnected'
 
-            span.set_tag('_dd.rc.client_id', Datadog::Core::Remote.active_remote.client.id)
+            span.set_tag('_dd.rc.client_id', active_remote.client.id)
             span.set_tag('_dd.rc.status', status)
 
             if boot.barrier != :pass

sig/datadog/core/remote.rbs

@@ -1,13 +1,6 @@
 module Datadog
   module Core
     module Remote
-      def self.active_remote: () -> Datadog::Core::Remote::Component
-
-      private
-
-      def self.components: () -> Datadog::Core::Configuration::Components
-
-      def self.remote: () -> Datadog::Core::Remote::Component
     end
   end
 end