wip

Author: marcotc

ext/datadog_profiling_native_extension/ruby_helpers.c

@@ -49,18 +49,19 @@ void _raise_native_error(VALUE native_exception_class, const char *detailed_mess
   rb_exc_raise(exception);
 }
 
+#define MAX_RAISE_MESSAGE_SIZE 256
+
 // Use `raise_error` the macro instead, as it provides additional argument checks.
 void _raise_error(VALUE native_exception_class, const char *fmt, ...) {
   va_list args;
   va_start(args, fmt);
-  VALUE formatted_msg = rb_vsprintf(fmt, args);
+  char formatted_msg[MAX_RAISE_MESSAGE_SIZE];
+  vsnprintf(formatted_msg, MAX_RAISE_MESSAGE_SIZE, fmt, args);
   va_end(args);
 
-  _raise_native_error(native_exception_class, fmt, formatted_msg);
+  _raise_native_error(native_exception_class, formatted_msg, rb_str_new_cstr(fmt));
 }
 
-#define MAX_RAISE_MESSAGE_SIZE 256
-
 typedef struct {
   VALUE exception_class;
   char exception_message[MAX_RAISE_MESSAGE_SIZE];

ext/datadog_profiling_native_extension/setup_signal_handler.c

@@ -38,7 +38,7 @@ static void install_sigprof_signal_handler_internal(
   sigemptyset(&signal_handler_config.sa_mask);
 
   if (sigaction(SIGPROF, &signal_handler_config, &existing_signal_handler_config) != 0) {
-    rb_exc_raise(rb_syserr_new_str(errno, rb_sprintf("Could not install profiling signal handler (%s)", handler_pretty_name)));
+    raise_syserr(errno, true, "Could not install profiling signal handler", __FILE__, __LINE__, handler_pretty_name);
   }
 
   // Because signal handler functions are global, let's check if we're not stepping on someone else's toes.

lib/datadog/profiling.rb

@@ -101,10 +101,6 @@ class NativeTypeError < TypeError
       prepend NativeError
     end
 
-    class NativeSystemCallError < SystemCallError
-      prepend NativeError
-    end
-
     private_class_method def self.replace_noop_allocation_count
       class << self
         remove_method :allocation_count

lib/datadog/profiling/stack_recorder.rb

@@ -88,7 +88,7 @@ def serialize!
         else
           error_message = result
 
-          raise NativeRuntimeError.new("Failed to serialize profiling data", "Failed to serialize profiling data: #{error_message}")
+          raise "Failed to serialize profiling data: #{error_message}"
         end
       end
 

spec/datadog/profiling/collectors/cpu_and_wall_time_worker_spec.rb

@@ -200,8 +200,9 @@
 
         exception = try_wait_until(backoff: 0.01) { cpu_and_wall_time_worker.send(:failure_exception) }
 
-        expect(exception.message).to include "pre-existing SIGPROF"
-        expect(exception.telemetry_message).to eq("Could not install profiling signal handler (%s): There's a pre-existing SIGPROF signal handler")
+        expect(exception.message).to include "(empty_signal_handler): There's a pre-existing SIGPROF"
+        expect(exception.telemetry_message).to include "There's a pre-existing SIGPROF"
+        expect(exception.telemetry_message).to_not include "empty_signal_handler"
       end
 
       it "leaves the existing signal handler in place" do

spec/datadog/profiling/native_extension_spec.rb

@@ -16,7 +16,7 @@
         .to raise_native_error(Datadog::Profiling::NativeRuntimeError, "this is a test", "this is a test")
     end
 
-    it "accepts printf-style string formatting" do
+    it "on printf-style, only report the fixed string for telemetry" do
       expect { described_class::Testing._native_grab_gvl_and_raise(Datadog::Profiling::NativeRuntimeError, "divided zero by %d", 42, true) }
         .to raise_native_error(Datadog::Profiling::NativeRuntimeError, "divided zero by 42", "divided zero by %d")
     end

spec/datadog/profiling/stack_recorder_spec.rb

@@ -934,12 +934,7 @@ def sample_and_clear
     context "when serialization fails" do
       before { expect(described_class).to receive(:_native_serialize).and_return([:error, "test error message"]) }
 
-      it {
-        expect { serialize! }.to raise_error(Datadog::Profiling::NativeRuntimeError) do |error|
-          expect(error.message).to include('test error message')
-          expect(error.telemetry_message).to eq('Failed to serialize profiling data')
-        end
-      }
+      it { expect { serialize! }.to raise_error(RuntimeError, /test error message/) }
     end
   end