update tests

Author: mabdinur

tests/appsec/contrib_appsec/django_app/urls.py

@@ -196,7 +196,7 @@ def login_user(request):
 def new_service(request, service_name: str):
     import ddtrace
 
-    ddtrace.trace.Pin.override(django, service=service_name, tracer=ddtrace.tracer)
+    ddtrace.trace.Pin._override(django, service=service_name, tracer=ddtrace.tracer)
     return HttpResponse(service_name, status=200)
 
 

tests/appsec/contrib_appsec/fastapi_app/app.py

@@ -104,7 +104,7 @@ async def multi_view_no_param(request: Request):  # noqa: B008
     async def new_service(service_name: str, request: Request):  # noqa: B008
         import ddtrace
 
-        ddtrace.trace.Pin.override(app, service=service_name, tracer=ddtrace.tracer)
+        ddtrace.trace.Pin._override(app, service=service_name, tracer=ddtrace.tracer)
         return HTMLResponse(service_name, 200)
 
     async def slow_numbers(minimum, maximum):

tests/appsec/contrib_appsec/flask_app/app.py

@@ -55,7 +55,7 @@ def multi_view(param_int=0, param_str=""):
 def new_service(service_name: str):
     import ddtrace
 
-    ddtrace.trace.Pin.override(Flask, service=service_name, tracer=ddtrace.tracer)
+    ddtrace.trace.Pin._override(Flask, service=service_name, tracer=ddtrace.tracer)
     return service_name
 
 

tests/appsec/contrib_appsec/test_flask.py

@@ -37,7 +37,7 @@ def setUp(self):
         self.app = app
         self.app.test_client_class = DDFlaskTestClient
         self.client = self.app.test_client()
-        Pin.override(self.app, tracer=self.tracer)
+        Pin._override(self.app, tracer=self.tracer)
 
     def tearDown(self):
         super(BaseFlaskTestCase, self).tearDown()

tests/appsec/contrib_appsec/utils.py

@@ -1568,7 +1568,7 @@ def test_tracer():
 @contextmanager
 def post_tracer(interface):
     original_tracer = getattr(ddtrace.trace.Pin.get_from(interface.framework), "tracer", None)
-    ddtrace.trace.Pin.override(interface.framework, tracer=interface.tracer)
+    ddtrace.trace.Pin._override(interface.framework, tracer=interface.tracer)
     yield
     if original_tracer is not None:
-        ddtrace.trace.Pin.override(interface.framework, tracer=original_tracer)
+        ddtrace.trace.Pin._override(interface.framework, tracer=original_tracer)

tests/appsec/integrations/django_tests/conftest.py

@@ -38,7 +38,7 @@ def tracer():
     # Patch Django and override tracer to be our test tracer
     pin = Pin.get_from(django)
     original_tracer = pin.tracer
-    Pin.override(django, tracer=tracer)
+    Pin._override(django, tracer=tracer)
 
     # Yield to our test
     yield tracer
@@ -47,7 +47,7 @@ def tracer():
     # Reset the tracer pinned to Django and unpatch
     # DEV: unable to properly unpatch and reload django app with each test
     # unpatch()
-    Pin.override(django, tracer=original_tracer)
+    Pin._override(django, tracer=original_tracer)
 
 
 @pytest.fixture

tests/contrib/aiobotocore/utils.py

@@ -42,11 +42,11 @@ async def aiobotocore_client(service, tracer):
         client, aiobotocore.session.ClientCreatorContext
     ):
         async with client as client:
-            Pin.override(client, tracer=tracer)
+            Pin._override(client, tracer=tracer)
             await yield_(client)
 
     else:
-        Pin.override(client, tracer=tracer)
+        Pin._override(client, tracer=tracer)
         try:
             await yield_(client)
         finally:

tests/contrib/aiohttp/test_aiohttp_client.py

@@ -189,7 +189,7 @@ def test_configure_service_name_pin(ddtrace_run_python_code_in_subprocess):
 
 async def test():
     async with aiohttp.ClientSession() as session:
-        Pin.override(session, service="pin-custom-svc")
+        Pin._override(session, service="pin-custom-svc")
         async with session.get(URL_200) as resp:
             pass
 

tests/contrib/aiohttp_jinja2/conftest.py

@@ -13,7 +13,7 @@
 def patched_app_tracer_jinja(patched_app_tracer):  # noqa: F811
     app, tracer = patched_app_tracer
     patch()
-    Pin.override(aiohttp_jinja2, tracer=tracer)
+    Pin._override(aiohttp_jinja2, tracer=tracer)
     yield app, tracer
     unpatch()
 
@@ -22,6 +22,6 @@ def patched_app_tracer_jinja(patched_app_tracer):  # noqa: F811
 def untraced_app_tracer_jinja(untraced_app_tracer):  # noqa: F811
     patch()
     app, tracer = untraced_app_tracer
-    Pin.override(aiohttp_jinja2, tracer=tracer)
+    Pin._override(aiohttp_jinja2, tracer=tracer)
     yield app, tracer
     unpatch()

tests/contrib/aiohttp_jinja2/test_aiohttp_jinja2.py

@@ -35,7 +35,7 @@ async def test_template_rendering(untraced_app_tracer_jinja, aiohttp_client):
 
 async def test_template_rendering_snapshot(untraced_app_tracer_jinja, aiohttp_client, snapshot_context):
     app, _ = untraced_app_tracer_jinja
-    Pin.override(aiohttp_jinja2, tracer=tracer)
+    Pin._override(aiohttp_jinja2, tracer=tracer)
     with snapshot_context():
         client = await aiohttp_client(app)
         # it should trace a template rendering
@@ -51,7 +51,7 @@ async def test_template_rendering_snapshot_patched_server(
     use_global_tracer,
 ):
     app, _ = patched_app_tracer_jinja
-    Pin.override(aiohttp_jinja2, tracer=tracer)
+    Pin._override(aiohttp_jinja2, tracer=tracer)
     # Ignore meta.http.url tag as the port is not fixed on the server
     with snapshot_context(ignores=["meta.http.url", "meta.http.useragent"]):
         client = await aiohttp_client(app)

tests/contrib/aiomysql/test_aiomysql.py

@@ -62,7 +62,7 @@ async def test_queries(snapshot_conn):
 @pytest.mark.asyncio
 @pytest.mark.snapshot
 async def test_pin_override(patched_conn, tracer):
-    Pin.override(patched_conn, service="db")
+    Pin._override(patched_conn, service="db")
     cursor = await patched_conn.cursor()
     await cursor.execute("SELECT 1")
     rows = await cursor.fetchall()
@@ -78,7 +78,7 @@ async def test_patch_unpatch(tracer, test_spans):
     service = "fo"
 
     conn = await aiomysql.connect(**AIOMYSQL_CONFIG)
-    Pin.get_from(conn).clone(service=service, tracer=tracer).onto(conn)
+    Pin.get_from(conn)._clone(service=service, tracer=tracer).onto(conn)
     await (await conn.cursor()).execute("select 'dba4x4'")
     conn.close()
 
@@ -100,7 +100,7 @@ async def test_patch_unpatch(tracer, test_spans):
     patch()
 
     conn = await aiomysql.connect(**AIOMYSQL_CONFIG)
-    Pin.get_from(conn).clone(service=service, tracer=tracer).onto(conn)
+    Pin.get_from(conn)._clone(service=service, tracer=tracer).onto(conn)
     await (await conn.cursor()).execute("select 'dba4x4'")
     conn.close()
 
@@ -237,7 +237,7 @@ async def _get_conn_tracer(self, tags=None):
             assert pin
             # Customize the service
             # we have to apply it on the existing one since new one won't inherit `app`
-            pin.clone(tracer=self.tracer, tags={**tags, **pin.tags}).onto(self.conn)
+            pin._clone(tracer=self.tracer, tags={**tags, **pin.tags}).onto(self.conn)
 
             return self.conn, self.tracer
 

tests/contrib/aiopg/test.py

@@ -39,7 +39,7 @@ def tearDown(self):
     @pytest.mark.asyncio
     async def _get_conn_and_tracer(self):
         conn = self._conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
 
         return conn, self.tracer
 
@@ -159,7 +159,7 @@ async def test_connect_factory(self):
         services = ["db", "another"]
         for service in services:
             conn, _ = await self._get_conn_and_tracer()
-            Pin.get_from(conn).clone(service=service, tracer=self.tracer).onto(conn)
+            Pin.get_from(conn)._clone(service=service, tracer=self.tracer).onto(conn)
             await self.assert_conn_is_traced(self.tracer, conn, service)
             conn.close()
 
@@ -172,7 +172,7 @@ async def test_patch_unpatch(self):
         service = "fo"
 
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(service=service, tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(service=service, tracer=self.tracer).onto(conn)
         await (await conn.cursor()).execute("select 'blah'")
         conn.close()
 
@@ -194,7 +194,7 @@ async def test_patch_unpatch(self):
         patch()
 
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(service=service, tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(service=service, tracer=self.tracer).onto(conn)
         await (await conn.cursor()).execute("select 'blah'")
         conn.close()
 
@@ -218,7 +218,7 @@ async def test_user_specified_service_v0(self):
         assert config.service == "mysvc"
 
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
         await (await conn.cursor()).execute("select 'blah'")
         conn.close()
 
@@ -240,7 +240,7 @@ async def test_user_specified_service_v1(self):
         assert config.service == "mysvc"
 
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
         await (await conn.cursor()).execute("select 'blah'")
         conn.close()
 
@@ -258,7 +258,7 @@ async def test_unspecified_service_v1(self):
         """
         # Ensure that the service name was configured
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
         await (await conn.cursor()).execute("select 'blah'")
         conn.close()
 
@@ -271,7 +271,7 @@ async def test_unspecified_service_v1(self):
     @run_in_subprocess(env_overrides=dict(DD_TRACE_SPAN_ATTRIBUTE_SCHEMA="v0"))
     async def test_trace_span_name_v0_schema(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
         await (await conn.cursor()).execute("select 'blah'")
         conn.close()
 
@@ -284,7 +284,7 @@ async def test_trace_span_name_v0_schema(self):
     @run_in_subprocess(env_overrides=dict(DD_TRACE_SPAN_ATTRIBUTE_SCHEMA="v1"))
     async def test_trace_span_name_v1_schema(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
         await (await conn.cursor()).execute("select 'blah'")
         conn.close()
 
@@ -299,7 +299,7 @@ async def test_trace_span_name_v1_schema(self):
     )
     async def test_user_specified_service_integration_v0(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
 
         cursor = await conn.cursor()
         await cursor.execute("SELECT 1")
@@ -314,7 +314,7 @@ async def test_user_specified_service_integration_v0(self):
     )
     async def test_user_specified_service_integration_v1(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
 
         cursor = await conn.cursor()
         await cursor.execute("SELECT 1")
@@ -327,7 +327,7 @@ async def test_user_specified_service_integration_v1(self):
     @AsyncioTestCase.run_in_subprocess(env_overrides=dict(DD_SERVICE="mysvc", DD_TRACE_SPAN_ATTRIBUTE_SCHEMA="v0"))
     async def test_user_specified_service_env_var_v0(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
 
         cursor = await conn.cursor()
         await cursor.execute("SELECT 1")
@@ -340,7 +340,7 @@ async def test_user_specified_service_env_var_v0(self):
     @AsyncioTestCase.run_in_subprocess(env_overrides=dict(DD_SERVICE="mysvc", DD_TRACE_SPAN_ATTRIBUTE_SCHEMA="v1"))
     async def test_user_specified_service_env_var_v1(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
 
         cursor = await conn.cursor()
         await cursor.execute("SELECT 1")
@@ -355,7 +355,7 @@ async def test_user_specified_service_env_var_v1(self):
     )
     async def test_pin_override_service_v1(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer, service="override").onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer, service="override").onto(conn)
 
         cursor = await conn.cursor()
         await cursor.execute("SELECT 1")
@@ -368,7 +368,7 @@ async def test_pin_override_service_v1(self):
     @AsyncioTestCase.run_in_subprocess(env_overrides=dict(DD_TRACE_SPAN_ATTRIBUTE_SCHEMA="v0"))
     async def test_span_name_v0_schema(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
 
         cursor = await conn.cursor()
         await cursor.execute("SELECT 1")
@@ -381,7 +381,7 @@ async def test_span_name_v0_schema(self):
     @AsyncioTestCase.run_in_subprocess(env_overrides=dict(DD_TRACE_SPAN_ATTRIBUTE_SCHEMA="v1"))
     async def test_span_name_v1_schema(self):
         conn = await aiopg.connect(**POSTGRES_CONFIG)
-        Pin.get_from(conn).clone(tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(tracer=self.tracer).onto(conn)
 
         cursor = await conn.cursor()
         await cursor.execute("SELECT 1")
@@ -395,7 +395,7 @@ class AiopgAnalyticsTestCase(AiopgTestCase):
     async def trace_spans(self):
         conn, _ = await self._get_conn_and_tracer()
 
-        Pin.get_from(conn).clone(service="db", tracer=self.tracer).onto(conn)
+        Pin.get_from(conn)._clone(service="db", tracer=self.tracer).onto(conn)
 
         cursor = await conn.cursor()
         await cursor.execute("select 'foobar'")

tests/contrib/algoliasearch/test.py

@@ -52,7 +52,7 @@ def search(self, query, args=None, request_options=None):
 
     def patch_algoliasearch(self):
         patch()
-        Pin.override(self.index, tracer=self.tracer)
+        Pin._override(self.index, tracer=self.tracer)
 
     def tearDown(self):
         super(AlgoliasearchTest, self).tearDown()
@@ -157,7 +157,7 @@ def test_patch_unpatch(self):
 
     def test_patch_all_auto_enable(self):
         patch_all()
-        Pin.override(self.index, tracer=self.tracer)
+        Pin._override(self.index, tracer=self.tracer)
         self.perform_search("test search")
 
         spans = self.get_spans()
@@ -179,7 +179,7 @@ def test_user_specified_service_default(self):
             The algoliasearch integration shouldn't use it as the service name
         """
         patch_all()
-        Pin.override(self.index, tracer=self.tracer)
+        Pin._override(self.index, tracer=self.tracer)
         self.perform_search("test search")
         spans = self.get_spans()
         self.reset()
@@ -195,7 +195,7 @@ def test_user_specified_service_v0(self):
             The algoliasearch integration shouldn't use it as the service name
         """
         patch_all()
-        Pin.override(self.index, tracer=self.tracer)
+        Pin._override(self.index, tracer=self.tracer)
         self.perform_search("test search")
         spans = self.get_spans()
         self.reset()
@@ -211,7 +211,7 @@ def test_user_specified_service_v1(self):
             so make sure that is used and not the v0 schema 'algoliasearch'
         """
         patch_all()
-        Pin.override(self.index, tracer=self.tracer)
+        Pin._override(self.index, tracer=self.tracer)
         self.perform_search("test search")
         spans = self.get_spans()
         self.reset()
@@ -223,7 +223,7 @@ def test_user_specified_service_v1(self):
     @TracerTestCase.run_in_subprocess(env_overrides=dict(DD_TRACE_SPAN_ATTRIBUTE_SCHEMA="v0"))
     def test_span_name_v0_schema(self):
         patch_all()
-        Pin.override(self.index, tracer=self.tracer)
+        Pin._override(self.index, tracer=self.tracer)
         self.perform_search("test search")
         spans = self.get_spans()
         self.reset()
@@ -235,7 +235,7 @@ def test_span_name_v0_schema(self):
     @TracerTestCase.run_in_subprocess(env_overrides=dict(DD_TRACE_SPAN_ATTRIBUTE_SCHEMA="v1"))
     def test_span_name_v1_schema(self):
         patch_all()
-        Pin.override(self.index, tracer=self.tracer)
+        Pin._override(self.index, tracer=self.tracer)
         self.perform_search("test search")
         spans = self.get_spans()
         self.reset()

tests/contrib/anthropic/conftest.py

@@ -36,7 +36,7 @@ def mock_tracer(ddtrace_global_config, anthropic):
     try:
         pin = Pin.get_from(anthropic)
         mock_tracer = DummyTracer(writer=DummyWriter(trace_flush_enabled=False))
-        pin.override(anthropic, tracer=mock_tracer)
+        pin._override(anthropic, tracer=mock_tracer)
         pin.tracer._configure()
         if ddtrace_global_config.get("_llmobs_enabled", False):
             # Have to disable and re-enable LLMObs to use to mock tracer.