chore(ci_visibility): test old pytest plugin on the ddtrace CI

ddtrace/ext/git.py

@@ -413,7 +413,7 @@ def extract_user_git_metadata(env=None):
         branch = None
 
     tags = {}
-    tags[REPOSITORY_URL] = env.get("DD_GIT_REPOSITORY_URL")
+    tags[REPOSITORY_URL] = env.get("_CI_DD_GIT_REPOSITORY_URL") or env.get("DD_GIT_REPOSITORY_URL")
     tags[COMMIT_SHA] = env.get("DD_GIT_COMMIT_SHA")
     tags[BRANCH] = branch
     tags[TAG] = tag

ddtrace/testing/internal/git.py

@@ -393,7 +393,7 @@ def get_git_tags_from_dd_variables(env: t.MutableMapping[str, str]) -> t.Dict[st
         branch = None
 
     tags: t.Dict[str, t.Optional[str]] = {
-        GitTag.REPOSITORY_URL: env.get("DD_GIT_REPOSITORY_URL"),
+        GitTag.REPOSITORY_URL: env.get("_CI_DD_GIT_REPOSITORY_URL") or env.get("DD_GIT_REPOSITORY_URL"),
         GitTag.COMMIT_SHA: env.get("DD_GIT_COMMIT_SHA"),
         GitTag.BRANCH: branch,
         GitTag.TAG: tag,

ddtrace/testing/internal/pytest/plugin.py

@@ -138,6 +138,11 @@ def __init__(self, session_manager: SessionManager) -> None:
         # during tests are captured by us (and not sent to the APM agent, for instance).
         self.enable_ddtrace_trace_filter = True
 
+        # EXCEPTION: When testing ddtrace itself, we don't want to interfere with the normal operation of the tracer,
+        # and want ddtrace spans to be entirely independent from the test spans.
+        if asbool(os.environ.get("_DD_CIVISIBILITY_USE_CI_CONTEXT_PROVIDER")):
+            self.enable_ddtrace_trace_filter = False
+
         self.enable_all_ddtrace_integrations = False
         self.reports_by_nodeid: t.Dict[str, _ReportGroup] = defaultdict(lambda: {})
         self.excinfo_by_report: t.Dict[pytest.TestReport, t.Optional[pytest.ExceptionInfo[t.Any]]] = {}

riotfile.py

@@ -118,6 +118,8 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
         "DD_PATCH_MODULES": "unittest:false",
         "CMAKE_BUILD_PARALLEL_LEVEL": "12",
         "CARGO_BUILD_JOBS": "12",
+        "_CI_DD_GIT_REPOSITORY_URL": "http://github.com/test-org/test-repo.git",
+        # "DD_PYTEST_USE_NEW_PLUGIN": "true",
     },
     venvs=[
         Venv(
@@ -1225,6 +1227,9 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
                         # DEV: Breaking change made in 2.1.0 release
                         "markupsafe": "<2.0",
                     },
+                    env={
+                        "DD_PYTEST_USE_NEW_PLUGIN": "false",  # env uses pytest <= 7.2.0
+                    },
                     venvs=[
                         Venv(pys=["3.9"], pkgs={"exceptiongroup": latest}),
                     ],
@@ -1793,6 +1798,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
             },
             env={
                 "DD_AGENT_PORT": "9126",
+                "DD_PYTEST_USE_NEW_PLUGIN": "false",  # env has tests for the old pytest plugin
             },
             venvs=[
                 Venv(
@@ -1850,6 +1856,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
             env={
                 "DD_AGENT_PORT": "9126",
                 "DD_PYTEST_USE_NEW_PLUGIN": "true",
+                "_DD_CIVISIBILITY_USE_CI_CONTEXT_PROVIDER": "0",
             },
             venvs=[
                 Venv(
@@ -1903,6 +1910,9 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
             pkgs={
                 "pytest-randomly": latest,
             },
+            env={
+                "DD_PYTEST_USE_NEW_PLUGIN": "false",  # env uses pytest <= 7.2.0
+            },
             venvs=[
                 Venv(
                     pys="3.9",
@@ -1929,6 +1939,9 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
                     ">=6.0,<6.1",
                 ],
             },
+            env={
+                "DD_PYTEST_USE_NEW_PLUGIN": "false",  # env has tests for the old pytest plugin
+            },
             venvs=[
                 Venv(
                     pys="3.9",
@@ -1959,6 +1972,9 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
                 "msgpack": latest,
                 "pytest-randomly": latest,
             },
+            env={
+                "DD_PYTEST_USE_NEW_PLUGIN": "false",  # env has tests for the old pytest plugin
+            },
             venvs=[
                 Venv(
                     pkgs={
@@ -1977,6 +1993,9 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
                 "flaky": latest,
                 "pytest-randomly": latest,
             },
+            env={
+                "DD_PYTEST_USE_NEW_PLUGIN": "false",  # env has tests for the old pytest plugin
+            },
         ),
         Venv(
             name="grpc",
@@ -3219,6 +3238,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
             },
             env={
                 "DD_AGENT_PORT": "9126",
+                "DD_PYTEST_USE_NEW_PLUGIN": "false",  # env has tests for the old pytest plugin
             },
             venvs=[
                 Venv(

tests/tracer/test_logger.py

@@ -338,20 +338,20 @@ def test_logger_does_not_add_handler_when_configured():
 
 
 def test_logger_log_level_from_env(monkeypatch):
-    monkeypatch.setenv("_DD_TESTING_DEBUG_LOG_LEVEL", "DEBUG")
-    monkeypatch.setenv("_DD_TESTING_WARNING_LOG_LEVEL", "WARNING")
+    monkeypatch.setenv("_DD_EXAMPLE_DEBUG_LOG_LEVEL", "DEBUG")
+    monkeypatch.setenv("_DD_EXAMPLE_WARNING_LOG_LEVEL", "WARNING")
     monkeypatch.setenv("_DD_PACKAGE_WITH_UNDERSCORE_SUBMODULE_LOG_LEVEL", "ERROR")
 
     import ddtrace.internal.logger as dd_logger
 
     with mock.patch.object(dd_logger, "LOG_LEVEL_TRIE", dd_logger.LoggerPrefix.build_trie()):
-        assert get_logger("ddtrace.testing.debug.foo.bar").level == logging.DEBUG
-        assert get_logger("ddtrace.testing.debug.foo").level == logging.DEBUG
-        assert get_logger("ddtrace.testing.debug").level == logging.DEBUG
-        assert get_logger("ddtrace.testing").level < logging.DEBUG
-
-        assert get_logger("ddtrace.testing.warning.foo.bar").level == logging.WARNING
-        assert get_logger("ddtrace.testing.warning.foo").level == logging.WARNING
-        assert get_logger("ddtrace.testing.warning").level == logging.WARNING
+        assert get_logger("ddtrace.example.debug.foo.bar").level == logging.DEBUG
+        assert get_logger("ddtrace.example.debug.foo").level == logging.DEBUG
+        assert get_logger("ddtrace.example.debug").level == logging.DEBUG
+        assert get_logger("ddtrace.example").level < logging.DEBUG
+
+        assert get_logger("ddtrace.example.warning.foo.bar").level == logging.WARNING
+        assert get_logger("ddtrace.example.warning.foo").level == logging.WARNING
+        assert get_logger("ddtrace.example.warning").level == logging.WARNING
 
         assert get_logger("ddtrace.package_with_underscore.submodule").level == logging.ERROR