logjam_agent 0.4.5 → 0.5.0

data/lib/logjam_agent/rack/logger.rb

@@ -23,9 +23,12 @@ module LogjamAgent
         Thread.current[:time_bandits_completed_info] = nil
 
         request = ActionDispatch::Request.new(env)
+
         path = request.filtered_path
 
-        Rails.logger.request.fields.merge!(:started_at => start_time.iso8601, :ip => request.ip, :host => @hostname)
+        logjam_fields = Rails.logger.request.fields
+        logjam_fields.merge!(:started_at => start_time.iso8601, :ip => request.ip, :host => @hostname)
+        logjam_fields.merge!(extract_request_info(request))
 
         info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{start_time.to_default_s}"
       end
@@ -34,7 +37,7 @@ module LogjamAgent
         status = result ? result.first : 500
         duration, additions, view_time, action = Thread.current[:time_bandits_completed_info]
 
-        basic_request_info = {:total_time => run_time_ms, :code => status, :action => action, :view_time => view_time || 0.0}
+        request_info = {:total_time => run_time_ms, :code => status, :action => action, :view_time => view_time || 0.0}
 
         message = "Completed #{status} #{::Rack::Utils::HTTP_STATUS_CODES[status]} in %.1fms" % run_time_ms
         message << " (#{additions.join(' | ')})" unless additions.blank?
@@ -42,11 +45,69 @@ module LogjamAgent
 
         ActiveSupport::LogSubscriber.flush_all!
 
-        Rails.logger.request.fields.merge!(basic_request_info)
+        Rails.logger.request.fields.merge!(request_info)
 
         env["time_bandits.metrics"] = TimeBandits.metrics
       end
 
+      HIDDEN_VARIABLES = /\A([a-z]|SERVER|PATH|GATEWAY|REQUEST|SCRIPT|REMOTE|QUERY|PASSENGER|DOCUMENT|SCGI|UNION_STATION)/o
+
+      TRANSLATED_VARIABLES = /\A(HTTP|CONTENT_LENGTH)/
+
+      TRANSLATED_KEYS = Hash.new do |h,k|
+        h[k] = k.sub(/\AHTTP_/,'').split('_').map(&:capitalize).join('-') if k =~ TRANSLATED_VARIABLES
+      end
+
+      REFERER = 'HTTP_REFERER'
+      CONTENT_LENGTH = 'CONTENT_LENGTH'
+
+      KV_RE   = '[^&;=]+'
+      PAIR_RE = %r{(#{KV_RE})=(#{KV_RE})}
+
+      def extract_request_info(request)
+        request_info = {}
+        filter = request.send(:parameter_filter)
+
+        request_info[:method] = request.method
+        request_info[:url] = request.filtered_path
+        request_info[:headers] = extract_headers(request, filter)
+
+        unless request.query_string.empty?
+          query_params = filter.filter(request.query_parameters)
+          request_info[:query_parameters] = query_params unless query_params.empty?
+        end
+
+        unless request.content_length == 0
+          body_params = filter.filter(request.request_parameters)
+          request_info[:body_parameters] = body_params unless body_params.empty?
+        end
+
+        { :request_info => request_info }
+      rescue Exception
+        Rails.logger.error($!)
+        {}
+      end
+
+      def extract_headers(request, filter)
+        headers = request.filtered_env
+        headers.reject!{|k,v| k =~ HIDDEN_VARIABLES }
+        headers.delete(CONTENT_LENGTH) if request.content_length == 0
+
+        if referer = headers[REFERER]
+          headers[REFERER] = referer.gsub(PAIR_RE) do |_|
+            filter.filter([[$1, $2]]).first.join("=")
+          end
+        end
+
+        headers.keys.each do |k|
+          if t = TRANSLATED_KEYS[k]
+            headers[t] = headers.delete(k)
+          end
+        end
+
+        headers
+      end
+
     end
   end
 end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,103 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: logjam_agent
-version: !ruby/object:Gem::Version
-  version: 0.4.5
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
-authors:
+authors: 
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: i18n
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: uuid4r
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: uuid4r
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: time_bandits
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.2
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: time_bandits
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
         version: 0.2.2
+  type: :runtime
+  version_requirements: *id005
 description: Logjam logger and request information forwarding
-email:
+email: 
 - stefan.kaes@xing.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -115,28 +116,38 @@ files:
 - lib/logjam_agent/version.rb
 - logjam_agent.gemspec
 - rails/init.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: logjam_agent
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Logjam client library to be used with logjam
 test_files: []
+