Skip to content

feat(otel-thread-ctx): add shared thread context #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yannham wants to merge 2 commits into
base: main
Choose a base branch
from
+372 −119
Draft

feat(otel-thread-ctx): add shared thread context #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f07a3b
feat: add shared thread context
yannham Jun 25, 2026
ac805e5
refactor: factor shared code in helpers
yannham Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions libdd-otel-thread-ctx-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub extern "C" fn ddog_otel_thread_ctx_sanity_check() -> libdd_common_ffi::VoidR

#[cfg(target_os = "linux")]
mod linux {
use libdd_otel_thread_ctx::linux::{ThreadContext, ThreadContextHandle};
use libdd_otel_thread_ctx::linux::{OwnedThreadContext, ThreadContext};
use std::ptr::NonNull;

/// Maximum size in bytes of the `attrs_data` field of a thread context record.
Expand All @@ -49,8 +49,8 @@ mod linux {
trace_id: &[u8; 16],
span_id: &[u8; 8],
local_root_span_id: &[u8; 8],
) -> NonNull<ThreadContextHandle> {
ThreadContext::new(*trace_id, *span_id, *local_root_span_id, &[]).into_opaque_ptr()
) -> NonNull<ThreadContext> {
OwnedThreadContext::new(*trace_id, *span_id, *local_root_span_id, &[]).into_opaque_ptr()
}

/// Free an owned thread context.
Expand All @@ -61,9 +61,9 @@ mod linux {
/// `ddog_otel_thread_ctx_detach`, and must not be used after this call. In particular, `ctx`
/// must not be currently attached to a thread.
#[no_mangle]
pub unsafe extern "C" fn ddog_otel_thread_ctx_free(ctx: *mut ThreadContextHandle) {
pub unsafe extern "C" fn ddog_otel_thread_ctx_free(ctx: *mut ThreadContext) {
if let Some(ctx) = NonNull::new(ctx) {
let _ = ThreadContext::from_opaque_ptr(ctx);
let _ = OwnedThreadContext::from_opaque_ptr(ctx);
}
}

Expand All @@ -77,20 +77,20 @@ mod linux {
/// attached.
#[no_mangle]
pub unsafe extern "C" fn ddog_otel_thread_ctx_attach(
ctx: *mut ThreadContextHandle,
) -> Option<NonNull<ThreadContextHandle>> {
ThreadContext::from_opaque_ptr(NonNull::new(ctx)?)
ctx: *mut ThreadContext,
) -> Option<NonNull<ThreadContext>> {
OwnedThreadContext::from_opaque_ptr(NonNull::new(ctx)?)
.attach()
.map(ThreadContext::into_opaque_ptr)
.map(OwnedThreadContext::into_opaque_ptr)
}

/// Remove the currently attached context from the TLS slot.
///
/// Returns the detached context (caller now owns it and must release it with
/// `ddog_otel_thread_ctx_free`), or null if the slot was empty.
#[no_mangle]
pub extern "C" fn ddog_otel_thread_ctx_detach() -> Option<NonNull<ThreadContextHandle>> {
ThreadContext::detach().map(ThreadContext::into_opaque_ptr)
pub extern "C" fn ddog_otel_thread_ctx_detach() -> Option<NonNull<ThreadContext>> {
OwnedThreadContext::detach().map(OwnedThreadContext::into_opaque_ptr)
}

/// Update the currently attached context in-place.
Expand All @@ -103,6 +103,6 @@ mod linux {
span_id: &[u8; 8],
local_root_span_id: &[u8; 8],
) {
ThreadContext::update(*trace_id, *span_id, *local_root_span_id, &[]);
OwnedThreadContext::update(*trace_id, *span_id, *local_root_span_id, &[]);
}
}
Loading
Loading