Merge pull request #4099 from envato/datadog-tracer

Pass keyword arguments for Ruby 3 compatibility
zendesk · Feb 13, 2024 · 28725a0 · 28725a0
2 parents caf3c54 + 5009188
commit 28725a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/samson/hooks.rb b/lib/samson/hooks.rb
@@ -182,9 +182,9 @@ def fire(name, *args, **kwargs)
         traced(name) { hooks(name).map { |hook| hook.call(*args, **kwargs) } }
       end
 
-      def render_views(name, view, *args)
+      def render_views(name, view, *args, **kwargs)
         hooks(name).each_with_object("".html_safe) do |partial, html|
-          html << view.render(partial, *args)
+          html << view.render(partial, *args, **kwargs)
         end
       end
 

diff --git a/plugins/datadog_tracer/lib/samson_datadog_tracer/samson_plugin.rb b/plugins/datadog_tracer/lib/samson_datadog_tracer/samson_plugin.rb
@@ -24,8 +24,8 @@ def wrap_method(klass, method, scope, &callback)
         raise "#{scope} wrapper already defined for #{method}"
       end
       klass.alias_method without, method
-      klass.define_method(method) do |*args, &block|
-        callback.call { send(without, *args, &block) }
+      klass.define_method(method) do |*args, **kwargs, &block|
+        callback.call { send(without, *args, **kwargs, &block) }
       end
       klass.send visibility, method
       klass.send visibility, without