update Context

Author: mabdinur

ddtrace/context.py

@@ -1,5 +1,5 @@
-from ddtrace._trace.context import Context  # noqa: F401
 from ddtrace.internal.utils.deprecations import DDTraceDeprecationWarning
+from ddtrace.trace import Context  # noqa: F401
 from ddtrace.vendor.debtcollector import deprecate
 
 

ddtrace/contrib/internal/futures/threading.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 import ddtrace
-from ddtrace._trace.context import Context
+from ddtrace.trace import Context
 
 
 def _wrap_submit(func, args, kwargs):

ddtrace/debugging/_signal/model.py

@@ -18,7 +18,6 @@
 from typing import cast
 from uuid import uuid4
 
-from ddtrace._trace.context import Context
 from ddtrace.debugging._expressions import DDExpressionEvaluationError
 from ddtrace.debugging._probe.model import Probe
 from ddtrace.debugging._probe.model import ProbeConditionMixin
@@ -30,6 +29,7 @@
 from ddtrace.internal.metrics import Metrics
 from ddtrace.internal.rate_limiter import BudgetRateLimiterWithJitter as RateLimiter
 from ddtrace.internal.rate_limiter import RateLimitExceeded
+from ddtrace.trace import Context
 from ddtrace.trace import Span
 
 

ddtrace/llmobs/_llmobs.py

@@ -10,7 +10,6 @@
 import ddtrace
 from ddtrace import config
 from ddtrace import patch
-from ddtrace._trace.context import Context
 from ddtrace.constants import ERROR_MSG
 from ddtrace.constants import ERROR_STACK
 from ddtrace.constants import ERROR_TYPE
@@ -67,6 +66,7 @@
 from ddtrace.llmobs.utils import ExportedLLMObsSpan
 from ddtrace.llmobs.utils import Messages
 from ddtrace.propagation.http import HTTPPropagator
+from ddtrace.trace import Context
 from ddtrace.trace import Span
 
 

ddtrace/opentracer/span.py

@@ -9,12 +9,12 @@
 from opentracing import Span as OpenTracingSpan
 from opentracing.ext import tags as OTTags
 
-from ddtrace._trace.context import Context as DatadogContext  # noqa:F401
 from ddtrace.constants import ERROR_MSG
 from ddtrace.constants import ERROR_STACK
 from ddtrace.constants import ERROR_TYPE
 from ddtrace.internal.compat import NumericType  # noqa:F401
 from ddtrace.internal.constants import SPAN_API_OPENTRACING
+from ddtrace.trace import Context as DatadogContext  # noqa:F401
 from ddtrace.trace import Span as DatadogSpan
 
 from .span_context import SpanContext

ddtrace/opentracer/span_context.py

@@ -4,8 +4,8 @@
 
 from opentracing import SpanContext as OpenTracingSpanContext
 
-from ddtrace._trace.context import Context as DatadogContext
 from ddtrace.internal.compat import NumericType  # noqa:F401
+from ddtrace.trace import Context as DatadogContext
 
 
 class SpanContext(OpenTracingSpanContext):

ddtrace/opentracer/tracer.py

@@ -12,10 +12,10 @@
 
 import ddtrace
 from ddtrace import config as ddconfig
-from ddtrace._trace.context import Context as DatadogContext  # noqa:F401
 from ddtrace.internal.constants import SPAN_API_OPENTRACING
 from ddtrace.internal.utils.config import get_application_name
 from ddtrace.settings import ConfigException
+from ddtrace.trace import Context as DatadogContext  # noqa:F401
 from ddtrace.trace import Span as DatadogSpan
 from ddtrace.trace import Tracer as DatadogTracer
 from ddtrace.vendor.debtcollector import deprecate

ddtrace/propagation/http.py

@@ -23,12 +23,12 @@
 
 from ddtrace import config
 from ddtrace._trace._span_link import SpanLink
-from ddtrace._trace.context import Context
 from ddtrace._trace.span import _get_64_highest_order_bits_as_hex
 from ddtrace._trace.span import _get_64_lowest_order_bits_as_int
 from ddtrace._trace.span import _MetaDictType
 from ddtrace.appsec._constants import APPSEC
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import Context
 
 from ..constants import AUTO_KEEP
 from ..constants import AUTO_REJECT

tests/contrib/asyncio/test_propagation.py

@@ -3,10 +3,10 @@
 
 import pytest
 
-from ddtrace._trace.context import Context
 from ddtrace._trace.provider import DefaultContextProvider
 from ddtrace.contrib.internal.asyncio.patch import patch
 from ddtrace.contrib.internal.asyncio.patch import unpatch
+from ddtrace.trace import Context
 from tests.opentracer.utils import init_tracer
 
 

tests/contrib/celery/test_integration.py

@@ -8,12 +8,12 @@
 import mock
 import pytest
 
-from ddtrace._trace.context import Context
 from ddtrace.constants import ERROR_MSG
 from ddtrace.contrib.internal.celery.patch import patch
 from ddtrace.contrib.internal.celery.patch import unpatch
 import ddtrace.internal.forksafe as forksafe
 from ddtrace.propagation.http import HTTPPropagator
+from ddtrace.trace import Context
 from ddtrace.trace import Pin
 from tests.opentracer.utils import init_tracer
 from tests.utils import flaky

tests/contrib/gevent/test_tracer.py

@@ -8,7 +8,7 @@
 from ddtrace.constants import ERROR_MSG
 from ddtrace.constants import _SAMPLING_PRIORITY_KEY
 from ddtrace.constants import USER_KEEP
-from ddtrace._trace.context import Context
+from ddtrace.trace import Context
 from ddtrace.contrib.internal.gevent.patch import patch
 from ddtrace.contrib.internal.gevent.patch import unpatch
 from tests.opentracer.utils import init_tracer

tests/contrib/tornado/test_stack_context.py

@@ -1,8 +1,8 @@
 import pytest
 import tornado
 
-from ddtrace._trace.context import Context
 from ddtrace.contrib.internal.tornado.stack_context import TracerStackContext
+from ddtrace.trace import Context
 
 from .utils import TornadoTestCase
 from .web.compat import sleep

tests/llmobs/test_llmobs_service.py

@@ -7,7 +7,6 @@
 import pytest
 
 import ddtrace
-from ddtrace._trace.context import Context
 from ddtrace.ext import SpanTypes
 from ddtrace.internal.service import ServiceStatus
 from ddtrace.llmobs import LLMObs as llmobs_service
@@ -32,6 +31,7 @@
 from ddtrace.llmobs._writer import LLMObsAgentlessEventClient
 from ddtrace.llmobs._writer import LLMObsProxiedEventClient
 from ddtrace.llmobs.utils import Prompt
+from ddtrace.trace import Context
 from tests.llmobs._utils import _expected_llmobs_eval_metric_event
 from tests.llmobs._utils import _expected_llmobs_llm_span_event
 from tests.llmobs._utils import _expected_llmobs_non_llm_span_event

tests/tracer/test_context.py

@@ -5,7 +5,7 @@
 import pytest
 
 from ddtrace._trace._span_link import SpanLink
-from ddtrace._trace.context import Context
+from ddtrace.trace import Context
 from ddtrace.trace import Span
 
 

tests/tracer/test_encoders.py

@@ -19,7 +19,6 @@
 
 from ddtrace._trace._span_link import SpanLink
 from ddtrace._trace._span_pointer import _SpanPointerDirection
-from ddtrace._trace.context import Context
 from ddtrace.constants import _ORIGIN_KEY as ORIGIN_KEY
 from ddtrace.ext import SpanTypes
 from ddtrace.ext.ci import CI_APP_TEST_ORIGIN
@@ -33,6 +32,7 @@
 from ddtrace.internal.encoding import MsgpackEncoderV04
 from ddtrace.internal.encoding import MsgpackEncoderV05
 from ddtrace.internal.encoding import _EncoderBase
+from ddtrace.trace import Context
 from ddtrace.trace import Span
 from tests.utils import DummyTracer
 

tests/tracer/test_processors.py

@@ -3,7 +3,6 @@
 import mock
 import pytest
 
-from ddtrace._trace.context import Context
 from ddtrace._trace.processor import SpanAggregator
 from ddtrace._trace.processor import SpanProcessor
 from ddtrace._trace.processor import TraceProcessor
@@ -25,6 +24,7 @@
 from ddtrace.internal.sampling import SamplingMechanism
 from ddtrace.internal.sampling import SpanSamplingRule
 from ddtrace.internal.telemetry.constants import TELEMETRY_NAMESPACE
+from ddtrace.trace import Context
 from ddtrace.trace import Span
 from ddtrace.trace import Tracer
 from tests.utils import DummyTracer

tests/tracer/test_propagation.py

@@ -9,7 +9,6 @@
 
 import ddtrace
 from ddtrace._trace._span_link import SpanLink
-from ddtrace._trace.context import Context
 from ddtrace._trace.span import _get_64_lowest_order_bits_as_int
 from ddtrace.appsec._trace_utils import _asm_manual_keep
 from ddtrace.constants import AUTO_REJECT
@@ -42,6 +41,7 @@
 from ddtrace.propagation.http import HTTPPropagator
 from ddtrace.propagation.http import _BaggageHeader
 from ddtrace.propagation.http import _TraceContext
+from ddtrace.trace import Context
 from ddtrace.trace import tracer as ddtracer
 from tests.contrib.fastapi.conftest import client as fastapi_client  # noqa:F401
 from tests.contrib.fastapi.conftest import fastapi_application  # noqa:F401
@@ -87,10 +87,10 @@ def test_inject_with_baggage_http_propagation(tracer):  # noqa: F811
     env=dict(DD_TRACE_PROPAGATION_STYLE=PROPAGATION_STYLE_DATADOG),
 )
 def test_inject_128bit_trace_id_datadog():
-    from ddtrace._trace.context import Context
     from ddtrace.internal.constants import HIGHER_ORDER_TRACE_ID_BITS
     from ddtrace.internal.constants import SAMPLING_DECISION_TRACE_TAG_KEY
     from ddtrace.propagation.http import HTTPPropagator
+    from ddtrace.trace import Context
     from tests.utils import DummyTracer
 
     tracer = DummyTracer()  # noqa: F811
@@ -117,8 +117,8 @@ def test_inject_128bit_trace_id_datadog():
     env=dict(DD_TRACE_PROPAGATION_STYLE=PROPAGATION_STYLE_B3_MULTI),
 )
 def test_inject_128bit_trace_id_b3multi():
-    from ddtrace._trace.context import Context
     from ddtrace.propagation.http import HTTPPropagator
+    from ddtrace.trace import Context
     from tests.utils import DummyTracer
 
     tracer = DummyTracer()  # noqa: F811
@@ -139,8 +139,8 @@ def test_inject_128bit_trace_id_b3multi():
     env=dict(DD_TRACE_PROPAGATION_STYLE=PROPAGATION_STYLE_B3_SINGLE),
 )
 def test_inject_128bit_trace_id_b3_single_header():
-    from ddtrace._trace.context import Context
     from ddtrace.propagation.http import HTTPPropagator
+    from ddtrace.trace import Context
     from tests.utils import DummyTracer
 
     tracer = DummyTracer()  # noqa: F811
@@ -161,8 +161,8 @@ def test_inject_128bit_trace_id_b3_single_header():
     env=dict(DD_TRACE_PROPAGATION_STYLE=_PROPAGATION_STYLE_W3C_TRACECONTEXT),
 )
 def test_inject_128bit_trace_id_tracecontext():
-    from ddtrace._trace.context import Context
     from ddtrace.propagation.http import HTTPPropagator
+    from ddtrace.trace import Context
     from tests.utils import DummyTracer
 
     tracer = DummyTracer()  # noqa: F811
@@ -2487,7 +2487,7 @@ def test_propagation_extract_env(
     code = """
 import json
 import pickle
-from ddtrace._trace.context import Context
+from ddtrace.trace import Context
 from ddtrace.propagation.http import HTTPPropagator
 
 context = HTTPPropagator.extract({!r})
@@ -3295,7 +3295,7 @@ def test_propagation_inject(name, styles, context, expected_headers, run_python_
     code = """
 import json
 
-from ddtrace._trace.context import Context
+from ddtrace.trace import Context
 from ddtrace.propagation.http import HTTPPropagator
 
 context = Context(**{!r})
@@ -3362,7 +3362,7 @@ def test_DD_TRACE_PROPAGATION_STYLE_INJECT_overrides_DD_TRACE_PROPAGATION_STYLE(
     code = """
 import json
 
-from ddtrace._trace.context import Context
+from ddtrace.trace import Context
 from ddtrace.propagation.http import HTTPPropagator
 
 context = Context(**{!r})

tests/tracer/test_sampler.py

@@ -6,7 +6,6 @@
 import mock
 import pytest
 
-from ddtrace._trace.context import Context
 from ddtrace._trace.sampler import DatadogSampler
 from ddtrace._trace.sampler import RateByServiceSampler
 from ddtrace._trace.sampler import RateSampler
@@ -23,6 +22,7 @@
 from ddtrace.internal.sampling import SAMPLING_DECISION_TRACE_TAG_KEY
 from ddtrace.internal.sampling import SamplingMechanism
 from ddtrace.internal.sampling import set_sampling_decision_maker
+from ddtrace.trace import Context
 from ddtrace.trace import Span
 
 from ..subprocesstest import run_in_subprocess

tests/tracer/test_trace_utils.py

@@ -14,7 +14,6 @@
 import pytest
 
 from ddtrace import config
-from ddtrace._trace.context import Context
 from ddtrace.contrib.internal import trace_utils
 from ddtrace.contrib.internal.trace_utils import _get_request_header_client_ip
 from ddtrace.ext import SpanTypes
@@ -26,6 +25,7 @@
 from ddtrace.propagation.http import HTTP_HEADER_TRACE_ID
 from ddtrace.settings import Config
 from ddtrace.settings import IntegrationConfig
+from ddtrace.trace import Context
 from ddtrace.trace import Pin
 from ddtrace.trace import Span
 from ddtrace.trace import Tracer

tests/tracer/test_tracer.py

@@ -15,7 +15,6 @@
 import pytest
 
 import ddtrace
-from ddtrace._trace.context import Context
 from ddtrace._trace.span import _is_top_level
 from ddtrace.constants import _HOSTNAME_KEY
 from ddtrace.constants import _ORIGIN_KEY
@@ -40,6 +39,7 @@
 from ddtrace.internal.writer import AgentWriter
 from ddtrace.internal.writer import LogWriter
 from ddtrace.settings import Config
+from ddtrace.trace import Context
 from ddtrace.trace import Tracer
 from tests.subprocesstest import run_in_subprocess
 from tests.utils import TracerTestCase

tests/tracer/test_utils.py

@@ -7,7 +7,6 @@
 import mock
 import pytest
 
-from ddtrace._trace.context import Context
 from ddtrace.internal.utils import ArgumentError
 from ddtrace.internal.utils import get_argument_value
 from ddtrace.internal.utils import set_argument_value
@@ -21,6 +20,7 @@
 from ddtrace.internal.utils.formats import parse_tags_str
 from ddtrace.internal.utils.http import w3c_get_dd_list_member
 from ddtrace.internal.utils.importlib import func_name
+from ddtrace.trace import Context
 
 
 class TestUtils(unittest.TestCase):

tests/webclient.py

@@ -2,9 +2,9 @@
 
 import requests
 
-from ddtrace._trace.context import Context
 from ddtrace.internal.utils.retry import retry
 from ddtrace.propagation.http import HTTPPropagator
+from ddtrace.trace import Context
 from ddtrace.trace import TraceFilter