Merge branch 'main' into test/symdb-fork-behaviour

Author: P403n1x87

.github/CODEOWNERS

@@ -126,6 +126,7 @@ tests/appsec/                       @DataDog/asm-python
 tests/contrib/subprocess            @DataDog/asm-python
 tests/snapshots/tests*appsec*.json  @DataDog/asm-python
 tests/contrib/*/test*appsec*.py     @DataDog/asm-python
+tests/contrib/*/test*iast*.py  @DataDog/asm-python
 scripts/iast/*                      @DataDog/asm-python
 
 # Profiling

.github/workflows/build_deploy.yml

@@ -50,8 +50,12 @@ jobs:
                 "$GITHUB_REF_NAME" =~ ^[0-9]+\.x$ ]]; then
             LIBRARY_VERSION=$(setuptools-scm --strip-dev)
           else
-            # All else, maintain the dev version
-            LIBRARY_VERSION=$(setuptools-scm)
+            # use version string explicitly set in the project metadata, if exists
+            LIBRARY_VERSION=$(grep '^version = ' pyproject.toml | tr -d '"' | cut -d' ' -f3)
+            if [[ -z $LIBRARY_VERSION ]]; then
+              # All else, maintain the dev version
+              LIBRARY_VERSION=$(setuptools-scm)
+            fi
           fi
 
           echo "${LIBRARY_VERSION}" | tee version.txt

.github/workflows/generate-package-versions.yml

@@ -49,6 +49,11 @@ jobs:
         with:
           python-version: "3.13"
 
+      - name: Setup Python 3.14
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        with:
+          python-version: "3.14"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
 
@@ -82,6 +87,8 @@ jobs:
           pip install riot==0.20.1
           pip install PyYAML
           pip install ddtrace
+          # Install latest pip-tools from main branch for Python 3.14 compatibility
+          pip install --upgrade git+https://github.com/jazzband/pip-tools.git@934b46a8795554f994b984ac743957f8458a29d6
 
       - name: Run regenerate-riot-latest
         run: scripts/regenerate-riot-latest.sh

.gitlab/package.yml

@@ -87,8 +87,6 @@ publish-wheels-to-s3:
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/mirror/amazon/aws-cli:2.4.29
   stage: package
-  rules:
-    - when: always
   needs:
     - job: download_ddtrace_artifacts
       artifacts: true

benchmarks/bm/flask_utils.py

@@ -101,7 +101,11 @@ def setup(self):
 
         if self.profiler_enabled:
             os.environ.update(
-                {"DD_PROFILING_ENABLED": "1", "DD_PROFILING_API_TIMEOUT": "0.1", "DD_PROFILING_UPLOAD_INTERVAL": "10"}
+                {
+                    "DD_PROFILING_ENABLED": "1",
+                    "DD_PROFILING_API_TIMEOUT_MS": "100",
+                    "DD_PROFILING_UPLOAD_INTERVAL": "10",
+                }
             )
             if not self.tracer_enabled:
                 import ddtrace.profiling.auto  # noqa:F401

benchmarks/coverage_fibonacci/config.yaml

@@ -1,8 +1,11 @@
 # Coverage benchmark configurations for fibonacci code
 # Tests sys.monitoring.DISABLE optimization performance
+# Configurations for both line-level and file-level coverage modes
 
+# Line-level coverage configurations (original mode)
 small: &base
   fib_n_recursive: 10
+  env_dd_coverage_file_level: "false"
 
 medium:
   <<: *base
@@ -11,3 +14,16 @@ medium:
 large:
   <<: *base
   fib_n_recursive: 20
+
+# File-level coverage configurations (lightweight mode)
+small_file: &base_file
+  fib_n_recursive: 10
+  env_dd_coverage_file_level: "true"
+
+medium_file:
+  <<: *base_file
+  fib_n_recursive: 15
+
+large_file:
+  <<: *base_file
+  fib_n_recursive: 20

benchmarks/coverage_fibonacci/scenario.py

@@ -21,9 +21,12 @@ class CoverageFibonacci(bm.Scenario):
 
     Tests the DISABLE optimization: returning sys.monitoring.DISABLE prevents
     the handler from being called repeatedly for the same line.
+
+    Can run in either line-level or file-level coverage mode.
     """
 
     fib_n_recursive: int
+    env_dd_coverage_file_level: str
 
     def run(self) -> Generator[Callable[[int], None], None, None]:
         import os
@@ -32,6 +35,9 @@ def run(self) -> Generator[Callable[[int], None], None, None]:
         from ddtrace.internal.coverage.code import ModuleCodeCollector
         from ddtrace.internal.coverage.installer import install
 
+        # Set coverage mode directly from parameter
+        os.environ["_DD_COVERAGE_FILE_LEVEL"] = self.env_dd_coverage_file_level
+
         # Install coverage
         install(include_paths=[Path(os.getcwd())])
 

benchmarks/django_simple/scenario.py

@@ -38,7 +38,11 @@ def run(self):
 
         if self.profiler_enabled:
             os.environ.update(
-                {"DD_PROFILING_ENABLED": "1", "DD_PROFILING_API_TIMEOUT": "0.1", "DD_PROFILING_UPLOAD_INTERVAL": "10"}
+                {
+                    "DD_PROFILING_ENABLED": "1",
+                    "DD_PROFILING_API_TIMEOUT_MS": "100",
+                    "DD_PROFILING_UPLOAD_INTERVAL": "10",
+                }
             )
         if self.appsec_enabled:
             os.environ.update({"DD_APPSEC_ENABLED ": "1"})

ddtrace/_trace/processor/resource_renaming.py

@@ -4,6 +4,7 @@
 from urllib.parse import urlparse
 
 from ddtrace._trace.processor import SpanProcessor
+from ddtrace._trace.span import Span
 from ddtrace.ext import SpanTypes
 from ddtrace.ext import http
 from ddtrace.internal.logger import get_logger
@@ -13,7 +14,7 @@
 log = get_logger(__name__)
 
 
-class ResourceRenamingProcessor(SpanProcessor):
+class SimplifiedEndpointComputer:
     def __init__(self):
         self._INT_RE = re.compile(r"^[1-9][0-9]+$")
         self._INT_ID_RE = re.compile(r"^(?=.*[0-9].*)[0-9._-]{3,}$")
@@ -35,7 +36,7 @@ def _compute_simplified_endpoint_path_element(self, elem: str) -> str:
             return "{param:str}"
         return elem
 
-    def _compute_simplified_endpoint(self, url: Optional[str]) -> str:
+    def from_url(self, url: Optional[str]) -> str:
         """Extracts and simplifies the path from an HTTP URL."""
         if not url:
             return "/"
@@ -62,16 +63,24 @@ def _compute_simplified_endpoint(self, url: Optional[str]) -> str:
         elements = [self._compute_simplified_endpoint_path_element(elem) for elem in elements]
         return "/" + "/".join(elements)
 
-    def on_span_start(self, span):
+
+class ResourceRenamingProcessor(SpanProcessor):
+    def __init__(self):
+        self.simplified_endpoint_computer = SimplifiedEndpointComputer()
+
+    def on_span_start(self, span: Span):
         pass
 
-    def on_span_finish(self, span):
+    def on_span_finish(self, span: Span):
         if not span._is_top_level or span.span_type not in (SpanTypes.WEB, SpanTypes.HTTP, SpanTypes.SERVERLESS):
             return
 
+        status = span.get_tag(http.STATUS_CODE)
+        is_404 = status == "404" or status == 404
+
         route = span.get_tag(http.ROUTE)
 
-        if not route or config._trace_resource_renaming_always_simplified_endpoint:
+        if not is_404 and (not route or config._trace_resource_renaming_always_simplified_endpoint):
             url = span.get_tag(http.URL)
-            endpoint = self._compute_simplified_endpoint(url)
-            span._set_tag_str(http.ENDPOINT, endpoint)
+            endpoint = self.simplified_endpoint_computer.from_url(url)
+            span.set_tag_str(http.ENDPOINT, endpoint)

ddtrace/_trace/tracer.py

@@ -172,6 +172,8 @@ def __init__(self) -> None:
             service_name=config.service or None,
             service_env=config.env or None,
             service_version=config.version or None,
+            process_tags=None,
+            container_id=None,
         )
         try:
             self._config_on_disk = store_metadata(metadata)