From c44ee57f3c6d3ac25eda9fbebc7b4a442685b366 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Tue, 14 Jan 2025 14:56:28 -0500 Subject: [PATCH] DEBUG-3329 rename datadog/di/init to datadog/di/preload --- lib/datadog/di/base.rb | 2 +- lib/datadog/di/{init.rb => preload.rb} | 2 +- sig/datadog/di/{init.rbs => preload.rbs} | 0 spec/datadog/di/{init_spec.rb => preload_spec.rb} | 2 +- spec/loading_spec.rb | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename lib/datadog/di/{init.rb => preload.rb} (90%) rename sig/datadog/di/{init.rbs => preload.rbs} (100%) rename spec/datadog/di/{init_spec.rb => preload_spec.rb} (98%) diff --git a/lib/datadog/di/base.rb b/lib/datadog/di/base.rb index afe8c38e602..69e7e78ec5c 100644 --- a/lib/datadog/di/base.rb +++ b/lib/datadog/di/base.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# This file is loaded by datadog/di/init.rb. +# This file is loaded by datadog/di/preload.rb. # It contains just the global DI reference to the (normally one and only) # code tracker for the current process. # This file should not require the rest of DI, specifically none of the diff --git a/lib/datadog/di/init.rb b/lib/datadog/di/preload.rb similarity index 90% rename from lib/datadog/di/init.rb rename to lib/datadog/di/preload.rb index 2af4c29c325..932e72d7e88 100644 --- a/lib/datadog/di/init.rb +++ b/lib/datadog/di/preload.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# Require 'datadog/di/init' early in the application boot process to +# Require 'datadog/di/preload' early in the application boot process to # enable dynamic instrumentation for third-party libraries used by the # application. diff --git a/sig/datadog/di/init.rbs b/sig/datadog/di/preload.rbs similarity index 100% rename from sig/datadog/di/init.rbs rename to sig/datadog/di/preload.rbs diff --git a/spec/datadog/di/init_spec.rb b/spec/datadog/di/preload_spec.rb similarity index 98% rename from spec/datadog/di/init_spec.rb rename to spec/datadog/di/preload_spec.rb index 45a5f650fc4..6ae770a08e5 100644 --- a/spec/datadog/di/init_spec.rb +++ b/spec/datadog/di/preload_spec.rb @@ -10,7 +10,7 @@ raise "Datadog code loaded too early" end - require 'datadog/di/init' + require 'datadog/di/preload' if Datadog.constants.sort != %i(DI VERSION) raise "Too many datadog components loaded: \#{Datadog.constants}" diff --git a/spec/loading_spec.rb b/spec/loading_spec.rb index 73da2c2d7e9..c65f4e62050 100644 --- a/spec/loading_spec.rb +++ b/spec/loading_spec.rb @@ -4,7 +4,7 @@ 'datadog/appsec' => 'Datadog::AppSec', 'datadog/core' => 'Datadog::Core', 'datadog/di' => 'Datadog::DI', - 'datadog/di/init' => 'Datadog::DI::CodeTracker', + 'datadog/di/preload' => 'Datadog::DI::CodeTracker', 'datadog/kit' => 'Datadog::Kit', 'datadog/profiling' => 'Datadog::Profiling', 'datadog/tracing' => 'Datadog::Tracing',