librato-rails 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481fc3dec85887b6db3aa6c70fea21292dbd0fb2
-  data.tar.gz: 04a8dee235d4e3d60292fe55634f059ab4b30b84
+  metadata.gz: 152f49ff52bc46153e592778c2e200c1a27b7212
+  data.tar.gz: e13fd4c9094655017a4d768b743d8c1106c1af21
 SHA512:
-  metadata.gz: 01a97257228233f3a73574c3560ec65e7ff2b4a7cb4d11fcbcbdfac1691c7ddae763da52ef5631e92f504741feb067c175a044995d82d6c8b2992ad6ad956b65
-  data.tar.gz: ba49549876186a7ca0e80e95edc38d5a9994666a84be9cbc771215cb97f49e2c63dc7d2cf0e2eedbf2d284afdacefacb7f61a6297e0cd66f5edb22649e923479
+  metadata.gz: a6999cb0ecb28909e940e07211a4cf846cc5f8adfab66018626088af150d7ba85b7fa4d9d0065a2c068c16498de50dfa4dc7ba248bf98ae62537bcef32e051d3
+  data.tar.gz: e516c899ebf1a8027f2d03989e14a95b03fc9abd7488770817315d37658434c4cc44abc646c6330cc7a6cb27f14296d8e4df50765f0fc07b219286e2fc79aeb5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### Version 0.11.1
+* Use controller/action as source for instrument_action metrics
+
 ### Version 0.11.0
 * Add instrument_action for profiling a specific controller action
 

data/README.md

@@ -5,9 +5,9 @@ librato-rails
 
 `librato-rails` will report key statistics for your Rails app to [Librato](https://metrics.librato.com/) and allow you to easily track your own custom metrics. Metrics are delivered asynchronously behind the scenes so they won't affect performance of your requests.
 
-Currently Rails 3.0+ and Ruby 1.9.2+ are required.
+Rails versions 3.0 or greater are supported on Ruby 1.9.2 and above.
 
-You may want to read the [notes on upgrading](https://github.com/librato/librato-rails/wiki/Alpha-Tester-Upgrade-Notes) if you were an alpha tester.
+Verified combinations of Ruby/Rails are available in our [build matrix](http://travis-ci.org/librato/librato-rails).
 
 ## Quick Start
 
@@ -183,9 +183,16 @@ class CommentController < ApplicationController
 end
 ```
 
-Once you instrument an action, `librato-rails` will start reporting a set of metrics specific to that action including # of requests, total time used per request, and db and view time used per request.
+Once you instrument an action, `librato-rails` will start reporting a set of metrics specific to that action including:
 
-Action instrumentation metrics are named following the format `rails.action.<controller>.<action>.<format>.*`.
+* rails.action.request.total     (# of requests)
+* rails.action.request.slow      (requests >= 200ms to produce)
+* rails.action.request.exceptions
+* rails.action.request.time      (total time spent in action)
+* rails.action.request.time.db   (db interaction time)
+* rails.action.request.time.view (view rendering time)
+
+Each instrumented action will appear as a source for the `rails.action.*` metrics, for example `mycontroller.action.html`.
 
 IMPORTANT NOTE: Metrics from `instrument_action` take into account all time spent in the ActionController stack for that action, including before/after filters and any global processing. They are _not_ equivalent to using a `Librato.timing` block inside the method body.
 

data/lib/librato/rails/subscribers/controller.rb

@@ -56,17 +56,18 @@ module Librato
         end # end group
 
         if @watches && @watches.index("#{controller}##{action}")
-          page_key = "#{controller}.#{action}.#{format}"
-          collector.group "rails.action.#{page_key}" do |r|
+          source = "#{controller}.#{action}.#{format}"
+          collector.group 'rails.action.request' do |r|
 
-            r.increment 'total'
-            r.timing    'time', event.duration
+            r.increment 'total', source: source
+            r.increment 'slow', source: source if event.duration > 200.0
+            r.timing    'time', event.duration, source: source
 
             if exception
-              r.increment 'exceptions'
+              r.increment 'exceptions', source: source
             else
-              r.timing 'time.db', event.payload[:db_runtime] || 0
-              r.timing 'time.view', event.payload[:view_runtime] || 0
+              r.timing 'time.db', event.payload[:db_runtime] || 0, source: source
+              r.timing 'time.view', event.payload[:view_runtime] || 0, source: source
             end
 
           end

data/lib/librato/rails/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Rails
-    VERSION = "0.11.0"
+    VERSION = "0.11.1"
   end
 end

data/test/integration/instrument_action_test.rb

@@ -8,14 +8,15 @@ class InstrumentActionTest < ActiveSupport::IntegrationCase
     # puts aggregate.instance_variable_get(:@cache).queued.inspect
     # puts counters.instance_variable_get(:@cache).inspect
 
-    base = 'rails.action.InstrumentActionController.inst.html'
+    source = 'InstrumentActionController.inst.html'
 
+    base = 'rails.action.request'
     timings = %w{time time.db time.view}
     timings.each do |t|
-      assert_equal 1, aggregate["#{base}.#{t}"][:count]
+      assert_equal 1, aggregate.fetch("#{base}.#{t}", source: source)[:count]
     end
 
-    assert_equal 1, counters["#{base}.total"]
+    assert_equal 1, counters.fetch("#{base}.total", source: source)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Matt Sanders
@@ -29,7 +29,7 @@ cert_chain:
   Kx1ncn07A+bJnKZ6henQAF1CH96ZcqcJH179S2tIiKDM8keeRIUOPC3WT0faok/2
   gA2ozdr851c/nA==
   -----END CERTIFICATE-----
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties