log4jruby 3.0.0.rc2-java → 3.0.0.rc3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1668efce6b23c33b459992956795614d50f3178ed3c2787e7651f1715b60235
-  data.tar.gz: ba8e28cc7b8dbc9531ccec0cb34b7642ab8beacc37eee8be0cd7df2abb5f661e
+  metadata.gz: f490ce9d3d34da275ebe45ea7f79fcb059bd1eb65382b7caad07ac56cff39319
+  data.tar.gz: 52f088f32e0ed016a29d0b1aad801980eff8998823f364b48046dab02c732ecb
 SHA512:
-  metadata.gz: 36c6cbd7bae1b08f33156a3ef73b3e93f00a174bc0e32b2949b5cfff6424a81c3ac12a766a889f618f308fc55fd4f942b3778f4129b3739c4140a4170c4e23a4
-  data.tar.gz: 1763996d46b5e5836c911c6061068245464a952c59ba94f890549ea56bf19b97b322a1112471ecb00e21bffc410c78b0e34e2073c0cbbec2ba53ec629ade2310
+  metadata.gz: 60f2e59dc9dde9a1ae8b802dc76ac7ecf41498abcea404d2747c9fb189091f4ef8ef5d2ac05bafbe8170620bf1f273d431e80467bab38a57802ee0e72a46ff32
+  data.tar.gz: 0c4d4826ee902621b4f4b0847974b5403dba21d2e0c8fc63d8f3a253d64c3d6f981d2c38378b6b9780e9aae36a8cdc650145bfb2594ac38afa67e6a70302717e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # log4jruby Changelog
 
+## v3.0.0.rc3
+
+* Resolve [missing backtraces with Rails](https://github.com/lenny/log4jruby/issues/27). Stringify
+  exceptions outside of the formatter because `ActiveSupport::TaggedLogging` broke
+  the `LegacyShimFormatter`. The `LegacyShimFormatter` was formerly responsible for outputing
+  backtraces in JRuby < 9.3
+* Optimizations to `Log4jruby::Support::JrubyVersion`
+
 ## v3.0.0.rc2
 
 * Restored support for JRuby 9.1.x/Ruby 2.3

data/lib/log4jruby/logger.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
+require 'logger'
+
 require 'log4jruby/support/log4j_args'
 require 'log4jruby/support/levels'
 require 'log4jruby/support/location'
 require 'log4jruby/support/log_manager'
 require 'log4jruby/support/formatter'
-require 'log4jruby/support/legacy_shim_formatter'
 require 'log4jruby/support/jruby_version'
-
-require 'logger'
+require 'log4jruby/support/ruby_backtrace_shim'
 
 module Log4jruby
   # Author::    Lenny Marks
@@ -125,7 +125,7 @@ module Log4jruby
       return @formatter if defined?(@formatter)
 
       @formatter = if self == Logger.root
-                     new_default_formatter
+                     Support::Formatter.new
                    else
                      parent.formatter
                    end
@@ -160,6 +160,9 @@ module Log4jruby
 
     def send_to_log4j(level, object, &block)
       progname, msg, throwable = Support::Log4jArgs.convert(object, &block)
+      unless  Support::JrubyVersion.native_ruby_stacktraces_supported?
+        msg = Support::RubyBacktraceShim.adapt(msg)
+      end
       if (f = formatter)
         msg = f.call(level, Time.now, progname, msg)
       end
@@ -171,13 +174,5 @@ module Log4jruby
         @log4j_logger.send(level, msg, throwable)
       end
     end
-
-    def new_default_formatter
-      if Support::JrubyVersion.native_ruby_stacktraces_supported?
-        Support::Formatter.new
-      else
-        Support::LegacyShimFormatter.new
-      end
-    end
   end
 end

data/lib/log4jruby/support/jruby_version.rb

@@ -6,10 +6,21 @@ module Log4jruby
     # Find consumers and remove this and references when no longer needed.
     class JrubyVersion
       class << self
+        attr_reader :native_ruby_stacktraces_supported
+
         def native_ruby_stacktraces_supported?
-          Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new('9.3')
+          @native_ruby_stacktraces_supported
+        end
+
+        private
+
+        def init
+          @native_ruby_stacktraces_supported =
+            Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new('9.3')
         end
       end
     end
   end
 end
+
+Log4jruby::Support::JrubyVersion.send(:init)

data/lib/log4jruby/support/ruby_backtrace_shim.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Log4jruby
+  module Support
+    # Transform exceptions into string with full backtraces and nested causes.
+    module RubyBacktraceShim
+      class << self
+        def adapt(msg)
+          return msg unless msg.is_a?(::Exception)
+
+          exception2str(msg)
+        end
+
+        private
+
+        def exception2str(exception)
+          "#{exception.message} (#{exception.class})\n\t#{exception.backtrace&.join("\n\t")}" \
+            "#{"\nCaused by: #{exception2str(exception.cause)}" if exception.cause}"
+        end
+      end
+    end
+  end
+end

data/lib/log4jruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Log4jruby
-  VERSION = '3.0.0.rc2'
+  VERSION = '3.0.0.rc3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log4jruby
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0.rc3
 platform: java
 authors:
 - Lenny Marks
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies: []
 description: Ruby Logger using Log4j, geared toward those who use JRuby to write Ruby
   code using/extending Java code. Ruby and Java are configured together using traditional
@@ -26,11 +26,11 @@ files:
 - lib/log4jruby/logger_for_class.rb
 - lib/log4jruby/support/formatter.rb
 - lib/log4jruby/support/jruby_version.rb
-- lib/log4jruby/support/legacy_shim_formatter.rb
 - lib/log4jruby/support/levels.rb
 - lib/log4jruby/support/location.rb
 - lib/log4jruby/support/log4j_args.rb
 - lib/log4jruby/support/log_manager.rb
+- lib/log4jruby/support/ruby_backtrace_shim.rb
 - lib/log4jruby/version.rb
 homepage: https://github.com/lenny/log4jruby
 licenses:

data/lib/log4jruby/support/legacy_shim_formatter.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Log4jruby
-  module Support
-    # Default ruby Logger formatter for Jruby < 9.3.x
-    # This formatter mimics
-    # [Logger::Formatter](https://ruby-doc.org/stdlib-2.6.4/libdoc/logger/rdoc/Logger/Formatter.html)
-    # but excludes log level and timestamp (delegated to Log4j).
-    # It also appends full backtraces with nested causes.
-    class LegacyShimFormatter
-      def call(_severity, _time, progname, msg)
-        "-- #{msg2str(progname)}: #{msg2str(msg)}"
-      end
-
-      private
-
-      def msg2str(msg)
-        case msg
-        when ::String
-          msg
-        when ::Exception
-          exception2str(msg)
-        else
-          msg.inspect
-        end
-      end
-
-      def exception2str(exception)
-        "#{exception.message} (#{exception.class})\n\t#{exception.backtrace&.join("\n\t")}" \
-          "#{"\nCaused by: #{exception2str(exception.cause)}" if exception.cause}"
-      end
-    end
-  end
-end