fix(active_record): Propagate **kwargs and &block

Otherwise *args can have too many arguments, which often happened on Rails 6.1 and above with postgres. ArgumentError: wrong number of arguments (given 6, expected 1..5) [...]lib/active_record/connection_adapters/abstract_adapter.rb:759:in `log' Signed-off-by: Ferenc Géczi <[email protected]>
instana · Jun 15, 2023 · 9a65462 · 9a65462
1 parent 40138d1
commit 9a65462
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/instana/instrumentation/active_record.rb b/lib/instana/instrumentation/active_record.rb
@@ -8,7 +8,7 @@ module ActiveRecord
       IGNORED_SQL = %w[BEGIN COMMIT SET].freeze
       SANITIZE_REGEXP = /('[\s\S][^']*'|\d*\.\d+|\d+|NULL)/i.freeze
 
-      def log(sql, name = 'SQL', binds = [], *args)
+      def log(sql, name = 'SQL', binds = [], *args, **kwargs, &block)
         call_payload = {
           activerecord: {
             adapter: @config[:adapter],
@@ -24,7 +24,7 @@ def log(sql, name = 'SQL', binds = [], *args)
           call_payload[:activerecord][:binds] = mapped
         end
 
-        maybe_trace(call_payload, name) { super(sql, name, binds, *args) }
+        maybe_trace(call_payload, name) { super(sql, name, binds, *args, **kwargs, &block) }
       end
 
       private