Merge branch 'main' into 4.0-breaking-changes

Author: emmettbutler

.github/workflows/build_python_3.yml

@@ -94,9 +94,6 @@ jobs:
       CIBW_BEFORE_ALL_MACOS: rustup target add aarch64-apple-darwin
       CIBW_BEFORE_ALL_LINUX: |
         if [[ "$(uname -m)-$(uname -i)-$(uname -o | tr '[:upper:]' '[:lower:]')-$(ldd --version 2>&1 | head -n 1 | awk '{print $1}')" != "i686-unknown-linux-musl" ]]; then
-          if command -v yum &> /dev/null; then
-            yum install -y libatomic.i686
-          fi
           curl -sSf https://sh.rustup.rs | sh -s -- -y;
         fi
       CIBW_ENVIRONMENT_LINUX: PATH=$HOME/.cargo/bin:$PATH CMAKE_BUILD_PARALLEL_LEVEL=24 CMAKE_ARGS="-DNATIVE_TESTING=OFF" SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}

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

@@ -81,14 +81,14 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade "pip<25.3"
           pip install packaging
           pip install requests
           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
+          pip install --upgrade git+https://github.com/jazzband/pip-tools.git@1c2692b7f45a94d93e3f4bb252da3fd711ad08a9 # v7.5.1
 
       - name: Run regenerate-riot-latest
         run: scripts/regenerate-riot-latest.sh

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

@@ -799,11 +799,11 @@ experiments:
           - name: otelspan-add-metrics
             thresholds:
               - execution_time < 344.80 ms
-              - max_rss_usage < 675.00 MB
+              - max_rss_usage < 47.50 MB
           - name: otelspan-add-tags
             thresholds:
-              - execution_time < 344.80 ms
-              - max_rss_usage < 675.00 MB
+              - execution_time < 314.00 ms
+              - max_rss_usage < 47.50 MB
           - name: otelspan-get-context
             thresholds:
               - execution_time < 92.35 ms
@@ -1032,11 +1032,11 @@ experiments:
           - name: span-add-metrics
             thresholds:
               - execution_time < 93.50 ms
-              - max_rss_usage < 961.00 MB
+              - max_rss_usage < 53.00 MB
           - name: span-add-tags
             thresholds:
               - execution_time < 155.00 ms
-              - max_rss_usage < 962.50 MB
+              - max_rss_usage < 53.00 MB
           - name: span-get-context
             thresholds:
               - execution_time < 20.50 ms

benchmarks/otel_span/scenario.py

@@ -92,11 +92,12 @@ def _(loops):
                     if finishspan:
                         s.end()
 
-            # If we are finishing spans, we need to ensure that the span aggregator is cleared
-            # to avoid memory leaks and errors on shutdown
-            if not finishspan:
-                if hasattr(tracer, "_span_aggregator"):
-                    if hasattr(tracer._span_aggregator, "_traces"):
-                        tracer._span_aggregator._traces.clear()
+                # If we are finishing spans, we need to ensure that the span aggregator is cleared
+                # to avoid memory leaks and errors on shutdown
+                # DEV: Do this per-loop to keep memory usage lower during the test
+                if not finishspan:
+                    if hasattr(tracer, "_span_aggregator"):
+                        if hasattr(tracer._span_aggregator, "_traces"):
+                            tracer._span_aggregator._traces.clear()
 
         yield _

benchmarks/span/scenario.py

@@ -84,11 +84,12 @@ def _(loops):
                     if finishspan:
                         s.finish()
 
-            # If we are finishing spans, we need to ensure that the span aggregator is cleared
-            # to avoid memory leaks and errors on shutdown
-            if not finishspan:
-                if hasattr(tracer, "_span_aggregator"):
-                    if hasattr(tracer._span_aggregator, "_traces"):
-                        tracer._span_aggregator._traces.clear()
+                # If we are finishing spans, we need to ensure that the span aggregator is cleared
+                # to avoid memory leaks and errors on shutdown
+                # DEV: Do this per-loop to keep memory usage lower during the test
+                if not finishspan:
+                    if hasattr(tracer, "_span_aggregator"):
+                        if hasattr(tracer._span_aggregator, "_traces"):
+                            tracer._span_aggregator._traces.clear()
 
         yield _

ddtrace/appsec/_utils.py

@@ -173,6 +173,15 @@ def __init__(
         self.location = location.replace(APPSEC.SECURITY_RESPONSE_ID, security_response_id)
         self.content_type: str = "application/json"
 
+    def get(self, method_name: str, default: Any = None) -> Any:
+        """
+        Dictionary-like get method for backward compatibility with Lambda integration.
+
+        Returns the attribute value if it exists, otherwise returns the default value.
+        This allows Block_config to be used in contexts that expect dictionary-like access.
+        """
+        return getattr(self, method_name, default)
+
 
 class Telemetry_result:
     __slots__ = [

ddtrace/internal/datadog/profiling/cmake/AnalysisFunc.cmake

@@ -1,9 +1,9 @@
 include(CheckIPOSupported)
 
 function(add_ddup_config target)
-    # Profiling native extensions are built with C++17, even though underlying repo adheres to the manylinux 2014
+    # Profiling native extensions are built with C++20, even though underlying repo adheres to the manylinux 2014
     # standard. This isn't currently a problem, but if it becomes one, we may have to structure the library differently.
-    target_compile_features(${target} PUBLIC cxx_std_17)
+    target_compile_features(${target} PUBLIC cxx_std_20)
 
     # Common compile options
     target_compile_options(

ddtrace/internal/datadog/profiling/dd_wrapper/CMakeLists.txt

@@ -1,4 +1,12 @@
 cmake_minimum_required(VERSION 3.19)
+
+# Disable testing by default (can be overridden with -DBUILD_TESTING=ON) Don't use FORCE to allow command-line overrides
+if(NOT DEFINED BUILD_TESTING)
+    set(BUILD_TESTING
+        OFF
+        CACHE BOOL "Build the testing tree")
+endif()
+
 project(
     dd_wrapper
     VERSION 0.1.1

ddtrace/internal/datadog/profiling/dd_wrapper/test/CMakeLists.txt

@@ -40,14 +40,23 @@ function(dd_wrapper_add_test name)
     add_ddup_config(${name})
     target_link_options(${name} PRIVATE -Wl,--no-as-needed)
 
+    # Test executable needs to find libdd_wrapper in parent directory Append to INSTALL_RPATH instead of replacing to
+    # preserve sanitizer library paths set by add_ddup_config
+    get_target_property(EXISTING_INSTALL_RPATH ${name} INSTALL_RPATH)
+    if(EXISTING_INSTALL_RPATH)
+        set_target_properties(${name} PROPERTIES INSTALL_RPATH "${EXISTING_INSTALL_RPATH};$ORIGIN/.."
+                                                 BUILD_WITH_INSTALL_RPATH TRUE)
+    else()
+        set_target_properties(${name} PROPERTIES INSTALL_RPATH "$ORIGIN/.." BUILD_WITH_INSTALL_RPATH TRUE)
+    endif()
+
     gtest_discover_tests(
-        ${name}
+        ${name} DISCOVERY_MODE PRE_TEST # Delay test discovery until test execution to avoid running sanitizer-built
+                                        # executables during build
         PROPERTIES # We start new threads after fork(), and we want to continue running the tests after that instead of
                    # dying.
                    ENVIRONMENT "TSAN_OPTIONS=die_after_fork=0:suppressions=${CMAKE_CURRENT_SOURCE_DIR}/TSan.supp")
 
-    set_target_properties(${name} PROPERTIES INSTALL_RPATH "$ORIGIN/..")
-
     if(LIB_INSTALL_DIR)
         install(TARGETS ${name} RUNTIME DESTINATION ${LIB_INSTALL_DIR}/../test)
     endif()

ddtrace/internal/datadog/profiling/ddup/CMakeLists.txt

@@ -64,11 +64,23 @@ set_target_properties(${EXTENSION_NAME} PROPERTIES PREFIX "")
 set_target_properties(${EXTENSION_NAME} PROPERTIES SUFFIX "")
 
 # RPATH is needed for sofile discovery at runtime, since Python packages are not installed in the system path. This is
-# typical.
+# typical. Use BUILD_WITH_INSTALL_RPATH to avoid rpath manipulation during install phase which can cause conflicts For
+# standalone/test builds, also include LIB_INSTALL_DIR so tests can find libdd_wrapper
 if(APPLE)
-    set_target_properties(${EXTENSION_NAME} PROPERTIES INSTALL_RPATH "@loader_path/..")
+    if(BUILD_TESTING AND LIB_INSTALL_DIR)
+        set_target_properties(${EXTENSION_NAME} PROPERTIES INSTALL_RPATH "@loader_path/..;${LIB_INSTALL_DIR}"
+                                                           BUILD_WITH_INSTALL_RPATH TRUE)
+    else()
+        set_target_properties(${EXTENSION_NAME} PROPERTIES INSTALL_RPATH "@loader_path/.." BUILD_WITH_INSTALL_RPATH
+                                                                                           TRUE)
+    endif()
 elseif(UNIX)
-    set_target_properties(${EXTENSION_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/..")
+    if(BUILD_TESTING AND LIB_INSTALL_DIR)
+        set_target_properties(${EXTENSION_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/..;${LIB_INSTALL_DIR}"
+                                                           BUILD_WITH_INSTALL_RPATH TRUE)
+    else()
+        set_target_properties(${EXTENSION_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/.." BUILD_WITH_INSTALL_RPATH TRUE)
+    endif()
 endif()
 target_include_directories(
     ${EXTENSION_NAME}