update 3.8 from main for 3.8.0rc2 (#13453)

This change synchronizes the 3.8 branch with the main branch for the
purpose of making a new release candidate.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

---------

Co-authored-by: Munir Abdinur <[email protected]>
Co-authored-by: Santiago M. Mola <[email protected]>
Co-authored-by: Vítor De Araújo <[email protected]>
Co-authored-by: Yun Kim <[email protected]>
Co-authored-by: Brett Langdon <[email protected]>
Co-authored-by: kyle <[email protected]>
Co-authored-by: Federico Mon <[email protected]>

Author: 8 people

.gitlab/benchmarks/microbenchmarks.yml

@@ -163,7 +163,6 @@ microbenchmarks:
         - "packages_update_imported_dependencies"
         - "telemetry_add_metric"
         - "startup"
-        - "ddtrace_run"
 
 "microbenchmarks flaky":
   extends: .benchmarks

.riot/requirements/142556c.txt renamed to .riot/requirements/1f5205e.txt

@@ -2,36 +2,36 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/142556c.in
+#    pip-compile --no-annotate .riot/requirements/1f5205e.in
 #
-atomicwrites==1.4.1
-attrs==24.2.0
+attrs==25.3.0
 blinker==1.9.0
-click==8.1.7
-coverage[toml]==7.6.7
-exceptiongroup==1.2.2
+click==8.1.8
+coverage[toml]==7.8.0
+exceptiongroup==1.3.0
 flask==0.12.5
 flask-cache==0.13.1
 hypothesis==6.45.0
-importlib-metadata==8.5.0
+importlib-metadata==8.7.0
+iniconfig==2.1.0
 itsdangerous==1.1.0
 jinja2==2.10.3
 markupsafe==1.1.1
-mock==5.1.0
+mock==5.2.0
 more-itertools==8.10.0
 opentracing==2.4.0
-packaging==24.2
-pluggy==0.13.1
+packaging==25.0
+pluggy==1.6.0
 py==1.11.0
-pytest==4.6.11
+pytest==6.2.5
 pytest-cov==3.0.0
 pytest-mock==2.0.0
 pytest-randomly==3.16.0
 python-memcached==1.62
 redis==2.10.6
-six==1.16.0
 sortedcontainers==2.4.0
-tomli==2.1.0
-wcwidth==0.2.13
+toml==0.10.2
+tomli==2.2.1
+typing-extensions==4.13.2
 werkzeug==0.16.1
 zipp==3.21.0

.riot/requirements/af02264.txt renamed to .riot/requirements/f903257.txt

@@ -2,36 +2,36 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/af02264.in
+#    pip-compile --no-annotate .riot/requirements/f903257.in
 #
-atomicwrites==1.4.1
-attrs==24.2.0
+attrs==25.3.0
 blinker==1.8.2
-click==8.1.7
+click==8.1.8
 coverage[toml]==7.6.1
-exceptiongroup==1.2.2
+exceptiongroup==1.3.0
 flask==0.12.5
 flask-cache==0.13.1
 hypothesis==6.45.0
 importlib-metadata==8.5.0
+iniconfig==2.1.0
 itsdangerous==1.1.0
 jinja2==2.10.3
 markupsafe==1.1.1
-mock==5.1.0
+mock==5.2.0
 more-itertools==8.10.0
 opentracing==2.4.0
-packaging==24.2
-pluggy==0.13.1
+packaging==25.0
+pluggy==1.5.0
 py==1.11.0
-pytest==4.6.11
+pytest==6.2.5
 pytest-cov==3.0.0
 pytest-mock==2.0.0
 pytest-randomly==3.15.0
 python-memcached==1.62
 redis==2.10.6
-six==1.16.0
 sortedcontainers==2.4.0
-tomli==2.1.0
-wcwidth==0.2.13
+toml==0.10.2
+tomli==2.2.1
+typing-extensions==4.13.2
 werkzeug==0.16.1
 zipp==3.20.2

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 Changelogs for versions not listed here can be found at https://github.com/DataDog/dd-trace-py/releases
 
+---
+
+## 3.7.1
+
+
+### Bug Fixes
+
+- CI Visibility
+  - Resolves an issue where pytest-xdist would not exit with the proper status code if ATR was enabled.
+  - Resolves an issue where ddtrace pytest plugin used with xdist would report test suites as failing even when all tests pass.
+
+
 ---
 
 ## 2.21.8

benchmarks/ddtrace_run/config.yaml

@@ -1,5 +1,7 @@
 baseline: &defaults
   env: {}
+  ddtrace_run: false
+  send_span: false
   import_ddtrace: false
   import_ddtrace_auto: false
   import_flask: false
@@ -32,3 +34,29 @@ import_ddtrace_auto_django:
   <<: *defaults
   import_ddtrace_auto: true
   import_django: true
+ddtrace_run:
+  <<: *defaults
+  ddtrace_run: true
+ddtrace_run_appsec:
+  <<: *defaults
+  env: {"DD_APPSEC_ENABLED": "true"}
+  ddtrace_run: true
+ddtrace_run_profiling:
+  <<: *defaults
+  env: {"DD_PROFILING_ENABLED": "true"}
+  ddtrace_run: true
+ddtrace_run_telemetry_enabled:
+  <<: *defaults
+  env: {"_DD_INSTRUMENTATION_TELEMETRY_TESTS_FORCE_APP_STARTED": "true"}
+  ddtrace_run: true
+ddtrace_run_telemetry_disabled:
+  <<: *defaults
+  env: {"DD_INSTRUMENTATION_TELEMETRY_ENABLED": "false", "_DD_INSTRUMENTATION_TELEMETRY_TESTS_FORCE_APP_STARTED": "false"}
+  ddtrace_run: true
+ddtrace_run_send_span:
+  <<: *defaults
+  send_span: true
+ddtrace_run_runtime_metrics:
+  <<: *defaults
+  env: {"DD_RUNTIME_METRICS_ENABLED": "true"}
+  ddtrace_run: true

benchmarks/ddtrace_run/scenario.py

@@ -8,8 +8,10 @@
 class Startup(bm.Scenario):
     import_ddtrace: bool
     import_ddtrace_auto: bool
+    ddtrace_run: bool
     import_flask: bool
     import_django: bool
+    send_span: bool
     env: str
 
     def run(self):
@@ -33,8 +35,15 @@ def run(self):
             # `import django` doesn't really do anything, `django.core.management` is what `manage.py` uses
             commands.append("import django.core.management")
 
+        if self.send_span:
+            commands.append("from ddtrace.trace import tracer")
+            commands.append("tracer.trace('test-x', service='bench-test').finish()")
+
         args = ["python", "-c"] + [";".join(commands)]
 
+        if self.ddtrace_run:
+            args = ["ddtrace-run"] + args
+
         def _(loops: int):
             for _ in range(loops):
                 subprocess.check_call(args=args, env=env)

benchmarks/startup/config.yaml

@@ -30,6 +30,7 @@
     List[SpanLink],  #  span_links
     Dict[str, Any],  # baggage
     bool,  # is_remote
+    bool,  # _reactivate
 ]
 
 
@@ -104,11 +105,21 @@ def __getstate__(self) -> _ContextState:
             self._span_links,
             self._baggage,
             self._is_remote,
+            self._reactivate,
             # Note: self._lock is not serializable
         )
 
     def __setstate__(self, state: _ContextState) -> None:
-        self.trace_id, self.span_id, self._meta, self._metrics, self._span_links, self._baggage, self._is_remote = state
+        (
+            self.trace_id,
+            self.span_id,
+            self._meta,
+            self._metrics,
+            self._span_links,
+            self._baggage,
+            self._is_remote,
+            self._reactivate,
+        ) = state
         # We cannot serialize and lock, so we must recreate it unless we already have one
         self._lock = threading.RLock()