logjam_agent 0.9.3 → 0.9.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGE1MWZkYjNjYzNjYzQ5MzkyZjQzMGEzMjZmMTBhOTE0YWM5YzdiZQ==
+    Yzc0ZDQ5YzMxNjRhMjM3MDE2ZWVkZTIwNDMwYjA0ZDkzYzU3Mjg4OA==
   data.tar.gz: !binary |-
-    YjJhZWU1YjdiNjYwYzM4ZDRjNDQ5NzNhY2I3YzE5Njc0NjFhYTBhMg==
+    ZmQwOWRiNjIwOGJjZThhYjA4MzM2ODllYTM4M2ZjMTkyYTYzMTg1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2M2NmJhZDRjZTJlOWM2M2ZjNDg1ZDIxODVkYTIwZmExYTE0MDhjOWIyOGEz
-    MWM5NmQ1YWQ0YjNjNjE1ZDEyNTM2NjU2ODI0NzY2YTY3NWFiYjA3OTY1ZTVi
-    MjA2NGNlOTA4MzZhZmNhODQwZjA4MGFiM2NhZjVmMWFjOWUyNzA=
+    MjUwNWJkYTIzMDE3OGU0MDRhY2E3N2Q0Njc3MWIwNjAwNjQyMjIxYTQzMjc5
+    MzZmN2U5ZTM1MTk2OTkyMGFmMmM0MjM5NzFlMWQ5OGRjNTc0NzU1YjkzYTc3
+    MWNmODgzZGJlZTEwZWIyMThhZmQzMjVkMDRiNjFhM2U0MjkzMjA=
   data.tar.gz: !binary |-
-    NWRjZGIyZjFlMzg1YmJjYWI5ZWIxYzYwMDU5ZWZjNWQwODdhYzE0YTcxNTZl
-    MmJlNmJmMWE3Mjg5YmJhZTFhZDE3YjllNjY0NWFkZDJkMjhmMGRkNTAzZDVl
-    NzZkOWNjNGYzZjVkNzY4ZDUxNGQxYjQzNTM4YmU3M2ZlZTliMWI=
+    Y2RjZjZlN2M1ZDZlOGVhZjdkODMwYmU1YjM3YWVmMGRmOGYxNWY2Yjc5Njdk
+    MWM0ZTg3ZDc0Y2UzYWY0ODJkM2VmNDJjY2ZiN2RjNzE1MTlmZjAzMWZlYWMy
+    ZGZlMDhlMmYwMzYzMmNiODQ2YTg0YWUwNDg2YjZjYTVhOTFmZjM=

data/README.md

@@ -46,6 +46,11 @@ module LogjamAgent
 
   # Configure cookie obfuscation. Defaults to [/_session\z/].
   # self.obfuscated_cookies = [/_session\z/]
+
+  # Configure asset request logging and forwarding. Defaults to ignore
+  # asset requests in development mode. Set this to false if you need
+  # to debug asset request handling.
+  # self.ignore_asset_requests = Rails.env.development?
 end
 ```
 

data/lib/logjam_agent/rack/logger.rb

@@ -8,6 +8,8 @@ module LogjamAgent
         @app = app
         @taggers = taggers || Rails.application.config.log_tags || []
         @hostname = LogjamAgent.hostname
+        @asset_prefix = Rails.application.config.assets.prefix rescue "---"
+        @ignore_asset_requests = LogjamAgent.ignore_asset_requests
       end
 
       def call(env)
@@ -46,18 +48,27 @@ module LogjamAgent
         end
       end
 
+      def ignored_asset_request?(path)
+        @ignore_asset_requests && path.starts_with?(@asset_prefix)
+      rescue
+        false
+      end
+
       def before_dispatch(request, env, start_time)
         TimeBandits.reset
         Thread.current.thread_variable_set(:time_bandits_completed_info, nil)
 
         path = request.filtered_path
 
-        logjam_fields = LogjamAgent.request.fields
+        logjam_request = LogjamAgent.request
+        logjam_request.ignore! if ignored_asset_request?(path)
+
+        logjam_fields = logjam_request.fields
         ip = LogjamAgent.ip_obfuscator(request.ip)
         logjam_fields.merge!(:started_at => start_time.iso8601, :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}"
+        info "Started #{request.request_method} \"#{path}\" for #{ip} at #{start_time.to_default_s}" unless logjam_request.ignored?
       end
 
       def after_dispatch(env, result, run_time_ms)
@@ -66,6 +77,7 @@ module LogjamAgent
           _, additions, view_time, _ = completed_info
         end
         request_info = {:total_time => run_time_ms, :code => status, :view_time => view_time || 0.0}
+        logjam_request = LogjamAgent.request
 
         if (allowed_time_ms = env['HTTP_X_LOGJAM_CALLER_TIMEOUT'].to_i) > 0 && (run_time_ms > allowed_time_ms)
           warn LogjamAgent::CallerTimeoutExceeded.new("exceeded allowed time by #{(run_time_ms.to_i - allowed_time_ms)} ms")
@@ -73,11 +85,11 @@ module LogjamAgent
 
         message = "Completed #{status} #{::Rack::Utils::HTTP_STATUS_CODES[status]} in %.1fms" % run_time_ms
         message << " (#{additions.join(' | ')})" unless additions.blank?
-        info message
+        info message unless logjam_request.ignored?
 
         ActiveSupport::LogSubscriber.flush_all!
 
-        LogjamAgent.request.fields.merge!(request_info)
+        logjam_request.fields.merge!(request_info)
 
         env["time_bandits.metrics"] = TimeBandits.metrics
       end

data/lib/logjam_agent/railtie.rb

@@ -54,6 +54,9 @@ module LogjamAgent
       forwarding_error_logger.formatter = ::Logger::Formatter.new
       LogjamAgent.forwarding_error_logger = forwarding_error_logger
 
+      # ignore asset requests in development
+      LogjamAgent.ignore_asset_requests = Rails.env.development?
+
       # patch controller testing to create a logjam request, because middlewares aren't executed
       if Rails.env.test?
         ActiveSupport.on_load(:action_controller) do

data/lib/logjam_agent/request.rb

@@ -16,6 +16,15 @@ module LogjamAgent
       @uuid = LogjamAgent.generate_uuid
       @fields = initial_fields.merge(:request_id => @uuid, :host => LogjamAgent.hostname, :process_id => Process.pid, :lines => @lines)
       @mutex = Mutex.new
+      @ignored = false
+    end
+
+    def ignore!
+      @ignored = true
+    end
+
+    def ignored?
+      @ignored
     end
 
     def id
@@ -47,6 +56,7 @@ module LogjamAgent
     end
 
     def forward
+      return if @ignored
       engine = @fields.delete(:engine)
       # puts @fields.inspect
       @forwarder.forward(LogjamAgent.encode_payload(@fields), :engine => engine)

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/lib/logjam_agent.rb

@@ -110,6 +110,9 @@ module LogjamAgent
   mattr_accessor :exception_matcher
   self.exception_matcher = nil
 
+  mattr_accessor :ignore_asset_requests
+  self.ignore_asset_requests = false
+
   def self.auto_detect_exception(exception_class)
     # ignore Exception classes created with Class.new (timeout.rb, my old friend)
     if (class_name = exception_class.to_s) =~ /^[\w:]+$/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement