Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ddtrace/contrib/internal/tornado/patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
import ddtrace
from ddtrace import config
from ddtrace.contrib.internal.tornado.stack_context import context_provider
from ddtrace.internal.utils.deprecations import DDTraceDeprecationWarning
from ddtrace.internal.utils.formats import asbool
from ddtrace.internal.utils.wrappers import unwrap as _u
from ddtrace.vendor.debtcollector import deprecate

from . import application
from . import decorators
Expand All @@ -26,7 +28,19 @@

def get_version():
# type: () -> str
return getattr(tornado, "version", "")
return getattr(tornado, "version", "0.0.0")


VERSION_TUPLE = tuple([int(x) for x in get_version().split(".")])

if VERSION_TUPLE < (6, 1, 0):
deprecate(
f"Tornado {VERSION_TUPLE} is deprecated",
message="Use Tornado v6.1 or later and configure tracing using "
"environment variables and ``ddtrace-run`` or ``import ddtrace.auto`` instead.",
category=DDTraceDeprecationWarning,
removal_version="4.0.0",
)


def _supported_versions() -> Dict[str, str]:
Expand Down
9 changes: 9 additions & 0 deletions ddtrace/contrib/tornado.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,17 @@ def log_exception(self, typ, value, tb):
from ddtrace.contrib.internal.tornado.stack_context import TracerStackContext
from ddtrace.contrib.internal.tornado.stack_context import context_provider
from ddtrace.contrib.internal.tornado.stack_context import run_with_trace_context
from ddtrace.internal.utils.deprecations import DDTraceDeprecationWarning
from ddtrace.vendor.debtcollector import deprecate


deprecate(
"ddtrace.contrib.tornado is deprecated",
message="Use ``import ddtrace.auto`` and ``DD_PATCH_MODULES`` to configure tracing for Tornado.",
category=DDTraceDeprecationWarning,
removal_version="4.0.0",
)

__all__ = [
"context_provider",
"run_with_trace_context",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
deprecations:
- |
tornado: Deprecated support for Tornado versions older than v6.1. Use Tornado v6.1 or later.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
deprecations:
- |
tornado: Deprecates programmatic tracing configuration via the ``ddtrace.contrib.tornado`` module. Configure tracing using environment variables and ``import ddtrace.auto`` instead.
Loading