Merge remote-tracking branch 'origin/main' into chore/native-lock

Author: P403n1x87

.github/workflows/system-tests.yml

@@ -42,7 +42,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '00ef7aa109379a58145417d79ed174d93ec7c19b'
+          ref: '13b08f0faf7673656bd68dad5c142ad04eddee69'
 
       - name: Checkout dd-trace-py
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -96,7 +96,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '00ef7aa109379a58145417d79ed174d93ec7c19b'
+          ref: '13b08f0faf7673656bd68dad5c142ad04eddee69'
 
       - name: Build runner
         uses: ./.github/actions/install_runner
@@ -277,7 +277,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '00ef7aa109379a58145417d79ed174d93ec7c19b'
+          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

@@ -57,7 +57,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):

ddtrace/_trace/context.py

@@ -214,7 +214,7 @@ def dd_user_id(self, value: Optional[Text]) -> None:
             self._meta[_USER_ID_KEY] = str(base64.b64encode(bytes(value, encoding="utf-8")), encoding="utf-8")
 
     @property
-    def _trace_id_64bits(self):
+    def _trace_id_64bits(self) -> Optional[int]:
         """Return the trace ID as a 64-bit value."""
         if self.trace_id is None:
             return None

ddtrace/_trace/filters.py

@@ -1,19 +1,14 @@
 import abc
-from typing import TYPE_CHECKING  # noqa:F401
-from typing import List  # noqa:F401
-from typing import Optional  # noqa:F401
+from typing import List
+from typing import Optional
 
 from ddtrace._trace.processor import TraceProcessor
-
-
-if TYPE_CHECKING:  # pragma: no cover
-    from ddtrace._trace.span import Span  # noqa:F401
+from ddtrace._trace.span import Span
 
 
 class TraceFilter(TraceProcessor):
     @abc.abstractmethod
-    def process_trace(self, trace):
-        # type: (List[Span]) -> Optional[List[Span]]
+    def process_trace(self, trace: List[Span]) -> Optional[List[Span]]:
         """Processes a trace.
 
         None can be returned to prevent the trace from being exported.