ddtrace 1.12.1 → 1.23.2

data/LICENSE-3rdparty.csv

@@ -2,7 +2,7 @@ Component,Origin,License,Copyright
 lib/datadog/core/vendor/multipart-post,https://github.com/socketry/multipart-post,MIT,"Copyright (c) 2007-2013 Nick Sieger."
 lib/datadog/tracing/contrib/active_record/vendor,https://github.com/rails/rails/,MIT,"Copyright (c) 2005-2018 David Heinemeier Hansson"
 lib/datadog/tracing/contrib/utils/quantization/http.rb,https://github.com/ruby/uri,BSD-2-Clause,"Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved."
-ext/ddtrace_profiling_native_extension/private_vm_api_access,https://github.com/ruby/ruby,BSD-2-Clause,"Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved."
+ext/datadog_profiling_native_extension/private_vm_api_access,https://github.com/ruby/ruby,BSD-2-Clause,"Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved."
 msgpack,https://rubygems.org/gems/msgpack,Apache-2.0,"Copyright (c) 2008-2015 Sadayuki Furuhashi"
 debase-ruby_core_source,https://rubygems.org/gems/debase-ruby_core_source,MIT for gem and BSD-2-Clause for Ruby sources,"Copyright (c) 2012 Gabriel Horner. Files from Ruby sources are Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved."
 lib/datadog/core/vendor/ipaddr,https://github.com/ruby/ipaddr/blob/master/lib/ipaddr.rb,BSD 2-Clause "Simplified" License,"Copyright (c) 2002 Hajimu UMEMOTO <ume@mahoroba.org> Copyright (c) 2007-2017 Akinori MUSHA <knu@iDaemons.org>"

data/bin/ddprofrb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require 'datadog/profiling/tasks/exec'
+require 'datadog/profiling/tasks/help'
+
+command = ARGV.shift
+
+case command
+when 'exec'
+  Datadog::Profiling::Tasks::Exec.new(ARGV).run
+when 'help', '--help'
+  Datadog::Profiling::Tasks::Help.new.run
+else
+  puts "Command '#{command}' is not valid for ddprofrb."
+  Datadog::Profiling::Tasks::Help.new.run
+end

data/bin/ddtracerb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+Kernel.warn 'WARNING: Use of `ddtracerb` is deprecated, and will be removed in 2.0. Use `ddprofrb` instead.'
+
 require 'datadog/profiling/tasks/exec'
 require 'datadog/profiling/tasks/help'
 
@@ -10,6 +12,6 @@ when 'exec'
 when 'help', '--help'
   Datadog::Profiling::Tasks::Help.new.run
 else
-  puts "Command '#{command}' is not valid for ddtrace."
+  puts "Command '#{command}' is not valid for ddtracerb."
   Datadog::Profiling::Tasks::Help.new.run
 end

data/ext/{ddtrace_profiling_loader/ddtrace_profiling_loader.c → datadog_profiling_loader/datadog_profiling_loader.c}

@@ -14,7 +14,7 @@
 // up other's symbols (`RTLD_DEEPBIND`).
 //
 // But Ruby's extension loading mechanism is not configurable -- there's no way to tell it to use different flags when
-// calling `dlopen`. To get around this, this file (ddtrace_profiling_loader.c) introduces another extension
+// calling `dlopen`. To get around this, this file (datadog_profiling_loader.c) introduces another extension
 // (profiling loader) which has only a single responsibility: mimic Ruby's extension loading mechanism, but when calling
 // `dlopen` use a different set of flags.
 // This idea was shamelessly stolen from @lloeki's work in https://github.com/rubyjs/mini_racer/pull/179, big thanks!
@@ -48,7 +48,7 @@ static void unload_failed_library(void *handle);
 
 #define DDTRACE_EXPORT __attribute__ ((visibility ("default")))
 
-void DDTRACE_EXPORT Init_ddtrace_profiling_loader(void) {
+void DDTRACE_EXPORT Init_datadog_profiling_loader(void) {
   VALUE datadog_module = rb_define_module("Datadog");
   VALUE profiling_module = rb_define_module_under(datadog_module, "Profiling");
   VALUE loader_module = rb_define_module_under(profiling_module, "Loader");

data/ext/{ddtrace_profiling_loader → datadog_profiling_loader}/extconf.rb

@@ -3,7 +3,7 @@
 
 if RUBY_ENGINE != 'ruby' || Gem.win_platform?
   $stderr.puts(
-    'WARN: Skipping build of ddtrace profiling loader. See ddtrace profiling native extension note for details.'
+    'WARN: Skipping build of Datadog profiling loader. See Datadog profiling native extension note for details.'
   )
 
   File.write('Makefile', 'all install clean: # dummy makefile that does nothing')
@@ -46,7 +46,7 @@ add_compiler_flag '-Werror-implicit-function-declaration'
 add_compiler_flag '-Wunused-parameter'
 
 # The native extension is not intended to expose any symbols/functions for other native libraries to use;
-# the sole exception being `Init_ddtrace_profiling_loader` which needs to be visible for Ruby to call it when
+# the sole exception being `Init_datadog_profiling_loader` which needs to be visible for Ruby to call it when
 # it `dlopen`s the library.
 #
 # By setting this compiler flag, we tell it to assume that everything is private unless explicitly stated.
@@ -64,7 +64,7 @@ add_compiler_flag '-Wextra'
 # This makes it easier for development (avoids "oops I forgot to rebuild when I switched my Ruby") and ensures that
 # the wrong library is never loaded.
 # When requiring, we need to use the exact same string, including the version and the platform.
-EXTENSION_NAME = "ddtrace_profiling_loader.#{RUBY_VERSION}_#{RUBY_PLATFORM}".freeze
+EXTENSION_NAME = "datadog_profiling_loader.#{RUBY_VERSION}_#{RUBY_PLATFORM}".freeze
 
 create_makefile(EXTENSION_NAME)
 

data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/NativeExtensionDesign.md

@@ -16,8 +16,7 @@ the gem. Setting `DD_PROFILING_NO_EXTENSION` at installation time skips compilat
 
 (If you're a customer and needed to use this, please tell us why on <https://github.com/DataDog/dd-trace-rb/issues/new>.)
 
-In past releases, it was possible for the profiler to run without the native extension, but that's no longer the case,
-and disabling the extension will disable profiling.
+Disabling the profiler extension will disable profiling.
 
 ## Who is this page for?
 
@@ -83,7 +82,7 @@ contribute upstream changes so that they become official public VM APIs.
 Ruby versions 2.6 to 3.2 shipped a JIT compiler called MJIT. This compiler does not directly generate machine code;
 instead it generates C code and uses the system C compiler to turn it into machine code.
 
-The generated C code `#include`s a private header -- which we reference as "the MJIT header" everywhere.
+The generated C code `#include`s a private header -- which we call "the MJIT header".
 The MJIT header gets shipped with all MJIT-enabled Rubies and includes the layout of many internal VM structures;
 and of course the intention is that it is only used by the Ruby MJIT compiler.
 
@@ -104,8 +103,7 @@ Thus, even though a regular Ruby installation does not include these files, we c
 * **OS support**: Linux
 
 To enable CPU-time profiling, we use the `pthread_getcpuclockid(pthread_t thread, clockid_t *clockid)` C function to
-obtain a `clockid_t` that can then be used with the `Process.clock_gettime` method (or directly with the
-`clock_gettime()` C function).
+obtain a `clockid_t` that can then be used with the `clock_gettime` function.
 
 The challenge with using `pthread_getcpuclockid()` is that we need to get the `pthread_t` for a given Ruby `Thread`
 object. We previously did this with a weird combination of monkey patching and `pthread_self()` (effectively patching

data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id.h

@@ -17,9 +17,6 @@ typedef struct thread_cpu_time {
 
 void self_test_clock_id(void);
 
-// TODO: Remove this after the OldStack profiler gets removed
-VALUE clock_id_for(VALUE self, VALUE thread);
-
 // Safety: This function is assumed never to raise exceptions by callers
 thread_cpu_time_id thread_cpu_time_id_for(VALUE thread);
 thread_cpu_time thread_cpu_time_for(thread_cpu_time_id time_id);

data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id_from_pthread.c

@@ -22,31 +22,12 @@ void self_test_clock_id(void) {
   if (expected_pthread_id != actual_pthread_id) rb_raise(rb_eRuntimeError, "pthread_id_for() self-test failed");
 }
 
-// TODO: Remove this after the OldStack profiler gets removed
-VALUE clock_id_for(DDTRACE_UNUSED VALUE _self, VALUE thread) {
-  rb_nativethread_id_t thread_id = pthread_id_for(thread);
-
-  clockid_t clock_id;
-  int error = pthread_getcpuclockid(thread_id, &clock_id);
-
-  if (error == 0) {
-    return CLOCKID2NUM(clock_id);
-  } else {
-    switch(error) {
-      // The more specific error messages are based on the pthread_getcpuclockid(3) man page
-      case ENOENT:
-        rb_exc_raise(rb_syserr_new(error, "Failed to get clock_id for given thread: Per-thread CPU time clocks are not supported by the system."));
-      case ESRCH:
-        rb_exc_raise(rb_syserr_new(error, "Failed to get clock_id for given thread: No thread could be found."));
-      default:
-        rb_exc_raise(rb_syserr_new(error, "Failed to get clock_id for given thread"));
-    }
-  }
-}
-
 // Safety: This function is assumed never to raise exceptions by callers
 thread_cpu_time_id thread_cpu_time_id_for(VALUE thread) {
   rb_nativethread_id_t thread_id = pthread_id_for(thread);
+
+  if (thread_id == 0) return (thread_cpu_time_id) {.valid = false};
+
   clockid_t clock_id;
 
   int error = pthread_getcpuclockid(thread_id, &clock_id);

data/ext/{ddtrace_profiling_native_extension → datadog_profiling_native_extension}/clock_id_noop.c

@@ -10,7 +10,6 @@
 #include "helpers.h"
 
 void self_test_clock_id(void) { } // Nothing to check
-VALUE clock_id_for(DDTRACE_UNUSED VALUE _self, DDTRACE_UNUSED VALUE _thread) { return Qnil; } // Nothing to return
 
 thread_cpu_time_id thread_cpu_time_id_for(DDTRACE_UNUSED VALUE _thread) {
   return (thread_cpu_time_id) {.valid = false};