Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion datadog_lambda/cold_start.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def set_cold_start(init_timestamp_ns):
_cold_start = False
_proactive_initialization = False
_lambda_container_initialized = True
from ddtrace import tracer as _tracer
from ddtrace.trace import tracer as _tracer


def is_cold_start():
Expand Down
4 changes: 2 additions & 2 deletions datadog_lambda/tracing.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
parse_xray_header,
)

from ddtrace import tracer, patch, Span
from ddtrace import patch
from ddtrace import __version__ as ddtrace_version
from ddtrace.propagation.http import HTTPPropagator
from ddtrace.context import Context
from ddtrace.trace import Context, Span, tracer
from datadog_lambda import __version__ as datadog_lambda_version
from datadog_lambda.trigger import (
_EventSource,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ classifiers = [
python = ">=3.8.0,<4"
datadog = ">=0.51.0,<1.0.0"
wrapt = "^1.11.2"
ddtrace = ">=2.17.0"
ddtrace = ">=2.20.0"
Comment thread
mabdinur marked this conversation as resolved.
ujson = ">=5.9.0"
boto3 = { version = "^1.34.0", optional = true }
requests = { version ="^2.22.0", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions tests/test_tracing.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

import ddtrace

from ddtrace import tracer
from ddtrace.context import Context
from ddtrace.trace import tracer
from ddtrace.trace import Context
Comment thread
mabdinur marked this conversation as resolved.
Outdated
Comment thread
mabdinur marked this conversation as resolved.
Outdated
from ddtrace._trace._span_pointer import _SpanPointer
from ddtrace._trace._span_pointer import _SpanPointerDirection
from ddtrace._trace._span_pointer import _SpanPointerDescription
Expand Down
2 changes: 1 addition & 1 deletion tests/test_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import datadog_lambda.xray as xray
from datadog_lambda.metric import lambda_metric
from datadog_lambda.thread_stats_writer import ThreadStatsWriter
from ddtrace import Span, tracer
from ddtrace.trace import Span, tracer
from ddtrace.internal.constants import MAX_UINT_64BITS

from tests.utils import get_mock_context, reset_xray_connection
Expand Down