Revert whitespace-only changes (blank lines)

Author: marcotc

ext/datadog_profiling_native_extension/private_vm_api_access.c

@@ -46,16 +46,13 @@
 #else
   #define DDTRACE_UNUSED
 #endif
-
 extern VALUE eNativeRuntimeError;
 extern VALUE eNativeArgumentError;
 extern VALUE eNativeTypeError;
-
 // Declare exception class globals from ruby_helpers.h
 // (We can't include ruby_helpers.h here as it pulls in public Ruby headers that conflict with private VM headers)
 #define raise_error(native_exception_class, fmt, ...) \
   _raise_error(native_exception_class, "" fmt, ##__VA_ARGS__)
-
 NORETURN(
   void _raise_error(VALUE native_exception_class, const char *fmt, ...)
   __attribute__ ((format (printf, 2, 3)));

ext/datadog_profiling_native_extension/profiling.c

@@ -54,7 +54,6 @@ void DDTRACE_EXPORT Init_datadog_profiling_native_extension(void) {
 
   rb_define_singleton_method(native_extension_module, "native_working?", native_working_p, 0);
   rb_funcall(native_extension_module, rb_intern("private_class_method"), 1, ID2SYM(rb_intern("native_working?")));
-
   // Exception classes defined in Ruby, in the `Datadog::Profiling` namespace
   eNativeRuntimeError = rb_const_get(profiling_module, rb_intern("NativeRuntimeError"));
   rb_global_variable(&eNativeRuntimeError);

ext/datadog_profiling_native_extension/ruby_helpers.c

@@ -12,7 +12,6 @@ static ID _id2ref_id = Qnil;
 static ID inspect_id = Qnil;
 static ID to_s_id = Qnil;
 static ID new_id = 0;
-
 // Global references to Datadog::Profiling exception classes defined in Ruby.
 VALUE eNativeRuntimeError = Qnil;
 VALUE eNativeArgumentError = Qnil;
@@ -27,7 +26,6 @@ void ruby_helpers_init(void) {
   to_s_id = rb_intern("to_s");
   new_id = rb_intern("new");
 }
-
 // Raises a NativeError exception with seperate telemetry-safe and detailed messages.
 void _raise_native_error(VALUE native_exception_class, const char *detailed_message, VALUE static_message) {
   #ifdef DD_DEBUG
@@ -38,7 +36,6 @@ void _raise_native_error(VALUE native_exception_class, const char *detailed_mess
             "Must be one of eNativeRuntimeError, eNativeArgumentError, or eNativeTypeError, was: %s", rb_class2name(native_exception_class));
     }
   #endif
-
   VALUE exception = rb_funcall(
     native_exception_class,
     new_id,
@@ -50,15 +47,13 @@ void _raise_native_error(VALUE native_exception_class, const char *detailed_mess
 }
 
 #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);
   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, formatted_msg, rb_str_new_cstr(fmt));
 }
 
@@ -97,11 +92,9 @@ void _grab_gvl_and_raise(VALUE native_exception_class, const char *format_string
       "grab_gvl_and_raise called by thread holding the global VM lock: %%s (%s)",
       rb_class2name(native_exception_class)
     );
-
     // Render the full exception message.
     char exception_message[MAX_RAISE_MESSAGE_SIZE];
     snprintf(exception_message, MAX_RAISE_MESSAGE_SIZE, telemetry_message, args.exception_message);
-
     _raise_native_error(eNativeRuntimeError, exception_message, rb_str_new_cstr(telemetry_message));
   }
 

ext/datadog_profiling_native_extension/ruby_helpers.h

@@ -44,7 +44,6 @@ static inline int check_if_pending_exception(void) {
 extern VALUE eNativeRuntimeError;
 extern VALUE eNativeArgumentError;
 extern VALUE eNativeTypeError;
-
 // Raises an exception of the specified class with the formatted string as its message.
 // This macro ensures that the literay string is sent for telemetry, while the formatted
 // message is the default `Exception#message`.
@@ -53,7 +52,6 @@ extern VALUE eNativeTypeError;
 // the telemetry-safe string: NativeRuntimeError, NativeArgumentError, NativeTypeError.
 #define raise_error(native_exception_class, fmt, ...) \
   _raise_error(native_exception_class, "" fmt, ##__VA_ARGS__)
-
 NORETURN(
   void _raise_error(VALUE native_exception_class, const char *fmt, ...)
   __attribute__ ((format (printf, 2, 3)));

lib/datadog/core/telemetry/logging.rb

@@ -71,13 +71,10 @@ def error(description)
 
           log!(event)
         end
-
         private
-
         # A constant string representing the exception
         def message_for_telemety(exception)
           return unless exception.respond_to?(:telemetry_message)
-
           exception.telemetry_message
         end
       end

lib/datadog/profiling.rb

@@ -76,27 +76,22 @@ def self.wait_until_running(timeout_seconds: 5)
         raise 'Profiler not enabled or available'
       end
     end
-
     # Base error type for exceptions raised by our native extensions.
     # These errors have both the original error message and a telemetry-safe message.
     # The telemetry-safe message is statically defined and does not possess dynamic data.
     module NativeError
       attr_reader :telemetry_message
-
       def initialize(message, telemetry_message = nil)
         super(message)
         @telemetry_message = telemetry_message
       end
     end
-
     class NativeRuntimeError < RuntimeError
       prepend NativeError
     end
-
     class NativeArgumentError < ArgumentError
       prepend NativeError
     end
-
     class NativeTypeError < TypeError
       prepend NativeError
     end

sig/datadog/core/telemetry/logging.rbs

@@ -15,9 +15,7 @@ module Datadog
         def report: (Exception exception, ?level: Symbol, ?description: String?) -> void
 
         def error: (String description) -> void
-
         private
-
         def constant_exception_message: (Exception exception) -> String?
       end
     end

sig/datadog/profiling.rbs

@@ -2,13 +2,10 @@ module Datadog
   module Profiling
     class NativeError < RuntimeError
       attr_reader telemetry_message: String?
-
       def initialize: (*untyped args, **untyped kwargs) -> void
     end
-
     ProfilingError: singleton(NativeError)
     ProfilingInternalError: singleton(NativeError)
-
     def self.supported?: () -> bool
     def self.unsupported_reason: () -> ::String?
     def self.start_if_enabled: () -> bool

spec/datadog/core/telemetry/logging_spec.rb

@@ -82,27 +82,23 @@ def log!(_event)
         end
       end
     end
-
     context 'with NativeError' do
       before do
         skip unless defined?(Datadog::Profiling::NativeError)
       end
-
       it 'includes the telemetry-safe message in telemetry' do
         expect(component).to receive(:log!).with(instance_of(Datadog::Core::Telemetry::Event::Log)) do |event|
           expect(event.payload).to include(
             logs: [{message: 'Datadog::Profiling::NativeRuntimeError: (This is a safe profiler error)', level: 'ERROR', count: 1,
                     stack_trace: a_string_including('REDACTED')}]
           )
         end
-
         begin
           raise Datadog::Profiling::NativeRuntimeError.new('This is a safe profiler error', telemetry_message: 'This is a safe profiler error')
         rescue => e
           component.report(e, level: :error)
         end
       end
-
       context 'with description' do
         it 'includes both description and telemetry message' do
           expect(component).to receive(:log!).with(instance_of(Datadog::Core::Telemetry::Event::Log)) do |event|
@@ -111,15 +107,13 @@ def log!(_event)
                       stack_trace: a_string_including('REDACTED')}]
             )
           end
-
           begin
             raise Datadog::Profiling::NativeRuntimeError.new('Failed to initialize native extension', telemetry_message: 'Failed to initialize native extension')
           rescue => e
             component.report(e, level: :error, description: 'Profiler failed to start')
           end
         end
       end
-
       context 'without telemetry message' do
         it 'omits the dynamic exception message from telemetry' do
           expect(component).to receive(:log!).with(instance_of(Datadog::Core::Telemetry::Event::Log)) do |event|
@@ -129,15 +123,13 @@ def log!(_event)
             )
             expect(event.payload[:logs].map { |log| log[:message] }).not_to include(/Failed to initialize.*0x[0-9a-f]+/)
           end
-
           begin
             raise Datadog::Profiling::NativeRuntimeError, 'Failed to initialize string storage: Error at address 0xdeadbeef'
           rescue => e
             component.report(e, level: :error)
           end
         end
       end
-
       context 'with telemetry message and dynamic content' do
         it 'includes only the telemetry-safe message' do
           expect(component).to receive(:log!).with(instance_of(Datadog::Core::Telemetry::Event::Log)) do |event|
@@ -147,15 +139,13 @@ def log!(_event)
             )
             expect(event.payload[:logs].map { |log| log[:message] }).not_to include('Dynamic info 0xabc123')
           end
-
           begin
             raise Datadog::Profiling::NativeRuntimeError.new('Static format string', 'Dynamic info 0xabc123')
           rescue => e
             component.report(e, level: :error)
           end
         end
       end
-
       context 'with description and dynamic content' do
         it 'includes the description but not the dynamic exception message' do
           expect(component).to receive(:log!).with(instance_of(Datadog::Core::Telemetry::Event::Log)) do |event|
@@ -165,7 +155,6 @@ def log!(_event)
             )
             expect(event.payload[:logs].map { |log| log[:message] }).not_to include(/memory address/)
           end
-
           begin
             raise Datadog::Profiling::NativeRuntimeError, 'Failed to serialize profile: Invalid memory address 0x12345678'
           rescue => e

spec/datadog/profiling/collectors/code_provenance_spec.rb

@@ -23,7 +23,6 @@
 
       platform_fragment = RUBY_PLATFORM
       hyphenated_platform_fragment = platform_fragment.sub(/darwin(\d+)/, 'darwin-\1')
-
       expect(generate_result).to include(
         {
           kind: "standard library",
@@ -56,7 +55,6 @@
 
     it "includes the native extension directory for gems with native extensions" do
       refresh
-
       platform_fragment = RUBY_PLATFORM
       hyphenated_platform_fragment = platform_fragment.sub(/darwin(\d+)/, 'darwin-\1')