Merge branch 'munir/make-tracer-a-singleton-2' into munir/remove-deprecations-from-pin

Author: mabdinur

Diff for: ddtrace/_trace/tracer.py

@@ -216,7 +216,7 @@ def __init__(
             if Tracer._instance is None:
                 Tracer._instance = self
             else:
-                raise ValueError(
+                log.error(
                     "Multiple Tracer instances can not be initialized. Use ``ddtrace.trace.tracer`` instead.",
                 )
 

Diff for: releasenotes/notes/drop-multitracer-support-ec109486f71c9c62.yaml

@@ -1,6 +1,4 @@
 ---
 upgrade:
   - |
-    tracing: Drops support for multiple Tracer instances in the same process. Use ``ddtrace.trace.tracer`` to access the global tracer instance.
-  - |
-    pin: Removes the ``tracer`` parameter from ``ddtrace.trace.Pin`` methods. All Pin objects now use the global tracer instance.
+    tracing: Drops support for multiple Tracer instances in the same process. Use ``ddtrace.trace.tracer`` to access the global tracer instance.

Diff for: tests/contrib/kafka/test_kafka.py

@@ -22,7 +22,7 @@
 from ddtrace.internal.utils.retry import fibonacci_backoff_with_jitter
 from ddtrace.trace import Pin
 from ddtrace.trace import TraceFilter
-from ddtrace.trace import tracer as ddtracer
+from ddtrace.trace import Tracer
 from tests.contrib.config import KAFKA_CONFIG
 from tests.datastreams.test_public_api import MockedTracer
 from tests.utils import DummyTracer
@@ -106,16 +106,16 @@ def should_filter_empty_polls():
 @pytest.fixture
 def tracer(should_filter_empty_polls):
     patch()
+    t = Tracer()
     if should_filter_empty_polls:
-        ddtracer.configure(trace_processors=[KafkaConsumerPollFilter()])
+        t._configure(trace_processors=[KafkaConsumerPollFilter()])
     # disable backoff because it makes these tests less reliable
-    previous_backoff = ddtracer._writer._send_payload_with_backoff
-    ddtracer._writer._send_payload_with_backoff = ddtracer._writer._send_payload
+    t._writer._send_payload_with_backoff = t._writer._send_payload
     try:
-        yield ddtracer
+        yield t
     finally:
-        ddtracer.flush()
-        ddtracer._writer._send_payload_with_backoff = previous_backoff
+        t.flush()
+        t.shutdown()
         unpatch()
 
 
@@ -124,8 +124,6 @@ def dsm_processor(tracer):
     processor = tracer.data_streams_processor
     with mock.patch("ddtrace.internal.datastreams.data_streams_processor", return_value=processor):
         yield processor
-        # flush buckets for the next test run
-        processor.periodic()
 
 
 @pytest.fixture
@@ -327,7 +325,6 @@ def test_commit_with_consume_with_multiple_messages(producer, consumer, kafka_to
 
 @pytest.mark.snapshot(ignores=SNAPSHOT_IGNORES)
 @pytest.mark.parametrize("should_filter_empty_polls", [False])
-@pytest.mark.skip(reason="FIXME: This test requires the initialization of a new tracer. This is not supported")
 def test_commit_with_consume_with_error(producer, consumer, kafka_topic):
     producer.produce(kafka_topic, PAYLOAD, key=KEY)
     producer.flush()

Diff for: tests/tracer/test_memory_leak.py

@@ -1,25 +1,21 @@
 """
 Variety of test cases ensuring that ddtrace does not leak memory.
 """
-from typing import TYPE_CHECKING
 from weakref import WeakValueDictionary
 
 import pytest
 
+from ddtrace.trace import Span
+from ddtrace.trace import Tracer
 from tests.utils import DummyTracer
 
 
-if TYPE_CHECKING:  # pragma: no cover
-    from ddtrace.trace import Span  # noqa:F401
-
-
 @pytest.fixture
 def tracer() -> DummyTracer:
     return DummyTracer()
 
 
-def trace(weakdict: WeakValueDictionary, tracer, *args, **kwargs):
-    # type: (...) -> Span
+def trace(weakdict: WeakValueDictionary, tracer: Tracer, *args, **kwargs) -> Span:
     """Return a span created from ``tracer`` and add it to the given weak
     dictionary.
 

Diff for: tests/tracer/test_processors.py

@@ -271,7 +271,6 @@ def test_trace_top_level_span_processor_same_service_name():
     """Parent span and child span have the same service name"""
 
     tracer = DummyTracer()
-    tracer._configure(writer=DummyWriter())
 
     with tracer.trace("parent", service="top_level_test") as parent:
         with tracer.trace("child") as child:
@@ -285,7 +284,6 @@ def test_trace_top_level_span_processor_different_service_name():
     """Parent span and child span have the different service names"""
 
     tracer = DummyTracer()
-    tracer._configure(writer=DummyWriter())
 
     with tracer.trace("parent", service="top_level_test_service") as parent:
         with tracer.trace("child", service="top_level_test_service2") as child:
@@ -299,7 +297,6 @@ def test_trace_top_level_span_processor_orphan_span():
     """Trace chuck does not contain parent span"""
 
     tracer = DummyTracer()
-    tracer._configure(writer=DummyWriter())
 
     with tracer.trace("parent") as parent:
         pass
@@ -633,7 +630,6 @@ def test_endpoint_call_counter_processor_disabled():
 def test_endpoint_call_counter_processor_real_tracer():
     tracer = DummyTracer()
     tracer._endpoint_call_counter_span_processor.enable()
-    tracer._configure(writer=DummyWriter())
 
     with tracer.trace("parent", service="top_level_test_service", resource="a", span_type=SpanTypes.WEB):
         with tracer.trace("child", service="top_level_test_service2"):
@@ -656,7 +652,6 @@ def test_endpoint_call_counter_processor_real_tracer():
 
 def test_trace_tag_processor_adds_chunk_root_tags():
     tracer = DummyTracer()
-    tracer._configure(writer=DummyWriter())
 
     with tracer.trace("parent") as parent:
         with tracer.trace("child") as child:

Diff for: tests/tracer/test_single_span_sampling_rules.py

@@ -11,7 +11,6 @@
 from ddtrace.internal.sampling import _get_file_json
 from ddtrace.internal.sampling import get_span_sampling_rules
 from tests.utils import DummyTracer
-from tests.utils import DummyWriter
 
 from ..utils import override_global_config
 
@@ -129,7 +128,6 @@ def test_env_rules_cause_matching_span_to_be_sampled():
         assert sampling_rules[0]._service_matcher.pattern == "test_service"
         assert sampling_rules[0]._name_matcher.pattern == "test_name"
         tracer = DummyTracer()
-        tracer._configure(writer=DummyWriter())
         span = traced_function(sampling_rules[0], tracer=tracer)
         assert_sampling_decision_tags(span)
 
@@ -141,7 +139,6 @@ def test_env_rules_dont_cause_non_matching_span_to_be_sampled():
         assert sampling_rules[0]._service_matcher.pattern == "test_ser"
         assert sampling_rules[0]._name_matcher.pattern == "test_na"
         tracer = DummyTracer()
-        tracer._configure(writer=DummyWriter())
         span = traced_function(sampling_rules[0], tracer=tracer)
         assert_sampling_decision_tags(span, sample_rate=None, mechanism=None, limit=None)
 
@@ -153,7 +150,6 @@ def test_single_span_rules_not_applied_when_span_sampled_by_trace_sampling():
         assert sampling_rules[0]._service_matcher.pattern == "test_service"
         assert sampling_rules[0]._name_matcher.pattern == "test_name"
         tracer = DummyTracer()
-        tracer._configure(writer=DummyWriter())
         span = traced_function(sampling_rules[0], tracer=tracer, trace_sampling=True)
         assert sampling_rules[0].match(span) is True
         assert_sampling_decision_tags(span, sample_rate=None, mechanism=None, limit=None, trace_sampling=True)

Diff for: tests/tracer/test_tracer.py

@@ -1994,10 +1994,13 @@ def mock_os_path_exists(path):
 
 @pytest.mark.subprocess()
 def test_multiple_tracer_instances():
-    import pytest
+    import mock
 
     import ddtrace
 
     assert ddtrace.trace.tracer is not None
-    with pytest.raises(ValueError):
+    with mock.patch("ddtrace._trace.tracer.log") as log:
         ddtrace.trace.Tracer()
+    log.error.assert_called_once_with(
+        "Multiple Tracer instances can not be initialized. " "Use ``ddtrace.trace.tracer`` instead."
+    )