From 48389475f7739f5688e0251902227404e5f93b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luismi=20Ram=C3=ADrez?= <luismi.ramirez@protonmail.com>
Date: Fri, 31 Mar 2023 13:46:14 +0200
Subject: [PATCH] Fix ActiveSupport Logger broadcast usage

As the severity methods of the `Appsignal::Logger` didn't call the
`#add` method, the `ActiveSupport::Logger.broadcast` feature wasn't
working.

The severity methods now call `#add` instead of directly sending the
message to the extension.
---
 .../fix-activesupport-logger-broadcast.md     |  6 +++
 lib/appsignal/logger.rb                       | 51 +++----------------
 2 files changed, 14 insertions(+), 43 deletions(-)
 create mode 100644 .changesets/fix-activesupport-logger-broadcast.md

diff --git a/.changesets/fix-activesupport-logger-broadcast.md b/.changesets/fix-activesupport-logger-broadcast.md
new file mode 100644
index 000000000..97a015eaf
--- /dev/null
+++ b/.changesets/fix-activesupport-logger-broadcast.md
@@ -0,0 +1,6 @@
+---
+bump: "patch"
+type: "fix"
+---
+
+The `Appsignal::Logger` is now compatible with `ActiveSupport::Logger.broadcast`.
diff --git a/lib/appsignal/logger.rb b/lib/appsignal/logger.rb
index 375a4157f..d317244ac 100644
--- a/lib/appsignal/logger.rb
+++ b/lib/appsignal/logger.rb
@@ -5,7 +5,7 @@
 
 module Appsignal
   # Logger that flushes logs to the AppSignal logging service
-  class Logger < ::Logger # rubocop:disable Metrics/ClassLength
+  class Logger < ::Logger
     PLAINTEXT = 0
     LOGFMT = 1
     JSON = 2
@@ -32,7 +32,7 @@ def initialize(group, level: INFO, format: PLAINTEXT)
     # We support the various methods in the Ruby
     # logger class by supplying this method.
     # @api private
-    def add(severity, message = nil, group = nil)
+    def add(severity, message = nil, group = nil, attributes = {})
       severity ||= UNKNOWN
       return true if severity < level
       group = @group if group.nil?
@@ -52,7 +52,7 @@ def add(severity, message = nil, group = nil)
         SEVERITY_MAP.fetch(severity, 0),
         @format,
         message,
-        Appsignal::Utils::Data.generate({})
+        Appsignal::Utils::Data.generate(attributes)
       )
     end
     alias log add
@@ -65,14 +65,7 @@ def debug(message = nil, attributes = {})
       return if DEBUG < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(DEBUG, Time.now, @group, message) if formatter
-      Appsignal::Extension.log(
-        @group,
-        2,
-        @format,
-        message,
-        Appsignal::Utils::Data.generate(attributes)
-      )
+      add(DEBUG, message, @group, attributes)
     end
 
     # Log an info level message
@@ -83,14 +76,7 @@ def info(message = nil, attributes = {})
       return if INFO < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(INFO, Time.now, @group, message) if formatter
-      Appsignal::Extension.log(
-        @group,
-        3,
-        @format,
-        message,
-        Appsignal::Utils::Data.generate(attributes)
-      )
+      add(INFO, message, @group, attributes)
     end
 
     # Log a warn level message
@@ -101,14 +87,7 @@ def warn(message = nil, attributes = {})
       return if WARN < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(WARN, Time.now, @group, message) if formatter
-      Appsignal::Extension.log(
-        @group,
-        5,
-        @format,
-        message,
-        Appsignal::Utils::Data.generate(attributes)
-      )
+      add(WARN, message, @group, attributes)
     end
 
     # Log an error level message
@@ -119,14 +98,7 @@ def error(message = nil, attributes = {})
       return if ERROR < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(ERROR, Time.now, @group, message) if formatter
-      Appsignal::Extension.log(
-        @group,
-        6,
-        @format,
-        message,
-        Appsignal::Utils::Data.generate(attributes)
-      )
+      add(ERROR, message, @group, attributes)
     end
 
     # Log a fatal level message
@@ -137,14 +109,7 @@ def fatal(message = nil, attributes = {})
       return if FATAL < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(FATAL, Time.now, @group, message) if formatter
-      Appsignal::Extension.log(
-        @group,
-        7,
-        @format,
-        message,
-        Appsignal::Utils::Data.generate(attributes)
-      )
+      add(FATAL, message, @group, attributes)
     end
   end
 end