statsd-instrument 2.3.2 → 2.6.0

data/lib/statsd-instrument.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'statsd/instrument'

data/statsd-instrument.gemspec

@@ -1,21 +1,23 @@
+# frozen-string-literal: true
 # encoding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'statsd/instrument/version'
 
 Gem::Specification.new do |spec|
-  spec.name        = "statsd-instrument"
-  spec.version     = StatsD::Instrument::VERSION
-  spec.authors     = ["Jesse Storimer", "Tobias Lutke", "Willem van Bergen"]
-  spec.email       = ["jesse@shopify.com"]
-  spec.homepage    = "https://github.com/Shopify/statsd-instrument"
-  spec.summary     = %q{A StatsD client for Ruby apps}
+  spec.name = "statsd-instrument"
+  spec.version = StatsD::Instrument::VERSION
+  spec.authors = ["Jesse Storimer", "Tobias Lutke", "Willem van Bergen"]
+  spec.email = ["jesse@shopify.com"]
+  spec.homepage = "https://github.com/Shopify/statsd-instrument"
+  spec.summary = %q{A StatsD client for Ruby apps}
   spec.description = %q{A StatsD client for Ruby apps. Provides metaprogramming methods to inject StatsD instrumentation into your code.}
-  spec.license     = "MIT"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency 'rake'
@@ -23,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'benchmark-ips'
 end

data/test/assertions_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class AssertionsTest < Minitest::Test
@@ -8,141 +10,120 @@ class AssertionsTest < Minitest::Test
   end
 
   def test_assert_no_statsd_calls
-    assert_no_assertion_triggered do
-      @test_case.assert_no_statsd_calls('counter') do
-        # noop
-      end
+    @test_case.assert_no_statsd_calls('counter') do
+      # noop
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_no_statsd_calls('counter') do
-        StatsD.increment('other')
-      end
+    @test_case.assert_no_statsd_calls('counter') do
+      StatsD.increment('other')
     end
 
-    assert_assertion_triggered("No StatsD calls for metric counter expected.") do
+    assertion = assert_raises(Minitest::Assertion) do
       @test_case.assert_no_statsd_calls('counter') do
         StatsD.increment('counter')
       end
     end
+    assert_equal assertion.message, "No StatsD calls for metric counter expected."
 
-    assert_assertion_triggered("No StatsD calls for metric other expected.") do
+    assertion = assert_raises(Minitest::Assertion) do
       @test_case.assert_no_statsd_calls do
         StatsD.increment('other')
       end
     end
+    assert_equal assertion.message, "No StatsD calls for metric other expected."
 
-    assert_assertion_triggered("No StatsD calls for metric other, another expected.") do
+    assertion = assert_raises(Minitest::Assertion) do
       @test_case.assert_no_statsd_calls do
         StatsD.increment('other')
         StatsD.increment('another')
       end
     end
+    assert_equal assertion.message, "No StatsD calls for metric other, another expected."
   end
 
   def test_assert_statsd_call
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter') do
-        StatsD.increment('counter')
-      end
+    @test_case.assert_statsd_increment('counter') do
+      StatsD.increment('counter')
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter') do
-        StatsD.increment('counter')
-        StatsD.increment('other')
-      end
+    @test_case.assert_statsd_increment('counter') do
+      StatsD.increment('counter')
+      StatsD.increment('other')
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter') do
         StatsD.increment('other')
       end
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter') do
         StatsD.gauge('counter', 42)
       end
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter') do
         StatsD.increment('counter')
         StatsD.increment('counter')
       end
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', times: 2) do
-        StatsD.increment('counter')
-        StatsD.increment('counter')
-      end
+    @test_case.assert_statsd_increment('counter', times: 2) do
+      StatsD.increment('counter')
+      StatsD.increment('counter')
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', times: 2, tags: ['foo:1']) do
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 1 })
-      end
+    @test_case.assert_statsd_increment('counter', times: 2, tags: ['foo:1']) do
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 1 })
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter', times: 2, tags: ['foo:1']) do
         StatsD.increment('counter', tags: { foo: 1 })
         StatsD.increment('counter', tags: { foo: 2 })
       end
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a', 'b']) do
-        StatsD.increment('counter', sample_rate: 0.5, tags: ['a', 'b'])
-      end
+    @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a', 'b']) do
+      StatsD.increment('counter', sample_rate: 0.5, tags: ['a', 'b'])
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a', 'b'], ignore_tags: ['b']) do
         StatsD.increment('counter', sample_rate: 0.5, tags: ['a'])
       end
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a'], ignore_tags: ['b']) do
-        StatsD.increment('counter', sample_rate: 0.5, tags: ['a', 'b'])
-      end
+    @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a'], ignore_tags: ['b']) do
+      StatsD.increment('counter', sample_rate: 0.5, tags: ['a', 'b'])
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a'], ignore_tags: ['b']) do
-        StatsD.increment('counter', sample_rate: 0.5, tags: ['a'])
-      end
+    @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a'], ignore_tags: ['b']) do
+      StatsD.increment('counter', sample_rate: 0.5, tags: ['a'])
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1 }, ignore_tags: { b: 2 }) do
-        StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 2 })
-      end
+    @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1 }, ignore_tags: { b: 2 }) do
+      StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 2 })
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1 }, ignore_tags: { b: 2 }) do
-        StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 3 })
-      end
+    @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1 }, ignore_tags: { b: 2 }) do
+      StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 3 })
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1, b: 3 }, ignore_tags: ['b']) do
         StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 2 })
       end
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1 }, ignore_tags: ['b']) do
-        StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 2 })
-      end
+    @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1 }, ignore_tags: ['b']) do
+      StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 2 })
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a', 'b']) do
         StatsD.increment('counter', sample_rate: 0.2, tags: ['c'])
       end
@@ -150,71 +131,70 @@ class AssertionsTest < Minitest::Test
   end
 
   def test_tags_will_match_subsets
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1 }) do
-        StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 2 })
-      end
+    @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1 }) do
+      StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 2 })
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: { a: 1, b: 3 }) do
         StatsD.increment('counter', sample_rate: 0.5, tags: { a: 1, b: 2, c: 4 })
       end
     end
   end
 
-  def test_multiple_metrics_are_not_order_dependent
-    assert_no_assertion_triggered do
-      foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:1'])
-      foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
-      @test_case.assert_statsd_calls([foo_1_metric, foo_2_metric]) do
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 2 })
+  def test_tags_friendly_error
+    assertion = assert_raises(Minitest::Assertion) do
+      @test_case.assert_statsd_increment('counter', tags: { class: "AnotherJob" }) do
+        StatsD.increment('counter', tags: { class: "MyJob" })
       end
     end
 
-    assert_no_assertion_triggered do
-      foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:1'])
-      foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
-      @test_case.assert_statsd_calls([foo_2_metric, foo_1_metric]) do
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 2 })
-      end
+    assert_includes assertion.message, "Captured metrics with the same key"
+    assert_includes assertion.message, "MyJob"
+  end
+
+  def test_multiple_metrics_are_not_order_dependent
+    foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:1'])
+    foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
+    @test_case.assert_statsd_calls([foo_1_metric, foo_2_metric]) do
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 2 })
     end
 
-    assert_no_assertion_triggered do
-      foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
-      foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
-      @test_case.assert_statsd_calls([foo_1_metric, foo_2_metric]) do
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 2 })
-      end
+    foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:1'])
+    foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
+    @test_case.assert_statsd_calls([foo_2_metric, foo_1_metric]) do
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 2 })
     end
 
-    assert_no_assertion_triggered do
-      foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
-      foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
-      @test_case.assert_statsd_calls([foo_2_metric, foo_1_metric]) do
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 2 })
-      end
+    foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
+    foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
+    @test_case.assert_statsd_calls([foo_1_metric, foo_2_metric]) do
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 2 })
     end
 
-    assert_no_assertion_triggered do
-      foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
-      foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
-      @test_case.assert_statsd_calls([foo_2_metric, foo_1_metric]) do
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 2 })
-        StatsD.increment('counter', tags: { foo: 1 })
-      end
+    foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
+    foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
+    @test_case.assert_statsd_calls([foo_2_metric, foo_1_metric]) do
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 2 })
+    end
+
+    foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
+    foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
+    @test_case.assert_statsd_calls([foo_2_metric, foo_1_metric]) do
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 2 })
+      StatsD.increment('counter', tags: { foo: 1 })
     end
   end
 
   def test_assert_multiple_statsd_calls
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
       foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
       @test_case.assert_statsd_calls([foo_1_metric, foo_2_metric]) do
@@ -223,7 +203,7 @@ class AssertionsTest < Minitest::Test
       end
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
       foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
       @test_case.assert_statsd_calls([foo_1_metric, foo_2_metric]) do
@@ -234,59 +214,52 @@ class AssertionsTest < Minitest::Test
       end
     end
 
-    assert_no_assertion_triggered do
-      foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
-      foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
-      @test_case.assert_statsd_calls([foo_1_metric, foo_2_metric]) do
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 1 })
-        StatsD.increment('counter', tags: { foo: 2 })
-      end
+    foo_1_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 2, tags: ['foo:1'])
+    foo_2_metric = StatsD::Instrument::MetricExpectation.new(type: :c, name: 'counter', times: 1, tags: ['foo:2'])
+    @test_case.assert_statsd_calls([foo_1_metric, foo_2_metric]) do
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 1 })
+      StatsD.increment('counter', tags: { foo: 2 })
     end
   end
 
   def test_assert_statsd_call_with_tags
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', tags: ['a:b', 'c:d']) do
-        StatsD.increment('counter', tags: { a: 'b', c: 'd' })
-      end
+    @test_case.assert_statsd_increment('counter', tags: ['a:b', 'c:d']) do
+      StatsD.increment('counter', tags: { a: 'b', c: 'd' })
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter', tags: { a: 'b', c: 'd' }) do
-        StatsD.increment('counter', tags: ['a:b', 'c:d'])
-      end
+    @test_case.assert_statsd_increment('counter', tags: { a: 'b', c: 'd' }) do
+      StatsD.increment('counter', tags: ['a:b', 'c:d'])
     end
   end
 
   def test_assert_statsd_call_with_wrong_sample_rate_type
-    assert_assertion_triggered "Unexpected sample rate type for metric counter, must be numeric" do
+    skip("In Strict mode, the StatsD.increment call will raise") if StatsD::Instrument.strict_mode_enabled?
+
+    assertion = assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter', tags: ['a', 'b']) do
-        StatsD.increment('counter', sample_rate: 'abc', tags:  ['a', 'b'])
+        StatsD.increment('counter', sample_rate: 'abc', tags: ['a', 'b'])
       end
     end
+    assert_equal "Unexpected sample rate type for metric counter, must be numeric", assertion.message
   end
 
   def test_nested_assertions
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter1') do
-        @test_case.assert_statsd_increment('counter2') do
-          StatsD.increment('counter1')
-          StatsD.increment('counter2')
-        end
+    @test_case.assert_statsd_increment('counter1') do
+      @test_case.assert_statsd_increment('counter2') do
+        StatsD.increment('counter1')
+        StatsD.increment('counter2')
       end
     end
 
-    assert_no_assertion_triggered do
-      @test_case.assert_statsd_increment('counter1') do
-        StatsD.increment('counter1')
-        @test_case.assert_statsd_increment('counter2') do
-          StatsD.increment('counter2')
-        end
+    @test_case.assert_statsd_increment('counter1') do
+      StatsD.increment('counter1')
+      @test_case.assert_statsd_increment('counter2') do
+        StatsD.increment('counter2')
       end
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter1') do
         @test_case.assert_statsd_increment('counter2') do
           StatsD.increment('counter2')
@@ -294,7 +267,7 @@ class AssertionsTest < Minitest::Test
       end
     end
 
-    assert_assertion_triggered do
+    assert_raises(Minitest::Assertion) do
       @test_case.assert_statsd_increment('counter1') do
         @test_case.assert_statsd_increment('counter2') do
           StatsD.increment('counter1')
@@ -304,26 +277,64 @@ class AssertionsTest < Minitest::Test
     end
   end
 
-  private
+  def test_assertion_block_with_expected_exceptions
+    @test_case.assert_statsd_increment('expected_happened') do
+      @test_case.assert_raises(RuntimeError) do
+        begin
+          raise "expected"
+        rescue
+          StatsD.increment('expected_happened')
+          raise
+        end
+      end
+    end
+
+    assertion = assert_raises(Minitest::Assertion) do
+      @test_case.assert_statsd_increment('counter') do
+        @test_case.assert_raises(RuntimeError) do
+          raise "expected"
+        end
+      end
+    end
+    assert_includes assertion.message, "No StatsD calls for metric counter of type c were made"
+  end
+
+  def test_assertion_block_with_unexpected_exceptions
+    assertion = assert_raises(Minitest::Assertion) do
+      @test_case.assert_statsd_increment('counter') do
+        StatsD.increment('counter')
+        raise "unexpected"
+      end
+    end
+    assert_includes assertion.message, "An exception occurred in the block provided to the StatsD assertion"
+
+    assertion = assert_raises(Minitest::Assertion) do
+      @test_case.assert_raises(RuntimeError) do
+        @test_case.assert_statsd_increment('counter') do
+          StatsD.increment('counter')
+          raise "unexpected"
+        end
+      end
+    end
+    assert_includes assertion.message, "An exception occurred in the block provided to the StatsD assertion"
 
-  def assert_no_assertion_triggered(&block)
-    block.call
-  rescue MiniTest::Assertion => assertion
-    flunk "No assertion trigger expected, but one was triggered with message #{assertion.message}."
-  else
-    pass
+    assertion = assert_raises(Minitest::Assertion) do
+      @test_case.assert_raises(RuntimeError) do
+        @test_case.assert_no_statsd_calls do
+          raise "unexpected"
+        end
+      end
+    end
+    assert_includes assertion.message, "An exception occurred in the block provided to the StatsD assertion"
   end
 
-  def assert_assertion_triggered(message = nil, &block)
-    block.call
-  rescue MiniTest::Assertion => assertion
-    if message
-      assert_equal message, assertion.message, "Assertion triggered, but message was not what was expected."
-    else
-      pass
-    end
-    assertion
-  else
-    flunk "No assertion was triggered, but one was expected."
+  def test_assertion_block_with_other_assertion_failures
+    # If another assertion failure happens inside the block, that failrue should have priority
+    assertion = assert_raises(Minitest::Assertion) do
+      @test_case.assert_statsd_increment('counter') do
+        @test_case.flunk('other assertion failure')
+      end
+    end
+    assert_equal "other assertion failure", assertion.message
   end
 end

data/test/benchmark/clock_gettime.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'benchmark/ips'
+
+Benchmark.ips do |bench|
+  bench.report("Process.clock_gettime in milliseconds (int)") do
+    Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+  end
+
+  bench.report("Process.clock_gettime in milliseconds (float)") do
+    Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
+  end
+
+  bench.report("Process.clock_gettime in seconds (float), multiplied by 1000") do
+    1000 * Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
+
+  bench.report("Process.clock_gettime in seconds (float), multiplied by 1000.0") do
+    1000.0 * Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
+
+  bench.report("Time.now, multiplied by 1000") do
+    1000 * Time.now.to_f
+  end
+
+  bench.compare!
+end

data/test/benchmark/default_tags.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'statsd-instrument'
+require 'benchmark/ips'
+
+StatsD.logger = Logger.new(File::NULL)
+
+class Suite
+  def warming(*args)
+    StatsD.default_tags = if args[0] == "with default tags"
+      { first_tag: 'first_value', second_tag: 'second_value' }
+    end
+    puts "warming with default tags: #{StatsD.default_tags}"
+  end
+
+  def running(*args)
+    StatsD.default_tags = if args[0] == "with default tags"
+      { first_tag: 'first_value', second_tag: 'second_value' }
+    end
+    puts "running with default tags: #{StatsD.default_tags}"
+  end
+
+  def warmup_stats(*)
+  end
+
+  def add_report(*)
+  end
+end
+
+suite = Suite.new
+
+Benchmark.ips do |bench|
+  bench.config(suite: suite)
+  bench.report("without default tags") do
+    StatsD.increment('GoogleBase.insert', tags: {
+      first_tag: 'first_value',
+      second_tag: 'second_value',
+      third_tag: 'third_value',
+    })
+  end
+
+  bench.report("with default tags") do
+    StatsD.increment('GoogleBase.insert', tags: { third_tag: 'third_value' })
+  end
+
+  bench.compare!
+end

data/test/benchmark/metrics.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'statsd-instrument'
 require 'benchmark/ips'
 
-def helperFunction()
-    a = 10
-    a += a
-    a -= a
-    a *= a
+def helper_function
+  a = 10
+  a += a
+  a -= a
+  a * a
 end
 
 Benchmark.ips do |bench|
@@ -14,8 +16,8 @@ Benchmark.ips do |bench|
   end
 
   bench.report("measure metric benchmark") do
-    StatsD.measure('helperFunction') do
-        helperFunction()
+    StatsD.measure('helper_function') do
+      helper_function
     end
   end
 
@@ -34,5 +36,4 @@ Benchmark.ips do |bench|
   bench.report("service check metric benchmark") do
     StatsD.service_check('shipit.redis_connection', 'ok')
   end
-
 end