make imports lazy

Author: P403n1x87

ddtrace/debugging/_origin/span.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from functools import partial
 from itertools import count
 import sys
 from threading import current_thread
@@ -21,10 +20,8 @@
 from ddtrace.debugging._uploader import SignalUploader
 from ddtrace.debugging._uploader import UploaderProduct
 from ddtrace.ext import EXIT_SPAN_TYPES
-from ddtrace.internal import core
 from ddtrace.internal.compat import Path
 from ddtrace.internal.packages import is_user_code
-from ddtrace.internal.safety import _isinstance
 from ddtrace.internal.wrapping.context import WrappingContext
 from ddtrace.settings.code_origin import config as co_config
 from ddtrace.trace import Span
@@ -37,15 +34,6 @@ def frame_stack(frame: FrameType) -> t.Iterator[FrameType]:
         _frame = _frame.f_back
 
 
-def wrap_entrypoint(uploader: t.Type[SignalUploader], f: t.Callable) -> None:
-    if not _isinstance(f, FunctionType):
-        return
-
-    _f = t.cast(FunctionType, f)
-    if not EntrySpanWrappingContext.is_wrapped(_f):
-        EntrySpanWrappingContext(uploader, _f).wrap()
-
-
 @dataclass
 class EntrySpanProbe(LogFunctionProbe):
     __span_class__ = "entry"
@@ -212,13 +200,6 @@ class SpanCodeOriginProcessorEntry:
     __context_wrapper__ = EntrySpanWrappingContext
 
     _instance: t.Optional["SpanCodeOriginProcessorEntry"] = None
-    _handler: t.Optional[t.Callable] = None
-
-    @classmethod
-    def init(cls) -> None:
-        # Register the entrypoint wrapping for entry spans
-        cls._handler = handler = partial(wrap_entrypoint, cls.__uploader__)
-        core.on("service_entrypoint.patch", handler)
 
     @classmethod
     def enable(cls):
@@ -244,7 +225,6 @@ def disable(cls):
         # Unregister code origin for span with the snapshot uploader
         cls.__uploader__.unregister(UploaderProduct.CODE_ORIGIN_SPAN_ENTRY)
 
-        cls._handler = None
         cls._instance = None
 
 

ddtrace/debugging/_products/code_origin/span.py

@@ -1,11 +1,17 @@
 import enum
+from functools import partial
+import typing as t
 
-from ddtrace.debugging._origin.span import SpanCodeOriginProcessorEntry
+import ddtrace.internal.core as core
 from ddtrace.internal.products import manager as product_manager
 from ddtrace.settings._core import ValueSource
 from ddtrace.settings.code_origin import config
 
 
+if t.TYPE_CHECKING:
+    from types import FunctionType
+
+
 CO_ENABLED = "DD_CODE_ORIGIN_FOR_SPANS_ENABLED"
 DI_PRODUCT_KEY = "dynamic-instrumentation"
 
@@ -18,13 +24,26 @@ def post_preload():
 
 
 def _start():
+    from ddtrace.debugging._origin.span import SpanCodeOriginProcessorEntry
+
     SpanCodeOriginProcessorEntry.enable()
 
 
 def start():
     # We need to instrument the entrypoints on boot because this is the only
     # time the tracer will notify us of entrypoints being registered.
-    SpanCodeOriginProcessorEntry.init()
+    @partial(core.on, "service_entrypoint.patch")
+    def _(f: t.Callable) -> None:
+        from ddtrace.debugging._origin.span import EntrySpanWrappingContext
+        from ddtrace.debugging._origin.span import SpanCodeOriginProcessorEntry
+        from ddtrace.internal.safety import _isinstance
+
+        if not _isinstance(f, FunctionType):
+            return
+
+        _f = t.cast(FunctionType, f)
+        if not EntrySpanWrappingContext.is_wrapped(_f):
+            EntrySpanWrappingContext(SpanCodeOriginProcessorEntry.__uploader__, _f).wrap()
 
     if config.span.enabled:
         from ddtrace.debugging._origin.span import SpanCodeOriginProcessorExit
@@ -43,16 +62,21 @@ def restart(join=False):
 
 
 def _stop():
+    from ddtrace.debugging._origin.span import SpanCodeOriginProcessorEntry
+
     SpanCodeOriginProcessorEntry.disable()
 
 
 def stop(join=False):
     if config.span.enabled:
+        from ddtrace.debugging._origin.span import SpanCodeOriginProcessorEntry
         from ddtrace.debugging._origin.span import SpanCodeOriginProcessorExit
 
         SpanCodeOriginProcessorEntry.disable()
         SpanCodeOriginProcessorExit.disable()
     elif product_manager.is_enabled(DI_PRODUCT_KEY):
+        from ddtrace.debugging._origin.span import SpanCodeOriginProcessorEntry
+
         SpanCodeOriginProcessorEntry.disable()
 
 

tests/debugging/origin/test_span.py

@@ -1,19 +1,36 @@
+from functools import partial
 from pathlib import Path
+from types import FunctionType
 import typing as t
 
 import ddtrace
+from ddtrace.debugging._origin.span import EntrySpanWrappingContext
 from ddtrace.debugging._origin.span import SpanCodeOriginProcessorEntry
 from ddtrace.debugging._origin.span import SpanCodeOriginProcessorExit
 from ddtrace.debugging._session import Session
 from ddtrace.ext import SpanTypes
 from ddtrace.internal import core
+from ddtrace.internal.safety import _isinstance
 from tests.debugging.mocking import MockSignalUploader
 from tests.utils import TracerTestCase
 
 
 class MockSpanCodeOriginProcessorEntry(SpanCodeOriginProcessorEntry):
     __uploader__ = MockSignalUploader
 
+    @classmethod
+    def enable(cls):
+        super().enable()
+
+        @partial(core.on, "service_entrypoint.patch")
+        def _(f: t.Callable) -> None:
+            if not _isinstance(f, FunctionType):
+                return
+
+            _f = t.cast(FunctionType, f)
+            if not EntrySpanWrappingContext.is_wrapped(_f):
+                EntrySpanWrappingContext(MockSignalUploader, _f).wrap()
+
     @classmethod
     def get_uploader(cls) -> MockSignalUploader:
         return t.cast(MockSignalUploader, cls.__uploader__._instance)
@@ -33,7 +50,6 @@ def setUp(self):
         self.backup_tracer = ddtrace.tracer
         ddtrace.tracer = self.tracer
 
-        MockSpanCodeOriginProcessorEntry.init()
         MockSpanCodeOriginProcessorEntry.enable()
         MockSpanCodeOriginProcessor.enable()