feat!: expose ThreadLocalMetadata via process_discovery

crates/process_discovery/Cargo.toml

@@ -8,7 +8,11 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 anyhow = "1"
-libdd-library-config = { git = "https://github.com/DataDog/libdatadog.git", tag = "v35.0.0", features = ["otel-thread-ctx"] }
+# Pointed at the merge commit that introduced ThreadLocalMetadata (caller-supplied
+# schema version + extra process-context attributes). Swap back to a tagged release
+# once one that includes 7cdeb7896e92d1ba38bde495934e112dac2eda25 is published.
+libdd-library-config = { git = "https://github.com/DataDog/libdatadog.git", rev = "7cdeb7896e92d1ba38bde495934e112dac2eda25", features = ["otel-thread-ctx"] }
+libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog.git", rev = "7cdeb7896e92d1ba38bde495934e112dac2eda25" }
 
 napi = { version = "2" }
 napi-derive = { version = "2", default-features = false }

crates/process_discovery/src/lib.rs

@@ -2,6 +2,7 @@ use napi::{Error, Status};
 use napi_derive::napi;
 
 use libdd_library_config::tracer_metadata;
+use libdd_trace_protobuf::opentelemetry::proto::common::v1::any_value;
 
 #[napi]
 pub struct NapiAnonymousFileHandle {
@@ -11,6 +12,44 @@ pub struct NapiAnonymousFileHandle {
 #[napi]
 impl NapiAnonymousFileHandle {}
 
+/// Additional OTel process-context attribute the threadlocal writer wants to
+/// publish alongside the key map (e.g. language-runtime layout constants). Set
+/// exactly one of `string_value` / `int_value` — the other variants of OTel's
+/// `AnyValue` (bool, double, bytes, array, kvlist) are not yet exposed.
+/// Passing both set or neither set is rejected as invalid input.
+#[derive(Clone)]
+#[napi(object)]
+pub struct ExtraAttribute {
+    pub key: String,
+    pub string_value: Option<String>,
+    pub int_value: Option<i64>,
+}
+
+/// Thread-level context metadata the tracer wants to publish as part of the
+/// OTel process context. When present on a [`TracerMetadata`], drives the
+/// `threadlocal.*` block in the emitted process context; when absent, no such
+/// block is emitted.
+#[derive(Clone)]
+#[napi(object)]
+pub struct ThreadLocalMetadata {
+    /// Ordered list of attribute key names for thread-level OTEP-4947 context
+    /// records. Wire key indices index into this list. libdatadog implicitly
+    /// prepends `datadog.local_root_span_id` at wire index 0, so entry 0 here
+    /// is wire key index 1.
+    pub attribute_keys: Vec<String>,
+
+    /// Value of the `threadlocal.schema_version` attribute. Identifies the
+    /// on-the-wire record schema (e.g. `"tlsdesc_v1_dev"` for libdatadog's own
+    /// TLSDESC writer, `"nodejs_v1_dev"` for a Node.js writer). Defaults to
+    /// `"tlsdesc_v1_dev"` when omitted.
+    pub schema_version: Option<String>,
+
+    /// Extra `threadlocal.*` attributes to publish alongside the key map (e.g.
+    /// V8 layout constants a Node.js reader needs to walk from the discovery
+    /// TLS symbol into the record).
+    pub extra_attributes: Vec<ExtraAttribute>,
+}
+
 #[napi(constructor)]
 pub struct TracerMetadata {
     pub runtime_id: Option<String>,
@@ -21,16 +60,50 @@ pub struct TracerMetadata {
     pub service_version: Option<String>,
     pub process_tags: Option<String>,
     pub container_id: Option<String>,
-    /// Ordered list of attribute key names for thread-level OTEP-4947
-    /// context records. Key indices on the wire index into this list.
-    /// libdatadog's OTel process-context conversion prepends the
-    /// implicit `datadog.local_root_span_id` entry at wire index 0, so
-    /// callers should only set their additional keys here — entry 0 in
-    /// this list corresponds to wire key index 1.
-    ///
-    /// `null`/omitted (the default) disables the thread-context-related
-    /// attributes in the OTel process context entirely.
-    pub threadlocal_attribute_keys: Option<Vec<String>>,
+    /// Optional thread-level context metadata; see [`ThreadLocalMetadata`].
+    /// `null`/omitted (the default) disables the `threadlocal.*` block in the
+    /// emitted OTel process context entirely.
+    pub threadlocal_metadata: Option<ThreadLocalMetadata>,
+}
+
+fn convert_extra_attribute(ea: &ExtraAttribute) -> napi::Result<(String, any_value::Value)> {
+    let value = match (&ea.string_value, ea.int_value) {
+        (Some(s), None) => any_value::Value::StringValue(s.clone()),
+        (None, Some(i)) => any_value::Value::IntValue(i),
+        (Some(_), Some(_)) => {
+            return Err(Error::new(
+                Status::InvalidArg,
+                format!(
+                    "ExtraAttribute {:?}: exactly one of stringValue / intValue must be set, both are",
+                    ea.key,
+                ),
+            ));
+        }
+        (None, None) => {
+            return Err(Error::new(
+                Status::InvalidArg,
+                format!(
+                    "ExtraAttribute {:?}: exactly one of stringValue / intValue must be set, neither is",
+                    ea.key,
+                ),
+            ));
+        }
+    };
+    Ok((ea.key.clone(), value))
+}
+
+fn convert_threadlocal_metadata(
+    tlm: &ThreadLocalMetadata,
+) -> napi::Result<tracer_metadata::ThreadLocalMetadata> {
+    Ok(tracer_metadata::ThreadLocalMetadata {
+        attribute_keys: tlm.attribute_keys.clone(),
+        schema_version: tlm.schema_version.clone(),
+        extra_attributes: tlm
+            .extra_attributes
+            .iter()
+            .map(convert_extra_attribute)
+            .collect::<napi::Result<_>>()?,
+    })
 }
 
 #[napi]
@@ -46,7 +119,11 @@ pub fn store_metadata(data: &TracerMetadata) -> napi::Result<NapiAnonymousFileHa
         service_version: data.service_version.clone(),
         process_tags: data.process_tags.clone(),
         container_id: data.container_id.clone(),
-        threadlocal_attribute_keys: data.threadlocal_attribute_keys.clone(),
+        threadlocal_metadata: data
+            .threadlocal_metadata
+            .as_ref()
+            .map(convert_threadlocal_metadata)
+            .transpose()?,
     });
 
     match res {

test/process-discovery.js

@@ -22,9 +22,10 @@ const metadata = new process_discovery.TracerMetadata(
 const cfg_handle = process_discovery.storeMetadata(metadata)
 assert(cfg_handle !== undefined)
 
-// Same shape, plus a thread-local attribute key map (OTEP-4947). libdatadog
-// implicitly prepends `datadog.local_root_span_id` at wire index 0; entries
-// here start at wire index 1.
+// Same shape, plus a thread-local metadata block (OTEP-4947). libdatadog
+// implicitly prepends `datadog.local_root_span_id` at wire index 0 in the
+// attribute key map; entries here start at wire index 1. `schemaVersion` and
+// `extraAttributes` describe the on-the-wire record schema for readers.
 const metadata_with_threadlocal = new process_discovery.TracerMetadata(
   '7938685c-19dd-490f-b9b3-8aae4c22f898',
   '1.0.0',
@@ -34,15 +35,67 @@ const metadata_with_threadlocal = new process_discovery.TracerMetadata(
   'my_version',
   undefined,
   undefined,
-  ['endpoint', 'http.status'],
+  {
+    attributeKeys: ['endpoint', 'http.status'],
+    schemaVersion: 'nodejs_v1_dev',
+    extraAttributes: [
+      { key: 'threadlocal.wrapped_object_offset', intValue: 24 },
+      { key: 'threadlocal.tagged_size', intValue: 8 },
+      { key: 'threadlocal.runtime.name', stringValue: 'nodejs' },
+    ],
+  },
 )
 assert.deepStrictEqual(
-  metadata_with_threadlocal.threadlocalAttributeKeys,
+  metadata_with_threadlocal.threadlocalMetadata.attributeKeys,
   ['endpoint', 'http.status'],
 )
+assert.strictEqual(
+  metadata_with_threadlocal.threadlocalMetadata.schemaVersion,
+  'nodejs_v1_dev',
+)
+assert.strictEqual(
+  metadata_with_threadlocal.threadlocalMetadata.extraAttributes.length,
+  3,
+)
 const cfg_handle_threadlocal = process_discovery.storeMetadata(metadata_with_threadlocal)
 assert(cfg_handle_threadlocal !== undefined)
 
+// An ExtraAttribute with neither stringValue nor intValue set is a caller
+// error — one of them has to be picked.
+const bad_metadata_neither = new process_discovery.TracerMetadata(
+  '7938685c-19dd-490f-b9b3-8aae4c22f899',
+  '1.0.0',
+  'my_hostname',
+  undefined, undefined, undefined, undefined, undefined,
+  {
+    attributeKeys: [],
+    schemaVersion: undefined,
+    extraAttributes: [{ key: 'threadlocal.bogus' }],
+  },
+)
+assert.throws(
+  () => process_discovery.storeMetadata(bad_metadata_neither),
+  /neither is/,
+)
+
+// Setting both stringValue and intValue is also a caller error — the intent
+// is ambiguous, so reject.
+const bad_metadata_both = new process_discovery.TracerMetadata(
+  '7938685c-19dd-490f-b9b3-8aae4c22f89a',
+  '1.0.0',
+  'my_hostname',
+  undefined, undefined, undefined, undefined, undefined,
+  {
+    attributeKeys: [],
+    schemaVersion: undefined,
+    extraAttributes: [{ key: 'threadlocal.bogus', stringValue: 's', intValue: 1 }],
+  },
+)
+assert.throws(
+  () => process_discovery.storeMetadata(bad_metadata_both),
+  /both are/,
+)
+
 if (process.platform === 'linux') {
   const contains_datadog_memfd = (fds) => {
     for (const fd in fds) {