datadog 2.42.0 → 2.44.0

data/ext/libdatadog_api/init.c

@@ -25,7 +25,9 @@ void DDTRACE_EXPORT Init_libdatadog_api(void) {
   library_config_init(core_module);
   ddsketch_init(core_module);
   feature_flags_init(core_module);
-  di_init(datadog_module);
+  #ifndef TRUFFLERUBY
+    di_init(datadog_module);
+  #endif
 
   VALUE tracing_module = rb_define_module_under(datadog_module, "Tracing");
   trace_exporter_init(tracing_module);

data/ext/libdatadog_api/otel_thread_context.c

@@ -4,7 +4,12 @@
 #include "datadog_ruby_common.h"
 #include "otel_thread_context.h"
 
-#ifdef __linux__
+// Relies on a :fiber_switch TracePoint that TruffleRuby does not support yet
+#if defined(__linux__) && !defined(TRUFFLERUBY)
+  #define OTEL_THREAD_CONTEXT_SUPPORTED
+#endif
+
+#ifdef OTEL_THREAD_CONTEXT_SUPPORTED
   #include <datadog/otel-thread-ctx.h>
   extern __thread const uint8_t *otel_thread_ctx_v1;
 
@@ -24,6 +29,7 @@ static ID fiber_context_slot;
 DDTRACE_UNUSED static bool otel_context_enabled = false;
 
 static VALUE native_set(VALUE _self, VALUE trace_id, VALUE span_id, VALUE local_root_span_id);
+static VALUE native_clear(VALUE _self);
 static VALUE native_supported_p(VALUE _self);
 static VALUE native_enable(VALUE _self);
 static VALUE native_read(VALUE _self);
@@ -31,17 +37,18 @@ static VALUE native_read(VALUE _self);
 void otel_thread_context_init(VALUE tracing_module) {
   fiber_context_slot = rb_intern("__dd_otel_fiber_context");
 
-  VALUE otel_thread_context_module = rb_define_module_under(tracing_module, "OTelThreadContext");
+  VALUE otel_thread_context_class = rb_define_class_under(tracing_module, "OTelThreadContext", rb_cObject);
 
-  rb_define_singleton_method(otel_thread_context_module, "_native_enable", native_enable, 0);
-  rb_define_singleton_method(otel_thread_context_module, "_native_set", native_set, 3);
-  rb_define_singleton_method(otel_thread_context_module, "_native_supported?", native_supported_p, 0);
+  rb_define_method(otel_thread_context_class, "_native_enable", native_enable, 0);
+  rb_define_method(otel_thread_context_class, "_native_set", native_set, 3);
+  rb_define_method(otel_thread_context_class, "_native_clear", native_clear, 0);
+  rb_define_method(otel_thread_context_class, "_native_supported?", native_supported_p, 0);
 
-  VALUE testing_module = rb_define_module_under(otel_thread_context_module, "Testing");
+  VALUE testing_module = rb_define_module_under(otel_thread_context_class, "Testing");
   rb_define_singleton_method(testing_module, "_native_read", native_read, 0);
 }
 
-#ifdef __linux__
+#ifdef OTEL_THREAD_CONTEXT_SUPPORTED
   static ddog_ThreadContextHandle *get_fiber_handle_for(VALUE thread) {
     VALUE obj = rb_thread_local_aref(thread, fiber_context_slot);
 
@@ -54,6 +61,22 @@ void otel_thread_context_init(VALUE tracing_module) {
     return get_fiber_handle_for(rb_thread_current());
   }
 
+  static void pack_span_id(VALUE id, uint8_t bytes[8]) {
+    // Tracing::Utils.next_id caps generated span IDs at (1 << 62) - 1, which fits
+    // in a Fixnum on 64-bit Ruby. Packing them directly avoids rb_integer_pack's
+    // generic conversion and format checks on each context update.
+    // https://github.com/DataDog/dd-trace-rb/blob/0b10368e0a2940c1f4d50c9739b9973b4f8bc32a/lib/datadog/tracing/utils.rb#L20-L37
+    if (FIXNUM_P(id)) {
+      uint64_t number = (uint64_t) FIX2LONG(id);
+      for (int i = 7; i >= 0; i--) {
+        bytes[i] = (uint8_t) number;
+        number >>= 8;
+      }
+    } else {
+      rb_integer_pack(id, bytes, 1, sizeof(uint64_t), 0, INTEGER_PACK_BIG_ENDIAN);
+    }
+  }
+
   static void store_current_fiber_handle(ddog_ThreadContextHandle *handle) {
     VALUE obj = TypedData_Wrap_Struct(rb_cObject, &otel_ctx_handle_t, handle);
     rb_thread_local_aset(rb_thread_current(), fiber_context_slot, obj);
@@ -135,7 +158,7 @@ void otel_thread_context_init(VALUE tracing_module) {
 #endif
 
 static VALUE native_enable(DDTRACE_UNUSED VALUE _self) {
-  #ifdef __linux__
+  #ifdef OTEL_THREAD_CONTEXT_SUPPORTED
     if (otel_context_enabled) return Qtrue;
     otel_context_enabled = true;
 
@@ -161,7 +184,7 @@ static VALUE native_enable(DDTRACE_UNUSED VALUE _self) {
 }
 
 static VALUE native_supported_p(DDTRACE_UNUSED VALUE _self) {
-  #ifdef __linux__
+  #ifdef OTEL_THREAD_CONTEXT_SUPPORTED
     return Qtrue;
   #else
     return Qfalse;
@@ -174,17 +197,17 @@ static VALUE native_set(
     DDTRACE_UNUSED VALUE span_id,
     DDTRACE_UNUSED VALUE local_root_span_id
   ) {
-  #ifdef __linux__
+  #ifdef OTEL_THREAD_CONTEXT_SUPPORTED
     if (!otel_context_enabled) return Qfalse;
 
     uint8_t trace_id_bytes[16];
     uint8_t span_id_bytes[8];
     uint8_t local_root_span_id_bytes[8];
 
-    const int BIG_ENDIAN_PACK_FLAGS = INTEGER_PACK_MSWORD_FIRST | INTEGER_PACK_BIG_ENDIAN;
-    rb_integer_pack(trace_id, trace_id_bytes, sizeof(trace_id_bytes), 1, 0, BIG_ENDIAN_PACK_FLAGS);
-    rb_integer_pack(span_id, span_id_bytes, sizeof(span_id_bytes), 1, 0, BIG_ENDIAN_PACK_FLAGS);
-    rb_integer_pack(local_root_span_id, local_root_span_id_bytes, sizeof(local_root_span_id_bytes), 1, 0, BIG_ENDIAN_PACK_FLAGS);
+    // Note: We use 2 words of size 8, as `rb_integer_pack` has a fast path for it (vs 16 bytes of size 1)
+    rb_integer_pack(trace_id, trace_id_bytes, 2, sizeof(uint64_t), 0, INTEGER_PACK_BIG_ENDIAN);
+    pack_span_id(span_id, span_id_bytes);
+    pack_span_id(local_root_span_id, local_root_span_id_bytes);
 
     ddog_ThreadContextHandle *handle = get_current_fiber_handle();
 
@@ -204,8 +227,21 @@ static VALUE native_set(
   #endif
 }
 
+static VALUE native_clear(DDTRACE_UNUSED VALUE _self) {
+  #ifdef OTEL_THREAD_CONTEXT_SUPPORTED
+    if (!otel_context_enabled) return Qfalse;
+
+    ddog_ThreadContextHandle *detached = ddog_otel_thread_ctx_detach();
+    rb_thread_local_aset(rb_thread_current(), fiber_context_slot, Qnil);
+
+    return detached == NULL ? Qfalse : Qtrue;
+  #else
+    return Qfalse;
+  #endif
+}
+
 static VALUE native_read(DDTRACE_UNUSED VALUE _self) {
-  #ifdef __linux__
+  #ifdef OTEL_THREAD_CONTEXT_SUPPORTED
     const uint8_t *raw = otel_thread_ctx_v1;
     if (!raw) return Qnil;