appsignal 4.5.16-java → 4.5.17-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c87519612771b1002ab8044e65233dcf3ae4a3f43b08fb030433e59b5df75f
-  data.tar.gz: e31fa949c51641db4708f514c8cfba006c022156c299de36298b07545ef12fcc
+  metadata.gz: 666c51a5ea7ddef04551ad8340779f0d28a792fe84dfea610dbf6bcabbf885a9
+  data.tar.gz: 27cd215ac772b9df1fd0851b0b7cbad6c201d273ddc9d416cf739b928c632c0a
 SHA512:
-  metadata.gz: 16cb2127adc17cde78ad3827fee08c35a4b3bdd5f3d9546a03b51211e2b36a3db42789e8ed31b91441c8dd4f600a4d108ef76acef228748e5c560c8df21804e8
-  data.tar.gz: 8977e5c054a7de0be2fbc93128bb5cf9259d7e9eff0196af290c37e8d5b8a9892059ce0b14dcf169893376a9efdcc5f9b22e8c5c68054e012d3ece2455772393
+  metadata.gz: 758af432738af3ae72abe2a5b187bbdc747f9034aebd42678b5f6431401dfe30abbce293ababe64f6d6b986f594a35225bf8e6f5c9ed2b9dc8262124bd361b30
+  data.tar.gz: 257ffe63d397bd648fefbf055fd5955851a6a95f605f810c5e2fc6cb0aef5bc5584b34487a4d0625dec08e73f1fd77ca15840a5d2fbd5d669f3c4c0f482817de

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # AppSignal for Ruby gem Changelog
 
+## 4.5.17
+
+_Published on 2025-07-01._
+
+### Fixed
+
+- When an `Appsignal::Logger` uses `.broadcast_to` to broadcast messages to other loggers, broadcast those messages even if the log level of those messages is lower than the logger's threshold. This allows other loggers to set their own logging thresholds.
+
+  When the logger is silenced, messages below the silencing threshold are *not* broadcasted to other loggers.
+
+  (patch [bd3f2147](https://github.com/appsignal/appsignal-ruby/commit/bd3f2147ec58f5ed8c6db49328429e30e1826800))
+- When an `Appsignal::Logger` uses `.broadcast_to` to broadcast messages to other loggers, broadcast the original message received by the logger, without formatting it or converting it to a string. (patch [bd3f2147](https://github.com/appsignal/appsignal-ruby/commit/bd3f2147ec58f5ed8c6db49328429e30e1826800))
+- Call the `Appsignal::Logger` formatter with the original message object given, rather than converting it to a string before calling the formatter. (patch [bd3f2147](https://github.com/appsignal/appsignal-ruby/commit/bd3f2147ec58f5ed8c6db49328429e30e1826800))
+- When an error is passed to an `Appsignal::Logger` as the message, format it regardless of the logging level. Previously it would only be formatted when passed to `#error`. (patch [bd3f2147](https://github.com/appsignal/appsignal-ruby/commit/bd3f2147ec58f5ed8c6db49328429e30e1826800))
+- Ignore `Errno::ECONNRESET` errors in the Rack wrapper. (patch [90b0b7a3](https://github.com/appsignal/appsignal-ruby/commit/90b0b7a3e14832cb3626adf4b339bee56ba9745e))
+
 ## 4.5.16
 
 _Published on 2025-06-27._

data/lib/appsignal/logger.rb

@@ -9,6 +9,41 @@ module Appsignal
   # @see https://docs.appsignal.com/logging/platforms/integrations/ruby.html
   #   AppSignal Ruby logging documentation.
   class Logger < ::Logger
+    # A wrapper for a block that ensures it is only called once.
+    # If called again, it will return the result of the first call.
+    # This is useful for ensuring that a block is not executed multiple
+    # times when it is broadcasted to multiple loggers.
+    class BlockOnce
+      def initialize(&block)
+        @block = block
+        @called = false
+        @success = nil
+        @result = nil
+        @error = nil
+      end
+
+      def call(*args, **kwargs)
+        if @called
+          return @result if @success
+
+          raise @error
+        end
+
+        @called = true
+        @result = @block.call(*args, **kwargs)
+        @success = true
+        @result
+      rescue StandardError => e
+        @success = false
+        @error = e
+        raise @error
+      end
+
+      def to_proc
+        method(:call).to_proc
+      end
+    end
+
     PLAINTEXT = 0
     LOGFMT = 1
     JSON = 2
@@ -34,10 +69,11 @@ module Appsignal
 
       @group = group
       @level = level
+      @silenced = false
       @format = format
       @mutex = Mutex.new
       @default_attributes = attributes
-      @appsignal_attributes = {}
+      @appsignal_attributes = attributes
       @loggers = []
     end
 
@@ -52,32 +88,43 @@ module Appsignal
     # 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, &block) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      # If we do not need to broadcast to any loggers and the severity is
+      # below the log level, we can return early.
       severity ||= UNKNOWN
-      return true if severity < level
+      return true if severity < level && @loggers.empty?
 
+      # If the logger is silenced, we do not log *or broadcast* messages
+      # below the log level.
+      return true if @silenced && severity < @level
+
+      # Ensure that the block is only run once, even if several loggers
+      # are being broadcasted to.
+      block = BlockOnce.new(&block) unless block.nil?
+
+      # If the group is not set, we use the default group.
       group = @group if group.nil?
-      if message.nil?
-        if block_given?
-          message = yield
-        else
-          message = group
-          group = @group
-        end
-      end
-      return if message.nil?
+
+      did_not_log = true
 
       @loggers.each do |logger|
-        logger.add(severity, message, group)
+        # Loggers should return true if they did *not* log the message.
+        # If any of the broadcasted loggers logs the message, that counts
+        # as having logged the message.
+        did_not_log &&= logger.add(severity, message, group, &block)
       rescue
         nil
       end
 
-      unless message.is_a?(String)
-        Appsignal.internal_logger.warn(
-          "Logger message was ignored, because it was not a String: #{message.inspect}"
-        )
-        return
+      # If the severity is below the log level, we do not log the message.
+      return did_not_log if severity < level
+
+      message = block.call if block && message.nil?
+
+      return if message.nil?
+
+      if message.is_a?(Exception)
+        message = "#{message.class}: #{message.message} (#{message.backtrace[0]})"
       end
 
       message = formatter.call(severity, Time.now, group, message) if formatter
@@ -86,9 +133,11 @@ module Appsignal
         group,
         SEVERITY_MAP.fetch(severity, 0),
         @format,
-        message,
+        message.to_s,
         Appsignal::Utils::Data.generate(appsignal_attributes)
       )
+
+      false
     end
     alias log add
 
@@ -96,67 +145,40 @@ module Appsignal
     # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
-    def debug(message = nil, attributes = {})
-      return if level > DEBUG
-
-      message = yield if message.nil? && block_given?
-      return if message.nil?
-
-      add_with_attributes(DEBUG, message, @group, attributes)
+    def debug(message = nil, attributes = {}, &block)
+      add_with_attributes(DEBUG, message, @group, attributes, &block)
     end
 
     # Log an info level message
     # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
-    def info(message = nil, attributes = {})
-      return if level > INFO
-
-      message = yield if message.nil? && block_given?
-      return if message.nil?
-
-      add_with_attributes(INFO, message, @group, attributes)
+    def info(message = nil, attributes = {}, &block)
+      add_with_attributes(INFO, message, @group, attributes, &block)
     end
 
     # Log a warn level message
     # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
-    def warn(message = nil, attributes = {})
-      return if level > WARN
-
-      message = yield if message.nil? && block_given?
-      return if message.nil?
-
-      add_with_attributes(WARN, message, @group, attributes)
+    def warn(message = nil, attributes = {}, &block)
+      add_with_attributes(WARN, message, @group, attributes, &block)
     end
 
     # Log an error level message
     # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
-    def error(message = nil, attributes = {})
-      return if level > ERROR
-
-      message = yield if message.nil? && block_given?
-      return if message.nil?
-
-      message = "#{message.class}: #{message.message}" if message.is_a?(Exception)
-
-      add_with_attributes(ERROR, message, @group, attributes)
+    def error(message = nil, attributes = {}, &block)
+      add_with_attributes(ERROR, message, @group, attributes, &block)
     end
 
     # Log a fatal level message
     # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
-    def fatal(message = nil, attributes = {})
-      return if level > FATAL
-
-      message = yield if message.nil? && block_given?
-      return if message.nil?
-
-      add_with_attributes(FATAL, message, @group, attributes)
+    def fatal(message = nil, attributes = {}, &block)
+      add_with_attributes(FATAL, message, @group, attributes, &block)
     end
 
     # Log an info level message
@@ -166,7 +188,7 @@ module Appsignal
     # @param message Message to log
     # @return [Integer]
     def <<(message)
-      add(Logger::INFO, message)
+      info(message)
       message.length
     end
 
@@ -180,9 +202,11 @@ module Appsignal
     def silence(severity = ERROR, &block)
       previous_level = @level
       @level = severity
+      @silenced = true
       block.call(self)
     ensure
       @level = previous_level
+      @silenced = false
     end
 
     def broadcast_to(logger)
@@ -193,11 +217,11 @@ module Appsignal
 
     attr_reader :default_attributes, :appsignal_attributes
 
-    def add_with_attributes(severity, message, group, attributes)
+    def add_with_attributes(severity, message, group, attributes, &block)
       @appsignal_attributes = default_attributes.merge(attributes)
-      add(severity, message, group)
+      add(severity, message, group, &block)
     ensure
-      @appsignal_attributes = {}
+      @appsignal_attributes = default_attributes
     end
   end
 end

data/lib/appsignal/rack/body_wrapper.rb

@@ -4,7 +4,7 @@ module Appsignal
   module Rack
     # @api private
     class BodyWrapper
-      IGNORED_ERRORS = [Errno::EPIPE].freeze
+      IGNORED_ERRORS = [Errno::EPIPE, Errno::ECONNRESET].freeze
 
       def self.wrap(original_body, appsignal_transaction)
         # The logic of how Rack treats a response body differs based on which methods

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "4.5.16"
+  VERSION = "4.5.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 4.5.16
+  version: 4.5.17
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-27 00:00:00.000000000 Z
+date: 2025-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com