logstasher 2.1.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59cdc11b4f36e90443fcc8ea7332552874da2ad2205f38e4efac48c8e4dda63a
-  data.tar.gz: 997cb22cb6799f67d28562e986e326fa23597ee5168a635bdc917d6a9bb65c6b
+  metadata.gz: 8c812ac81d2e0aa6cd314f3325e7e875ccc746752a2539ba46b13ec273faa4f6
+  data.tar.gz: 8e14621d9afaf65e07accab9b27009ff3a3b9502a2b0e1d8f1d81e99570d68e3
 SHA512:
-  metadata.gz: dd6d94a4055566fd119a570107724ce1fc1c1f3f1781f2929c248e4f2b227a3f95adb010b6e059f44cf49991f5baa1d9f3271f272efb5a97415104a265eb0e1b
-  data.tar.gz: 35d3e80b5e460753033b327e41d51149d24b20c7b1321189a2ec24373ac5aa9c713189eba701ddc3ec5904fbf86a2b98657deff4c2a02fcfcee20f93c31fd9f9
+  metadata.gz: 570318f5ceae39043b9c4a1085a056939d228d5133f775698b6d3d1e713fbaeb11f48c97fcd2c95bfdd641a9c71558f4952b8dcfd37833f574413b992dd6a8cb
+  data.tar.gz: 2172c27d4a0fff550cc0f911110e97cd4fed232fc108c7d2add2917a6af19be0e5801dd96cdc2c5411264d13cba8082b253038e8ecc0923ff07993007968edb2

data/lib/logstasher/action_view/log_subscriber.rb

@@ -51,7 +51,8 @@ module LogStasher
       def event_data(event)
         {
           name: event.name,
-          transaction_id: event.transaction_id
+          transaction_id: event.transaction_id,
+          allocations: event.try(:allocations) || 0
         }
       end
 

data/lib/logstasher/active_support/log_subscriber.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'active_support'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 require 'logstasher/custom_fields'

data/lib/logstasher/custom_fields.rb

@@ -4,7 +4,10 @@ module LogStasher
   module CustomFields
     module LogSubscriber
       def extract_custom_fields(data)
-        (!CustomFields.custom_fields.empty? && data.extract!(*CustomFields.custom_fields)) || {}
+        # Don't mutate the original payload; slice the requested fields instead
+        fields = CustomFields.custom_fields
+        return {} if fields.empty?
+        data.respond_to?(:slice) ? data.slice(*fields) : fields.each_with_object({}) { |k, h| h[k] = data[k] if data.key?(k) }
       end
     end
 

data/lib/logstasher/rails_ext/action_controller/base.rb

@@ -18,7 +18,12 @@ module LogStasher
       def append_info_to_payload(payload) #:nodoc:
         LogStasher.add_default_fields_to_payload(payload, request)
         if respond_to?(:logstasher_add_custom_fields_to_request_context)
-          logstasher_add_custom_fields_to_request_context(LogStasher.request_context)
+          # Collect custom fields into a temporary hash, then merge into both
+          # the per-request context and the controller payload.
+          _fields = {}
+          logstasher_add_custom_fields_to_request_context(_fields)
+          LogStasher.request_context.merge!(_fields)
+          payload.merge!(_fields)
         end
 
         if respond_to?(:logstasher_add_custom_fields_to_payload)

data/lib/logstasher/rails_ext/action_controller/metal/instrumentation.rb

@@ -26,7 +26,12 @@ module ActionController
 
       ActiveSupport::Notifications.instrument('process_action.action_controller', raw_payload) do |payload|
         if respond_to?(:logstasher_add_custom_fields_to_request_context)
-          logstasher_add_custom_fields_to_request_context(LogStasher.request_context)
+          # Collect custom fields in a temporary hash then merge into both
+          # request context and the event payload to satisfy specs.
+          _fields = {}
+          logstasher_add_custom_fields_to_request_context(_fields)
+          LogStasher.request_context.merge!(_fields)
+          payload.merge!(_fields)
         end
 
         if respond_to?(:logstasher_add_custom_fields_to_payload)

data/lib/logstasher/railtie.rb

@@ -6,6 +6,21 @@ require 'action_controller/log_subscriber'
 require 'socket'
 
 module LogStasher
+  def default_source
+    case RUBY_PLATFORM
+    when /darwin/
+      # NOTE: MacOS Sierra and later are setting `.local`
+      # hostnames that even as real hostnames without the `.local` part,
+      # are still unresolvable. One reliable way to get an IP is to
+      # get all available IP address lists and use the first one.
+      # This will always be `127.0.0.1`.
+      address_info = Socket.ip_address_list.first
+      address_info&.ip_address
+    else
+      IPSocket.getaddress(Socket.gethostname)
+    end
+  end
+
   class Railtie < Rails::Railtie
     config.logstasher = ::ActiveSupport::OrderedOptions.new
     config.logstasher.enabled = false
@@ -16,6 +31,7 @@ module LogStasher
     config.logstasher.record_enabled = false
     config.logstasher.view_enabled = true
     config.logstasher.job_enabled = true
+    config.logstasher.source = LogStasher.default_source
 
     # Try loading the config/logstasher.yml if present
     env = Rails.env.to_sym || :development
@@ -37,7 +53,7 @@ module LogStasher
       LogStasher.setup_before(app.config.logstasher) if app.config.logstasher.enabled
     end
 
-    initializer :logstasher do
+    initializer :logstasher_after_init do
       config.after_initialize do
         LogStasher.setup(config.logstasher) if config.logstasher.enabled
       end
@@ -48,21 +64,6 @@ module LogStasher
     end
   end
 
-  def default_source
-    case RUBY_PLATFORM
-    when /darwin/
-      # NOTE: MacOS Sierra and later are setting `.local`
-      # hostnames that even as real hostnames without the `.local` part,
-      # are still unresolvable. One reliable way to get an IP is to
-      # get all available IP address lists and use the first one.
-      # This will always be `127.0.0.1`.
-      address_info = Socket.ip_address_list.first
-      address_info&.ip_address
-    else
-      IPSocket.getaddress(Socket.gethostname)
-    end
-  end
-
   def process_config(config, yml_config)
     # Enable the logstasher logs for the current environment
     config.enabled = yml_config[:enabled] if yml_config.key? :enabled

data/lib/logstasher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LogStasher
-  VERSION = '2.1.3'
+  VERSION = '3.0.0'
 end

data/lib/logstasher.rb

@@ -47,10 +47,24 @@ module LogStasher
   end
 
   def unsubscribe(component, subscriber)
+    # Use Rails' built-in detach mechanism when available (Rails 5.1+).
+    # detach_from is a class method, so we get the class first.
+    klass = subscriber.is_a?(Class) ? subscriber : subscriber.class
+    if klass.respond_to?(:detach_from)
+      klass.detach_from(component)
+      return
+    end
+
+    # Fallback for older Rails versions without detach_from.
     events = subscriber.public_methods(false).reject { |method| method.to_s == 'call' }
     events.each do |event|
       ::ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
-        ::ActiveSupport::Notifications.unsubscribe listener if listener.instance_variable_get('@delegate') == subscriber
+        begin
+          delegate = listener.instance_variable_get('@delegate')
+        rescue StandardError
+          delegate = nil
+        end
+        ::ActiveSupport::Notifications.unsubscribe(listener) if delegate == subscriber
       end
     end
   end
@@ -71,8 +85,15 @@ module LogStasher
       LogStasher::CustomFields.add(*LogStasher.store.keys)
       instance_exec(fields, &block)
     end
-    ::ActionController::Metal.send(:define_method, :logstasher_add_custom_fields_to_payload, &wrapped_block)
-    ::ActionController::Base.send(:define_method, :logstasher_add_custom_fields_to_payload, &wrapped_block)
+    if defined?(::ActionController::Base) || defined?(::ActionController::Metal)
+      ::ActionController::Metal.send(:define_method, :logstasher_add_custom_fields_to_payload, &wrapped_block) if defined?(::ActionController::Metal)
+      ::ActionController::Base.send(:define_method, :logstasher_add_custom_fields_to_payload, &wrapped_block) if defined?(::ActionController::Base)
+    else
+      ::ActiveSupport.on_load(:action_controller) do
+        ::ActionController::Metal.send(:define_method, :logstasher_add_custom_fields_to_payload, &wrapped_block)
+        ::ActionController::Base.send(:define_method, :logstasher_add_custom_fields_to_payload, &wrapped_block)
+      end
+    end
   end
 
   def add_custom_fields_to_request_context(&block)
@@ -80,8 +101,15 @@ module LogStasher
       instance_exec(fields, &block)
       LogStasher::CustomFields.add(*fields.keys)
     end
-    ::ActionController::Metal.send(:define_method, :logstasher_add_custom_fields_to_request_context, &wrapped_block)
-    ::ActionController::Base.send(:define_method, :logstasher_add_custom_fields_to_request_context, &wrapped_block)
+    if defined?(::ActionController::Base) || defined?(::ActionController::Metal)
+      ::ActionController::Metal.send(:define_method, :logstasher_add_custom_fields_to_request_context, &wrapped_block) if defined?(::ActionController::Metal)
+      ::ActionController::Base.send(:define_method, :logstasher_add_custom_fields_to_request_context, &wrapped_block) if defined?(::ActionController::Base)
+    else
+      ::ActiveSupport.on_load(:action_controller) do
+        ::ActionController::Metal.send(:define_method, :logstasher_add_custom_fields_to_request_context, &wrapped_block)
+        ::ActionController::Base.send(:define_method, :logstasher_add_custom_fields_to_request_context, &wrapped_block)
+      end
+    end
   end
 
   def add_default_fields_to_request_context(request)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Shadab Ahmed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Awesome rails logs