logjam_agent 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 238a6d18a9fdd1fdf660314a3e3de7706e658e08ab304aa4874d7e73985c787d
-  data.tar.gz: 208a910c0abadf9572d1e9f872eee8b90c8d3706e9a59bf8c550d64cb1144281
+  metadata.gz: b0980fb837410c08361600e378f44a6bacf83a36ecd95fa3090348f4dc0ca5d9
+  data.tar.gz: 8f191a84d982672fee5a7b00bfc8faf9d37c98f6573ecd2c72911fc00584986e
 SHA512:
-  metadata.gz: f1852e9eec5abceed5a8ddd8977188a1a86ae415c6883e01db30d5471e0d20def84c07ad1eadb947e1809860c61e72010ad8dbb2aaaf92c6c842f3f3029708e5
-  data.tar.gz: 5565c68259a98b4561240cc3f2a1bd1233598efa3aeca555db6c78183d0064376e5d3f1acfd13469bee5654e8565bee217843f7bd965b49d93a586662db4d1f3
+  metadata.gz: 9f7c46d32b4c7dd42279a9e20a4b834baad1082201234fb8ccd26466846d04572139d1542abe5c637bba39cc722177952fa67a639bc05d6f8c379d19867fbece
+  data.tar.gz: 2f56ac4b0f6e6b0a9e7c11e5b7b6314343726f8fa9c164181f2c5dd7b262e207ef5b6739d90f5afb38fb6857c87168a07457c25a371d094d66b86541af961735

data/lib/logjam_agent/rack/logger.rb

@@ -106,6 +106,9 @@ module LogjamAgent
         logjam_request.ignore!(:asset) if ignored_asset_request?(path)
         logjam_request.ignore!(:url) if ignored_request_url?(path)
 
+        logjam_request.log_info[:path] = path
+        logjam_request.log_info[:method] = request.method
+
         logjam_request.start_time = start_time
         logjam_fields = logjam_request.fields
         logjam_fields[:wait_time] = wait_time_ms if wait_time_ms > 0.0
@@ -119,7 +122,9 @@ module LogjamAgent
         logjam_fields.merge!(:ip => ip, :host => @hostname)
         logjam_fields.merge!(extract_request_info(request))
 
-        info "Started #{request.request_method} \"#{path}\" for #{ip} at #{start_time.to_default_s}" unless logjam_request.ignored?(:asset)
+        LogjamAgent.logjam_only do
+          info "Started #{request.request_method} \"#{path}\" for #{ip} at #{start_time.to_default_s}" unless logjam_request.ignored?(:asset)
+        end
         if spoofed
           error spoofed
           raise spoofed
@@ -146,9 +151,20 @@ module LogjamAgent
           warn LogjamAgent::NegativeWaitTime.new("#{wait_time_ms} ms")
         end
 
-        message = "Completed #{status} #{::Rack::Utils::HTTP_STATUS_CODES[status]} in %.1fms" % run_time_ms
-        message << " (#{additions.join(' | ')})" unless additions.blank?
-        info message unless logjam_request.ignored?(:asset)
+        http_status = "#{status} #{::Rack::Utils::HTTP_STATUS_CODES[status]}"
+        LogjamAgent.logjam_only do
+          message = "Completed #{http_status} in %.1fms" % run_time_ms
+          message << " (#{additions.join(' | ')})" unless additions.blank?
+          info message unless logjam_request.ignored?(:asset)
+        end
+        if LogjamAgent.selective_logging_enabled
+          LogjamAgent.logdevice_only do
+            logjam_request.log_info[:status] = status
+            logjam_request.log_info[:duration] = run_time_ms
+            # logjam_request.log_info[:metrics] = TimeBandits.metrics.reject{|k,v| v.zero?}
+            info "Completed #{http_status} #{logjam_request.log_info.to_json}"
+          end
+        end
 
         ActiveSupport::LogSubscriber.flush_all!
         request_info = { :total_time => run_time_ms, :code => status }

data/lib/logjam_agent/rack/rails_support.rb

@@ -16,10 +16,18 @@ module ActionController #:nodoc:
       full_name = "#{controller}##{action}"
       action_name = LogjamAgent.action_name_proc.call(full_name)
 
-      LogjamAgent.request.fields[:action] = action_name
+      request = LogjamAgent.request
+      request.fields[:action] = action_name
 
-      info "Processing by #{full_name} as #{format}"
-      info "  Parameters: #{params.inspect}" unless params.empty?
+      request.log_info[:action] = action
+      request.log_info[:controller] = controller
+      request.log_info[:format] = format
+      # request.log_info[:params] = params
+
+      LogjamAgent.logjam_only do
+        info "Processing by #{full_name} as #{format}"
+        info "  Parameters: #{params.inspect}" unless params.empty?
+      end
     end
   end
 

data/lib/logjam_agent/request.rb

@@ -6,7 +6,7 @@ end
 
 module LogjamAgent
   class Request
-    attr_reader :fields, :uuid, :start_time
+    attr_reader :fields, :uuid, :start_time, :log_info
     attr_accessor :log_device_ignored_lines
 
     def initialize(app, env, initial_fields)
@@ -39,6 +39,7 @@ module LogjamAgent
       @max_bytes_all_lines = LogjamAgent.max_bytes_all_lines
       @max_line_length = LogjamAgent.max_line_length
       @lines_dropped = false
+      @log_info = {}
     end
 
     def start_time=(start_time)

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.36.0"
+  VERSION = "0.37.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake