api_hammer 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08b690f386355cb74fcf2f6dea70a70db2a84baa95087b77a3ef3b7e13b146f
-  data.tar.gz: a483f9f0b8ca038f76623a1014bbdcf4a37d266293f26976bf439ecba1ae17e2
+  metadata.gz: 43a33c5f9ae38cb2f9bdc1fa75f16c9bbb58abc228ae400d1321f90872dc09e6
+  data.tar.gz: c69e131b3dc28183e32f1cc5a601f38bdb7cd82a8493e0b854818e66c8f9215d
 SHA512:
-  metadata.gz: 2b3a55ad37ca4ca755c8de88c09a1c713b654d3cde3e51fa63d37e04c236582f02da336b4882dd9f18cc3e5ff078464c9cc569e1a18933c03e7eb0fd2d8c3d0b
-  data.tar.gz: 3f4c29c95bba19accd4a74ce940d9fdc967e27634bc2c60587806387502e727b908c6ce03218d78687a86348a5058a0e2ebd58b2b39430726c8747b1cc8f7302
+  metadata.gz: a581e28995ffdeee7f712d9bc743b77db7deca57748267cfbc17e2fb0bf481542facf6a5d511379ed5d8c9291ccb57f4539021eb1e0951834872da6754cdd1bb
+  data.tar.gz: a1fada15803bcb03ba0745c1c46bdd062845b9c511d792d48795a67271ccac78203106a9e9e955e4aad29fad9ba950b5430db51e2c2f472431e9864358a0bfc1

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
-  - 2.0.0
-  - 2.2.5
-  - 2.3.1
+  - 2.2.10
+  - 2.3.8
+  - 2.6.1
 gemfile:
   - gemfiles/Gemfile_rack_1
   - gemfiles/Gemfile_rack_2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.19.0
+- drop support for ruby < 2.2
+- count time monotonically
+- bugfix getting current logger tags
+- prepare for ur
+
 # v0.18.2
 - bugfix utf8 http body handling
 - report to Rollbar on 4xx if Rollbar available and DEBUG_4XX indicates so

data/lib/api_hammer/faraday/request_logger.rb

@@ -29,6 +29,7 @@ module ApiHammer
 
       def call(request_env)
         began_at = Time.now
+        began_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
 
         log_tags = Thread.current[:activesupport_tagged_logging_tags]
         saved_log_tags = log_tags.dup if log_tags && log_tags.any?
@@ -36,7 +37,7 @@ module ApiHammer
         request_body = request_env[:body].dup if request_env[:body]
 
         @app.call(request_env).on_complete do |response_env|
-          now = Time.now
+          now_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
           status = response_env[:status]
 
           if log_bodies(status)
@@ -59,6 +60,7 @@ module ApiHammer
 
           data = {
             'request_role' => 'client',
+            'bound' => 'outbound',
             'request' => {
               'method' => request_env[:method],
               'uri' => request_env[:url].normalize.to_s,
@@ -72,15 +74,15 @@ module ApiHammer
             }.reject{|k,v| v.nil? },
             'processing' => {
               'began_at' => began_at.utc.to_f,
-              'duration' => now - began_at,
+              'duration' => (now_ns - began_ns) * 1e-9,
               'activesupport_tagged_logging_tags' => log_tags,
             }.reject{|k,v| v.nil? },
           }
 
           json_data = JSON.generate(data)
           dolog = proc do
-            now_s = now.strftime('%Y-%m-%d %H:%M:%S %Z')
-            @logger.info "#{bold(intense_magenta('>'))} #{status_s(status)} : #{bold(intense_magenta(request_env[:method].to_s.upcase))} #{intense_magenta(request_env[:url].normalize.to_s)} @ #{intense_magenta(now_s)}"
+            began_s = began_at.strftime('%Y-%m-%d %H:%M:%S %Z')
+            @logger.info "#{bold(intense_magenta('>'))} #{status_s(status)} : #{bold(intense_magenta(request_env[:method].to_s.upcase))} #{intense_magenta(request_env[:url].normalize.to_s)} @ #{intense_magenta(began_s)}"
             @logger.info json_data
           end
 

data/lib/api_hammer/request_logger.rb

@@ -55,14 +55,16 @@ module ApiHammer
 
     def call(env)
       began_at = Time.now
+      began_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
 
       # this is closed after the app is called, so read it before 
       env["rack.input"].rewind
       request_body = env["rack.input"].read
       env["rack.input"].rewind
 
-      log_tags = Thread.current[:activesupport_tagged_logging_tags]
-      log_tags = log_tags.dup if log_tags && log_tags.any?
+      if @logger && @logger.formatter.respond_to?(:current_tags)
+        log_tags = @logger.formatter.current_tags.dup
+      end
 
       request = Rack::Request.new(env)
       request_uri = Addressable::URI.new(
@@ -76,13 +78,13 @@ module ApiHammer
       status, response_headers, response_body = @app.call(env)
       response_headers = ::Rack::Utils::HeaderHash.new(response_headers)
       body_proxy = ::Rack::BodyProxy.new(response_body) do
-        log(env, request_uri, request_body, status, response_headers, response_body, began_at, log_tags)
+        log(env, request_uri, request_body, status, response_headers, response_body, began_at, began_ns, log_tags)
       end
       [status, response_headers, body_proxy]
     end
 
-    def log(env, request_uri, request_body, status, response_headers, response_body, began_at, log_tags)
-      now = Time.now
+    def log(env, request_uri, request_body, status, response_headers, response_body, began_at, began_ns, log_tags)
+      now_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
 
       request = Rack::Request.new(env)
       response = Rack::Response.new('', status, response_headers)
@@ -102,6 +104,7 @@ module ApiHammer
 
       data = {
         'request_role' => 'server',
+        'bound' => 'inbound',
         'request' => {
           'method' => request.request_method,
           'uri' => request_uri.normalize.to_s,
@@ -121,7 +124,7 @@ module ApiHammer
         }.reject { |k,v| v.nil? },
         'processing' => {
           'began_at' => began_at.utc.to_f,
-          'duration' => now - began_at,
+          'duration' => (now_ns - began_ns) * 1e-9,
           'activesupport_tagged_logging_tags' => log_tags,
         }.merge(env['request_logger.info'] || {}).merge(Thread.current['request_logger.info'] || {}).reject { |k,v| v.nil? },
       }
@@ -156,8 +159,8 @@ module ApiHammer
       Thread.current['request_logger.info'] = nil
       json_data = JSON.dump(data)
       dolog = proc do
-        now_s = now.strftime('%Y-%m-%d %H:%M:%S %Z')
-        @logger.info "#{bold(intense_cyan('<'))} #{status_s(status)} : #{bold(intense_cyan(request.request_method))} #{intense_cyan(request_uri.normalize)} @ #{intense_cyan(now_s)}"
+        began_s = began_at.strftime('%Y-%m-%d %H:%M:%S %Z')
+        @logger.info "#{bold(intense_cyan('<'))} #{status_s(status)} : #{bold(intense_cyan(request.request_method))} #{intense_cyan(request_uri.normalize)} @ #{intense_cyan(began_s)}"
         @logger.info json_data
       end
       # do the logging with tags that applied to the request if appropriate 

data/lib/api_hammer/version.rb

@@ -1,3 +1,3 @@
 module ApiHammer
-  VERSION = "0.18.2"
+  VERSION = "0.19.0"
 end

data/lib/logstash/filters/api_hammer_request.rb

@@ -24,8 +24,8 @@ class LogStash::Filters::ApiHammerRequest < LogStash::Filters::Base
       parsed_message = JSON.parse(event[@source])
       if @consume
         # replace the source with a brief human-readable message
-        role = parsed_message['request_role']
-        dir = role == 'server' ? '<' : role == 'client' ? '>' : '*'
+        bound = parsed_message['bound']
+        dir = role == 'inbound' ? '<' : role == 'outbound' ? '>' : '*'
         status = parsed_message['response'] && parsed_message['response']['status']
         request_method = parsed_message['request'] && parsed_message['request']['method']
         request_uri = parsed_message['request'] && parsed_message['request']['uri']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_hammer
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: an API tool