From d5c758de5514a4e3a3a104251b8c6df89bc9879d Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Tue, 28 Jan 2025 11:17:36 -0500 Subject: [PATCH 1/3] feat(ddtrace): upgrade ddtrace version --- datadog_lambda/cold_start.py | 2 +- datadog_lambda/tracing.py | 4 ++-- pyproject.toml | 2 +- tests/test_tracing.py | 4 ++-- tests/test_wrapper.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/datadog_lambda/cold_start.py b/datadog_lambda/cold_start.py index 8c21420d..ea10ea20 100644 --- a/datadog_lambda/cold_start.py +++ b/datadog_lambda/cold_start.py @@ -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(): diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index c90baff1..973cb562 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -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, diff --git a/pyproject.toml b/pyproject.toml index 6f1b5761..dd5442e6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ python = ">=3.8.0,<4" datadog = ">=0.41.0,<1.0.0" wrapt = "^1.11.2" -ddtrace = ">=2.17.0" +ddtrace = ">=2.20.0" ujson = ">=5.9.0" boto3 = { version = "^1.34.0", optional = true } requests = { version ="^2.22.0", optional = true } diff --git a/tests/test_tracing.py b/tests/test_tracing.py index f7d54542..1cf1223a 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -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 from ddtrace._trace._span_pointer import _SpanPointer from ddtrace._trace._span_pointer import _SpanPointerDirection from ddtrace._trace._span_pointer import _SpanPointerDescription diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index db9f0f9e..f47285e6 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -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 From c0743637a0500d5ffff402367b01adbe69ceb487 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Wed, 29 Jan 2025 15:15:08 -0500 Subject: [PATCH 2/3] merge import --- tests/test_tracing.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 1cf1223a..7d755f8e 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -10,8 +10,7 @@ import ddtrace -from ddtrace.trace import tracer -from ddtrace.trace import Context +from ddtrace.trace import Context, tracer from ddtrace._trace._span_pointer import _SpanPointer from ddtrace._trace._span_pointer import _SpanPointerDirection from ddtrace._trace._span_pointer import _SpanPointerDescription From 8fbc6b7600fb91cd1d82ddd6702286064d051931 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 30 Jan 2025 11:20:37 -0500 Subject: [PATCH 3/3] update more references --- tests/test_benchmarks.py | 2 +- tests/test_tracing.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_benchmarks.py b/tests/test_benchmarks.py index 899e3d7f..48598cb3 100644 --- a/tests/test_benchmarks.py +++ b/tests/test_benchmarks.py @@ -38,7 +38,7 @@ def test_metric_write_metric_point_to_stdout(benchmark, monkeypatch): def test_tag_object_tag_object(event, benchmark): with open(f"{event_samples_dir}/{event}.json") as f: event = json.load(f) - span = ddtrace.tracer.start_span("test") + span = ddtrace.trace.tracer.start_span("test") benchmark(tag_object.tag_object, span, "function.request", event) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 7d755f8e..89a7712c 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -2157,7 +2157,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None): @pytest.mark.parametrize("source,expect", _test_create_inferred_span) -@patch("ddtrace.Span.finish", autospec=True) +@patch("ddtrace.trace.Span.finish", autospec=True) def test_create_inferred_span(mock_span_finish, source, expect): with open(f"{event_samples}{source}.json") as f: event = json.load(f) @@ -2196,7 +2196,7 @@ def test_mark_trace_as_error_for_5xx_responses_getting_400_response_code( def test_mark_trace_as_error_for_5xx_responses_sends_error_metric_and_set_error_tags( self, mock_submit_errors_metric ): - mock_span = Mock(ddtrace.Span) + mock_span = Mock(ddtrace.trace.Span) status_code = "500" mark_trace_as_error_for_5xx_responses( context="fake_context", status_code=status_code, span=mock_span