vitals 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144354fc633911fa91781b4ceefc10e9e8b0f7f7
-  data.tar.gz: 72b1133aa8c4ac7aa9bdcc59d69781f946ef9551
+  metadata.gz: 18d3c258a6d33421ef4c97c17a3a3fab5446e687
+  data.tar.gz: a901838061bdc54a96e47777a54fb659db3adb20
 SHA512:
-  metadata.gz: 037a86c00abc7b8e1206f3ce651538a93d177b26853c57dda4f0d1511f57555b293bb72da24f9e930c8bfa1099686d92face5faf397b5de925e4877f34432e71
-  data.tar.gz: 0abeedcabd6f8a33403b5c894555b5729bb3b2fd1d960eaa01d22469217837d98ba6c3a976a0373bc9b5e39fe772a9839953cb6e82dec4002b079e1cf37dacc2
+  metadata.gz: 5d9e8a208a0f930db9ede6a3db245bc793ba45dec41aadabaa039588e4cd96b24333fde8c5b85d2355691c3081e73837e4f19b85f971e0b65a745de5282cab8c
+  data.tar.gz: 7043d594b8c34a347792c89b4b072c8852d2612353d4d16b9274e679bc45eed6e7cc6bbe81c10764c8c0b24d0467c4c08e1e4d2fe4a45a51a5157076ba6ebf4c

data/.gitignore

@@ -5,3 +5,4 @@ test/dummy/db/*.sqlite3
 test/dummy/log/*.log
 test/dummy/tmp/coverage/
 coverage/
+.byebug_history

data/Gemfile.lock

@@ -20,6 +20,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     benchmark-ips (2.5.0)
     builder (3.2.2)
+    byebug (8.2.2)
     coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -141,6 +142,7 @@ DEPENDENCIES
   activesupport (~> 4.2.6)
   benchmark-ips (~> 2.5.0)
   bundler (~> 1.11)
+  byebug (~> 8.2.2)
   coveralls (~> 0.8.13)
   grape (~> 0.15.0)
   guard-minitest (~> 2.4.4)

data/integration/multiverse/rails42_app/config/initializers/vitals.rb

@@ -10,3 +10,6 @@ Vitals::Integrations::Notifications::ActionController.subscribe!
 require 'vitals/integrations/notifications/active_job'
 Vitals::Integrations::Notifications::ActiveJob.subscribe!
 
+require 'vitals/integrations/rack/requests'
+Rails.application.config.middleware.insert_before "Rails::Rack::Logger", Vitals::Integrations::Rack::Requests
+

data/integration/multiverse/rails42_app/test/integration/vitals_flow_test.rb

@@ -29,6 +29,21 @@ class VitalsFlowTest < ActionDispatch::IntegrationTest
     TestLogSubscriber.attach_to :action_controller
   end
 
+  test "get posts with rack middleware" do
+    get '/posts'
+    metrics = %w{
+      controllers.posts_index_get.200.all
+      controllers.posts_index_get.200.db
+      controllers.posts_index_get.200.view
+      requests.posts_index_get.200
+    }
+
+    assert_timings Vitals.reporter.reports,
+                   metrics,
+                   TestLogSubscriber.controller_times+[-1],
+                   60
+  end
+
   test "get new which also triggers a job" do
     get '/posts/new'
 
@@ -37,11 +52,12 @@ class VitalsFlowTest < ActionDispatch::IntegrationTest
       controllers.posts_new_get.200.all
       controllers.posts_new_get.200.db
       controllers.posts_new_get.200.view
+      requests.posts_new_get.200
     }
 
     assert_timings Vitals.reporter.reports,
                    metrics,
-                   [3]+TestLogSubscriber.controller_times,
+                   [-1]+TestLogSubscriber.controller_times+[-1],
                    60
 
   end
@@ -53,11 +69,12 @@ class VitalsFlowTest < ActionDispatch::IntegrationTest
       controllers.posts_index_get.200.all
       controllers.posts_index_get.200.db
       controllers.posts_index_get.200.view
+      requests.posts_index_get.200
     }
 
     assert_timings Vitals.reporter.reports,
                    metrics,
-                   TestLogSubscriber.controller_times,
+                   TestLogSubscriber.controller_times+[-1],
                    80
   end
 
@@ -67,11 +84,12 @@ class VitalsFlowTest < ActionDispatch::IntegrationTest
     metrics = %w{
       controllers.posts_create_post.302.all
       controllers.posts_create_post.302.db
+      requests.posts_create_post.302
     }
 
     assert_timings Vitals.reporter.reports,
                    metrics,
-                   TestLogSubscriber.controller_times,
+                   TestLogSubscriber.controller_times+[-1],
                    80
   end
 

data/integration/multiverse_helper.rb

@@ -4,13 +4,13 @@ def assert_timings(reports, metrics, times, delta=30)
     expect(reports.count).to eq metrics.count
     metrics.zip(times).each_with_index do |(m,v), i|
       expect(reports[i][:timing]).to eq m
-      expect(reports[i][:val]).to be_within(delta).of(v)
+      expect(reports[i][:val]).to(be_within(delta).of(v)) if v >=0
     end
   else
     assert_equal reports.count, metrics.count
     metrics.zip(times).each_with_index do |(m,v), i|
       assert_equal reports[i][:timing], m
-      assert_in_delta reports[i][:val], v, delta
+      assert_in_delta(reports[i][:val], v, delta) if v >=0
     end
   end
 end

data/lib/vitals/integrations/notifications/grape.rb

@@ -11,16 +11,12 @@ module Vitals::Integrations::Notifications
     def self.handle(name, started, finished, unique_id, payload)
       endpoint = payload[:endpoint]
       route    = endpoint.route
-      version  = route.route_version
       method   = route.route_method.downcase
 
-      path = route.route_path.dup
-      path.sub!(/\(\..*\)$/, '')
-      path.sub!(":version", version) if version
-      path.gsub!(/\//, ".")
+      path = Vitals::Utils.grape_path(route)
 
       # TODO move 'grape' to configuration opts in subscribe!(opts)
-      m = "grape#{path}_#{method}.#{endpoint.status}.all"
+      m = "grape.#{path}_#{method}.#{endpoint.status}.all"
       Vitals.timing(m, duration(started, finished))
     end
 

data/lib/vitals/integrations/rack/requests.rb

@@ -1,23 +1,56 @@
-
 module Vitals::Integrations::Rack
   class Requests
     REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-    PATH_INFO = 'PATH_INFO'.freeze
+
+    RACK_PATH_INFO = 'PATH_INFO'.freeze
+    SINATRA_PATH_INFO = 'sinatra.route'.freeze
+    GRAPE_PATH_INFO = 'api.endpoint'.freeze
+    RAILS_PATH_INFO = 'action_controller.instance'.freeze
 
     def initialize(app, options = {})
       @app = app
+      @prefix = options[:prefix] ? options[:prefix] + "." : nil
     end
 
     def call(env)
       start = Time.now
       status, header, body = @app.call(env)
+      t = Time.now - start
+      path = if env[SINATRA_PATH_INFO]
+            Requests.sinatra_path(env)
+          elsif env[GRAPE_PATH_INFO]
+            Requests.grape_path(env)
+          elsif env[RAILS_PATH_INFO]
+            Requests.rails_path(env)
+          else
+            Requests.rack_path(env)
+          end
+      m = "requests.#{@prefix}#{path}_#{env[REQUEST_METHOD].downcase}.#{status}"
 
       # TODO add option to customize 'requests' through options
-      m = "requests.#{env[PATH_INFO]}.#{env[REQUEST_METHOD].downcase}.#{status}"
-      Vitals.timing(m, Vitals::Utils.sec_to_ms(Time.now - start))
+      Vitals.timing(m, Vitals::Utils.sec_to_ms(t))
 
       [status, header, body]
     end
+
+    private
+
+    def self.sinatra_path(env)
+      env[SINATRA_PATH_INFO].gsub(/^\w+\s+\//, '')
+    end
+
+    def self.grape_path(env)
+      Vitals::Utils.grape_path(env[GRAPE_PATH_INFO].route)
+    end
+
+    def self.rails_path(env)
+      ctrl = env[RAILS_PATH_INFO]
+      "#{ctrl.controller_name}_#{ctrl.action_name}"
+    end
+
+    def self.rack_path(env)
+      ''
+    end
   end
 end
 

data/lib/vitals/reporters/console_reporter.rb

@@ -2,21 +2,26 @@ module Vitals::Reporters
   class ConsoleReporter < BaseReporter
     attr_accessor :format
 
-    def initialize(category:'main', format:nil)
+    def initialize(category:'main', output: $stdout, format:nil)
       @format = format
       @category = category
+      @output = output
     end
 
     def inc(m)
-      puts "#{@category} INC #{self.format.format(m)}"
+      print "#{@category} INC #{self.format.format(m)}"
     end
 
     def gauge(m, v)
-      puts "#{@category} GAUGE #{self.format.format(m)} #{v}"
+      print "#{@category} GAUGE #{self.format.format(m)} #{v}"
     end
 
     def timing(m, v)
-      puts "#{@category} TIME #{self.format.format(m)} #{v}"
+      print "#{@category} TIME #{self.format.format(m)} #{v}"
+    end
+
+    def print(str)
+      @output.printf("#{ str }\n")
     end
   end
 end

data/lib/vitals/utils.rb

@@ -11,5 +11,14 @@ module Vitals
     def self.sec_to_ms(sec)
       (1000.0 * sec).round
     end
+    # XXX grape specific, move this away some day?
+    def self.grape_path(route)
+      version = route.route_version
+      path = route.route_path.dup[1..-1]
+      path.sub!(/\(\..*\)$/, '')
+      path.sub!(":version", version) if version
+      path.gsub!(/\//, ".")
+      path
+    end
   end
 end

data/lib/vitals/version.rb

@@ -1,3 +1,3 @@
 module Vitals
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/vitals.gemspec

@@ -43,6 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "grape", "~> 0.15.0"
   spec.add_development_dependency "activesupport", "~> 4.2.6"
   spec.add_development_dependency "sinatra", "~> 1.4.7"
-
+  spec.add_development_dependency "byebug", "~> 8.2.2"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vitals
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dotan Nahum
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.7
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 8.2.2
 description: Flexible StatsD instrumentation for Rails, Rack, Grape and more
 email:
 - jondotan@gmail.com