resurfaceio-logger 1.7.14 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43259eb0b70a63bd2d27ff40915e5046a0296784
-  data.tar.gz: 011033a042cdc4642b50edfc29148d55ffca0926
+  metadata.gz: b3be2e4cca1408ec107b7311ee3719b89ba23bd0
+  data.tar.gz: 98406ab661b3dbfb74e3f62b231c288363e444b8
 SHA512:
-  metadata.gz: ec22698b4ca603ab73fc1d68d73ccb958a207679f147755a517bdc20f330c1266d719d3807c00696eba4823a858fe97de19c3aeb77808238720832ef7fe4e508
-  data.tar.gz: 0ffd311454eca86d67b465316116c067b9aa811d2f02bd01b4ee8cdb142f4bd880a9566f98a64b7b7b3adc3fd35d5bfa13c599bcd21bf4196bc6735be56a8f58
+  metadata.gz: 90a62d981f55556545de8350709e967206f0c2f706afa7fdf988dfb435219c57d235b6ee212761249ddeb1c19c95de18336c2c0ab2dd1d010e7de0528017b04d
+  data.tar.gz: 5f94610eb8077981971636bca25cbe322773a3241fb03b2b6845ab4a84e3db9479535dff239a81dc506cff76d4d1bd525ddea030f46e84d9fabdbc9192391f16

data/lib/resurfaceio/base_logger.rb

@@ -4,12 +4,15 @@
 require 'uri'
 require 'net/http'
 require 'net/https'
+require 'zlib'
 require 'resurfaceio/usage_loggers'
 
 class BaseLogger
 
-  def initialize(agent, options={})
+  def initialize(agent, options = {})
     @agent = agent
+    @skip_compression = false
+    @skip_submission = false
     @version = BaseLogger.version_lookup
 
     # set options in priority order
@@ -65,8 +68,24 @@ class BaseLogger
     @enabled && UsageLoggers.enabled?
   end
 
+  def skip_compression?
+    @skip_compression
+  end
+
+  def skip_compression=(value)
+    @skip_compression = value
+  end
+
+  def skip_submission?
+    @skip_submission
+  end
+
+  def skip_submission=(value)
+    @skip_submission = value
+  end
+
   def submit(json)
-    if !enabled?
+    if @skip_submission || !enabled?
       true
     elsif @queue
       @queue << json
@@ -77,7 +96,12 @@ class BaseLogger
         @url_connection ||= Net::HTTP.new(@url_parsed.host, @url_parsed.port)
         @url_connection.use_ssl = @url.include?('https')
         request = Net::HTTP::Post.new(@url_parsed.path)
-        request.body = json
+        if @skip_compression
+          request.body = json
+        else
+          request.add_field('Content-Encoding', 'deflated')
+          request.body = Zlib::Deflate.deflate(json)
+        end
         response = @url_connection.request(request)
         response.code.to_i == 204
       rescue SocketError

data/lib/resurfaceio/http_logger.rb

@@ -12,27 +12,29 @@ class HttpLogger < BaseLogger
     super(AGENT, options)
   end
 
-  def format(request, request_body, response, response_body, now=nil)
+  def format(request, response, response_body=nil, request_body=nil, now=nil)
     message = []
     append_value message, 'request_method', request.request_method
     append_value message, 'request_url', request.url
     append_value message, 'response_code', response.status
     append_request_headers message, request
+    append_request_params message, request
     append_response_headers message, response
-    append_value message, 'request_body', request_body.nil? ? request.body : request_body
-    append_value message, 'response_body', response_body.nil? ? response.body : response_body
+    append_value message, 'request_body', request_body unless request_body == ''
+    final_response_body = response_body.nil? ? response.body : response_body
+    append_value message, 'response_body', final_response_body unless final_response_body == ''
     message << ['agent', @agent]
     message << ['version', @version]
     message << ['now', now.nil? ? (Time.now.to_f * 1000).floor.to_s : now]
     JSON.generate message
   end
 
-  def log(request, request_body, response, response_body)
-    !enabled? || submit(format(request, request_body, response, response_body))
+  def log(request, response, response_body=nil, request_body=nil)
+    !enabled? || submit(format(request, response, response_body, request_body))
   end
 
-  def string_content_type?(s)
-    !s.nil? && s =~ /^(text\/(html|plain|xml))|(application\/(json|soap|xml|x-www-form-urlencoded))/i
+  def self.string_content_type?(s)
+    !s.nil? && !(s =~ /^(text\/(html|plain|xml))|(application\/(json|soap|xml|x-www-form-urlencoded))/i).nil?
   end
 
   protected
@@ -50,7 +52,23 @@ class HttpLogger < BaseLogger
             message << ["request_header.#{name[5..-1].downcase.tr('_', '-')}", value]
           end
         end
-      end
+      end unless headers.nil?
+    end
+  end
+
+  def append_request_params(message, request)
+    respond_to_env = request.respond_to?(:env)
+    if respond_to_env || request.respond_to?(:form_hash)
+      hash = respond_to_env ? request.env['rack.request.form_hash'] : request.form_hash
+      hash.each do |name, value|
+        append_value message, "request_param.#{name.downcase}", value
+      end unless hash.nil?
+    end
+    if respond_to_env || request.respond_to?(:query_hash)
+      hash = respond_to_env ? request.env['rack.request.query_hash'] : request.query_hash
+      hash.each do |name, value|
+        append_value message, "request_param.#{name.downcase}", value
+      end unless hash.nil?
     end
   end
 
@@ -63,7 +81,7 @@ class HttpLogger < BaseLogger
           found_content_type = true if name =~ /^content-type/
           message << ["response_header.#{name}", value]
         end
-      end
+      end unless response.headers.nil?
     end
     unless found_content_type || response.content_type.nil?
       message << ['response_header.content-type', response.content_type]
@@ -79,11 +97,7 @@ class HttpLogger < BaseLogger
           when String
             message << [key, value]
           else
-            if value.respond_to?(:read)
-              message << [key, value.read]
-            else
-              message << [key, value.to_s]
-            end
+            message << [key, value.to_s]
         end
       end
     end

data/lib/resurfaceio/http_logger_for_rack.rb

@@ -11,13 +11,17 @@ class HttpLoggerForRack # http://rack.rubyforge.org/doc/SPEC.html
     @logger = HttpLogger.new(options)
   end
 
+  def logger
+    @logger
+  end
+
   def call(env)
     status, headers, body = @app.call(env)
-    if @logger.enabled? && status < 300
+    if @logger.enabled? && (status < 300 || status == 302)
       response = Rack::Response.new(body, status, headers)
-      if @logger.string_content_type?(response.content_type)
+      if HttpLogger::string_content_type?(response.content_type)
         request = Rack::Request.new(env)
-        @logger.log(request, nil, response, nil)
+        @logger.log(request, response)
       end
     end
     [status, headers, body]

data/lib/resurfaceio/http_logger_for_rails.rb

@@ -9,11 +9,17 @@ class HttpLoggerForRails
     @logger = HttpLogger.new(options)
   end
 
+  def logger
+    @logger
+  end
+
   def around(controller)
     yield
+    request = controller.request
     response = controller.response
-    if response.status < 300 && @logger.string_content_type?(response.content_type)
-      @logger.log(controller.request, nil, response, nil)
+    status = response.status
+    if (status < 300 || status == 302) && HttpLogger::string_content_type?(response.content_type)
+      @logger.log(request, response)
     end
   end
 

data/lib/resurfaceio/http_request_impl.rb

@@ -4,8 +4,9 @@
 class HttpRequestImpl
 
   def initialize
+    @form_hash = Hash.new
     @headers = Hash.new
-    @raw_body = nil
+    @query_hash = Hash.new
   end
 
   def add_header(key, value)
@@ -19,10 +20,6 @@ class HttpRequestImpl
     end
   end
 
-  def body
-    @raw_body ? StringIO.new(@raw_body) : nil
-  end
-
   def content_type
     @headers['CONTENT_TYPE']
   end
@@ -31,11 +28,18 @@ class HttpRequestImpl
     @headers['CONTENT_TYPE'] = content_type
   end
 
+  def form_hash
+    @form_hash
+  end
+
   def headers
     @headers
   end
 
-  attr_accessor :raw_body
+  def query_hash
+    @query_hash
+  end
+
   attr_accessor :request_method
   attr_accessor :url
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resurfaceio-logger
 version: !ruby/object:Gem::Version
-  version: 1.7.14
+  version: 1.8.2
 platform: ruby
 authors:
 - RobDickinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler