undo py version check removal and fix langchain/tornado

Author: mabdinur

ddtrace/__init__.py

@@ -26,12 +26,9 @@
 from ._monkey import patch  # noqa: E402
 from ._monkey import patch_all  # noqa: E402
 from .internal.compat import PYTHON_VERSION_INFO  # noqa: E402
-from .internal.utils.deprecations import DDTraceDeprecationWarning  # noqa: E402
-from ddtrace._trace.pin import Pin  # noqa: E402
-from ddtrace._trace.span import Span  # noqa: E402
-from ddtrace._trace.tracer import Tracer  # noqa: E402
 from ddtrace.vendor import debtcollector
 from .version import get_version  # noqa: E402
+from .internal.utils.deprecations import DDTraceDeprecationWarning  # noqa: E402
 
 
 # TODO(mabdinur): Remove this once we have a better way to start the mini agent
@@ -65,28 +62,6 @@
 ]
 
 
-_DEPRECATED_TRACE_ATTRIBUTES = [
-    "Span",
-    "Tracer",
-    "Pin",
-]
-
-
-def __getattr__(name):
-    if name in _DEPRECATED_TRACE_ATTRIBUTES:
-        debtcollector.deprecate(
-            ("%s.%s is deprecated" % (__name__, name)),
-            message="Import from ddtrace.trace instead.",
-            category=DDTraceDeprecationWarning,
-            removal_version="3.0.0",
-        )
-
-    if name in globals():
-        return globals()[name]
-
-    raise AttributeError("%s has no attribute %s", __name__, name)
-
-
 def check_supported_python_version():
     if PYTHON_VERSION_INFO < (3, 8):
         deprecation_message = (

ddtrace/contrib/internal/langchain/patch.py

@@ -39,7 +39,6 @@
 
 import wrapt
 
-from ddtrace import Span
 from ddtrace import config
 from ddtrace.contrib.internal.langchain.constants import API_KEY
 from ddtrace.contrib.internal.langchain.constants import COMPLETION_TOKENS
@@ -63,6 +62,7 @@
 from ddtrace.llmobs._integrations import LangChainIntegration
 from ddtrace.llmobs._utils import safe_json
 from ddtrace.trace import Pin
+from ddtrace.trace import Span
 
 
 log = get_logger(__name__)

ddtrace/contrib/internal/langgraph/patch.py

@@ -9,7 +9,7 @@
 from ddtrace.contrib.trace_utils import wrap
 from ddtrace.internal.utils import get_argument_value
 from ddtrace.llmobs._integrations.langgraph import LangGraphIntegration
-from ddtrace.pin import Pin
+from ddtrace.trace import Pin
 
 
 def get_version():

ddtrace/contrib/internal/tornado/application.py

@@ -56,7 +56,7 @@ def tracer_config(__init__, app, args, kwargs):
 
     # configure the PIN object for template rendering
     # Required for backwards compatibility. Remove the else clause when
-    # the `ddtrace.Pin` object no longer accepts the Pin argument.
+    # the `ddtrace.trace.Pin` object no longer accepts the Pin argument.
     if tracer is ddtrace.tracer:
         ddtrace.trace.Pin(service=service).onto(template)
     else: