Fix issues with parameters handling and extra attributes

Author: solnic

sentry-ruby/lib/sentry/log_event.rb

@@ -131,7 +131,8 @@ def parameters
       @parameters ||= begin
         return DEFAULT_PARAMETERS unless template
 
-        parameters = attributes[:parameters] || DEFAULT_PARAMETERS
+        parameters = template_tokens.empty? ?
+          attributes.fetch(:parameters, DEFAULT_PARAMETERS) : attributes.slice(*template_tokens)
 
         if parameters.is_a?(Hash)
           parameters.each do |key, value|
@@ -145,8 +146,14 @@ def parameters
       end
     end
 
+    TOKEN_REGEXP = /%\{(\w+)\}/
+
+    def template_tokens
+      @template_tokens ||= body.scan(TOKEN_REGEXP).flatten.map(&:to_sym)
+    end
+
     def is_template?
-      body.is_a?(String) && body.include?("%")
+      body.include?("%s") || TOKEN_REGEXP.match?(body)
     end
   end
 end

sentry-ruby/lib/sentry/structured_logger.rb

@@ -127,10 +127,11 @@ def fatal(message, parameters = [], **attributes)
     #
     # @return [LogEvent, nil] The created log event or nil if logging is disabled
     def log(level, message, parameters:, **attributes)
-      if parameters.is_a?(Hash) && attributes.empty? && !message.include?("%")
-        Sentry.capture_log(message, level: level, severity: LEVELS[level], **parameters)
-      else
+      case parameters
+      when Array then
         Sentry.capture_log(message, level: level, severity: LEVELS[level], parameters: parameters, **attributes)
+      else
+        Sentry.capture_log(message, level: level, severity: LEVELS[level], **parameters)
       end
     end
   end

sentry-ruby/spec/sentry/structured_logger_spec.rb

@@ -86,8 +86,7 @@
         end
 
         it "logs with hash-based template parameters" do
-          hash_params = { name: "Jane", day: "Monday" }
-          Sentry.logger.public_send(level, "Hello %{name}, it is %{day}", hash_params)
+          Sentry.logger.public_send(level, "Hello %{name}, it is %{day}", name: "Jane", day: "Monday")
 
           expect(logs).to_not be_empty
 
@@ -108,8 +107,7 @@
         end
 
         it "logs with hash-based template parameters and extra attributes" do
-          hash_params = { name: "Jane", day: "Monday" }
-          Sentry.logger.public_send(level, "Hello %{name}, it is %{day}", hash_params, user_id: 123)
+          Sentry.logger.public_send(level, "Hello %{name}, it is %{day}", name: "Jane", day: "Monday", user_id: 123)
 
           expect(logs).to_not be_empty