librato-rails 1.4.2 → 2.0.0

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

@@ -4,21 +4,21 @@ module Librato
 
       # SQL
 
-      ActiveSupport::Notifications.subscribe 'sql.active_record' do |*args|
+      ActiveSupport::Notifications.subscribe "sql.active_record" do |*args|
+
         payload = args.last
+        sql = payload[:sql].strip
 
         collector.group "rails.sql" do |s|
-          # puts (payload[:name] || 'nil') + ":" + payload[:sql] + "\n\n"
-          s.increment 'queries'
+          s.increment "queries"
+          s.increment "selects" if sql.starts_with?("SELECT")
+          s.increment "inserts" if sql.starts_with?("INSERT")
+          s.increment "updates" if sql.starts_with?("UPDATE")
+          s.increment "deletes" if sql.starts_with?("DELETE")
+        end # end group
 
-          sql = payload[:sql].strip
-          s.increment 'selects' if sql.starts_with?('SELECT')
-          s.increment 'inserts' if sql.starts_with?('INSERT')
-          s.increment 'updates' if sql.starts_with?('UPDATE')
-          s.increment 'deletes' if sql.starts_with?('DELETE')
-        end
-      end
+      end # end subscribe
 
     end
   end
-end
+end

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

@@ -2,19 +2,17 @@ module Librato
   module Rails
     module Subscribers
 
-      # Controller Status
+      # ActionController Status
 
-      ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |*args|
+      ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
 
         event = ActiveSupport::Notifications::Event.new(*args)
-        status = event.payload[:status]
+        tags = { status: event.payload[:status] }
 
-        unless status.blank?
-          collector.group "rails.request.status" do |s|
-            s.increment status
-            s.increment "#{status.to_s[0]}xx"
-            s.timing "#{status}.time", event.duration
-            s.timing "#{status.to_s[0]}xx.time", event.duration
+        unless tags[:status].blank?
+          collector.group "rails.request" do |s|
+            s.increment "status", tags: tags, inherit_tags: true
+            s.timing "status.time", event.duration, tags: tags, inherit_tags: true
           end # end group
         end
 

data/lib/librato/rails/tracker.rb

@@ -10,4 +10,4 @@ module Librato
 
     end
   end
-end
+end

data/lib/librato/rails/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Rails
-    VERSION = "1.4.2"
+    VERSION = "2.0.0"
   end
 end

data/test/dummy/app/controllers/instrument_action_controller.rb

@@ -14,6 +14,10 @@ class InstrumentActionController < ApplicationController
     render nothing: true
   end
 
+  def invalid_format
+    head :ok
+  end
+
   private
 
   def before

data/test/dummy/app/mailers/user_mailer.rb

@@ -1,8 +1,12 @@
 class UserMailer < ActionMailer::Base
   default from: "from@librato-rails.com"
-  
+
   def welcome_email(user)
     @user = user
     mail(:to => user.email, :subject => "Why Howdy!")
   end
+
+  def receive(email)
+    email
+  end
 end

data/test/dummy/config/routes.rb

@@ -19,6 +19,7 @@ Dummy::Application.routes.draw do
 
   get 'instrument/inst' => 'instrument_action#inst', :as => :instrument_action
   get 'instrument/not'  => 'instrument_action#not',  :as => :not_instrumented
+  get '/invalid_format' => 'instrument_action#invalid_format'
 
   get 'base/action_1'         => 'base#action_1',         :as => :base_action_1
   get 'base/action_2'         => 'base#action_2',         :as => :base_action_2

data/test/fixtures/config/empty.yml

@@ -1,4 +1,4 @@
 test:
   user: 'test@bar.com'
   token: 'test key'
-  log_level: ''
+  log_level: ''

data/test/fixtures/config/librato.yml

@@ -3,11 +3,12 @@ test:
   token: <%= 'test api key' %>
   prefix: 'rails-test'
   flush_interval: 30
-  source: 'custom-1'
-  source_pids: false
+  tags:
+    region: "us-east-1"
+    az: "b"
   proxy: 'http://localhost:8080'
   suites: all
-  
+
 production:
   user: 'live@bar.com'
   token: 'live api key'

data/test/fixtures/config/simple.yml

@@ -1,5 +1,3 @@
 test:
   user: 'test@bar.com'
   token: <%= 'test api key' %>
-
-

data/test/integration/cache_test.rb

@@ -5,35 +5,35 @@ class CacheTest < ActiveSupport::IntegrationCase
   test 'cache read' do
     visit cache_read_path
 
-    assert_equal 1, counters["rails.cache.read"]
+    assert_equal 1, counters["rails.cache.read"][:value]
     assert_equal 1, aggregate["rails.cache.read.time"][:count]
   end
 
   test 'cache write' do
     visit cache_write_path
 
-    assert_equal 1, counters["rails.cache.write"]
+    assert_equal 1, counters["rails.cache.write"][:value]
     assert_equal 1, aggregate["rails.cache.write.time"][:count]
   end
 
   test 'cache fetch_hit' do
     visit cache_fetch_hit_path
 
-    assert_equal 1, counters["rails.cache.fetch_hit"]
+    assert_equal 1, counters["rails.cache.fetch_hit"][:value]
     assert_equal 1, aggregate["rails.cache.fetch_hit.time"][:count]
   end
 
   test 'cache generate' do
     visit cache_generate_path
 
-    assert_equal 1, counters["rails.cache.generate"]
+    assert_equal 1, counters["rails.cache.generate"][:value]
     assert_equal 1, aggregate["rails.cache.generate.time"][:count]
   end
 
   test 'cache delete' do
     visit cache_delete_path
 
-    assert_equal 1, counters["rails.cache.delete"]
+    assert_equal 1, counters["rails.cache.delete"][:value]
     assert_equal 1, aggregate["rails.cache.delete.time"][:count]
   end
 

data/test/integration/custom_test.rb

@@ -5,8 +5,8 @@ class CustomTest < ActiveSupport::IntegrationCase
   test 'controller access' do
     visit custom_path
 
-    assert_equal 1, counters['custom.visits']
-    assert_equal 3, counters['custom.events']
+    assert_equal 1, counters['custom.visits'][:value]
+    assert_equal 3, counters['custom.events'][:value]
 
     assert_equal 12, aggregate['custom.timing'][:sum]
     assert_equal 2, aggregate['custom.timing'][:count]
@@ -15,7 +15,7 @@ class CustomTest < ActiveSupport::IntegrationCase
   test 'model class access' do
     visit custom_path
 
-    assert_equal 3, counters['custom.model.lookups']
+    assert_equal 3, counters['custom.model.lookups'][:value]
     assert_equal 19.0, aggregate['custom.model.search'][:sum]
     assert_equal 2, aggregate['custom.model.search'][:count]
   end
@@ -23,7 +23,7 @@ class CustomTest < ActiveSupport::IntegrationCase
   test 'model instance access' do
     visit custom_path
 
-    assert_equal 1, counters['custom.model.touch']
+    assert_equal 1, counters['custom.model.touch'][:value]
   end
 
 end

data/test/integration/instrument_action_test.rb

@@ -2,51 +2,99 @@ require 'test_helper'
 
 class InstrumentActionTest < ActiveSupport::IntegrationCase
 
-  test 'instrument controller action' do
-    visit instrument_action_path
-
-    # puts aggregate.instance_variable_get(:@cache).queued.inspect
-    # puts counters.instance_variable_get(:@cache).inspect
+  test "instrument controller action" do
+    tags = {
+      controller: "InstrumentActionController",
+      action: "inst",
+      format: "html"
+    }.merge(default_tags)
 
-    source = 'InstrumentActionController.inst.html'
+    visit instrument_action_path
 
-    base = 'rails.action.request'
+    base = "rails.request"
     timings = %w{time time.db time.view}
     timings.each do |t|
-      assert_equal 1, aggregate.fetch("#{base}.#{t}", source: source)[:count]
+      assert_equal 1, aggregate.fetch("#{base}.#{t}", tags: tags)[:count]
     end
 
-    assert_equal 1, counters.fetch("#{base}.total", source: source)
+    assert_equal 1, counters.fetch("#{base}.total", tags: tags)[:value]
   end
 
-  test 'instrument all controller actions' do
+  test "instrument all controller actions" do
     visit base_action_1_path
     visit base_action_2_path
 
-    metric = 'rails.action.request.time'
-
-    assert_equal 1, aggregate.fetch(metric, source: 'BaseController.action_1.html')[:count]
-    assert_equal 1, aggregate.fetch(metric, source: 'BaseController.action_2.html')[:count]
+    metric = "rails.request.time"
+
+    assert_equal 1, aggregate.fetch(metric,
+      tags: {
+        controller: "BaseController",
+        action: "action_1",
+        format: "html"
+      }.merge(default_tags))[:count]
+    assert_equal 1, aggregate.fetch(metric,
+      tags: {
+        controller: "BaseController",
+        action: "action_2",
+        format: "html"
+      }.merge(default_tags))[:count]
   end
 
-  test 'instrument all controller actions for inherited controllers' do
+  test "instrument all controller actions for inherited controllers" do
     visit intermediate_action_1_path
     visit derived_action_1_path
     visit derived_action_2_path
 
-    metric = 'rails.action.request.time'
-
-    assert_equal 1, aggregate.fetch(metric, source: 'IntermediateController.action_1.html')[:count]
-    assert_equal 1, aggregate.fetch(metric, source: 'DerivedController.action_1.html')[:count]
-    assert_equal 1, aggregate.fetch(metric, source: 'DerivedController.action_2.html')[:count]
+    metric = "rails.request.time"
+
+    assert_equal 1, aggregate.fetch(metric,
+      tags: {
+        controller: "IntermediateController",
+        action: "action_1",
+        format: "html"
+      }.merge(default_tags))[:count]
+    assert_equal 1, aggregate.fetch(metric,
+      tags: {
+        controller: "DerivedController",
+        action: "action_1",
+        format: "html"
+      }.merge(default_tags))[:count]
+    assert_equal 1, aggregate.fetch(metric,
+      tags: {
+        controller: "DerivedController",
+        action: "action_2",
+        format: "html"
+      }.merge(default_tags))[:count]
   end
 
-  test 'instrument all controller actions for all controllers' do
+  test "instrument all controller actions for all controllers" do
     visit not_instrumented_path
 
-    metric = 'rails.action.request.time'
+    metric = "rails.request.time"
+
+    assert_equal 1, aggregate.fetch(metric,
+      tags: {
+        controller: "InstrumentActionController",
+        action: "not",
+        format: "html"
+      }.merge(default_tags))[:count]
+  end
+
+  test "instrument invalid format" do
+    Capybara.current_session.driver.header "Accept", "*/*"
+
+    visit "/invalid_format"
+
+    metric = "rails.request.time"
+
+    assert_equal 1, aggregate.fetch(metric,
+      tags: {
+        controller: "InstrumentActionController",
+        action: "invalid_format",
+        format: "all"
+      }.merge(default_tags))[:count]
 
-    assert_equal 1, aggregate.fetch(metric, source: 'InstrumentActionController.not.html')[:count]
+    Capybara.current_session.driver.header "Accept", nil
   end
 
 end

data/test/integration/job_test.rb

@@ -3,16 +3,26 @@ require 'test_helper'
 class JobTest < ActiveSupport::IntegrationCase
   Librato::Rails::VersionSpecifier.supported(min: '4.2') do
     test 'jobs performed' do
+      tags = {
+        adapter: "inline_adapter",
+        job: "dummy_job"
+      }.merge(default_tags)
+
       DummyJob.perform_now
 
-      assert_equal 1, counters['rails.job.perform']
-      assert_equal 1, aggregate.fetch('rails.job.perform.time', source: 'DummyJob')[:count]
+      assert_equal 1, counters.fetch("rails.job.perform", tags: tags)[:value]
+      assert_equal 1, aggregate.fetch("rails.job.perform.time", tags: tags)[:count]
     end
 
     test 'jobs enqueued' do
+      tags = {
+        adapter: "inline_adapter",
+        job: "dummy_job"
+      }.merge(default_tags)
+
       DummyJob.perform_later
 
-      assert_equal 1, counters['rails.job.enqueue']
+      assert_equal 1, counters.fetch("rails.job.enqueue", tags: tags)[:value]
     end
   end
 end

data/test/integration/mail_test.rb

@@ -4,8 +4,16 @@ class MailTest < ActiveSupport::IntegrationCase
 
   test 'mail sent' do
     user = User.create!(:email => 'foo@foo.com', :password => 'wow')
+    tags = { mailer: "UserMailer" }.merge(default_tags)
     UserMailer.welcome_email(user).deliver
-    assert_equal 1, counters["rails.mail.sent"]
+    assert_equal 1, counters.fetch("rails.mail.sent", tags: tags)[:value]
+  end
+
+  test "mail received" do
+    user = User.create!(email: "foo@foo.com", password: "foobar")
+    tags = { mailer: "UserMailer" }.merge(default_tags)
+    UserMailer.receive(user.email)
+    assert_equal 1, counters.fetch("rails.mail.received", tags: tags)[:value]
   end
 
 end

data/test/integration/render_test.rb

@@ -5,23 +5,23 @@ class RenderTest < ActiveSupport::IntegrationCase
   test 'render partial' do
     visit render_partial_path
 
-    assert_equal 1, counters.fetch("rails.view.render_partial",
-                                      source: 'render:first.html.erb')
-    assert_equal 1, counters.fetch("rails.view.render_partial",
-                                      source: 'render:second.html.erb')
-    assert_equal 1, aggregate.fetch("rails.view.render_partial.time",
-                                      source: 'render:first.html.erb')[:count]
-    assert_equal 1, aggregate.fetch("rails.view.render_partial.time",
-                                      source: 'render:second.html.erb')[:count]
+    assert_equal 1, counters.fetch("rails.view.render.partial",
+                                      tags: { partial: "render:first.html.erb" }.merge(default_tags))[:value]
+    assert_equal 1, counters.fetch("rails.view.render.partial",
+                                      tags: { partial: "render:second.html.erb" }.merge(default_tags))[:value]
+    assert_equal 1, aggregate.fetch("rails.view.render.partial.time",
+                                      tags: { partial: "render:first.html.erb" }.merge(default_tags))[:count]
+    assert_equal 1, aggregate.fetch("rails.view.render.partial.time",
+                                      tags: { partial: "render:second.html.erb" }.merge(default_tags))[:count]
   end
 
   test 'render template' do
     visit render_template_path
 
-    assert_equal 1, counters.fetch("rails.view.render_template",
-                                      source: 'render:template.html.erb')
-    assert_equal 1, aggregate.fetch("rails.view.render_template.time",
-                                      source: 'render:template.html.erb')[:count]
+    assert_equal 1, counters.fetch("rails.view.render.template",
+                                      tags: { template: "render:template.html.erb" }.merge(default_tags))[:value]
+    assert_equal 1, aggregate.fetch("rails.view.render.template.time",
+                                      tags: { template: "render:template.html.erb" }.merge(default_tags))[:count]
   end
 
 end

data/test/integration/request_test.rb

@@ -5,52 +5,67 @@ class RequestTest < ActiveSupport::IntegrationCase
   # Each request
 
   test 'increment total and status' do
+    tags_1 = {
+      controller: "HomeController",
+      action: "index",
+      format: "html"
+    }.merge(default_tags)
+
     visit root_path
 
-    assert_equal 1, counters["rails.request.total"]
-    assert_equal 1, counters["rails.request.status.200"]
-    assert_equal 1, counters["rails.request.status.2xx"]
-    assert_equal 1, counters["rails.request.method.get"]
+    assert_equal 1, counters.fetch("rails.request.total", tags: tags_1)[:value]
+    assert_equal 1, counters.fetch("rails.request.status", tags: { status: 200 }.merge(default_tags))[:value]
+    assert_equal 1, counters.fetch("rails.request.method", tags: { method: "get" }.merge(default_tags))[:value]
+
+    visit root_path
+
+    assert_equal 2, counters.fetch("rails.request.total", tags: tags_1)[:value]
+
+    tags_2 = {
+      controller: "StatusController",
+      action: "index",
+      format: "html"
+    }.merge(default_tags)
 
     visit '/status/204'
 
-    assert_equal 2, counters["rails.request.total"]
-    assert_equal 1, counters["rails.request.status.200"]
-    assert_equal 1, counters["rails.request.status.204"]
-    assert_equal 2, counters["rails.request.status.2xx"]
+    assert_equal 1, counters.fetch("rails.request.total", tags: tags_2)[:value]
+    assert_equal 1, counters.fetch("rails.request.status", tags: { status: 204 }.merge(default_tags))[:value]
   end
 
   test 'request times' do
+    tags = {
+      controller: "HomeController",
+      action: "index",
+      format: "html"
+    }.merge(default_tags)
+
     visit root_path
 
     # common for all paths
-    assert_equal 1, aggregate["rails.request.time"][:count],
+    assert_equal 1, aggregate.fetch("rails.request.time", tags: tags)[:count],
       'should record total time'
-    assert_equal 1, aggregate["rails.request.time.db"][:count],
+    assert_equal 1, aggregate.fetch("rails.request.time.db", tags: tags)[:count],
       'should record db time'
-    assert_equal 1, aggregate["rails.request.time.view"][:count],
+    assert_equal 1, aggregate.fetch("rails.request.time.view", tags: tags)[:count],
       'should record view time'
 
     # status specific
-    assert_equal 1, aggregate["rails.request.status.200.time"][:count]
-    assert_equal 1, aggregate["rails.request.status.2xx.time"][:count]
+    assert_equal 1, aggregate.fetch("rails.request.status.time", tags: { status: 200 }.merge(default_tags))[:count]
 
     # http method specific
-    assert_equal 1, aggregate["rails.request.method.get.time"][:count]
-  end
-
-  test 'track exceptions' do
-    begin
-      visit exception_path #rescue nil
-    rescue RuntimeError => e
-      raise unless e.message == 'test exception!'
-    end
-    assert_equal 1, counters["rails.request.exceptions"]
+    assert_equal 1, aggregate.fetch("rails.request.method.time", tags: { method: "get" }.merge(default_tags))[:count]
   end
 
   test 'track slow requests' do
+    tags = {
+      controller: "HomeController",
+      action: "slow",
+      format: "html"
+    }.merge(default_tags)
+
     visit slow_path
-    assert_equal 1, counters["rails.request.slow"]
+    assert_equal 1, counters.fetch("rails.request.slow", tags: tags)[:value]
   end
 
-end
+end