logjam_agent 0.38.5 → 0.39.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a24358f9899f5d51901c6f1e26abb546cdbe21b04e961ce2a76d213cd1a9d23
-  data.tar.gz: 8ae4ce5d3b81edb69876408eb823b651841de5da64dfaf3a2288aa7eab42d503
+  metadata.gz: f186ba84a9bc5d93776c0d24b140736439fbc0f29eebe2afbeb9401c22eb0987
+  data.tar.gz: 7ef52541666f638caa3ffd2798f2da95128f720b9df27c8acf6a37ade5666c08
 SHA512:
-  metadata.gz: d532f42b3b39e26448bab7c758076b003de095d2e42c4bf26c383b10936aa7c156b2fd0dd10049850eaeb5036abececfb50c0a6b1423747790f6a7943510394e
-  data.tar.gz: d0fb5cc2eef5c93477a6a41dda442186745a646f16653e21b949be49102d9d515e7216fe901bc268c0f0be8de56b68918a80fbcc9359daefa847e15e2aa63834
+  metadata.gz: a3a424872649058f48a09babd30da5abac2e013db6afe50fd9284bb51e313fe6ab9d313c47f7aee40e097c64b297d533d209d3f118273fc1980e2f4e6f08f138
+  data.tar.gz: 4003a735b587bd1e6a69cd2f6c671ce86f70c609269dd273fb8859ea0a9795cf5264421d088b842b5d357f50c090360d2530ae092cf05a639c17e808465ae6aa

data/lib/logjam_agent/buffered_logger.rb

@@ -13,13 +13,16 @@ class LogjamAgent::ConsoleFormatter < Logger::Formatter
   end
 end
 
-class ActiveSupport::Logger
-  class << self
-    alias_method :original_broadcast, :broadcast
-    def broadcast(logger)
-      logger.formatter = LogjamAgent::ConsoleFormatter.new
-      logger.formatter.extend(ActiveSupport::TaggedLogging::Formatter)
-      original_broadcast(logger)
+if Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new("7.1.0")
+
+  class ActiveSupport::Logger
+    class << self
+      alias_method :original_broadcast, :broadcast
+      def broadcast(logger)
+        logger.formatter = LogjamAgent::ConsoleFormatter.new
+        logger.formatter.extend(ActiveSupport::TaggedLogging::Formatter)
+        original_broadcast(logger)
+      end
     end
   end
 end

data/lib/logjam_agent/rack/logger.rb

@@ -12,6 +12,7 @@ module LogjamAgent
         @asset_prefix = Rails.application.config.assets.prefix rescue "---"
         @ignore_asset_requests = LogjamAgent.ignore_asset_requests
         @ignored_request_urls = LogjamAgent.ignored_request_urls
+        @use_to_default_s = Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new("7.1.0")
       end
 
       def call(env)
@@ -123,7 +124,8 @@ module LogjamAgent
         logjam_fields.merge!(extract_request_info(request))
 
         LogjamAgent.logjam_only do
-          info "Started #{request.request_method} \"#{path}\" for #{ip} at #{start_time.to_default_s}" unless logjam_request.ignored?(:asset)
+          started_at_str = @use_to_default_s ? start_time.to_default_s : start_time.to_s
+          info "Started #{request.request_method} \"#{path}\" for #{ip} at #{started_at_str}" unless logjam_request.ignored?(:asset)
         end
         if spoofed
           error spoofed

data/lib/logjam_agent/rack/rails_support.rb

@@ -10,6 +10,7 @@ module ActionController #:nodoc:
       params  = payload[:params].except(*INTERNAL_PARAMS)
       format  = payload[:format]
       format  = format.to_s.upcase if format.is_a?(Symbol)
+      format  = "*/*" if format.nil?
 
       controller = payload[:controller]
       action = payload[:action]

data/lib/logjam_agent/railtie.rb

@@ -33,6 +33,19 @@ module LogjamAgent
           )
           LogjamAgent.logger = logger
         end
+
+      if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("7.1.0")
+        unless Rails.logger.is_a?(ActiveSupport::BroadcastLogger)
+          broadcast_logger = ActiveSupport::BroadcastLogger.new(Rails.logger)
+          broadcast_logger.formatter = Rails.logger.formatter
+          Rails.logger = broadcast_logger
+          LogjamAgent.logger = logger
+        end
+
+        unless app.config.consider_all_requests_local
+          Rails.error.logger = Rails.logger
+        end
+      end
     end
 
     initializer "logjam_agent", :after => "time_bandits" do |app|
@@ -127,11 +140,21 @@ module LogjamAgent
             trace = wrapper.application_trace
             trace = wrapper.framework_trace if trace.empty?
 
-            ActiveSupport::Deprecation.silence do
-              parts = [ "#{exception.class} (#{exception.message})" ]
-              parts.concat exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
-              parts.concat trace
-              logger.fatal parts.join("\n  ")
+            if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("7.1.0")
+              Rails.application.deprecators.silence do
+                parts = [ "#{exception.class} (#{exception.message})" ]
+                parts.concat exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
+                parts.concat trace
+                logger.fatal parts.join("\n  ")
+              end
+            else
+              ActiveSupport::Deprecation.silence do
+                parts = [ "#{exception.class} (#{exception.message})" ]
+                parts.concat exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
+                parts.concat trace
+                logger.fatal parts.join("\n  ")
+              end
+
             end
           end
         end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.38.5"
+  VERSION = "0.39.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.38.5
+  version: 0.39.1
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Logjam client library to be used with logjam