ddtrace: Carry patches over to version 4.15.3

0001 is rebased onto the libdatadog v43.0.1 pin in src/native/Cargo.toml;
0002 applies unchanged.

Author: luhenry

patches/ddtrace/4.15.3/0001-native-build-the-OTel-thread-context-only-where-libd.patch

@@ -0,0 +1,161 @@
+From ec81148de2a5306b6ee5c98ecbbf2a05ccc2a40f Mon Sep 17 00:00:00 2001
+From: Ludovic Henry <git@ludovic.dev>
+Date: Wed, 16 Sep 2026 23:32:33 +0200
+Subject: [PATCH] native: build the OTel thread context only where libdatadog
+ supports it
+
+libdatadog's libdd-otel-thread-ctx exists to expose a thread-local
+pointer through the TLSDESC dialect, and its build script hard-fails on
+any Linux architecture other than x86_64/aarch64:
+
+    panic!("Unsupported architecture `{}` for otel-thread-ctx on Linux.
+            Only x86_64 and aarch64 are currently supported.")
+
+src/native declares it under `cfg(target_os = "linux")`, so the whole
+native crate fails to build on riscv64. Narrow every `target_os =
+"linux"` gate around the feature to the two architectures libdatadog
+actually supports, and let the Python wrapper fall back to its existing
+no-op listener when the two native functions are absent.
+
+Rebased onto 4.15.0: upstream split the single update function into
+update_otel_thread_context_from_context/_from_span, and Cargo.toml's
+linux-only dependency block picked up a third, unconditional `libc`
+dependency (used by process_metrics on every Linux arch), so that
+target block is split in two: `libc` stays unconditional for Linux,
+and only the otel-thread-ctx dependencies move to the narrower
+x86_64/aarch64 block.
+
+The proper fix belongs in libdatadog: RISC-V TLSDESC needs GCC 14,
+binutils 2.42 and glibc 2.40, and the manylinux/runner glibc is 2.39, so
+even a compiling shim would not be resolvable at load time today.
+
+Upstream-Status: To upstream [blocked on riscv64 TLSDESC support in libdatadog's libdd-otel-thread-ctx]
+
+Signed-off-by: Ludovic Henry <git@ludovic.dev>
+---
+ ddtrace/internal/opentelemetry/thread_context.py | 10 +++++++++-
+ src/native/Cargo.toml                            |  4 +++-
+ src/native/build.rs                              |  7 ++++++-
+ src/native/lib.rs                                |  4 ++--
+ src/native/library_config.rs                     |  4 ++--
+ tests/smoke_test.py                              |  3 ++-
+ 6 files changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/ddtrace/internal/opentelemetry/thread_context.py b/ddtrace/internal/opentelemetry/thread_context.py
+index 90a76ea..6cd3ffc 100644
+--- a/ddtrace/internal/opentelemetry/thread_context.py
++++ b/ddtrace/internal/opentelemetry/thread_context.py
+@@ -23,11 +23,19 @@ _ContextSwitchListener = Callable[[], None]
+ _ThreadContextListeners = tuple[_ContextActivationListener, _ContextSwitchListener]
+
+
+-if sys.platform == "linux":
++try:
+     from ddtrace.internal.native._native import detach_otel_thread_context
+     from ddtrace.internal.native._native import update_otel_thread_context_from_context
+     from ddtrace.internal.native._native import update_otel_thread_context_from_span
+
++    _native_thread_context = sys.platform == "linux"
++except ImportError:
++    # libdatadog only builds the TLSDESC shim behind these functions on
++    # x86_64 and aarch64, so they are absent on other Linux architectures.
++    _native_thread_context = False
++
++if _native_thread_context:
++
+     def register_otel_thread_context_listener(tracer: TracerProtocol) -> Optional[_ThreadContextListeners]:
+         if not config._otel_thread_context_enabled:
+             return None
+diff --git a/src/native/Cargo.toml b/src/native/Cargo.toml
+index ab753f3..aed615e 100644
+--- a/src/native/Cargo.toml
++++ b/src/native/Cargo.toml
+@@ -74,9 +74,11 @@ tracing = { version = "0.1", default-features = false }
+ pyo3-ffi = { version = "0.28", optional = true }
+
+ [target.'cfg(target_os = "linux")'.dependencies]
++libc = "0.2"
++
++[target.'cfg(all(target_os = "linux", any(target_arch = "x86_64", target_arch = "aarch64")))'.dependencies]
+ libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "v43.0.1", features = ["otel-thread-ctx"]}
+ libdd-otel-thread-ctx = { git = "https://github.com/DataDog/libdatadog", rev = "v43.0.1" }
+-libc = "0.2"
+
+ [target.'cfg(target_os = "macos")'.dependencies]
+ libc = "0.2"
+diff --git a/src/native/build.rs b/src/native/build.rs
+index 7aea389..1aef370 100644
+--- a/src/native/build.rs
++++ b/src/native/build.rs
+@@ -64,7 +64,12 @@ fn main() {
+         pyo3_build_config::add_extension_module_link_args();
+     }
+
+-    if env::var("CARGO_CFG_TARGET_OS").ok().as_deref() == Some("linux") {
++    if env::var("CARGO_CFG_TARGET_OS").ok().as_deref() == Some("linux")
++        && matches!(
++            env::var("CARGO_CFG_TARGET_ARCH").ok().as_deref(),
++            Some("x86_64") | Some("aarch64")
++        )
++    {
+         configure_otel_thread_context_export();
+     }
+ }
+diff --git a/src/native/lib.rs b/src/native/lib.rs
+index 61cb600..d1a5795 100644
+--- a/src/native/lib.rs
++++ b/src/native/lib.rs
+@@ -19,7 +19,7 @@ mod ffe;
+ mod http_client;
+ mod library_config;
+ mod log;
+-#[cfg(target_os = "linux")]
++#[cfg(all(target_os = "linux", any(target_arch = "x86_64", target_arch = "aarch64")))]
+ mod otel_thread_ctx;
+ mod process_metrics;
+ mod py_string;
+@@ -68,7 +68,7 @@ fn _native(m: &Bound<'_, PyModule>) -> PyResult<()> {
+     m.add_class::<library_config::PyAnonymousFileHandle>()?;
+     m.add_wrapped(wrap_pyfunction!(library_config::store_metadata))?;
+
+-    #[cfg(target_os = "linux")]
++    #[cfg(all(target_os = "linux", any(target_arch = "x86_64", target_arch = "aarch64")))]
+     {
+         m.add_wrapped(wrap_pyfunction!(
+             otel_thread_ctx::update_otel_thread_context_from_span
+diff --git a/src/native/library_config.rs b/src/native/library_config.rs
+index 96cd3ae..07019e9 100644
+--- a/src/native/library_config.rs
++++ b/src/native/library_config.rs
+@@ -1,4 +1,4 @@
+-#[cfg(target_os = "linux")]
++#[cfg(all(target_os = "linux", any(target_arch = "x86_64", target_arch = "aarch64")))]
+ use libdd_library_config::tracer_metadata::ThreadLocalMetadata;
+ use libdd_library_config::{
+     tracer_metadata::{store_tracer_metadata, AnonymousFileHandle, TracerMetadata},
+@@ -132,7 +132,7 @@ pub fn store_metadata(data: &PyTracerMetadata) -> PyResult<PyAnonymousFileHandle
+         service_version: data.service_version.clone(),
+         process_tags: data.process_tags.clone(),
+         container_id: data.container_id.clone(),
+-        #[cfg(target_os = "linux")]
++        #[cfg(all(target_os = "linux", any(target_arch = "x86_64", target_arch = "aarch64")))]
+         threadlocal_metadata: Some(ThreadLocalMetadata {
+             attribute_keys: vec![],
+             schema_version: None,
+diff --git a/tests/smoke_test.py b/tests/smoke_test.py
+index 0bf60ba..03890f6 100644
+--- a/tests/smoke_test.py
++++ b/tests/smoke_test.py
+@@ -82,7 +82,8 @@ if __name__ == "__main__":
+         # Skip the test for 32-bit Linux systems
+         print("Skipping test, 32-bit DDWAF not ready yet")
+ 
+-    if platform.system() == "Linux":
++    # libdatadog exports otel_thread_ctx_v1 on x86_64 and aarch64 only.
++    if platform.system() == "Linux" and platform.machine() in ("x86_64", "aarch64"):
+         from ddtrace.internal.native import _native
+ 
+         print("Running OTel thread context symbol smoke test...")
+--
+2.50.1 (Apple Git-155)
+