Merge branch 'taegyunkim/prof-14213-timer-create' of https://github.com/DataDog/dd-trace-py into taegyunkim/prof-14213-timer-create

Author: taegyunkim

.github/CODEOWNERS

@@ -189,6 +189,7 @@ ddtrace/contrib/internal/google_adk                           @DataDog/ml-observ
 ddtrace/contrib/internal/google_generativeai                  @DataDog/ml-observability
 ddtrace/contrib/internal/google_genai                         @DataDog/ml-observability
 ddtrace/contrib/internal/vertexai                             @DataDog/ml-observability
+ddtrace/contrib/internal/mistralai                            @DataDog/ml-observability
 ddtrace/contrib/internal/langgraph                            @DataDog/ml-observability
 ddtrace/contrib/internal/crewai                               @DataDog/ml-observability
 ddtrace/contrib/internal/openai_agents                        @DataDog/ml-observability
@@ -213,6 +214,7 @@ tests/contrib/google_adk                                      @DataDog/ml-observ
 tests/contrib/google_generativeai                             @DataDog/ml-observability
 tests/contrib/google_genai                                    @DataDog/ml-observability
 tests/contrib/vertexai                                        @DataDog/ml-observability
+tests/contrib/mistralai                                       @DataDog/ml-observability
 tests/contrib/langgraph                                       @DataDog/ml-observability
 tests/contrib/crewai                                          @DataDog/ml-observability
 tests/contrib/openai_agents                                   @DataDog/ml-observability
@@ -233,6 +235,7 @@ tests/snapshots/tests.contrib.botocore.test_bedrock_agents.*  @DataDog/ml-observ
 tests/snapshots/tests.contrib.botocore.test_bedrock.*         @DataDog/ml-observability
 tests/snapshots/tests.contrib.google_adk.*                    @DataDog/ml-observability
 tests/snapshots/tests.contrib.google_generativeai.*           @DataDog/ml-observability
+tests/snapshots/tests.contrib.mistralai.*                     @DataDog/ml-observability
 tests/snapshots/tests.contrib.langgraph.*                     @DataDog/ml-observability
 tests/snapshots/tests.contrib.crewai.*                        @DataDog/ml-observability
 tests/snapshots/tests.contrib.openai_agents.*                 @DataDog/ml-observability
@@ -332,10 +335,6 @@ tests/tracer/test_propagation.py        @DataDog/apm-sdk-capabilities-python @Da
 docker/Dockerfile.fuzz            @DataDog/chaos-engineering @DataDog/profiling-python
 
 # Supported versions
-supported_versions_table.csv                    @DataDog/apm-core-python @DataDog/apm-idm-python
-supported_versions_output.json                  @DataDog/apm-core-python @DataDog/apm-idm-python
+supported_versions.json                         @DataDog/apm-core-python @DataDog/apm-idm-python
 scripts/integration_registry/registry.yaml      @DataDog/apm-core-python @DataDog/apm-idm-python
-
-# Tested versions
-tested_versions.json            @DataDog/apm-core-python @DataDog/apm-idm-python
-scripts/tested_versions/*       @DataDog/apm-core-python @DataDog/apm-idm-python
+scripts/integration_registry/generate_supported_versions.py  @DataDog/apm-core-python @DataDog/apm-idm-python

.github/PULL_REQUEST_TEMPLATE/python_315_bump.md

@@ -23,7 +23,7 @@ This PR enables the **`<integration>`** integration on Python 3.15.
 - [ ] Lifted `max_version="3.13"` / `"3.14"` cap on the affected venv(s) (if present)
 - [ ] Ran `riot generate <suite-pattern>` and committed the regenerated `.riot/requirements/*.txt` lockfiles
 - [ ] Ran the suite locally on 3.15 via `scripts/run-tests <suite>` (paste a link or summary of the result)
-- [ ] Updated `supported_versions_table.csv` / `supported_versions_output.json` if integration min/max versions changed
+- [ ] Updated `supported_versions.json` if integration min/max versions changed
 - [ ] Release note added under `releasenotes/notes/`, **or** PR labeled `changelog/no-changelog` (test/CI-only changes)
 
 ## Testing

.github/scripts/should-run.sh

@@ -49,7 +49,6 @@ is_ignored() {
     [[ "$f" == scripts/iast/* ]] && return 0
     [[ "$f" == scripts/import-analysis/* ]] && return 0
     [[ "$f" == scripts/integration_registry/* ]] && return 0
-    [[ "$f" == scripts/tested_versions/* ]] && return 0
     [[ "$f" == scripts/profiles/* ]] && return 0
     [[ "$f" == scripts/trace_flares/* ]] && return 0
     [[ "$f" == scripts/vcr/* ]] && return 0

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

@@ -64,10 +64,19 @@ jobs:
         run: |
           curl https://dd-trace-py-builds.s3.amazonaws.com/main/install.sh | bash
 
-      - run: python scripts/freshvenvs.py generate
+      - name: Generate supported versions
+        run: python scripts/integration_registry/generate_supported_versions.py
 
-      - name: Generate table
-        run: python scripts/generate_table.py
+      - name: Preview supported versions output
+        run: |
+          python - <<'PY'
+          import json
+          from pathlib import Path
+
+          supported_versions = json.loads(Path("supported_versions.json").read_text())
+          print(f"Generated {len(supported_versions)} supported version entries.")
+          print(json.dumps(supported_versions[:3], indent=2))
+          PY
 
       - run: git diff
 
@@ -83,12 +92,12 @@ jobs:
         with:
           token: ${{ steps.octo-sts.outputs.token }}
           branch: "update-supported-versions"
-          commit-message: "Update supported versions table"
+          commit-message: "Update supported versions"
           delete-branch: true
           base: main
           title: "chore: update supported versions"
           labels: changelog/no-changelog
           body: |
-            Generates / updates the supported versions table for integrations.
+            Generates / updates the supported versions for integrations.
             This should be tied to releases, or triggered manually.
             Workflow runs: [Generate Supported Integration Versions](https://github.com/DataDog/dd-trace-py/actions/workflows/generate-supported-versions.yml)

.github/workflows/system-tests.yml

@@ -95,11 +95,11 @@ jobs:
   serverless-system-tests:
     needs: [serverless-system-tests-build-layer]
     # Automatically managed, use scripts/update-system-tests-version to update
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@9daccd578f30ad15d66011b3550f4f35b2e9be52
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@77e6da9b53639436525bf7bfb076723e18e102c3
     secrets: inherit
     with:
       library: python_lambda
-      ref: '9daccd578f30ad15d66011b3550f4f35b2e9be52'
+      ref: '77e6da9b53639436525bf7bfb076723e18e102c3'
       binaries_artifact: serverless_system_tests_binaries
       scenarios_groups: lambda_end_to_end
       skip_empty_scenarios: true
@@ -126,22 +126,22 @@ jobs:
     if: github.event_name != 'schedule' || github.event.repository.fork == false
     needs: [integration-frameworks-combine-wheels]
     # Automatically managed, use scripts/update-system-tests-version to update
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@9daccd578f30ad15d66011b3550f4f35b2e9be52
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@77e6da9b53639436525bf7bfb076723e18e102c3
     secrets: inherit
     with:
       library: python
-      ref: '9daccd578f30ad15d66011b3550f4f35b2e9be52'
+      ref: '77e6da9b53639436525bf7bfb076723e18e102c3'
       scenarios: INTEGRATION_FRAMEWORKS
       binaries_artifact: integration-frameworks-wheels
       push_to_test_optimization: true
 
   tracer-release:
     needs:
       - download-s3-wheels
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@9daccd578f30ad15d66011b3550f4f35b2e9be52
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@77e6da9b53639436525bf7bfb076723e18e102c3
     with:
       library: python
-      ref: '9daccd578f30ad15d66011b3550f4f35b2e9be52'
+      ref: '77e6da9b53639436525bf7bfb076723e18e102c3'
       binaries_artifact: wheels-manylinux_x86_64
       desired_execution_time: 900
       scenarios_groups: tracer-release

.gitlab-ci.yml

@@ -16,7 +16,7 @@ variables:
   DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
   # CI_DEBUG_SERVICES: "true"
   # Automatically managed, use scripts/update-system-tests-version to update
-  SYSTEM_TESTS_REF: "9daccd578f30ad15d66011b3550f4f35b2e9be52"
+  SYSTEM_TESTS_REF: "77e6da9b53639436525bf7bfb076723e18e102c3"
 
   # Profiling native build image (built from dd/images/dd-trace-py/profiling_native)
   PROFILING_NATIVE_IMAGE: "registry.ddbuild.io/dd-trace-py:v103334885-be1888c-profiling_native"
@@ -309,7 +309,7 @@ check_requirements_lockfiles:
     KUBERNETES_MEMORY_REQUEST: "8Gi"
     KUBERNETES_MEMORY_LIMIT: "8Gi"
   script:
-    - pip install toml==0.10.2
+    - pip install toml==0.10.2 pyyaml==6.0.2
     - scripts/compile-and-prune-test-requirements
     - scripts/check-diff '.riot/requirements/' 'Mismatches found between .riot/requirements/*.txt and riotfile.py. Run scripts/compile-and-prune-test-requirements and commit the result.'
     - python scripts/requirements_to_csv.py
@@ -376,6 +376,10 @@ detect_circular_imports:
   stage: tests
   needs: []
   extends: .testrunner
+  rules:
+    - if: $RELEASE_ALLOW_TEST_FAILURES == "true"
+      allow_failure: true
+    - allow_failure: false
   script:
     - pip install uv
     - cd ..

.gitlab/benchmarks/bp-runner.microbenchmarks.fail-on-breach.template.yml

@@ -163,7 +163,7 @@ experiments:
               - max_rss_usage < 61.00 MB
           - name: errortrackingflasksqli-errortracking-enabled-user
             thresholds:
-              - execution_time < 2.25 ms
+              - execution_time < 2.85 ms
               - max_rss_usage < 61.00 MB
           - name: errortrackingflasksqli-tracer-enabled
             thresholds:

.gitlab/package.yml

@@ -392,20 +392,12 @@ download_dependency_wheels:
   tags: [ "arch:amd64" ]
   stage: package
   script:
-    # Prevent git operation errors when the GitLab executor sees the checkout as owned by another user.
-    - git config --global --add safe.directory "${CI_PROJECT_DIR}"
-    - BASE_PACKAGE_VERSION=$(python -c "import tomllib; print(tomllib.load(open('pyproject.toml', 'rb'))['project']['version'])")
-    - PACKAGE_VERSION="${BASE_PACKAGE_VERSION}"
-    - |
-      if [[ -z "${CI_COMMIT_TAG:-}" && "${BASE_PACKAGE_VERSION}" != *+* ]]; then
-        PACKAGE_VERSION="${BASE_PACKAGE_VERSION}+g$(git rev-parse --short=7 HEAD)"
-      fi
+    - PACKAGE_VERSION=$(python -c "import tomllib; print(tomllib.load(open('pyproject.toml', 'rb'))['project']['version'])")
     - echo "PACKAGE_VERSION=${PACKAGE_VERSION}" | tee -a package_version.env
-    - echo "BASE_PACKAGE_VERSION=${BASE_PACKAGE_VERSION}" | tee -a package_version.env
-    # Validate commit tag matches base version if tag is set
+    # Validate commit tag matches version if tag is set
     - |
       if [ -n "${CI_COMMIT_TAG:-}" ]; then
-        EXPECTED_TAG="v${BASE_PACKAGE_VERSION}"
+        EXPECTED_TAG="v${PACKAGE_VERSION}"
         if [ "${CI_COMMIT_TAG}" != "${EXPECTED_TAG}" ]; then
           echo "[ERROR] CI_COMMIT_TAG (${CI_COMMIT_TAG}) does not match expected tag (${EXPECTED_TAG})"
           exit 1

.gitlab/services.yml

@@ -26,7 +26,7 @@
       DD_DISABLE_ERROR_RESPONSES: true
       ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service
       SNAPSHOT_IGNORED_ATTRS: span_id,trace_id,parent_id,duration,start,metrics.system.pid,metrics.system.process_id,metrics.process_id,meta.runtime-id,meta._dd.p.tid,meta.pathway.hash,metrics._dd.tracer_kr,meta._dd.parent_id,meta.kafka.cluster_id,meta._dd.git.repository_url
-      VCR_PROVIDER_MAP: azure_openai=https://llmobs-test-resource.openai.azure.com/
+      VCR_PROVIDER_MAP: azure_openai=https://llmobs-test-resource.openai.azure.com/,mistral=https://api.mistral.ai/
   mongo:
     name: registry.ddbuild.io/images/mirror/mongo:6.0.5
     alias: mongo

.riot/requirements/11193ae.txt

@@ -0,0 +1,43 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/11193ae.in
+#
+annotated-types==0.7.0
+anyio==4.13.0
+attrs==26.1.0
+backports-asyncio-runner==1.2.0
+certifi==2026.5.20
+coverage[toml]==7.14.1
+eval-type-backport==0.4.0
+exceptiongroup==1.3.1
+h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.18
+importlib-metadata==8.7.1
+iniconfig==2.3.0
+jsonpath-python==1.1.6
+mistralai==2.4.9
+mock==5.2.0
+opentelemetry-api==1.39.1
+opentelemetry-semantic-conventions==0.60b1
+opentracing==2.4.0
+packaging==26.2
+pluggy==1.6.0
+pydantic==2.13.4
+pydantic-core==2.46.4
+pygments==2.20.0
+pytest==9.0.3
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+python-dateutil==2.9.0.post0
+six==1.17.0
+sortedcontainers==2.4.0
+tomli==2.4.1
+typing-extensions==4.15.0
+typing-inspection==0.4.2
+zipp==4.1.0