ddtrace 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7755d42a1b84dda8386f13ce2edc3854f09e1e227d5786546b19ea31a60cc03b
-  data.tar.gz: 57ee6f72d29b72305c8272b98dc4b7d08a66f9463820d9963aa487723094d1f7
+  metadata.gz: 845f4614c8e20a84d26d9d14a22b5cddde0e1b27aeb7e093b5addf7a0cbd7490
+  data.tar.gz: 829de76d1ac7aa04f1eb9a1bd36ef3ff5fec7bfc5657015cea291fe8219ea162
 SHA512:
-  metadata.gz: e9c5d234fb1261e202bf8d4ae00417f31f325dbcc9ceb9081277ac96a04114316456fed6d21f3de343dbe6192e4a0ceccb4504e5b1a59bbb44fe2666042a7890
-  data.tar.gz: effa42b2181771676d69ea5efb946cd6bd4617853b36f75b9655a710d369f57a200dded1cdc8b86642eaf60174c20b44da3b3de29fbfddfd76c6845364927fe2
+  metadata.gz: 6a3ed99fb7b1ddf340fa2f343f70d0f2ba456f6f45f62cd6f1a3250b05dafa2f44f18784899bd898d213eab37ca4921b618581b8faf0134c2bed325febb20c30
+  data.tar.gz: 6ef24c9b3559eb34705a4b43d325d4582bef7279627563641cae3675e26978ce92e5f953c277991866389083e57540622d232b58a44d44e4ede4fb370ff93b68

data/CHANGELOG.md

@@ -2,21 +2,70 @@
 
 ## [Unreleased]
 
+## [1.13.0] - 2023-07-31
+
+### Added
+
+* Core: Add support for `Option` precedence ([#2915][])
+* Core: Add support for unsetting options ([#2972][])
+* Core: Gauge primitive `RubyVM::YJIT.runtime_stats`, if `YJIT` is enabled ([#2711][], [#2959][])([@HeyNonster][])
+* Core: Add Telemetry `app-client-configuration-change` event ([#2977][])
+* Core: Improve our `SafeDup` module ([#2960][])
+* Tracing: Add `OpenSearch` Integration ([#2940][])
+* Tracing: Implement `peer.service` tag to integrations ([#2982][])
+* Tracing: Add mandatory rpc and grpc tags for `grpc` integration ([#2620][], [#2962][])
+* Tracing: Include `_dd.profiling.enabled` tag ([#2913][])
+* Tracing: Support host injection ([#2941][], [#3007][])
+* Tracing: Implement Dynamic Configuration for tracing ([#2848][], [#2973][])
+* Tracing: Add for dynamic log injection configuration ([#2992][])
+* Tracing: Add sampling configuration with `DD_TRACE_SAMPLING_RULES` ([#2968][])
+* Tracing: Add HTTP header tagging with `DD_TRACE_HEADER_TAGS` for clients and servers ([#2946][], [#2935][])
+* Profiling: Add fallback name/invoke location for unnamed threads started in native code ([#2993][])
+* Profiling: Use invoke location as a fallback for nameless threads in the profiler ([#2950][])
+* Profiling: Add fallback name for main thread in profiling data ([#2939][])
+* Ci-app: Add `Minitest` CI integration ([#2932][]) ([@bravehager][])
+* Appsec: `Devise` integration and automatic user events  ([#2877][])
+* Appsec: Handle disabled tracing and appsec events ([#2572][])
+* Appsec: Automate user events check for UUID in safe mode ([#2952][])
+* Docs: Add Ruby 3.2 support to compatibility matrix ([#2971][])
+
+### Changed
+
+* Core: Set maximum supported Ruby version ([#2497][])
+* Core: Prevent telemetry requests from being traced ([#2961][])
+* Core: Add `env` and `type` to Core configuration option ([#2983][], [#2988][], [#2994][])
+* Core: Remove `lazy` from Core configuration option ([#2931][], [#2999][])
+* Profiling: Bump `libdatadog` dependency to version 3 ([#2948][])
+* Profiling: Improve error message when `ddtrace_profiling_loader` fails to load ([#2957][])
+* Tracing: Improve log injection runtime conditionals ([#2926][], [#2882][])
+
+### Fixed
+
+* Core: Fix polynomial-time regular expressions ([#2814][])
+* Core: Fix environment variable for dynamic configuration polling interval ([#2967][])
+* Core: Reduce remote configuration error logging noise ([#3011][])
+* Tracing: Fix manual log injection for 128 bit trace_id ([#2974][])
+* Tracing: Ensure the GRPC client interceptor return the response ([#2928][]) ([@KJTsanaktsidis][])
+* Tracing: Remove dynamic input used in regular expression ([#2867][])
+* Tracing: Fix distributed tracing header formats ([#3005][] )
+* Profiling: Fix profiler `libmysqlclient` version detection with `mysql2-aurora` gem ([#2956][])
+* Profiling: Automatically enable profiler "no signals" workaround for `passenger` web server ([#2978][])
+
 ## [1.12.1] - 2023-06-14
 
 ### Added
-Appsec: Add `appsec.blocked` tag to span ([#2895][])
-Profiling:  Add workaround for legacy profiler incompatibility with ruby-cloud-profiler gem ([#2891][])
-Core: Allow setting remote configuration service name ([#2853][])
+* Appsec: Add `appsec.blocked` tag to span ([#2895][])
+* Profiling:  Add workaround for legacy profiler incompatibility with ruby-cloud-profiler gem ([#2891][])
+* Core: Allow setting remote configuration service name ([#2853][])
 
 ### Changed
-Appsec: Change the value format for the WAF address `server.request.query` ([#2903][])
-Profiling: Log pkg-config command when building profiling native extension
+* Appsec: Change the value format for the WAF address `server.request.query` ([#2903][])
+* Profiling: Log pkg-config command when building profiling native extension
 
 ### Fixed
-Appsec: Update blocked response content_type resolution ([#2900][])
-Appsec: Ensure to use service entry span. ([#2898][])
-Tracing: Fix AWS integration constant loading ([#2896][])
+* Appsec: Update blocked response content_type resolution ([#2900][])
+* Appsec: Ensure to use service entry span. ([#2898][])
+* Tracing: Fix AWS integration constant loading ([#2896][])
 
 ## [1.12.0] - 2023-06-02
 
@@ -2454,7 +2503,8 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
-[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.12.1...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v1.13.0...master
+[1.13.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.12.1...v1.13.0
 [1.12.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.12.0...v1.12.1
 [1.12.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.11.1...v1.12.0
 [1.11.1]: https://github.com/DataDog/dd-trace-rb/compare/v1.10.1...v1.11.1
@@ -3427,6 +3477,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2489]: https://github.com/DataDog/dd-trace-rb/issues/2489
 [#2493]: https://github.com/DataDog/dd-trace-rb/issues/2493
 [#2496]: https://github.com/DataDog/dd-trace-rb/issues/2496
+[#2497]: https://github.com/DataDog/dd-trace-rb/issues/2497
 [#2501]: https://github.com/DataDog/dd-trace-rb/issues/2501
 [#2504]: https://github.com/DataDog/dd-trace-rb/issues/2504
 [#2512]: https://github.com/DataDog/dd-trace-rb/issues/2512
@@ -3439,6 +3490,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2543]: https://github.com/DataDog/dd-trace-rb/issues/2543
 [#2557]: https://github.com/DataDog/dd-trace-rb/issues/2557
 [#2562]: https://github.com/DataDog/dd-trace-rb/issues/2562
+[#2572]: https://github.com/DataDog/dd-trace-rb/issues/2572
 [#2573]: https://github.com/DataDog/dd-trace-rb/issues/2573
 [#2576]: https://github.com/DataDog/dd-trace-rb/issues/2576
 [#2580]: https://github.com/DataDog/dd-trace-rb/issues/2580
@@ -3461,6 +3513,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2614]: https://github.com/DataDog/dd-trace-rb/issues/2614
 [#2618]: https://github.com/DataDog/dd-trace-rb/issues/2618
 [#2619]: https://github.com/DataDog/dd-trace-rb/issues/2619
+[#2620]: https://github.com/DataDog/dd-trace-rb/issues/2620
 [#2634]: https://github.com/DataDog/dd-trace-rb/issues/2634
 [#2635]: https://github.com/DataDog/dd-trace-rb/issues/2635
 [#2642]: https://github.com/DataDog/dd-trace-rb/issues/2642
@@ -3488,6 +3541,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2704]: https://github.com/DataDog/dd-trace-rb/issues/2704
 [#2705]: https://github.com/DataDog/dd-trace-rb/issues/2705
 [#2710]: https://github.com/DataDog/dd-trace-rb/issues/2710
+[#2711]: https://github.com/DataDog/dd-trace-rb/issues/2711
 [#2720]: https://github.com/DataDog/dd-trace-rb/issues/2720
 [#2726]: https://github.com/DataDog/dd-trace-rb/issues/2726
 [#2727]: https://github.com/DataDog/dd-trace-rb/issues/2727
@@ -3514,6 +3568,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2805]: https://github.com/DataDog/dd-trace-rb/issues/2805
 [#2806]: https://github.com/DataDog/dd-trace-rb/issues/2806
 [#2810]: https://github.com/DataDog/dd-trace-rb/issues/2810
+[#2814]: https://github.com/DataDog/dd-trace-rb/issues/2814
 [#2815]: https://github.com/DataDog/dd-trace-rb/issues/2815
 [#2822]: https://github.com/DataDog/dd-trace-rb/issues/2822
 [#2824]: https://github.com/DataDog/dd-trace-rb/issues/2824
@@ -3521,6 +3576,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2829]: https://github.com/DataDog/dd-trace-rb/issues/2829
 [#2836]: https://github.com/DataDog/dd-trace-rb/issues/2836
 [#2840]: https://github.com/DataDog/dd-trace-rb/issues/2840
+[#2848]: https://github.com/DataDog/dd-trace-rb/issues/2848
 [#2853]: https://github.com/DataDog/dd-trace-rb/issues/2853
 [#2854]: https://github.com/DataDog/dd-trace-rb/issues/2854
 [#2855]: https://github.com/DataDog/dd-trace-rb/issues/2855
@@ -3529,10 +3585,13 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2860]: https://github.com/DataDog/dd-trace-rb/issues/2860
 [#2864]: https://github.com/DataDog/dd-trace-rb/issues/2864
 [#2866]: https://github.com/DataDog/dd-trace-rb/issues/2866
+[#2867]: https://github.com/DataDog/dd-trace-rb/issues/2867
 [#2869]: https://github.com/DataDog/dd-trace-rb/issues/2869
 [#2873]: https://github.com/DataDog/dd-trace-rb/issues/2873
 [#2874]: https://github.com/DataDog/dd-trace-rb/issues/2874
 [#2875]: https://github.com/DataDog/dd-trace-rb/issues/2875
+[#2877]: https://github.com/DataDog/dd-trace-rb/issues/2877
+[#2882]: https://github.com/DataDog/dd-trace-rb/issues/2882
 [#2883]: https://github.com/DataDog/dd-trace-rb/issues/2883
 [#2890]: https://github.com/DataDog/dd-trace-rb/issues/2890
 [#2891]: https://github.com/DataDog/dd-trace-rb/issues/2891
@@ -3541,6 +3600,44 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#2898]: https://github.com/DataDog/dd-trace-rb/issues/2898
 [#2900]: https://github.com/DataDog/dd-trace-rb/issues/2900
 [#2903]: https://github.com/DataDog/dd-trace-rb/issues/2903
+[#2913]: https://github.com/DataDog/dd-trace-rb/issues/2913
+[#2915]: https://github.com/DataDog/dd-trace-rb/issues/2915
+[#2926]: https://github.com/DataDog/dd-trace-rb/issues/2926
+[#2928]: https://github.com/DataDog/dd-trace-rb/issues/2928
+[#2931]: https://github.com/DataDog/dd-trace-rb/issues/2931
+[#2932]: https://github.com/DataDog/dd-trace-rb/issues/2932
+[#2935]: https://github.com/DataDog/dd-trace-rb/issues/2935
+[#2939]: https://github.com/DataDog/dd-trace-rb/issues/2939
+[#2940]: https://github.com/DataDog/dd-trace-rb/issues/2940
+[#2941]: https://github.com/DataDog/dd-trace-rb/issues/2941
+[#2946]: https://github.com/DataDog/dd-trace-rb/issues/2946
+[#2948]: https://github.com/DataDog/dd-trace-rb/issues/2948
+[#2950]: https://github.com/DataDog/dd-trace-rb/issues/2950
+[#2952]: https://github.com/DataDog/dd-trace-rb/issues/2952
+[#2956]: https://github.com/DataDog/dd-trace-rb/issues/2956
+[#2957]: https://github.com/DataDog/dd-trace-rb/issues/2957
+[#2959]: https://github.com/DataDog/dd-trace-rb/issues/2959
+[#2960]: https://github.com/DataDog/dd-trace-rb/issues/2960
+[#2961]: https://github.com/DataDog/dd-trace-rb/issues/2961
+[#2962]: https://github.com/DataDog/dd-trace-rb/issues/2962
+[#2967]: https://github.com/DataDog/dd-trace-rb/issues/2967
+[#2968]: https://github.com/DataDog/dd-trace-rb/issues/2968
+[#2971]: https://github.com/DataDog/dd-trace-rb/issues/2971
+[#2972]: https://github.com/DataDog/dd-trace-rb/issues/2972
+[#2973]: https://github.com/DataDog/dd-trace-rb/issues/2973
+[#2974]: https://github.com/DataDog/dd-trace-rb/issues/2974
+[#2977]: https://github.com/DataDog/dd-trace-rb/issues/2977
+[#2978]: https://github.com/DataDog/dd-trace-rb/issues/2978
+[#2982]: https://github.com/DataDog/dd-trace-rb/issues/2982
+[#2983]: https://github.com/DataDog/dd-trace-rb/issues/2983
+[#2988]: https://github.com/DataDog/dd-trace-rb/issues/2988
+[#2992]: https://github.com/DataDog/dd-trace-rb/issues/2992
+[#2993]: https://github.com/DataDog/dd-trace-rb/issues/2993
+[#2994]: https://github.com/DataDog/dd-trace-rb/issues/2994
+[#2999]: https://github.com/DataDog/dd-trace-rb/issues/2999
+[#3005]: https://github.com/DataDog/dd-trace-rb/issues/3005
+[#3007]: https://github.com/DataDog/dd-trace-rb/issues/3007
+[#3011]: https://github.com/DataDog/dd-trace-rb/issues/3011
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot
@@ -3548,11 +3645,13 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@Drowze]: https://github.com/Drowze
 [@EpiFouloux]: https://github.com/EpiFouloux
 [@EvNomad]: https://github.com/EvNomad
+[@HeyNonster]: https://github.com/HeyNonster
 [@HoneyryderChuck]: https://github.com/HoneyryderChuck
 [@JamesHarker]: https://github.com/JamesHarker
 [@Jared-Prime]: https://github.com/Jared-Prime
 [@Joas1988]: https://github.com/Joas1988
 [@JustSnow]: https://github.com/JustSnow
+[@KJTsanaktsidis]: https://github.com/KJTsanaktsidis
 [@KieranP]: https://github.com/KieranP
 [@MMartyn]: https://github.com/MMartyn
 [@NobodysNightmare]: https://github.com/NobodysNightmare
@@ -3577,6 +3676,7 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@bheemreddy181]: https://github.com/bheemreddy181
 [@blaines]: https://github.com/blaines
 [@brafales]: https://github.com/brafales
+[@bravehager]: https://github.com/bravehager
 [@bzf]: https://github.com/bzf
 [@callumj]: https://github.com/callumj
 [@caramcc]: https://github.com/caramcc

data/ext/ddtrace_profiling_native_extension/collectors_thread_context.c

@@ -63,8 +63,8 @@
 // allowed to happen during Ruby's garbage collection start/finish hooks.
 // ---
 
-#define INVALID_TIME -1
 #define THREAD_ID_LIMIT_CHARS 44 // Why 44? "#{2**64} (#{2**64})".size + 1 for \0
+#define THREAD_INVOKE_LOCATION_LIMIT_CHARS 512
 #define IS_WALL_TIME true
 #define IS_NOT_WALL_TIME false
 #define MISSING_TRACER_CONTEXT_KEY 0
@@ -99,6 +99,12 @@ struct thread_context_collector_state {
   VALUE thread_list_buffer;
   // Used to omit endpoint names (retrieved from tracer) from collected data
   bool endpoint_collection_enabled;
+  // Used to omit timestamps / timeline events from collected data
+  bool timeline_enabled;
+  // Used when calling monotonic_to_system_epoch_ns
+  monotonic_to_system_epoch_state time_converter_state;
+  // Used to identify the main thread, to give it a fallback name
+  VALUE main_thread;
 
   struct stats {
     // Track how many garbage collection samples we've taken.
@@ -112,6 +118,8 @@ struct thread_context_collector_state {
 struct per_thread_context {
   char thread_id[THREAD_ID_LIMIT_CHARS];
   ddog_CharSlice thread_id_char_slice;
+  char thread_invoke_location[THREAD_INVOKE_LOCATION_LIMIT_CHARS];
+  ddog_CharSlice thread_invoke_location_char_slice;
   thread_cpu_time_id thread_cpu_time_id;
   long cpu_time_at_previous_sample_ns;  // Can be INVALID_TIME until initialized or if getting it fails for another reason
   long wall_time_at_previous_sample_ns; // Can be INVALID_TIME until initialized
@@ -148,7 +156,8 @@ static VALUE _native_initialize(
   VALUE recorder_instance,
   VALUE max_frames,
   VALUE tracer_context_key,
-  VALUE endpoint_collection_enabled
+  VALUE endpoint_collection_enabled,
+  VALUE timeline_enabled
 );
 static VALUE _native_sample(VALUE self, VALUE collector_instance, VALUE profiler_overhead_stack_thread);
 static VALUE _native_on_gc_start(VALUE self, VALUE collector_instance);
@@ -168,12 +177,13 @@ static void trigger_sample_for_thread(
   VALUE stack_from_thread,
   struct per_thread_context *thread_context,
   sample_values values,
-  sample_type type
+  sample_type type,
+  long current_monotonic_wall_time_ns
 );
 static VALUE _native_thread_list(VALUE self);
 static struct per_thread_context *get_or_create_context_for(VALUE thread, struct thread_context_collector_state *state);
 static struct per_thread_context *get_context_for(VALUE thread, struct thread_context_collector_state *state);
-static void initialize_context(VALUE thread, struct per_thread_context *thread_context);
+static void initialize_context(VALUE thread, struct per_thread_context *thread_context, struct thread_context_collector_state *state);
 static VALUE _native_inspect(VALUE self, VALUE collector_instance);
 static VALUE per_thread_context_st_table_as_ruby_hash(struct thread_context_collector_state *state);
 static int per_thread_context_as_ruby_hash(st_data_t key_thread, st_data_t value_context, st_data_t result_hash);
@@ -190,6 +200,7 @@ static bool is_type_web(VALUE root_span_type);
 static VALUE _native_reset_after_fork(DDTRACE_UNUSED VALUE self, VALUE collector_instance);
 static VALUE thread_list(struct thread_context_collector_state *state);
 static VALUE _native_sample_allocation(VALUE self, VALUE collector_instance, VALUE sample_weight);
+static VALUE _native_new_empty_thread(VALUE self);
 
 void collectors_thread_context_init(VALUE profiling_module) {
   VALUE collectors_module = rb_define_module_under(profiling_module, "Collectors");
@@ -207,7 +218,7 @@ void collectors_thread_context_init(VALUE profiling_module) {
   // https://bugs.ruby-lang.org/issues/18007 for a discussion around this.
   rb_define_alloc_func(collectors_thread_context_class, _native_new);
 
-  rb_define_singleton_method(collectors_thread_context_class, "_native_initialize", _native_initialize, 5);
+  rb_define_singleton_method(collectors_thread_context_class, "_native_initialize", _native_initialize, 6);
   rb_define_singleton_method(collectors_thread_context_class, "_native_inspect", _native_inspect, 1);
   rb_define_singleton_method(collectors_thread_context_class, "_native_reset_after_fork", _native_reset_after_fork, 1);
   rb_define_singleton_method(testing_module, "_native_sample", _native_sample, 2);
@@ -218,6 +229,7 @@ void collectors_thread_context_init(VALUE profiling_module) {
   rb_define_singleton_method(testing_module, "_native_thread_list", _native_thread_list, 0);
   rb_define_singleton_method(testing_module, "_native_per_thread_context", _native_per_thread_context, 1);
   rb_define_singleton_method(testing_module, "_native_stats", _native_stats, 1);
+  rb_define_singleton_method(testing_module, "_native_new_empty_thread", _native_new_empty_thread, 0);
 
   at_active_span_id = rb_intern_const("@active_span");
   at_active_trace_id = rb_intern_const("@active_trace");
@@ -249,6 +261,7 @@ static void thread_context_collector_typed_data_mark(void *state_ptr) {
   rb_gc_mark(state->recorder_instance);
   st_foreach(state->hash_map_per_thread_context, hash_map_per_thread_context_mark, 0 /* unused */);
   rb_gc_mark(state->thread_list_buffer);
+  rb_gc_mark(state->main_thread);
 }
 
 static void thread_context_collector_typed_data_free(void *state_ptr) {
@@ -294,6 +307,9 @@ static VALUE _native_new(VALUE klass) {
   state->tracer_context_key = MISSING_TRACER_CONTEXT_KEY;
   state->thread_list_buffer = rb_ary_new();
   state->endpoint_collection_enabled = true;
+  state->timeline_enabled = true;
+  state->time_converter_state = (monotonic_to_system_epoch_state) MONOTONIC_TO_SYSTEM_EPOCH_INITIALIZER;
+  state->main_thread = rb_thread_main();
 
   return TypedData_Wrap_Struct(klass, &thread_context_collector_typed_data, state);
 }
@@ -304,9 +320,11 @@ static VALUE _native_initialize(
   VALUE recorder_instance,
   VALUE max_frames,
   VALUE tracer_context_key,
-  VALUE endpoint_collection_enabled
+  VALUE endpoint_collection_enabled,
+  VALUE timeline_enabled
 ) {
   ENFORCE_BOOLEAN(endpoint_collection_enabled);
+  ENFORCE_BOOLEAN(timeline_enabled);
 
   struct thread_context_collector_state *state;
   TypedData_Get_Struct(collector_instance, struct thread_context_collector_state, &thread_context_collector_typed_data, state);
@@ -319,6 +337,7 @@ static VALUE _native_initialize(
   // hash_map_per_thread_context is already initialized, nothing to do here
   state->recorder_instance = enforce_recorder_instance(recorder_instance);
   state->endpoint_collection_enabled = (endpoint_collection_enabled == Qtrue);
+  state->timeline_enabled = (timeline_enabled == Qtrue);
 
   if (RTEST(tracer_context_key)) {
     ENFORCE_TYPE(tracer_context_key, T_SYMBOL);
@@ -443,7 +462,8 @@ void update_metrics_and_sample(
     stack_from_thread,
     thread_context,
     (sample_values) {.cpu_time_ns = cpu_time_elapsed_ns, .cpu_samples = 1, .wall_time_ns = wall_time_elapsed_ns},
-    SAMPLE_REGULAR
+    SAMPLE_REGULAR,
+    current_monotonic_wall_time_ns
   );
 }
 
@@ -585,7 +605,8 @@ VALUE thread_context_collector_sample_after_gc(VALUE self_instance) {
       /* stack_from_thread: */ thread,
       thread_context,
       (sample_values) {.cpu_time_ns = gc_cpu_time_elapsed_ns, .cpu_samples = 1, .wall_time_ns = gc_wall_time_elapsed_ns},
-      SAMPLE_IN_GC
+      SAMPLE_IN_GC,
+      INVALID_TIME // For now we're not collecting timestamps for these events
     );
 
     // Mark thread as no longer in GC
@@ -615,12 +636,14 @@ static void trigger_sample_for_thread(
   VALUE stack_from_thread, // This can be different when attributing profiler overhead using a different stack
   struct per_thread_context *thread_context,
   sample_values values,
-  sample_type type
+  sample_type type,
+  long current_monotonic_wall_time_ns
 ) {
   int max_label_count =
     1 + // thread id
     1 + // thread name
     1 + // profiler overhead
+    1 + // end_timestamp_ns
     2;  // local root span id and span id
   ddog_prof_Label labels[max_label_count];
   int label_pos = 0;
@@ -636,6 +659,19 @@ static void trigger_sample_for_thread(
       .key = DDOG_CHARSLICE_C("thread name"),
       .str = char_slice_from_ruby_string(thread_name)
     };
+  } else if (thread == state->main_thread) { // Threads are often not named, but we can have a nice fallback for this special thread
+    ddog_CharSlice main_thread_name = DDOG_CHARSLICE_C("main");
+    labels[label_pos++] = (ddog_prof_Label) {
+      .key = DDOG_CHARSLICE_C("thread name"),
+      .str = main_thread_name
+    };
+  } else {
+    // For other threads without name, we use the "invoke location" (first file:line of the block used to start the thread), if any.
+    // This is what Ruby shows in `Thread#to_s`.
+    labels[label_pos++] = (ddog_prof_Label) {
+      .key = DDOG_CHARSLICE_C("thread name"),
+      .str = thread_context->thread_invoke_location_char_slice // This is an empty string if no invoke location was available
+    };
   }
 
   struct trace_identifiers trace_identifiers_result = {.valid = false, .trace_endpoint = Qnil};
@@ -670,10 +706,17 @@ static void trigger_sample_for_thread(
     };
   }
 
+  if (state->timeline_enabled && current_monotonic_wall_time_ns != INVALID_TIME) {
+    labels[label_pos++] = (ddog_prof_Label) {
+      .key = DDOG_CHARSLICE_C("end_timestamp_ns"),
+      .num = monotonic_to_system_epoch_ns(&state->time_converter_state, current_monotonic_wall_time_ns)
+    };
+  }
+
   // The number of times `label_pos++` shows up in this function needs to match `max_label_count`. To avoid "oops I
   // forgot to update max_label_count" in the future, we've also added this validation.
-  // @ivoanjo: I wonder if C compilers are smart enough to statically prove when this check never triggers happens and
-  // remove it entirely.
+  // @ivoanjo: I wonder if C compilers are smart enough to statically prove this check never triggers unless someone
+  // changes the code erroneously and remove it entirely?
   if (label_pos > max_label_count) {
     rb_raise(rb_eRuntimeError, "BUG: Unexpected label_pos (%d) > max_label_count (%d)", label_pos, max_label_count);
   }
@@ -704,7 +747,7 @@ static struct per_thread_context *get_or_create_context_for(VALUE thread, struct
     thread_context = (struct per_thread_context*) value_context;
   } else {
     thread_context = ruby_xcalloc(1, sizeof(struct per_thread_context));
-    initialize_context(thread, thread_context);
+    initialize_context(thread, thread_context, state);
     st_insert(state->hash_map_per_thread_context, (st_data_t) thread, (st_data_t) thread_context);
   }
 
@@ -722,10 +765,32 @@ static struct per_thread_context *get_context_for(VALUE thread, struct thread_co
   return thread_context;
 }
 
-static void initialize_context(VALUE thread, struct per_thread_context *thread_context) {
+static void initialize_context(VALUE thread, struct per_thread_context *thread_context, struct thread_context_collector_state *state) {
   snprintf(thread_context->thread_id, THREAD_ID_LIMIT_CHARS, "%"PRIu64" (%lu)", native_thread_id_for(thread), (unsigned long) thread_id_for(thread));
   thread_context->thread_id_char_slice = (ddog_CharSlice) {.ptr = thread_context->thread_id, .len = strlen(thread_context->thread_id)};
 
+  int invoke_line_location;
+  VALUE invoke_file_location = invoke_location_for(thread, &invoke_line_location);
+  if (invoke_file_location != Qnil) {
+    snprintf(
+      thread_context->thread_invoke_location,
+      THREAD_INVOKE_LOCATION_LIMIT_CHARS,
+      "%s:%d",
+      StringValueCStr(invoke_file_location),
+      invoke_line_location
+    );
+  } else if (thread != state->main_thread) {
+    // If the first function of a thread is native code, there won't be an invoke location, so we use this fallback.
+    // NOTE: In the future, I wonder if we could take the pointer to the native function, and try to see if there's a native
+    // symbol attached to it.
+    snprintf(thread_context->thread_invoke_location, THREAD_INVOKE_LOCATION_LIMIT_CHARS, "%s", "(Unnamed thread from native code)");
+  }
+
+  thread_context->thread_invoke_location_char_slice = (ddog_CharSlice) {
+    .ptr = thread_context->thread_invoke_location,
+    .len = strlen(thread_context->thread_invoke_location)
+  };
+
   thread_context->thread_cpu_time_id = thread_cpu_time_id_for(thread);
 
   // These will get initialized during actual sampling
@@ -753,6 +818,13 @@ static VALUE _native_inspect(DDTRACE_UNUSED VALUE _self, VALUE collector_instanc
   rb_str_concat(result, rb_sprintf(" sample_count=%u", state->sample_count));
   rb_str_concat(result, rb_sprintf(" stats=%"PRIsVALUE, stats_as_ruby_hash(state)));
   rb_str_concat(result, rb_sprintf(" endpoint_collection_enabled=%"PRIsVALUE, state->endpoint_collection_enabled ? Qtrue : Qfalse));
+  rb_str_concat(result, rb_sprintf(" timeline_enabled=%"PRIsVALUE, state->timeline_enabled ? Qtrue : Qfalse));
+  rb_str_concat(result, rb_sprintf(
+    " time_converter_state={.system_epoch_ns_reference=%ld, .delta_to_epoch_ns=%ld}",
+    state->time_converter_state.system_epoch_ns_reference,
+    state->time_converter_state.delta_to_epoch_ns
+  ));
+  rb_str_concat(result, rb_sprintf(" main_thread=%"PRIsVALUE, state->main_thread));
 
   return result;
 }
@@ -772,6 +844,7 @@ static int per_thread_context_as_ruby_hash(st_data_t key_thread, st_data_t value
 
   VALUE arguments[] = {
     ID2SYM(rb_intern("thread_id")),                       /* => */ rb_str_new2(thread_context->thread_id),
+    ID2SYM(rb_intern("thread_invoke_location")),          /* => */ rb_str_new2(thread_context->thread_invoke_location),
     ID2SYM(rb_intern("thread_cpu_time_id_valid?")),       /* => */ thread_context->thread_cpu_time_id.valid ? Qtrue : Qfalse,
     ID2SYM(rb_intern("thread_cpu_time_id")),              /* => */ CLOCKID2NUM(thread_context->thread_cpu_time_id.clock_id),
     ID2SYM(rb_intern("cpu_time_at_previous_sample_ns")),  /* => */ LONG2NUM(thread_context->cpu_time_at_previous_sample_ns),
@@ -989,7 +1062,8 @@ void thread_context_collector_sample_allocation(VALUE self_instance, unsigned in
     /* stack_from_thread: */ current_thread,
     get_or_create_context_for(current_thread, state),
     (sample_values) {.alloc_samples = sample_weight},
-    SAMPLE_REGULAR
+    SAMPLE_REGULAR,
+    INVALID_TIME // For now we're not collecting timestamps for allocation events, as per profiling team internal discussions
   );
 }
 
@@ -999,3 +1073,12 @@ static VALUE _native_sample_allocation(DDTRACE_UNUSED VALUE self, VALUE collecto
   thread_context_collector_sample_allocation(collector_instance, NUM2UINT(sample_weight));
   return Qtrue;
 }
+
+static VALUE new_empty_thread_inner(DDTRACE_UNUSED void *arg) { return Qnil; }
+
+// This method exists only to enable testing Datadog::Profiling::Collectors::ThreadContext behavior using RSpec.
+// It SHOULD NOT be used for other purposes.
+// (It creates an empty native thread, so we can test our native thread naming fallback)
+static VALUE _native_new_empty_thread(DDTRACE_UNUSED VALUE self) {
+  return rb_thread_create(new_empty_thread_inner, NULL);
+}

data/ext/ddtrace_profiling_native_extension/extconf.rb

@@ -143,6 +143,9 @@ $defs << '-DNO_RB_NATIVE_THREAD' if RUBY_VERSION < '3.2'
 # On older Rubies, there was no struct rb_thread_sched (it was struct rb_global_vm_lock_struct)
 $defs << '-DNO_RB_THREAD_SCHED' if RUBY_VERSION < '3.2'
 
+# On older Rubies, the first_lineno inside a location was a VALUE and not a int (https://github.com/ruby/ruby/pull/6430)
+$defs << '-DNO_INT_FIRST_LINENO' if RUBY_VERSION < '3.2'
+
 # On older Rubies, there was no tid member in the internal thread structure
 $defs << '-DNO_THREAD_TID' if RUBY_VERSION < '3.1'
 
@@ -155,6 +158,9 @@ $defs << '-DNO_RACTORS' if RUBY_VERSION < '3'
 # On older Rubies, rb_global_vm_lock_struct did not include the owner field
 $defs << '-DNO_GVL_OWNER' if RUBY_VERSION < '2.6'
 
+# On older Rubies, there was no thread->invoke_arg
+$defs << '-DNO_THREAD_INVOKE_ARG' if RUBY_VERSION < '2.6'
+
 # On older Rubies, we need to use rb_thread_t instead of rb_execution_context_t
 $defs << '-DUSE_THREAD_INSTEAD_OF_EXECUTION_CONTEXT' if RUBY_VERSION < '2.5'
 

data/ext/ddtrace_profiling_native_extension/http_transport.c

@@ -46,7 +46,8 @@ static VALUE _native_do_export(
   VALUE pprof_data,
   VALUE code_provenance_file_name,
   VALUE code_provenance_data,
-  VALUE tags_as_array
+  VALUE tags_as_array,
+  VALUE internal_metadata_json
 );
 static void *call_exporter_without_gvl(void *call_args);
 static void interrupt_exporter_call(void *cancel_token);
@@ -56,7 +57,7 @@ void http_transport_init(VALUE profiling_module) {
   http_transport_class = rb_define_class_under(profiling_module, "HttpTransport", rb_cObject);
 
   rb_define_singleton_method(http_transport_class, "_native_validate_exporter",  _native_validate_exporter, 1);
-  rb_define_singleton_method(http_transport_class, "_native_do_export",  _native_do_export, 11);
+  rb_define_singleton_method(http_transport_class, "_native_do_export",  _native_do_export, 12);
 
   ok_symbol = ID2SYM(rb_intern_const("ok"));
   error_symbol = ID2SYM(rb_intern_const("error"));
@@ -202,11 +203,20 @@ static VALUE perform_export(
   ddog_Timespec finish,
   ddog_prof_Exporter_Slice_File slice_files,
   ddog_Vec_Tag *additional_tags,
+  ddog_CharSlice internal_metadata,
   uint64_t timeout_milliseconds
 ) {
   ddog_prof_ProfiledEndpointsStats *endpoints_stats = NULL; // Not in use yet
-  ddog_prof_Exporter_Request_BuildResult build_result =
-    ddog_prof_Exporter_Request_build(exporter, start, finish, slice_files, additional_tags, endpoints_stats, timeout_milliseconds);
+  ddog_prof_Exporter_Request_BuildResult build_result = ddog_prof_Exporter_Request_build(
+    exporter,
+    start,
+    finish,
+    slice_files,
+    additional_tags,
+    endpoints_stats,
+    &internal_metadata,
+    timeout_milliseconds
+  );
 
   if (build_result.tag == DDOG_PROF_EXPORTER_REQUEST_BUILD_RESULT_ERR) {
     ddog_prof_Exporter_drop(exporter);
@@ -274,7 +284,8 @@ static VALUE _native_do_export(
   VALUE pprof_data,
   VALUE code_provenance_file_name,
   VALUE code_provenance_data,
-  VALUE tags_as_array
+  VALUE tags_as_array,
+  VALUE internal_metadata_json
 ) {
   ENFORCE_TYPE(upload_timeout_milliseconds, T_FIXNUM);
   ENFORCE_TYPE(start_timespec_seconds, T_FIXNUM);
@@ -284,6 +295,7 @@ static VALUE _native_do_export(
   ENFORCE_TYPE(pprof_file_name, T_STRING);
   ENFORCE_TYPE(pprof_data, T_STRING);
   ENFORCE_TYPE(code_provenance_file_name, T_STRING);
+  ENFORCE_TYPE(internal_metadata_json, T_STRING);
 
   // Code provenance can be disabled and in that case will be set to nil
   bool have_code_provenance = !NIL_P(code_provenance_data);
@@ -312,6 +324,7 @@ static VALUE _native_do_export(
   }
 
   ddog_Vec_Tag *null_additional_tags = NULL;
+  ddog_CharSlice internal_metadata = char_slice_from_ruby_string(internal_metadata_json);
 
   ddog_prof_Exporter_NewResult exporter_result = create_exporter(exporter_configuration, tags_as_array);
   // Note: Do not add anything that can raise exceptions after this line, as otherwise the exporter memory will leak
@@ -319,7 +332,7 @@ static VALUE _native_do_export(
   VALUE failure_tuple = handle_exporter_failure(exporter_result);
   if (!NIL_P(failure_tuple)) return failure_tuple;
 
-  return perform_export(exporter_result.ok, start, finish, slice_files, null_additional_tags, timeout_milliseconds);
+  return perform_export(exporter_result.ok, start, finish, slice_files, null_additional_tags, internal_metadata, timeout_milliseconds);
 }
 
 static void *call_exporter_without_gvl(void *call_args) {

data/ext/ddtrace_profiling_native_extension/native_extension_helpers.rb

@@ -15,7 +15,7 @@ module Datadog
       # The MJIT header was introduced on 2.6 and removed on 3.3; for other Rubies we rely on debase-ruby_core_source
       CAN_USE_MJIT_HEADER = RUBY_VERSION.start_with?('2.6', '2.7', '3.0.', '3.1.', '3.2.')
 
-      LIBDATADOG_VERSION = '~> 2.0.0.1.0'
+      LIBDATADOG_VERSION = '~> 3.0.0.1.0'
 
       def self.fail_install_if_missing_extension?
         ENV[ENV_FAIL_INSTALL_IF_MISSING_EXTENSION].to_s.strip.downcase == 'true'