Merge branch 'main' into munir/make-log-injection-boolean-again

Author: mabdinur

.github/CODEOWNERS

@@ -139,30 +139,19 @@ tests/profiling_v2                  @DataDog/profiling-python
 # MLObs
 ddtrace/llmobs/                                               @DataDog/ml-observability
 ddtrace/contrib/internal/openai                               @DataDog/ml-observability
-ddtrace/contrib/_openai.py                                    @DataDog/ml-observability
 ddtrace/contrib/internal/langchain                            @DataDog/ml-observability
-ddtrace/contrib/_langchain.py                                 @DataDog/ml-observability
 ddtrace/contrib/internal/botocore/services/bedrock.py         @DataDog/ml-observability
 ddtrace/contrib/internal/botocore/services/bedrock_agents.py  @DataDog/ml-observability
 ddtrace/contrib/botocore/services/bedrock.py                  @DataDog/ml-observability
 ddtrace/contrib/internal/anthropic                            @DataDog/ml-observability
-ddtrace/contrib/_anthropic.py                                 @DataDog/ml-observability
 ddtrace/contrib/internal/google_generativeai                  @DataDog/ml-observability
-ddtrace/contrib/_google_generativeai.py                       @DataDog/ml-observability
 ddtrace/contrib/internal/google_genai                         @DataDog/ml-observability
-ddtrace/contrib/_google_genai.py                              @DataDog/ml-observability
 ddtrace/contrib/internal/vertexai                             @DataDog/ml-observability
-ddtrace/contrib/_vertexai.py                                  @DataDog/ml-observability
 ddtrace/contrib/internal/langgraph                            @DataDog/ml-observability
-ddtrace/contrib/_langgraph.py                                 @DataDog/ml-observability
 ddtrace/contrib/internal/crewai                               @DataDog/ml-observability
-ddtrace/contrib/_crewai.py                                    @DataDog/ml-observability
 ddtrace/contrib/internal/openai_agents                        @DataDog/ml-observability
-ddtrace/contrib/_openai_agents.py                             @DataDog/ml-observability
 ddtrace/contrib/internal/litellm                              @DataDog/ml-observability
-ddtrace/contrib/_litellm.py                                   @DataDog/ml-observability
 ddtrace/contrib/internal/pydantic_ai                          @DataDog/ml-observability
-ddtrace/contrib/_pydantic_ai.py                               @DataDog/ml-observability
 tests/llmobs                                                  @DataDog/ml-observability
 tests/contrib/openai                                          @DataDog/ml-observability
 tests/contrib/langchain                                       @DataDog/ml-observability

.github/workflows/build_python_3.yml

@@ -33,7 +33,7 @@ jobs:
           MATRIX_INCLUDE=$(
             {
               cibuildwheel --print-build-identifiers --platform linux --arch x86_64,i686 | jq -cR '{only: ., os: "ubuntu-latest"}' \
-              && cibuildwheel --print-build-identifiers --platform linux --arch aarch64  | jq -cR '{only: ., os: "arm-4core-linux-ubuntu24.04"}' \
+              && cibuildwheel --print-build-identifiers --platform linux --arch aarch64  | jq -cR '{only: ., os: "ubuntu-24.04-arm"}' \
               && cibuildwheel --print-build-identifiers --platform windows --arch AMD64,x86 | jq -cR '{only: ., os: "windows-latest"}' \
               && cibuildwheel --print-build-identifiers --platform macos --arch x86_64 | jq -cR '{only: ., os: "macos-13"}' \
               && cibuildwheel --print-build-identifiers --platform macos --arch arm64 | jq -cR '{only: ., os: "macos-latest"}'
@@ -59,19 +59,19 @@ jobs:
           fetch-depth: 0
 
       - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        if: matrix.os != 'arm-4core-linux-ubuntu24.04'
+        if: matrix.os != 'ubuntu-24.04-arm'
         name: Install Python
         with:
           python-version: '3.8'
 
       - name: Set up QEMU
-        if: runner.os == 'Linux' && matrix.os != 'arm-4core-linux-ubuntu24.04'
+        if: runner.os == 'Linux' && matrix.os != 'ubuntu-24.04-arm'
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
           platforms: all
 
       - name: Build wheels arm64
-        if: always() && matrix.os == 'arm-4core-linux-ubuntu24.04'
+        if: always() && matrix.os == 'ubuntu-24.04-arm'
         run: pipx run cibuildwheel==2.22.0 --only ${{ matrix.only }}
         env:
           CIBW_SKIP: ${{ inputs.cibw_skip }}
@@ -106,7 +106,7 @@ jobs:
           # CIBW_BUILD_VERBOSITY_MACOS: 3
 
       - name: Build wheels
-        if: always() && matrix.os != 'arm-4core-linux-ubuntu24.04'
+        if: always() && matrix.os != 'ubuntu-24.04-arm'
         uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3
         with:
           only: ${{ matrix.only }}

.github/workflows/system-tests.yml

@@ -277,7 +277,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: 'e79a35571dedbe2e9bc5f4731a3cf172f589b032'
+          ref: '13b08f0faf7673656bd68dad5c142ad04eddee69'
       - name: Checkout dd-trace-py
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:

.gitlab-ci.yml

@@ -10,7 +10,8 @@ variables:
   REPO_NOTIFICATION_CHANNEL: "#apm-python-release"
   RELEASE_ALLOW_TEST_FAILURES: false
   RELEASE_ALLOW_BENCHMARK_FAILURES: false
-  DD_DISABLE_VPA: true
+  # VPA Template configuration
+  DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
   # CI_DEBUG_SERVICES: "true"
 
 default:
@@ -76,7 +77,7 @@ microbenchmarks:
   variables:
     PARENT_PIPELINE_ID: $CI_PIPELINE_ID
     # Disable VPA for benchmarks
-    KUBERNETES_POD_ANNOTATIONS_1: vpa.datadoghq.com/updateMode=Off
+    DD_DISABLE_VPA: true
 
 macrobenchmarks:
   stage: benchmarks
@@ -85,7 +86,7 @@ macrobenchmarks:
     include: .gitlab/benchmarks/macrobenchmarks.yml
   variables:
     # Disable VPA for benchmarks
-    KUBERNETES_POD_ANNOTATIONS_1: vpa.datadoghq.com/updateMode=Off
+    DD_DISABLE_VPA: true
   allow_failure: true
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"

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

@@ -153,31 +153,31 @@ experiments:
           # httppropagationextract
           - name: httppropagationextract-all_styles_all_headers
             thresholds:
-              - execution_time < 0.07 ms
+              - execution_time < 0.10 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-b3_headers
             thresholds:
               - execution_time < 0.02 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-b3_single_headers
             thresholds:
-              - execution_time < 0.01 ms
+              - execution_time < 0.02 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-datadog_tracecontext_tracestate_not_propagated_on_trace_id_no_match
             thresholds:
-              - execution_time < 0.06 ms
+              - execution_time < 0.08 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-datadog_tracecontext_tracestate_propagated_on_trace_id_match
             thresholds:
-              - execution_time < 0.06 ms
+              - execution_time < 0.08 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-empty_headers
             thresholds:
               - execution_time < 0.01 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-full_t_id_datadog_headers
             thresholds:
-              - execution_time < 0.02 ms
+              - execution_time < 0.03 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-invalid_priority_header
             thresholds:
@@ -217,7 +217,7 @@ experiments:
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-tracecontext_headers
             thresholds:
-              - execution_time < 0.03 ms
+              - execution_time < 0.04 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationextract-valid_headers_all
             thresholds:
@@ -275,35 +275,35 @@ experiments:
           # httppropagationinject
           - name: httppropagationinject-ids_only
             thresholds:
-              - execution_time < 0.02 ms
+              - execution_time < 0.03 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationinject-with_all
             thresholds:
-              - execution_time < 0.03 ms
+              - execution_time < 0.04 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationinject-with_dd_origin
             thresholds:
-              - execution_time < 0.02 ms
+              - execution_time < 0.03 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationinject-with_priority_and_origin
             thresholds:
-              - execution_time < 0.02 ms
+              - execution_time < 0.04 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationinject-with_sampling_priority
             thresholds:
-              - execution_time < 0.02 ms
+              - execution_time < 0.03 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationinject-with_tags
             thresholds:
-              - execution_time < 0.02 ms
+              - execution_time < 0.04 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationinject-with_tags_invalid
             thresholds:
-              - execution_time < 0.03 ms
+              - execution_time < 0.04 ms
               - max_rss_usage < 31.00 MB
           - name: httppropagationinject-with_tags_max_size
             thresholds:
-              - execution_time < 0.03 ms
+              - execution_time < 0.04 ms
               - max_rss_usage < 31.00 MB
 
           # iast_aspects

.gitlab/one-pipeline.locked.yml

@@ -1,4 +1,4 @@
 # DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/d44e89797a5a47c43cf712193abefe2178a004176606f7e01b77d1ec49a3ef5e/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/a0486057161f85a77e39ad2aa60ac66bb52414696d9b3dd87177df1057b11295/one-pipeline.yml

.readthedocs.yml

@@ -3,7 +3,7 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.10"
-    rust: "1.78"
+    rust: "1.86"
   commands:
     - git fetch --unshallow || true
     - curl -L https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-x86_64-unknown-linux-gnu.tar.gz | tar zx

benchmarks/core_api/scenario.py

@@ -40,7 +40,7 @@ def listener(*_):
 
                 # If we don't support "core.on_all", just double up the registered listeners to try
                 # and make the comparison semi-equal
-                core.on(self.CUSTOM_EVENT_NAME, listener)
+                core.on(CUSTOM_EVENT_NAME, listener)
                 core.on("context.started.with_data", listener)
                 core.on("context.ended.with_data", listener)
 
@@ -50,12 +50,12 @@ def listener(*_):
         def core_dispatch(loops):
             """Measure the cost to dispatch an event on the hub"""
             for _ in range(loops):
-                core.dispatch(self.CUSTOM_EVENT_NAME, (5, 6, 7, 8))
+                core.dispatch(CUSTOM_EVENT_NAME, (5, 6, 7, 8))
 
         def core_dispatch_with_results(loops):
             """Measure the cost to dispatch an event on the hub"""
             for _ in range(loops):
-                core.dispatch_with_results(self.CUSTOM_EVENT_NAME, (5, 6, 7, 8))
+                core.dispatch_with_results(CUSTOM_EVENT_NAME, (5, 6, 7, 8))
 
         def context_with_data(loops):
             """Measure the cost of creating and ending a new context"""

ddtrace/_hooks.py

@@ -2,17 +2,13 @@
 from copy import deepcopy
 from typing import Any  # noqa:F401
 from typing import Callable  # noqa:F401
+from typing import DefaultDict  # noqa:F401
 from typing import Optional  # noqa:F401
 from typing import Set  # noqa:F401
 
 from .internal.logger import get_logger
 
 
-try:
-    from typing import DefaultDict  # noqa:F401
-except ImportError:
-    from collections import defaultdict as DefaultDict
-
 log = get_logger(__name__)
 
 

ddtrace/_logger.py

@@ -58,7 +58,6 @@ def configure_ddtrace_logger():
 def _configure_ddtrace_debug_logger(logger):
     if get_config("DD_TRACE_DEBUG", False, asbool):
         logger.setLevel(logging.DEBUG)
-        logger.debug("debug mode has been enabled for the ddtrace logger")
 
 
 def _configure_ddtrace_file_logger(logger):