harness 0.2.4 → 0.2.5

data/lib/harness/adapters/librato_adapter.rb

@@ -62,12 +62,10 @@ module Harness
     end
 
     def self.sanitize(name)
-      base = name.gsub(/^!/, 'bang.')
-
       if Harness.config.namespace
         "#{name}.#{Harness.config.namespace}"
       else
-        base
+        name
       end
     end
   end

data/lib/harness/instrumentation.rb

@@ -1,6 +1,8 @@
 ActiveSupport::Notifications.subscribe %r{.+} do |*args|
   event = ActiveSupport::Notifications::Event.new(*args)
 
-  Harness::Gauge.from_event(event).log if event.payload[:gauge]
-  Harness::Counter.from_event(event).log if event.payload[:counter]
+  unless event.payload[:exception]
+    Harness::Gauge.from_event(event).log if event.payload[:gauge]
+    Harness::Counter.from_event(event).log if event.payload[:counter]
+  end
 end

data/lib/harness/integration/action_controller.rb

@@ -1,9 +1,9 @@
 events = %w(write_fragment read_fragment expire_fragment write_page expire_page process_action send_file)
 
-regex = %r{#{events.join("|")}.action_controller}
-
-ActiveSupport::Notifications.subscribe regex do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  gauge = Harness::Gauge.from_event event
-  gauge.log
+events.each do |name|
+  ActiveSupport::Notifications.subscribe "#{name}.action_controller" do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    gauge = Harness::Gauge.from_event event
+    gauge.log
+  end
 end

data/lib/harness/integration/action_mailer.rb

@@ -1,10 +1,9 @@
 events = %w(receive deliver)
 
-regex = %r{#{events.join("|")}.action_mailer}
-
-ActiveSupport::Notifications.subscribe regex do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  gauge = Harness::Gauge.from_event event
-  gauge.log
+events.each do |name|
+  ActiveSupport::Notifications.subscribe "#{name}.action_mailer" do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    gauge = Harness::Gauge.from_event event
+    gauge.log
+  end
 end
-

data/lib/harness/integration/action_view.rb

@@ -1,10 +1,9 @@
 events = %w(render_template render_partial)
 
-regex = %r{#{events.join("|")}.action_view}
-
-ActiveSupport::Notifications.subscribe regex do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  gauge = Harness::Gauge.from_event event
-  gauge.log
+events.each do |name|
+  ActiveSupport::Notifications.subscribe "#{name}.action_view" do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    gauge = Harness::Gauge.from_event event
+    gauge.log
+  end
 end
-

data/lib/harness/integration/active_support.rb

@@ -1,9 +1,9 @@
 events = %w(cache_read cache_generate cache_fetch_hit cache_write cache_delete)
 
-regex = %r{#{events.join("|")}.active_support}
-
-ActiveSupport::Notifications.subscribe regex do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  gauge = Harness::Gauge.from_event event
-  gauge.log
+events.each do |name|
+  ActiveSupport::Notifications.subscribe "#{name}.active_support" do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    gauge = Harness::Gauge.from_event event
+    gauge.log
+  end
 end

data/lib/harness/version.rb

@@ -1,3 +1,3 @@
 module Harness
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/test/integration/instrumentation_test.rb

@@ -25,4 +25,26 @@ class ActiveSupportTestCase < IntegrationTest
     assert_counter_logged "test-counter"
     assert_gauge_logged "test-gauge"
   end
+
+  def test_does_not_log_counter_on_exception
+    begin
+      ActiveSupport::Notifications.instrument "counter_test.harness", :counter => true do |args|
+        raise
+      end
+    rescue
+    end
+
+    refute_counter_logged "counter_test.harness"
+  end
+
+  def test_does_not_log_gauge_on_exception
+    begin
+      ActiveSupport::Notifications.instrument "gauge_test.harness", :gauge => true do |args|
+        raise
+      end
+    rescue
+    end
+
+    refute_gauge_logged "gauge_test.harness"
+  end
 end

data/test/integration/integrations/action_view_test.rb

@@ -13,10 +13,20 @@ class ActionViewIntegration < IntegrationTest
     assert_gauge_logged "render_partial.action_view"
   end
 
+  def test_skips_internal_partial_events
+    instrument "!render_partial"
+
+    refute_gauge_logged "!render_partial.action_view"
+  end
+
+  def test_skips_internal_template_events
+    instrument "!render_template"
+
+    refute_gauge_logged "!render_template.action_view"
+  end
+
   private
   def instrument(event)
-    ActiveSupport::Notifications.instrument "#{event}.action_view" do |*args|
-      # nada
-    end
+    ActiveSupport::Notifications.instrument "#{event}.action_view"
   end
 end

data/test/test_helper.rb

@@ -35,6 +35,14 @@ class IntegrationTest < MiniTest::Unit::TestCase
     refute_empty counters.select {|c| c.name = name }, "Expected #{counters.inspect} to contain a #{name} result"
   end
 
+  def refute_gauge_logged(name)
+    assert_empty gauges.select {|g| g.name = name }, "No gauge expected to be logged"
+  end
+
+  def refute_counter_logged(name)
+    assert_empty counters.select {|c| c.name = name }, "No counter expected to be logged"
+  end
+
   def gauges
     Harness::MemoryAdapter.gauges
   end

data/test/unit/adapters/librato_adapter_test.rb

@@ -21,13 +21,7 @@ class LibratoAdapterTest < MiniTest::Unit::TestCase
 
     Harness::LibratoAdapter.config.email = email
     Harness::LibratoAdapter.config.token = token
-  end
-
-  def teardown
-    WebMock.reset!
-
-    Harness::LibratoAdapter.config.email = nil
-    Harness::LibratoAdapter.config.token = nil
+    Harness.config.namespace = nil
   end
 
   def test_gauge_is_logged
@@ -50,12 +44,12 @@ class LibratoAdapterTest < MiniTest::Unit::TestCase
     assert_requested expected_request
   end
 
-  def test_gauge_id_is_sanitized
-    @gauge.id = "!process_action.action_controller"
+  def test_gauge_is_logged_with_namespace
+    Harness.config.namespace = :foo
 
     json = {
       :gauges => [{
-        :name => "bang.process_action.action_controller",
+        :name => "#{@gauge.id}.foo",
         :display_name => @gauge.name,
         :value => @gauge.value,
         :measure_time => @gauge.time.to_i,
@@ -72,7 +66,6 @@ class LibratoAdapterTest < MiniTest::Unit::TestCase
     assert_requested expected_request
   end
 
-
   def test_logging_gague_raises_an_exception
     stub_request(:post, %r{metrics}).to_return(:status => 500, :body => "message")
 
@@ -118,12 +111,12 @@ class LibratoAdapterTest < MiniTest::Unit::TestCase
     assert_requested expected_request
   end
 
-  def test_counter_id_is_sanitized
-    @counter.id = "!total_requests.action_controller"
+  def test_counter_is_logged_with_namespace
+    Harness.config.namespace = :foo
 
     json = {
       :counters => [{
-        :name => "bang.total_requests.action_controller",
+        :name => "#{@counter.id}.foo",
         :display_name => @counter.name,
         :value => @counter.value,
         :measure_time => @counter.time.to_i,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harness
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70204325832440 !ruby/object:Gem::Requirement
+  requirement: &70254849265340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70204325832440
+  version_requirements: *70254849265340
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70204325832020 !ruby/object:Gem::Requirement
+  requirement: &70254849264700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204325832020
+  version_requirements: *70254849264700
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70204325831560 !ruby/object:Gem::Requirement
+  requirement: &70254849264220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204325831560
+  version_requirements: *70254849264220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70204325831140 !ruby/object:Gem::Requirement
+  requirement: &70254849263400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204325831140
+  version_requirements: *70254849263400
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70204325830720 !ruby/object:Gem::Requirement
+  requirement: &70254849262580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204325830720
+  version_requirements: *70254849262580
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70204325830300 !ruby/object:Gem::Requirement
+  requirement: &70254851992420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204325830300
+  version_requirements: *70254851992420
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  requirement: &70204325829880 !ruby/object:Gem::Requirement
+  requirement: &70254851996240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204325829880
+  version_requirements: *70254851996240
 description: ''
 email:
 - me@broadcastingadam.com
@@ -152,18 +152,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2209955114685400060
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2209955114685400060
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11