chore(ci_visibility): revert sub-plugin strategy and move v2 functions to try-except blocks

.circleci/config.templ.yml

@@ -1045,6 +1045,14 @@ jobs:
           pattern: 'pytest'
           snapshot: true
 
+  pytest_v2:
+    <<: *machine_executor
+    parallelism: 10
+    steps:
+     - run_hatch_env_test:
+          env: 'pytest_plugin_v2'
+          snapshot: true
+
   unittest:
     <<: *machine_executor
     steps:

ddtrace/contrib/pytest/_utils.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 import json
 import os
+from pathlib import Path
 import re
 import typing as t
 
@@ -11,16 +12,21 @@
 from ddtrace.ext.ci_visibility.api import CISessionId
 from ddtrace.ext.ci_visibility.api import CISourceFileInfo
 from ddtrace.ext.ci_visibility.api import CISuiteId
+from ddtrace.ext.ci_visibility.api import CITest
 from ddtrace.ext.ci_visibility.api import CITestId
 from ddtrace.internal.ci_visibility.constants import ITR_UNSKIPPABLE_REASON
 from ddtrace.internal.ci_visibility.utils import get_source_lines_for_test_method
 from ddtrace.internal.logger import get_logger
+from ddtrace.internal.utils.cache import cached
+from ddtrace.internal.utils.formats import asbool
 from ddtrace.internal.utils.inspection import undecorated
 
 
 log = get_logger(__name__)
 
-_NODEID_REGEX = re.compile("^((?P<module>.*)/(?P<suite>[^/]*?))::(?P<name>.*?)$")
+_NODEID_REGEX = re.compile("^(((?P<module>.*)/)?(?P<suite>[^/]*?))::(?P<name>.*?)$")
+
+_USE_PLUGIN_V2 = asbool(os.environ.get("_DD_CIVISIBILITY_USE_PYTEST_V2", "false"))
 
 
 @dataclass
@@ -47,13 +53,16 @@ def _get_names_from_item(item: pytest.Item) -> TestNames:
 
     matches = re.match(_NODEID_REGEX, item.nodeid)
     if not matches:
-        return TestNames(module="", suite="", test="")
+        return TestNames(module="unknown_module", suite="unknown_suite", test=item.name)
 
-    return TestNames(
-        module=matches.group("module").replace("/", "."), suite=matches.group("suite"), test=matches.group("name")
-    )
+    module_name = (matches.group("module") or "").replace("/", ".")
+    suite_name = matches.group("suite")
+    test_name = matches.group("name")
+
+    return TestNames(module=module_name, suite=suite_name, test=test_name)
 
 
+@cached()
 def _get_test_id_from_item(item: pytest.Item) -> CITestId:
     """Converts an item to a CITestId, which recursively includes the parent IDs
 
@@ -72,20 +81,25 @@ def _get_test_id_from_item(item: pytest.Item) -> CITestId:
     # Test parameters are part of the test ID
     parameters_json: t.Optional[str] = None
     if getattr(item, "callspec", None):
-        parameters = {"arguments": {}, "metadata": {}}  # type: Dict[str, Dict[str, str]]
+        parameters: t.Dict[str, t.Dict[str, str]] = {"arguments": {}, "metadata": {}}
         for param_name, param_val in item.callspec.params.items():
             try:
                 parameters["arguments"][param_name] = _encode_test_parameter(param_val)
             except Exception:
                 parameters["arguments"][param_name] = "Could not encode"
                 log.warning("Failed to encode %r", param_name, exc_info=True)
+
         parameters_json = json.dumps(parameters)
 
     test_id = CITestId(suite_id, test_name, parameters_json)
 
     return test_id
 
 
+def _get_module_path_from_item(item: pytest.Item) -> Path:
+    return Path(item.nodeid.rpartition("/")[0]).absolute()
+
+
 def _get_session_command(session: pytest.Session):
     """Extract and re-create pytest session command from pytest config."""
     command = "pytest"
@@ -130,17 +144,21 @@ def _pytest_marked_to_skip(item: pytest.Item) -> bool:
     if item.get_closest_marker("skip") is not None:
         return True
 
-    return any([True for marker in item.iter_markers(name="skipif") if marker.args[0] is True])
+    return any(marker.args[0] for marker in item.iter_markers(name="skipif"))
 
 
 def _is_test_unskippable(item: pytest.Item) -> bool:
     """Returns True if a test has a skipif marker with value false and reason ITR_UNSKIPPABLE_REASON"""
     return any(
-        [
-            True
-            for marker in item.iter_markers(name="skipif")
-            if marker.args[0] is False
-            and "reason" in marker.kwargs
-            and marker.kwargs["reason"] is ITR_UNSKIPPABLE_REASON
-        ]
+        (marker.args[0] is False and marker.kwargs.get("reason") is ITR_UNSKIPPABLE_REASON)
+        for marker in item.iter_markers(name="skipif")
     )
+
+
+def _extract_span(item):
+    """Extract span from `pytest.Item` instance."""
+    if _USE_PLUGIN_V2:
+        test_id = _get_test_id_from_item(item)
+        return CITest.get_span(test_id)
+
+    return getattr(item, "_datadog_span", None)

ddtrace/contrib/pytest/plugin.py

@@ -17,7 +17,10 @@
 
 import pytest
 
+from ddtrace.contrib.pytest._utils import _USE_PLUGIN_V2
+from ddtrace.contrib.pytest._utils import _extract_span
 from ddtrace.contrib.pytest._utils import _pytest_version_supports_itr
+from ddtrace.internal.utils.formats import asbool
 
 
 DDTRACE_HELP_MSG = "Enable tracing of pytest functions."
@@ -100,7 +103,6 @@ def pytest_load_initial_conftests(early_config, parser, args):
         # Enables experimental use of ModuleCodeCollector for coverage collection.
         from ddtrace.internal.ci_visibility.coverage import USE_DD_COVERAGE
         from ddtrace.internal.logger import get_logger
-        from ddtrace.internal.utils.formats import asbool
 
         log = get_logger(__name__)
 
@@ -113,7 +115,7 @@ def pytest_load_initial_conftests(early_config, parser, args):
 
             try:
                 workspace_path = Path(extract_workspace_path())
-            except ValueError:
+            except (ValueError, FileNotFoundError):
                 workspace_path = Path(os.getcwd())
 
             log.warning("Installing ModuleCodeCollector with include_paths=%s", [workspace_path])
@@ -128,25 +130,37 @@ def pytest_load_initial_conftests(early_config, parser, args):
                 )
 
 
+# Version-specific pytest hooks
+if _USE_PLUGIN_V2:
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_collection_finish  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_configure as _versioned_pytest_configure
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_ddtrace_get_item_module_name  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_ddtrace_get_item_suite_name  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_ddtrace_get_item_test_name  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_runtest_makereport  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_runtest_protocol  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_sessionfinish  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v2 import pytest_sessionstart  # noqa: F401
+else:
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_collection_modifyitems  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_configure as _versioned_pytest_configure
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_ddtrace_get_item_module_name  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_ddtrace_get_item_suite_name  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_ddtrace_get_item_test_name  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_runtest_makereport  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_runtest_protocol  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_sessionfinish  # noqa: F401
+    from ddtrace.contrib.pytest._plugin_v1 import pytest_sessionstart  # noqa: F401
+
+    # Internal coverage is only used for ITR at the moment, so the hook is only added if the pytest version supports it
+    if _pytest_version_supports_itr():
+        from ddtrace.contrib.pytest._plugin_v1 import pytest_terminal_summary  # noqa: F401
+
+
 def pytest_configure(config):
     config.addinivalue_line("markers", "dd_tags(**kwargs): add tags to current span")
     if is_enabled(config):
-        from ddtrace.internal.utils.formats import asbool
-
-        if asbool(os.environ.get("_DD_CIVISIBILITY_USE_PYTEST_V2", "false")):
-            from ddtrace.internal.logger import get_logger
-
-            log = get_logger(__name__)
-
-            log.warning("The new ddtrace pytest plugin is in beta and is not currently supported")
-            from ._plugin_v2 import _PytestDDTracePluginV2
-
-            config.pluginmanager.register(_PytestDDTracePluginV2(), "_datadog-pytest-v2")
-            return
-
-        from ._plugin_v1 import _PytestDDTracePluginV1
-
-        config.pluginmanager.register(_PytestDDTracePluginV1(), "_datadog-pytest-v1")
+        _versioned_pytest_configure(config)
 
 
 @pytest.hookimpl
@@ -161,7 +175,6 @@ def ddspan(request):
     """Return the :class:`ddtrace._trace.span.Span` instance associated with the
     current test when Datadog CI Visibility is enabled.
     """
-    from ddtrace.contrib.pytest._plugin_v1 import _extract_span
     from ddtrace.internal.ci_visibility import CIVisibility as _CIVisibility
 
     if _CIVisibility.enabled:
@@ -190,3 +203,6 @@ def patch_all(request):
 
     if request.config.getoption("ddtrace-patch-all") or request.config.getini("ddtrace-patch-all"):
         ddtrace.patch_all()
+
+
+# from ddtrace.contrib.pytest._plugin_v2 import pytest_collection_modifyitems

ddtrace/contrib/pytest_bdd/_plugin.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from ddtrace.contrib.pytest._plugin_v1 import _extract_span as _extract_feature_span
+from ddtrace.contrib.pytest._utils import _extract_span as _extract_feature_span
 from ddtrace.contrib.pytest_bdd import get_version
 from ddtrace.contrib.pytest_bdd.constants import FRAMEWORK
 from ddtrace.contrib.pytest_bdd.constants import STEP_KIND

ddtrace/contrib/pytest_benchmark/_plugin.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ddtrace.contrib.pytest._plugin_v1 import _extract_span
+from ddtrace.contrib.pytest._utils import _extract_span
 from ddtrace.contrib.pytest_benchmark.constants import BENCHMARK_INFO
 from ddtrace.contrib.pytest_benchmark.constants import PLUGIN_METRICS
 from ddtrace.contrib.pytest_benchmark.constants import PLUGIN_OUTLIERS

ddtrace/ext/ci_visibility/_ci_visibility_base.py

@@ -59,6 +59,10 @@ def get_parent_id(self) -> PT:
 
 
 class _CIVisibilityAPIBase(abc.ABC):
+    class GetTagArgs(NamedTuple):
+        item_id: Union[_CIVisibilityChildItemIdBase, _CIVisibilityRootItemIdBase]
+        name: str
+
     class SetTagArgs(NamedTuple):
         item_id: Union[_CIVisibilityChildItemIdBase, _CIVisibilityRootItemIdBase]
         name: str