resurfaceio-logger 1.9.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f745e986a52a415313ca922f66c119d3de17234d1c9c7c654e0dd104be45237f
-  data.tar.gz: 8a48a6124d974ef7082566aef5c4190d5de17d6b58f1e8b950efa61620f96646
+  metadata.gz: 96d9dcd75c1689a944d72d80ed12692efbdc75b8c10b391bece364c26090efc1
+  data.tar.gz: 6851901ff3dba16d290c479cd8262f6ff3789997089bb213ead746ccb74ebb93
 SHA512:
-  metadata.gz: 35375e533763567753fcb9947a144b81d0908c2b812a96dc3f1c17c11cbdb3ec6f97e3ace13896f6fe5eec71f22d80efea4ed1bbc913e93aeb9907ab9d7e7435
-  data.tar.gz: 75b8e7e419e755621b78b3f602a40deadfef1a78ee57e86caf4a5528c6dfa7655901991f1fc4f019b310f763fb3881ed6bd6358b4ff54a18df5c268d0e98bccf
+  metadata.gz: bf5eb2c3775d016416f6e55a35a1422f4ae33d89887ffe7bf69ac280e4f569d98eed2aacb4715efcf20af4e07527726f262ad268131605174d038231a152ce3c
+  data.tar.gz: 715e09307d21578168425a94ef905a00bcf5497153e3902d2a3a5b0f8e058caa8d14a158ea571b0fbc81c04dd1a6c2416a4342c892a941eaf0c26fbcdb0972a1

data/lib/resurfaceio/all.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 require 'resurfaceio/base_logger'
 require 'resurfaceio/http_logger'

data/lib/resurfaceio/base_logger.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 require 'uri'
 require 'net/http'
 require 'net/https'
+require 'socket'
 require 'zlib'
 require 'resurfaceio/usage_loggers'
 
@@ -11,6 +12,7 @@ class BaseLogger
 
   def initialize(agent, options = {})
     @agent = agent
+    @host = BaseLogger.host_lookup
     @skip_compression = false
     @skip_submission = false
     @version = BaseLogger.version_lookup
@@ -49,7 +51,12 @@ class BaseLogger
       end
     end
 
+    # finalize internal properties
     @enableable = !@queue.nil? || !@url.nil?
+    @submit_failures = 0
+    @submit_failures_lock = Mutex.new
+    @submit_successes = 0
+    @submit_successes_lock = Mutex.new
   end
 
   def agent
@@ -74,6 +81,14 @@ class BaseLogger
     @enabled && UsageLoggers.enabled?
   end
 
+  def host
+    @host
+  end
+
+  def queue
+    @queue
+  end
+
   def skip_compression?
     @skip_compression
   end
@@ -90,33 +105,46 @@ class BaseLogger
     @skip_submission = value
   end
 
-  def submit(json)
-    if json.nil? || @skip_submission || !enabled?
-      true
+  def submit(msg)
+    if msg.nil? || @skip_submission || !enabled?
+      # do nothing
     elsif @queue
-      @queue << json
-      true
+      @queue << msg
+      @submit_successes_lock.synchronize { @submit_successes += 1 }
     else
       begin
         @url_parsed ||= URI.parse(@url)
         @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.add_field('Content-Type', 'application/json; charset=UTF-8')
         if @skip_compression
-          request.body = json
+          request.body = msg
         else
           request.add_field('Content-Encoding', 'deflated')
-          request.body = Zlib::Deflate.deflate(json)
+          request.body = Zlib::Deflate.deflate(msg)
         end
         response = @url_connection.request(request)
-        response.code.to_i == 204
+        if response.code.to_i == 204
+          @submit_successes_lock.synchronize { @submit_successes += 1 }
+        else
+          @submit_failures_lock.synchronize { @submit_failures += 1 }
+        end
       rescue SocketError
+        @submit_failures_lock.synchronize { @submit_failures += 1 }
         @url_connection = nil
-        false
       end
     end
   end
 
+  def submit_failures
+    @submit_failures
+  end
+
+  def submit_successes
+    @submit_successes
+  end
+
   def url
     @url
   end
@@ -125,6 +153,16 @@ class BaseLogger
     @version
   end
 
+  def self.host_lookup
+    dyno = ENV['DYNO']
+    return dyno unless dyno.nil?
+    begin
+      Socket.gethostname
+    rescue
+      'unknown'
+    end
+  end
+
   def self.version_lookup
     Gem.loaded_specs['resurfaceio-logger'].version.to_s
   end

data/lib/resurfaceio/http_logger.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 require 'json'
 require 'resurfaceio/base_logger'
@@ -11,53 +11,20 @@ class HttpLogger < BaseLogger
 
   AGENT = 'http_logger.rb'.freeze
 
-  @@default_rules = HttpRules.strict_rules
-
-  def self.default_rules
-    @@default_rules
-  end
-
-  def self.default_rules=(val)
-    @@default_rules = val.gsub(/^\s*include default\s*$/, '')
-  end
-
-  def self.string_content_type?(s)
-    !s.nil? && !(s =~ /^(text\/(html|plain|xml))|(application\/(json|soap|xml|x-www-form-urlencoded))/i).nil?
-  end
-
   def initialize(options = {})
     super(AGENT, options)
 
-    # read rules from param or defaults
+    # parse specified rules
     if options.respond_to?(:has_key?) && options.has_key?(:rules)
-      @rules = options[:rules].gsub(/^\s*include default\s*$/, @@default_rules)
-      @rules = @@default_rules unless @rules.strip.length > 0
+      @rules = HttpRules.new(options[:rules])
     else
-      @rules = @@default_rules
+      @rules = HttpRules.new(nil)
     end
 
-    # parse and break rules out by verb
-    prs = HttpRules.parse(@rules)
-    @rules_allow_http_url = prs.select {|r| 'allow_http_url' == r.verb}.length > 0
-    @rules_copy_session_field = prs.select {|r| 'copy_session_field' == r.verb}
-    @rules_remove = prs.select {|r| 'remove' == r.verb}
-    @rules_remove_if = prs.select {|r| 'remove_if' == r.verb}
-    @rules_remove_if_found = prs.select {|r| 'remove_if_found' == r.verb}
-    @rules_remove_unless = prs.select {|r| 'remove_unless' == r.verb}
-    @rules_remove_unless_found = prs.select {|r| 'remove_unless_found' == r.verb}
-    @rules_replace = prs.select {|r| 'replace' == r.verb}
-    @rules_sample = prs.select {|r| 'sample' == r.verb}
-    @rules_stop = prs.select {|r| 'stop' == r.verb}
-    @rules_stop_if = prs.select {|r| 'stop_if' == r.verb}
-    @rules_stop_if_found = prs.select {|r| 'stop_if_found' == r.verb}
-    @rules_stop_unless = prs.select {|r| 'stop_unless' == r.verb}
-    @rules_stop_unless_found = prs.select {|r| 'stop_unless_found' == r.verb}
-    @skip_compression = prs.select {|r| 'skip_compression' == r.verb}.length > 0
-    @skip_submission = prs.select {|r| 'skip_submission' == r.verb}.length > 0
-
-    # finish validating rules
-    raise RuntimeError.new('Multiple sample rules') if @rules_sample.length > 1
-    unless @url.nil? || @url.start_with?('https') || @rules_allow_http_url
+    # apply configuration rules
+    @skip_compression = @rules.skip_compression
+    @skip_submission = @rules.skip_submission
+    unless @url.nil? || @url.start_with?('https') || @rules.allow_http_url
       @enableable = false
       @enabled = false
     end
@@ -67,57 +34,21 @@ class HttpLogger < BaseLogger
     @rules
   end
 
-  def log(request, response, response_body = nil, request_body = nil)
-    !enabled? || submit(format(request, response, response_body, request_body))
-  end
-
-  def format(request, response, response_body = nil, request_body = nil, now = nil)
-    details = HttpMessage.build(request, response, response_body, request_body)
+  def submit_if_passing(details)
+    # apply active rules
+    details = @rules.apply(details)
+    return nil if details.nil?
 
-    # copy data from session if configured
-    unless @rules_copy_session_field.empty?
-      ssn = request.session
-      if !ssn.nil? && ssn.respond_to?(:keys)
-        @rules_copy_session_field.each do |r|
-          ssn.keys.each {|d| (details << ["session_field:#{d}", ssn[d].to_s]) if r.param1.match(d)}
-        end
-      end
-    end
-
-    # quit early based on stop rules if configured
-    @rules_stop.each {|r| details.each {|d| return nil if r.scope.match(d[0])}}
-    @rules_stop_if_found.each {|r| details.each {|d| return nil if r.scope.match(d[0]) && r.param1.match(d[1])}}
-    @rules_stop_if.each {|r| details.each {|d| return nil if r.scope.match(d[0]) && r.param1.match(d[1])}}
-    passed = 0
-    @rules_stop_unless_found.each {|r| details.each {|d| passed += 1 if r.scope.match(d[0]) && r.param1.match(d[1])}}
-    return nil if passed != @rules_stop_unless_found.length
-    passed = 0
-    @rules_stop_unless.each {|r| details.each {|d| passed += 1 if r.scope.match(d[0]) && r.param1.match(d[1])}}
-    return nil if passed != @rules_stop_unless.length
-
-    # do sampling if configured
-    return nil if !@rules_sample[0].nil? && (rand * 100 >= @rules_sample[0].param1)
-
-    # winnow sensitive details based on remove rules if configured
-    @rules_remove.each {|r| details.delete_if {|d| r.scope.match(d[0])}}
-    @rules_remove_unless_found.each {|r| details.delete_if {|d| r.scope.match(d[0]) && !r.param1.match(d[1])}}
-    @rules_remove_if_found.each {|r| details.delete_if {|d| r.scope.match(d[0]) && r.param1.match(d[1])}}
-    @rules_remove_unless.each {|r| details.delete_if {|d| r.scope.match(d[0]) && !r.param1.match(d[1])}}
-    @rules_remove_if.each {|r| details.delete_if {|d| r.scope.match(d[0]) && r.param1.match(d[1])}}
-    return nil if details.empty?
-
-    # mask sensitive details based on replace rules if configured
-    @rules_replace.each {|r| details.each {|d| d[1] = d[1].gsub(r.param1, r.param2) if r.scope.match(d[0])}}
-
-    # remove any details with empty values
-    details.delete_if {|d| '' == d[1]}
-    return nil if details.empty?
-
-    # finish message
-    details << ['now', now.nil? ? (Time.now.to_f * 1000).floor.to_s : now]
+    # finalize message
     details << ['agent', @agent]
+    details << ['host', @host]
     details << ['version', @version]
-    JSON.generate details
+
+    # let's do this thing
+    submit(JSON.generate(details))
   end
 
+  def self.string_content_type?(s)
+    !s.nil? && !(s =~ /^(text\/(html|plain|xml))|(application\/(json|soap|xml|x-www-form-urlencoded))/i).nil?
+  end
 end

data/lib/resurfaceio/http_logger_for_rack.rb

@@ -1,8 +1,10 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 require 'rack'
 require 'resurfaceio/http_logger'
+require 'resurfaceio/http_message'
+require 'resurfaceio/timer'
 
 class HttpLoggerForRack # http://rack.rubyforge.org/doc/SPEC.html
 
@@ -16,12 +18,13 @@ class HttpLoggerForRack # http://rack.rubyforge.org/doc/SPEC.html
   end
 
   def call(env)
+    timer = Timer.new
     status, headers, body = @app.call(env)
     if @logger.enabled? && (status < 300 || status == 302)
       response = Rack::Response.new(body, status, headers)
       if HttpLogger::string_content_type?(response.content_type)
         request = Rack::Request.new(env)
-        @logger.submit(@logger.format(request, response))
+        HttpMessage.send(logger, request, response, nil, nil, nil, timer.millis)
       end
     end
     [status, headers, body]

data/lib/resurfaceio/http_logger_for_rails.rb

@@ -1,7 +1,9 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 require 'resurfaceio/http_logger'
+require 'resurfaceio/http_message'
+require 'resurfaceio/timer'
 
 class HttpLoggerForRails
 
@@ -14,13 +16,14 @@ class HttpLoggerForRails
   end
 
   def around(controller)
+    timer = Timer.new
     yield
     if @logger.enabled?
       request = controller.request
       response = controller.response
       status = response.status
       if (status < 300 || status == 302) && HttpLogger::string_content_type?(response.content_type)
-        @logger.submit(@logger.format(request, response))
+        HttpMessage.send(logger, request, response, nil, nil, nil, timer.millis)
       end
     end
   end

data/lib/resurfaceio/http_message.rb

@@ -1,15 +1,38 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 require 'json'
 
 class HttpMessage
 
+  def self.send(logger, request, response, response_body = nil, request_body = nil, now = nil, interval = nil)
+    return unless logger.enabled?
+
+    # copy details from request & response
+    message = build(request, response, response_body, request_body)
+
+    # copy details from active session
+    unless logger.rules.copy_session_field.empty?
+      ssn = request.session
+      if !ssn.nil? && ssn.respond_to?(:keys)
+        logger.rules.copy_session_field.each do |r|
+          ssn.keys.each {|d| (message << ["session_field:#{d}", ssn[d].to_s]) if r.param1.match(d)}
+        end
+      end
+    end
+
+    # add timing details
+    message << ['now', now.nil? ? (Time.now.to_f * 1000).floor.to_s : now]
+    message << ['interval', interval] unless interval.nil?
+
+    logger.submit_if_passing(message)
+  end
+
   def self.build(request, response, response_body = nil, request_body = 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_value message, 'request_method', request.request_method unless request.request_method.nil?
+    append_value message, 'request_url', request.url unless request.url.nil?
+    append_value message, 'response_code', response.status unless response.status.nil?
     append_request_headers message, request
     append_request_params message, request
     append_response_headers message, response
@@ -19,8 +42,6 @@ class HttpMessage
     return message
   end
 
-  protected
-
   def self.append_request_headers(message, request)
     respond_to_env = request.respond_to?(:env)
     if respond_to_env || request.respond_to?(:headers)
@@ -74,12 +95,12 @@ class HttpMessage
     unless key.nil?
       unless value.nil?
         case value
-          when Array
-            message << [key, value.join]
-          when String
-            message << [key, value]
-          else
-            message << [key, value.to_s]
+        when Array
+          message << [key, value.join]
+        when String
+          message << [key, value]
+        else
+          message << [key, value.to_s]
         end
       end
     end

data/lib/resurfaceio/http_request_impl.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 class HttpRequestImpl
 

data/lib/resurfaceio/http_response_impl.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 class HttpResponseImpl
 

data/lib/resurfaceio/http_rule.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 class HttpRule
 

data/lib/resurfaceio/http_rules.rb

@@ -1,37 +1,39 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 class HttpRules
 
+  DEBUG_RULES = "allow_http_url\ncopy_session_field /.*/\n".freeze
+
+  STANDARD_RULES = %q(/request_header:cookie|response_header:set-cookie/ remove
+/(request|response)_body|request_param/ replace /[a-zA-Z0-9.!#$%&’*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)/, /x@y.com/
+/request_body|request_param|response_body/ replace /[0-9\.\-\/]{9,}/, /xyxy/
+).freeze
+
+  STRICT_RULES = %q(/request_url/ replace /([^\?;]+).*/, !\\\\1!
+/request_body|response_body|request_param:.*|request_header:(?!user-agent).*|response_header:(?!(content-length)|(content-type)).*/ remove
+).freeze
+
+  @@default_rules = STRICT_RULES
+
+  def self.default_rules
+    @@default_rules
+  end
+
+  def self.default_rules=(val)
+    @@default_rules = val.gsub(/^\s*include default\s*$/, '')
+  end
+
   def self.debug_rules
-    "allow_http_url\ncopy_session_field /.*/\n"
+    DEBUG_RULES
   end
 
   def self.standard_rules
-    %q(/request_header:cookie|response_header:set-cookie/ remove
-/(request|response)_body|request_param/ replace /[a-zA-Z0-9.!#$%&’*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)/, /x@y.com/
-/request_body|request_param|response_body/ replace /[0-9\.\-\/]{9,}/, /xyxy/
-)
+    STANDARD_RULES
   end
 
   def self.strict_rules
-    %q(/request_url/ replace /([^\?;]+).*/, !\\\\1!
-/request_body|response_body|request_param:.*|request_header:(?!user-agent).*|response_header:(?!(content-length)|(content-type)).*/ remove
-)
-  end
-
-  def self.parse(rules)
-    result = []
-    unless rules.nil?
-      rules = rules.gsub(/^\s*include debug\s*$/, debug_rules)
-      rules = rules.gsub(/^\s*include standard\s*$/, standard_rules)
-      rules = rules.gsub(/^\s*include strict\s*$/, strict_rules)
-      rules.each_line do |rule|
-        parsed = parse_rule(rule)
-        result << parsed unless parsed.nil?
-      end
-    end
-    result
+    STRICT_RULES
   end
 
   def self.parse_rule(r)
@@ -76,15 +78,13 @@ class HttpRules
     end
   end
 
-  protected
-
   def self.parse_regex(r, regex)
-    str = parse_string(r, regex)
-    raise RuntimeError.new("Invalid regex (#{regex}) in rule: #{r}") if '*' == str || '+' == str || '?' == str
-    str = "^#{str}" unless str.start_with?('^')
-    str = "#{str}$" unless str.end_with?('$')
+    s = parse_string(r, regex)
+    raise RuntimeError.new("Invalid regex (#{regex}) in rule: #{r}") if '*' == s || '+' == s || '?' == s
+    s = "^#{s}" unless s.start_with?('^')
+    s = "#{s}$" unless s.end_with?('$')
     begin
-      return Regexp.compile(str)
+      return Regexp.compile(s)
     rescue RegexpError
       raise RuntimeError.new("Invalid regex (#{regex}) in rule: #{r}")
     end
@@ -98,15 +98,171 @@ class HttpRules
     end
   end
 
-  def self.parse_string(r, str)
+  def self.parse_string(r, expr)
     %w(~ ! % | /).each do |sep|
-      if (m = str.match(/^[#{sep}](.*)[#{sep}]$/))
+      if (m = expr.match(/^[#{sep}](.*)[#{sep}]$/))
         m1 = m[1]
         raise RuntimeError.new("Unescaped separator (#{sep}) in rule: #{r}") if m1.match(/^[#{sep}].*|.*[^\\][#{sep}].*/)
         return m1.gsub("\\#{sep}", sep)
       end
     end
-    raise RuntimeError.new("Invalid expression (#{str}) in rule: #{r}")
+    raise RuntimeError.new("Invalid expression (#{expr}) in rule: #{r}")
+  end
+
+  def initialize(rules)
+    rules = HttpRules.default_rules if rules.nil?
+
+    # load rules from external files
+    if rules.start_with?('file://')
+      rfile = rules[7..]
+      begin
+        rules = File.read(rfile)
+      rescue
+        raise RuntimeError.new("Failed to load rules: #{rfile}")
+      end
+    end
+
+    # force default rules if necessary
+    rules = rules.gsub(/^\s*include default\s*$/, HttpRules.default_rules)
+    rules = HttpRules.default_rules unless rules.strip.length > 0
+
+    # expand rule inclues
+    rules = rules.gsub(/^\s*include debug\s*$/, DEBUG_RULES)
+    rules = rules.gsub(/^\s*include standard\s*$/, STANDARD_RULES)
+    rules = rules.gsub(/^\s*include strict\s*$/, STRICT_RULES)
+    @text = rules
+
+    # parse all rules
+    prs = []
+    rules.each_line do |rule|
+      parsed = HttpRules.parse_rule(rule)
+      prs << parsed unless parsed.nil?
+    end
+    @length = prs.length
+
+    # break out rules by verb
+    @allow_http_url = prs.select {|r| 'allow_http_url' == r.verb}.length > 0
+    @copy_session_field = prs.select {|r| 'copy_session_field' == r.verb}
+    @remove = prs.select {|r| 'remove' == r.verb}
+    @remove_if = prs.select {|r| 'remove_if' == r.verb}
+    @remove_if_found = prs.select {|r| 'remove_if_found' == r.verb}
+    @remove_unless = prs.select {|r| 'remove_unless' == r.verb}
+    @remove_unless_found = prs.select {|r| 'remove_unless_found' == r.verb}
+    @replace = prs.select {|r| 'replace' == r.verb}
+    @sample = prs.select {|r| 'sample' == r.verb}
+    @skip_compression = prs.select {|r| 'skip_compression' == r.verb}.length > 0
+    @skip_submission = prs.select {|r| 'skip_submission' == r.verb}.length > 0
+    @stop = prs.select {|r| 'stop' == r.verb}
+    @stop_if = prs.select {|r| 'stop_if' == r.verb}
+    @stop_if_found = prs.select {|r| 'stop_if_found' == r.verb}
+    @stop_unless = prs.select {|r| 'stop_unless' == r.verb}
+    @stop_unless_found = prs.select {|r| 'stop_unless_found' == r.verb}
+
+    # validate rules
+    raise RuntimeError.new('Multiple sample rules') if @sample.length > 1
+  end
+
+  def allow_http_url
+    @allow_http_url
+  end
+
+  def copy_session_field
+    @copy_session_field
+  end
+
+  def length
+    @length
+  end
+
+  def remove
+    @remove
+  end
+
+  def remove_if
+    @remove_if
+  end
+
+  def remove_if_found
+    @remove_if_found
+  end
+
+  def remove_unless
+    @remove_unless
+  end
+
+  def remove_unless_found
+    @remove_unless_found
+  end
+
+  def replace
+    @replace
+  end
+
+  def sample
+    @sample
+  end
+
+  def skip_compression
+    @skip_compression
+  end
+
+  def skip_submission
+    @skip_submission
+  end
+
+  def stop
+    @stop
+  end
+
+  def stop_if
+    @stop_if
+  end
+
+  def stop_if_found
+    @stop_if_found
+  end
+
+  def stop_unless
+    @stop_unless
+  end
+
+  def stop_unless_found
+    @stop_unless_found
+  end
+
+  def text
+    @text
+  end
+
+  def apply(details)
+    # stop rules come first
+    @stop.each {|r| details.each {|d| return nil if r.scope.match(d[0])}}
+    @stop_if_found.each {|r| details.each {|d| return nil if r.scope.match(d[0]) && r.param1.match(d[1])}}
+    @stop_if.each {|r| details.each {|d| return nil if r.scope.match(d[0]) && r.param1.match(d[1])}}
+    passed = 0
+    @stop_unless_found.each {|r| details.each {|d| passed += 1 if r.scope.match(d[0]) && r.param1.match(d[1])}}
+    return nil if passed != @stop_unless_found.length
+    passed = 0
+    @stop_unless.each {|r| details.each {|d| passed += 1 if r.scope.match(d[0]) && r.param1.match(d[1])}}
+    return nil if passed != @stop_unless.length
+
+    # do sampling if configured
+    return nil if !@sample[0].nil? && (rand * 100 >= @sample[0].param1)
+
+    # winnow sensitive details based on remove rules if configured
+    @remove.each {|r| details.delete_if {|d| r.scope.match(d[0])}}
+    @remove_unless_found.each {|r| details.delete_if {|d| r.scope.match(d[0]) && !r.param1.match(d[1])}}
+    @remove_if_found.each {|r| details.delete_if {|d| r.scope.match(d[0]) && r.param1.match(d[1])}}
+    @remove_unless.each {|r| details.delete_if {|d| r.scope.match(d[0]) && !r.param1.match(d[1])}}
+    @remove_if.each {|r| details.delete_if {|d| r.scope.match(d[0]) && r.param1.match(d[1])}}
+    return nil if details.empty?
+
+    # mask sensitive details based on replace rules if configured
+    @replace.each {|r| details.each {|d| d[1] = d[1].gsub(r.param1, r.param2) if r.scope.match(d[0])}}
+
+    # remove any details with empty values
+    details.delete_if {|d| '' == d[1]}
+    details.empty? ? nil : details
   end
 
   REGEX_ALLOW_HTTP_URL = /^\s*allow_http_url\s*(#.*)?$/.freeze

data/lib/resurfaceio/timer.rb

@@ -0,0 +1,14 @@
+# coding: utf-8
+# © 2016-2020 Resurface Labs Inc.
+
+class Timer
+
+  def initialize
+    @started = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
+  end
+
+  def millis
+    (Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond) - @started).to_s
+  end
+
+end

data/lib/resurfaceio/usage_loggers.rb

@@ -1,18 +1,18 @@
 # coding: utf-8
-# © 2016-2019 Resurface Labs Inc.
+# © 2016-2020 Resurface Labs Inc.
 
 class UsageLoggers
 
-  @@DISABLED = 'true'.eql?(ENV['USAGE_LOGGERS_DISABLE'])
+  @@BRICKED = 'true'.eql?(ENV['USAGE_LOGGERS_DISABLE'])
 
-  @@disabled = @@DISABLED
+  @@disabled = @@BRICKED
 
   def self.disable
     @@disabled = true
   end
 
   def self.enable
-    @@disabled = false unless @@DISABLED
+    @@disabled = false unless @@BRICKED
   end
 
   def self.enabled?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resurfaceio-logger
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 2.0.2
 platform: ruby
 authors:
 - RobDickinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,58 +16,58 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 description: Library for usage logging
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -82,12 +82,13 @@ files:
 - lib/resurfaceio/http_response_impl.rb
 - lib/resurfaceio/http_rule.rb
 - lib/resurfaceio/http_rules.rb
+- lib/resurfaceio/timer.rb
 - lib/resurfaceio/usage_loggers.rb
 homepage: https://github.com/resurfaceio/logger-ruby
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,16 +96,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Library for usage logging
 test_files: []