decoupled the native side from DI/ER env vars to support HandsOff Config

Author: GreenMatan

tracer/src/Datadog.Tracer.Native/debugger_environment_variables.h

@@ -16,13 +16,18 @@ namespace environment
     const WSTRING internal_instrument_all_lines_enabled = WStr("DD_INTERNAL_DEBUGGER_INSTRUMENT_ALL_LINES");
     const WSTRING internal_instrument_all_lines_path = WStr("DD_INTERNAL_DEBUGGER_INSTRUMENT_ALL_LINES_PATH");
 
-    // Determines if the Dynamic Instrumentation (aka live debugger) is enabled.
+    // Determines if the Dynamic Instrumentation (aka live debugger) product is enabled.
     const WSTRING dynamic_instrumentation_enabled = WStr("DD_DYNAMIC_INSTRUMENTATION_ENABLED");
 
     // Determines if the Exception Replay product is enabled.
-    const WSTRING exception_debugging_enabled = WStr("DD_EXCEPTION_DEBUGGING_ENABLED"); // Old name
     const WSTRING exception_replay_enabled = WStr("DD_EXCEPTION_REPLAY_ENABLED");
 
+    // Determines if Dynamic Instrumentation should be controlled by Stable Configuration
+    const WSTRING dynamic_instrumentation_stable_config_enabled = WStr("DD_DYNAMIC_INSTRUMENTATION_MANAGED_ACTIVATION_ENABLED");
+
+    // Determines if Exception Replay should be controlled by Stable Configuration
+    const WSTRING exception_replay_stable_config_enabled = WStr("DD_EXCEPTION_REPLAY_MANAGED_ACTIVATION_ENABLED");
+
 } // namespace environment
 } // namespace debugger
 

tracer/src/Datadog.Tracer.Native/debugger_environment_variables_util.cpp

@@ -11,15 +11,17 @@ bool IsDynamicInstrumentationEnabled()
 
 bool IsExceptionReplayEnabled()
 {
-    static int sValue = -1;
-    if (sValue == -1)
-    {
-        const auto old_exception_replay_flag = GetEnvironmentValue(environment::exception_debugging_enabled);
-        const auto new_exception_replay_flag = GetEnvironmentValue(environment::exception_replay_enabled);
-        sValue = (IsTrue(old_exception_replay_flag) || IsTrue(new_exception_replay_flag)) ? 1 : 0;
-    }
-
-    return sValue == 1;
+    CheckIfTrue(GetEnvironmentValue(environment::exception_replay_enabled));
+}
+
+bool IsDynamicInstrumentationStableConfigDisabled()
+{
+    CheckIfFalse(GetEnvironmentValue(environment::dynamic_instrumentation_stable_config_enabled));
+}
+
+bool IsExceptionReplayStableConfigDisabled()
+{
+    CheckIfFalse(GetEnvironmentValue(environment::exception_replay_stable_config_enabled));
 }
 
 bool IsDebuggerInstrumentAllEnabled()

tracer/src/Datadog.Tracer.Native/debugger_environment_variables_util.h

@@ -10,6 +10,8 @@ namespace debugger
 
 bool IsDynamicInstrumentationEnabled();
 bool IsExceptionReplayEnabled();
+bool IsDynamicInstrumentationStableConfigDisabled();
+bool IsExceptionReplayStableConfigDisabled();
 bool IsDebuggerInstrumentAllEnabled();
 bool IsDebuggerInstrumentAllLinesEnabled();
 

tracer/src/Datadog.Tracer.Native/debugger_probes_instrumentation_requester.cpp

@@ -330,19 +330,36 @@ DebuggerProbesInstrumentationRequester::DebuggerProbesInstrumentationRequester(
     m_work_offloader(work_offloader),
     m_fault_tolerant_method_duplicator(fault_tolerant_method_duplicator)
 {
-    auto diEnabled = IsDynamicInstrumentationEnabled();
+    auto diStableConfigDisabled = IsDynamicInstrumentationStableConfigDisabled();
+    if (diStableConfigDisabled)
+    {
+        Logger::Info("Dynamic Instrumentation Stable Config is explicitly disabled");
+    }
+
+    auto erStableConfigDisabled = IsExceptionReplayStableConfigDisabled();
+    if (erStableConfigDisabled)
+    {
+        Logger::Info("Exception Replay Stable Config is explicitly disabled");
+    }
+
+    auto diEnabled = !diStableConfigDisabled || IsDynamicInstrumentationEnabled();
     if (diEnabled == false)
     {
-        Logger::Debug("Dynamic Instrumentation is disabled");
+        Logger::Info("Dynamic Instrumentation hot standby is disabled");
     }
 
-    auto erEnabled = IsExceptionReplayEnabled();
+    auto erEnabled = !erStableConfigDisabled || IsExceptionReplayEnabled();
     if (erEnabled == false)
     {
-        Logger::Debug("Exception Replay is explicitly disabled");
+        Logger::Info("Exception Replay hot standby is disabled");
     }
 
-    is_debugger_or_exception_debugging_enabled = diEnabled || erEnabled;
+    is_debugger_or_exception_replay_hot_standby = diEnabled || erEnabled;
+
+    if (is_debugger_or_exception_replay_hot_standby)
+    {
+        Logger::Info("Dynamic Instrumentation/Exception Replay Hot Standby is on");
+    }
 }
 
 void DebuggerProbesInstrumentationRequester::RemoveProbes(debugger::DebuggerRemoveProbesDefinition* removeProbes,
@@ -1027,13 +1044,13 @@ void DebuggerProbesInstrumentationRequester::ModuleLoadFinished_AddMetadataToMod
 
 HRESULT STDMETHODCALLTYPE DebuggerProbesInstrumentationRequester::ModuleLoadFinished(const ModuleID moduleId)
 {
-    if (!is_debugger_or_exception_debugging_enabled)
+    if (!is_debugger_or_exception_replay_hot_standby)
     {
-        return S_OK;
+         return S_OK;
     }
 
     // IMPORTANT: The call to `ModuleLoadFinished_AddMetadataToModule` must be in `ModuleLoadFinished` as mutating the
-    // layout of types is only feasible prior the type is loaded.s
+    // layout of types is only feasible prior the type is loaded.
     ModuleLoadFinished_AddMetadataToModule(moduleId);
     RequestRejitForLoadedModule(moduleId);
     return S_OK;

tracer/src/Datadog.Tracer.Native/debugger_probes_instrumentation_requester.h

@@ -40,7 +40,7 @@ class DebuggerProbesInstrumentationRequester
     std::shared_ptr<RejitHandler> m_rejit_handler = nullptr;
     std::shared_ptr<RejitWorkOffloader> m_work_offloader = nullptr;
     std::shared_ptr<fault_tolerant::FaultTolerantMethodDuplicator> m_fault_tolerant_method_duplicator = nullptr;
-    bool is_debugger_or_exception_debugging_enabled = false;
+    bool is_debugger_or_exception_replay_hot_standby = false;
     std::unordered_map<std::pair<std::string, mdToken>, std::vector<int>, pair_hash> explorationLineProbes;
     std::once_flag explorationLinesInitFlag;