update sources

Author: mabdinur

ddtrace/auto.py

@@ -19,3 +19,7 @@ def main():
 directly.
 """
 import ddtrace.bootstrap.sitecustomize  # noqa:F401
+from ddtrace.internal.telemetry import telemetry_writer
+
+
+telemetry_writer.add_configuration("instrumentation_source", "ddtrace.auto", "code")

ddtrace/bootstrap/sitecustomize.py

@@ -165,8 +165,7 @@ def _(threading):
         else:
             log.debug("additional sitecustomize found in: %s", sys.path)
 
-    telemetry_writer.add_configuration("ddtrace_bootstrapped", True, "unknown")
-    telemetry_writer.add_configuration("ddtrace_auto_used", "ddtrace.auto" in sys.modules, "unknown")
+    telemetry_writer.add_configuration("instrumentation_source", "ddtrace.run", "code")
     # Loading status used in tests to detect if the `sitecustomize` has been
     # properly loaded without exceptions. This must be the last action in the module
     # when the execution ends with a success.

ddtrace/settings/_config.py

@@ -14,6 +14,7 @@
 
 from ddtrace.internal.serverless import in_azure_function
 from ddtrace.internal.serverless import in_gcp_function
+from ddtrace.internal.telemetry import telemetry_writer
 from ddtrace.internal.telemetry import validate_otel_envs
 from ddtrace.internal.utils.cache import cachedmethod
 
@@ -775,10 +776,7 @@ def _set_config_items(self, items):
             item_names.append(key)
             item = self._config[key]
             item.set_value_source(value, origin)
-            if self._telemetry_enabled:
-                from ddtrace.internal.telemetry import telemetry_writer
-
-                telemetry_writer.add_configuration(item._name, item.value(), item.source())
+            telemetry_writer.add_configuration(item._name, item.value(), item.source())
         self._notify_subscribers(item_names)
 
     def _reset(self):
@@ -868,3 +866,6 @@ def _lower(self, value):
 
 
 config = Config()
+# This is used to track the source of the instrumentation.
+# By default it is set to "manual" but can be updated to ssi, ddtrace.auto, or ddtrace.run.
+telemetry_writer.add_configuration("instrumentation_source", "manual", "code")

lib-injection/sources/sitecustomize.py

@@ -431,7 +431,7 @@ def _inject():
                 )
                 # Track whether library injection was successful
                 ddtrace.config._lib_was_injected = True
-                ddtrace.internal.telemetry.telemetry_writer.add_configuration("lib_injection_successful", True, "code")
+                ddtrace.internal.telemetry.telemetry_writer.add_configuration("instrumentation_source", "ssi", "code")
             except Exception as e:
                 TELEMETRY_DATA.append(
                     create_count_metric(

tests/telemetry/test_writer.py

@@ -159,8 +159,7 @@ def test_app_started_event(telemetry_writer, test_agent_session, mock_time):
                     {"name": "DD_TRACE_WRITER_INTERVAL_SECONDS", "origin": "unknown", "value": 1.0},
                     {"name": "DD_TRACE_WRITER_MAX_PAYLOAD_SIZE_BYTES", "origin": "unknown", "value": 20 << 20},
                     {"name": "DD_TRACE_WRITER_REUSE_CONNECTIONS", "origin": "unknown", "value": False},
-                    {"name": "ddtrace_auto_used", "origin": "unknown", "value": False},
-                    {"name": "ddtrace_bootstrapped", "origin": "unknown", "value": False},
+                    {"name": "instrumentation_source", "origin": "code", "value": "manual"},
                     {"name": "profiling_enabled", "origin": "default", "value": "false"},
                     {"name": "data_streams_enabled", "origin": "default", "value": "false"},
                     {"name": "appsec_enabled", "origin": "default", "value": "false"},
@@ -527,8 +526,7 @@ def test_app_started_event_configuration_override(test_agent_session, run_python
         {"name": "_DD_APPSEC_DEDUPLICATION_ENABLED", "origin": "default", "value": True},
         {"name": "_DD_IAST_LAZY_TAINT", "origin": "default", "value": False},
         {"name": "_DD_TRACE_WRITER_LOG_ERROR_PAYLOADS", "origin": "default", "value": False},
-        {"name": "ddtrace_auto_used", "origin": "unknown", "value": True},
-        {"name": "ddtrace_bootstrapped", "origin": "unknown", "value": True},
+        {"name": "instrumentation_source", "origin": "code", "value": "ddtrace.auto"},
         {"name": "python_build_gnu_type", "origin": "unknown", "value": sysconfig.get_config_var("BUILD_GNU_TYPE")},
         {"name": "python_host_gnu_type", "origin": "unknown", "value": sysconfig.get_config_var("HOST_GNU_TYPE")},
         {"name": "python_soabi", "origin": "unknown", "value": sysconfig.get_config_var("SOABI")},