statsd-instrument 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e941d77f1b0893b2a919f8c36e902e119c657338e6a4e8b45fc5eaa7b5a05a3
-  data.tar.gz: f80105adf47e4379a59716bd7bb46080db3ed9751edf9ef21ef64689ce39920a
+  metadata.gz: 3a26da2deac1a048fae156e2e8804ec5a423fde1e383ed1b3c446d34b0c553ec
+  data.tar.gz: edae81c0c408a10c4729d019930596e2a586abc17863b57642e3f2a0ff1b3084
 SHA512:
-  metadata.gz: 3518393ed260edb75f138168afad1e0f1cbd604bf12511dd73596b84d1721d0008cae138cfdef03291895bd4f8b861dd18b641dcfda093e84976a0d446da5bd3
-  data.tar.gz: 4fd2bc2646b88b497802103eaed1538234e37619ef35363ed061b43ce100dd4d59f03de037b5b766c46e8937b7c926fbba2a0dba7f10d5610fae43e2c31f17f2
+  metadata.gz: 87037561be37e4fbf2cdee8e32564b35ae66b9d4c5a308e4784764d879171644ce2e0e5470fca8ac949b3e4ac3bff633e4bf95e83c37449dbbbe365543305bba
+  data.tar.gz: 9679d5832ffb8406ab800580bbab62ac3ba3d2b936ac9e841a755a90a9f09883ab62777f084a1ad6c979dbb4372f283cfed61e7e200dd32ee164da2673b82669

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         # Windows on macOS builds started failing, so they are disabled for noew
 
-        ruby: [2.4, 2.5, 2.6]
+        ruby: [2.4, 2.5, 2.6, 2.7]
         # platform: [windows-2019, macOS-10.14, ubuntu-18.04]
 
         # exclude:
@@ -43,7 +43,7 @@ jobs:
       run: gem install bundler && bundle install --jobs 4 --retry 3
 
     - name: Run test suite
-      run: bundle exec rake
+      run: rake test
 
     - name: Run Rubocop
-      run: bundle exec rubocop
+      run: bin/rubocop

data/.rubocop.yml

@@ -1,11 +1,11 @@
-inherit_from:
-  - https://shopify.github.io/ruby-style-guide/rubocop.yml
+inherit_gem:
+  rubocop-shopify: rubocop.yml
 
 require:
   - ./lib/statsd/instrument/rubocop.rb
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   UseCache: true
   CacheRootDirectory: tmp/rubocop
   Exclude:
@@ -16,16 +16,6 @@ Naming/FileName:
   Exclude:
     - lib/statsd-instrument.rb
 
-Style/ClassAndModuleChildren:
-  Enabled: false # TODO: enable later
-
-
-Style/MethodCallWithArgsParentheses:
-  Enabled: false # TODO: enable later
-
-Lint/UnusedMethodArgument:
-  AllowUnusedKeywordArguments: true
-
 # Enable our own cops on our own repo
 
 StatsD/MetricReturnValue:

data/CHANGELOG.md

@@ -8,6 +8,12 @@ section below.
 
 _Nothing yet_
 
+## Version 3.0.1
+
+- Fix metaprograming methods to not print keyword argument warnings on
+  Ruby 2.7.
+- Fix the gemspec to no longer register `rake` and `rubocop` as executables.
+
 ## Version 3.0.0
 
 This version makes the new client that was added in version 2.6+ the default

data/Gemfile

@@ -3,5 +3,13 @@
 source "https://rubygems.org"
 gemspec
 
+gem 'rake'
+gem 'minitest'
+gem 'rspec'
+gem 'mocha'
+gem 'yard'
+gem 'rubocop'
+gem 'rubocop-shopify', require: false
+
 # benchmark-ips save! method is not part of a released version yet.
 gem 'benchmark-ips', git: 'https://github.com/evanphx/benchmark-ips', branch: 'master'

data/README.md

@@ -105,7 +105,7 @@ Because you are counting unique values, the results of using a sampling value le
 Builds a histogram of numeric values.
 ``` ruby
 
-StatsD.histogram('Order.value', order.value_in_usd.to_f tags: { source: 'POS' })
+StatsD.histogram('Order.value', order.value_in_usd.to_f, tags: { source: 'POS' })
 ```
 
 Because you are counting unique values, the results of using a sampling value less than 1.0 can lead to unexpected, hard to interpret results.
@@ -128,7 +128,7 @@ An event is a (title, text) tuple that can be used to correlate metrics with som
 This is a good fit for instance to correlate response time variation with a deploy of the new code.
 
 ```ruby
-StatsD.event('shipit.deploy', 'started', sample_rate: 1.0)
+StatsD.event('shipit.deploy', 'started')
 ```
 
 *Note: This is only supported by the [datadog implementation](https://docs.datadoghq.com/guides/dogstatsd/#events).*

data/Rakefile

@@ -9,4 +9,4 @@ Rake::TestTask.new('test') do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task default: :test
+task(default: :test)

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load(Gem.bin_path("rake", "rake"))

data/bin/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load(Gem.bin_path("rubocop", "rubocop"))

data/lib/statsd/instrument.rb

@@ -275,6 +275,9 @@ module StatsD
 
       instrumentation_module.module_eval(&block)
       instrumentation_module.send(method_scope, method)
+      if instrumentation_module.respond_to?(:ruby2_keywords, true)
+        instrumentation_module.send(:ruby2_keywords, method)
+      end
       prepend(instrumentation_module) unless self < instrumentation_module
     end
 
@@ -333,7 +336,7 @@ module StatsD
     # @!method distribution(name, value = nil, sample_rate: nil, tags: nil, &block)
     #   (see StatsD::Instrument::Client#distribution)
     #
-    # @!method event(title, text, tags: nil, hostname: nil, timestamp: nil, aggregation_key: nil, priority: nil, source_type_name: nil, alert_type: nil) # rubocop:disable Metrics/LineLength
+    # @!method event(title, text, tags: nil, hostname: nil, timestamp: nil, aggregation_key: nil, priority: nil, source_type_name: nil, alert_type: nil) # rubocop:disable Layout/LineLength
     #   (see StatsD::Instrument::Client#event)
     #
     # @!method service_check(name, status, tags: nil, hostname: nil, timestamp: nil, message: nil)

data/lib/statsd/instrument/assertions.rb

@@ -1,219 +1,223 @@
 # frozen_string_literal: true
 
-# This module defines several assertion methods that can be used to verify that
-# your application is emitting the right StatsD metrics.
-#
-# Every metric type has its own assertion method, like {#assert_statsd_increment}
-# to assert `StatsD.increment` calls. You can also assert other properties of the
-# metric that was emitted, like the sample rate or presence of tags.
-# To check for the absence of metrics, use {#assert_no_statsd_calls}.
-#
-# @example Check for metric properties:
-#   assert_statsd_measure('foo', sample_rate: 0.1, tags: ["bar"]) do
-#     StatsD.measure('foo', sample_rate: 0.5, tags: ['bar','baz']) do
-#       some_code_to_measure
-#     end
-#   end
-#
-# @example Check for multiple occurrences:
-#   assert_statsd_increment('foo', times: 2) do
-#     StatsD.increment('foo')
-#     StatsD.increment('foo')
-#   end
-#
-# @example Absence of metrics
-#   assert_no_statsd_calls do
-#     foo
-#   end
-#
-# @example Handling exceptions
-#   assert_statsd_increment('foo.error') do
-#     # If we expect exceptions to occur, we have to handle them inside
-#     # the block we pass to assert_statsd_increment.
-#     assert_raises(RuntimeError) do
-#       begin
-#         attempt_foo
-#       rescue
-#         StatsD.increment('foo.error')
-#         raise 'foo failed'
-#       end
-#     end
-#   end
-module StatsD::Instrument::Assertions
-  include StatsD::Instrument::Helpers
-
-  # Asserts no metric occurred during the execution of the provided block.
-  #
-  # @param [Array<String>] metric_names (default: []) The metric names that are not
-  #   allowed to happen inside the block. If this is set to `[]`, the assertion
-  #   will fail if any metric occurs.
-  # @yield A block in which the specified metric should not occur. This block
-  #   should not raise any exceptions.
-  # @return [void]
-  # @raise [Minitest::Assertion] If an exception occurs, or if any metric (with the
-  #   provided names, or any), occurred during the execution of the provided block.
-  def assert_no_statsd_calls(*metric_names, datagrams: nil, client: nil, &block)
-    if datagrams.nil?
-      raise LocalJumpError, "assert_no_statsd_calls requires a block" unless block_given?
-      datagrams = capture_statsd_datagrams_with_exception_handling(client: client, &block)
-    end
-
-    datagrams.select! { |metric| metric_names.include?(metric.name) } unless metric_names.empty?
-    assert(datagrams.empty?, "No StatsD calls for metric #{datagrams.map(&:name).join(', ')} expected.")
-  end
-
-  # Asserts that a given counter metric occurred inside the provided block.
-  #
-  # @param [String] metric_name The name of the metric that should occur.
-  # @param [Hash] options (see StatsD::Instrument::MetricExpectation.new)
-  # @yield A block in which the specified metric should occur. This block
-  #   should not raise any exceptions.
-  # @return [void]
-  # @raise [Minitest::Assertion] If an exception occurs, or if the metric did
-  #   not occur as specified during the execution the block.
-  def assert_statsd_increment(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.increment(metric_name, value, **options)
-    assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
-  end
-
-  # Asserts that a given timing metric occurred inside the provided block.
-  #
-  # @param metric_name (see #assert_statsd_increment)
-  # @param options (see #assert_statsd_increment)
-  # @yield (see #assert_statsd_increment)
-  # @return [void]
-  # @raise (see #assert_statsd_increment)
-  def assert_statsd_measure(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.measure(metric_name, value, **options)
-    assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
-  end
-
-  # Asserts that a given gauge metric occurred inside the provided block.
-  #
-  # @param metric_name (see #assert_statsd_increment)
-  # @param options (see #assert_statsd_increment)
-  # @yield (see #assert_statsd_increment)
-  # @return [void]
-  # @raise (see #assert_statsd_increment)
-  def assert_statsd_gauge(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.gauge(metric_name, value, **options)
-    assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
-  end
+module StatsD
+  module Instrument
+    # This module defines several assertion methods that can be used to verify that
+    # your application is emitting the right StatsD metrics.
+    #
+    # Every metric type has its own assertion method, like {#assert_statsd_increment}
+    # to assert `StatsD.increment` calls. You can also assert other properties of the
+    # metric that was emitted, like the sample rate or presence of tags.
+    # To check for the absence of metrics, use {#assert_no_statsd_calls}.
+    #
+    # @example Check for metric properties:
+    #   assert_statsd_measure('foo', sample_rate: 0.1, tags: ["bar"]) do
+    #     StatsD.measure('foo', sample_rate: 0.5, tags: ['bar','baz']) do
+    #       some_code_to_measure
+    #     end
+    #   end
+    #
+    # @example Check for multiple occurrences:
+    #   assert_statsd_increment('foo', times: 2) do
+    #     StatsD.increment('foo')
+    #     StatsD.increment('foo')
+    #   end
+    #
+    # @example Absence of metrics
+    #   assert_no_statsd_calls do
+    #     foo
+    #   end
+    #
+    # @example Handling exceptions
+    #   assert_statsd_increment('foo.error') do
+    #     # If we expect exceptions to occur, we have to handle them inside
+    #     # the block we pass to assert_statsd_increment.
+    #     assert_raises(RuntimeError) do
+    #       begin
+    #         attempt_foo
+    #       rescue
+    #         StatsD.increment('foo.error')
+    #         raise 'foo failed'
+    #       end
+    #     end
+    #   end
+    module Assertions
+      include StatsD::Instrument::Helpers
+
+      # Asserts no metric occurred during the execution of the provided block.
+      #
+      # @param [Array<String>] metric_names (default: []) The metric names that are not
+      #   allowed to happen inside the block. If this is set to `[]`, the assertion
+      #   will fail if any metric occurs.
+      # @yield A block in which the specified metric should not occur. This block
+      #   should not raise any exceptions.
+      # @return [void]
+      # @raise [Minitest::Assertion] If an exception occurs, or if any metric (with the
+      #   provided names, or any), occurred during the execution of the provided block.
+      def assert_no_statsd_calls(*metric_names, datagrams: nil, client: nil, &block)
+        if datagrams.nil?
+          raise LocalJumpError, "assert_no_statsd_calls requires a block" unless block_given?
+          datagrams = capture_statsd_datagrams_with_exception_handling(client: client, &block)
+        end
 
-  # Asserts that a given histogram metric occurred inside the provided block.
-  #
-  # @param metric_name (see #assert_statsd_increment)
-  # @param options (see #assert_statsd_increment)
-  # @yield (see #assert_statsd_increment)
-  # @return [void]
-  # @raise (see #assert_statsd_increment)
-  def assert_statsd_histogram(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.histogram(metric_name, value, **options)
-    assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
-  end
+        datagrams.select! { |metric| metric_names.include?(metric.name) } unless metric_names.empty?
+        assert(datagrams.empty?, "No StatsD calls for metric #{datagrams.map(&:name).join(', ')} expected.")
+      end
 
-  # Asserts that a given distribution metric occurred inside the provided block.
-  #
-  # @param metric_name (see #assert_statsd_increment)
-  # @param options (see #assert_statsd_increment)
-  # @yield (see #assert_statsd_increment)
-  # @return [void]
-  # @raise (see #assert_statsd_increment)
-  def assert_statsd_distribution(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.distribution(metric_name, value, **options)
-    assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
-  end
+      # Asserts that a given counter metric occurred inside the provided block.
+      #
+      # @param [String] metric_name The name of the metric that should occur.
+      # @param [Hash] options (see StatsD::Instrument::MetricExpectation.new)
+      # @yield A block in which the specified metric should occur. This block
+      #   should not raise any exceptions.
+      # @return [void]
+      # @raise [Minitest::Assertion] If an exception occurs, or if the metric did
+      #   not occur as specified during the execution the block.
+      def assert_statsd_increment(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+        expectation = StatsD::Instrument::Expectation.increment(metric_name, value, **options)
+        assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
+      end
 
-  # Asserts that a given set metric occurred inside the provided block.
-  #
-  # @param metric_name (see #assert_statsd_increment)
-  # @param options (see #assert_statsd_increment)
-  # @yield (see #assert_statsd_increment)
-  # @return [void]
-  # @raise (see #assert_statsd_increment)
-  def assert_statsd_set(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.set(metric_name, value, **options)
-    assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
-  end
+      # Asserts that a given timing metric occurred inside the provided block.
+      #
+      # @param metric_name (see #assert_statsd_increment)
+      # @param options (see #assert_statsd_increment)
+      # @yield (see #assert_statsd_increment)
+      # @return [void]
+      # @raise (see #assert_statsd_increment)
+      def assert_statsd_measure(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+        expectation = StatsD::Instrument::Expectation.measure(metric_name, value, **options)
+        assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
+      end
 
-  # Asserts that the set of provided metric expectations came true.
-  #
-  # Generally, it's recommended to  use more specific assertion methods, like
-  # {#assert_statsd_increment} and others.
-  #
-  # @private
-  # @param [Array<StatsD::Instrument::Expectation>] expectations The set of
-  #   expectations to verify.
-  # @yield (see #assert_statsd_increment)
-  # @return [void]
-  # @raise (see #assert_statsd_increment)
-  def assert_statsd_expectations(expectations, datagrams: nil, client: nil, &block)
-    if datagrams.nil?
-      raise LocalJumpError, "assert_statsd_expectations requires a block" unless block_given?
-      datagrams = capture_statsd_datagrams_with_exception_handling(client: client, &block)
-    end
+      # Asserts that a given gauge metric occurred inside the provided block.
+      #
+      # @param metric_name (see #assert_statsd_increment)
+      # @param options (see #assert_statsd_increment)
+      # @yield (see #assert_statsd_increment)
+      # @return [void]
+      # @raise (see #assert_statsd_increment)
+      def assert_statsd_gauge(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+        expectation = StatsD::Instrument::Expectation.gauge(metric_name, value, **options)
+        assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
+      end
 
-    expectations = Array(expectations)
-    matched_expectations = []
-    expectations.each do |expectation|
-      expectation_times = expectation.times
-      expectation_times_remaining = expectation.times
-      filtered_datagrams = datagrams.select { |m| m.type == expectation.type && m.name == expectation.name }
+      # Asserts that a given histogram metric occurred inside the provided block.
+      #
+      # @param metric_name (see #assert_statsd_increment)
+      # @param options (see #assert_statsd_increment)
+      # @yield (see #assert_statsd_increment)
+      # @return [void]
+      # @raise (see #assert_statsd_increment)
+      def assert_statsd_histogram(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+        expectation = StatsD::Instrument::Expectation.histogram(metric_name, value, **options)
+        assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
+      end
 
-      if filtered_datagrams.empty?
-        flunk("No StatsD calls for metric #{expectation.name} of type #{expectation.type} were made.")
+      # Asserts that a given distribution metric occurred inside the provided block.
+      #
+      # @param metric_name (see #assert_statsd_increment)
+      # @param options (see #assert_statsd_increment)
+      # @yield (see #assert_statsd_increment)
+      # @return [void]
+      # @raise (see #assert_statsd_increment)
+      def assert_statsd_distribution(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+        expectation = StatsD::Instrument::Expectation.distribution(metric_name, value, **options)
+        assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
       end
 
-      filtered_datagrams.each do |datagram|
-        next unless expectation.matches(datagram)
+      # Asserts that a given set metric occurred inside the provided block.
+      #
+      # @param metric_name (see #assert_statsd_increment)
+      # @param options (see #assert_statsd_increment)
+      # @yield (see #assert_statsd_increment)
+      # @return [void]
+      # @raise (see #assert_statsd_increment)
+      def assert_statsd_set(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+        expectation = StatsD::Instrument::Expectation.set(metric_name, value, **options)
+        assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
+      end
 
-        if expectation_times_remaining == 0
-          flunk("Unexpected StatsD call; number of times this metric " \
-            "was expected exceeded: #{expectation.inspect}")
+      # Asserts that the set of provided metric expectations came true.
+      #
+      # Generally, it's recommended to  use more specific assertion methods, like
+      # {#assert_statsd_increment} and others.
+      #
+      # @private
+      # @param [Array<StatsD::Instrument::Expectation>] expectations The set of
+      #   expectations to verify.
+      # @yield (see #assert_statsd_increment)
+      # @return [void]
+      # @raise (see #assert_statsd_increment)
+      def assert_statsd_expectations(expectations, datagrams: nil, client: nil, &block)
+        if datagrams.nil?
+          raise LocalJumpError, "assert_statsd_expectations requires a block" unless block_given?
+          datagrams = capture_statsd_datagrams_with_exception_handling(client: client, &block)
         end
 
-        expectation_times_remaining -= 1
-        datagrams.delete(datagram)
-        if expectation_times_remaining == 0
-          matched_expectations << expectation
+        expectations = Array(expectations)
+        matched_expectations = []
+        expectations.each do |expectation|
+          expectation_times = expectation.times
+          expectation_times_remaining = expectation.times
+          filtered_datagrams = datagrams.select { |m| m.type == expectation.type && m.name == expectation.name }
+
+          if filtered_datagrams.empty?
+            flunk("No StatsD calls for metric #{expectation.name} of type #{expectation.type} were made.")
+          end
+
+          filtered_datagrams.each do |datagram|
+            next unless expectation.matches(datagram)
+
+            if expectation_times_remaining == 0
+              flunk("Unexpected StatsD call; number of times this metric " \
+                "was expected exceeded: #{expectation.inspect}")
+            end
+
+            expectation_times_remaining -= 1
+            datagrams.delete(datagram)
+            if expectation_times_remaining == 0
+              matched_expectations << expectation
+            end
+          end
+
+          next if expectation_times_remaining == 0
+
+          msg = +"Metric expected #{expectation_times} times but seen " \
+            "#{expectation_times - expectation_times_remaining} " \
+            "times: #{expectation.inspect}."
+          msg << "\nCaptured metrics with the same key: #{filtered_datagrams}" if filtered_datagrams.any?
+          flunk(msg)
         end
-      end
+        expectations -= matched_expectations
 
-      next if expectation_times_remaining == 0
-
-      msg = +"Metric expected #{expectation_times} times but seen " \
-        "#{expectation_times - expectation_times_remaining} " \
-        "times: #{expectation.inspect}."
-      msg << "\nCaptured metrics with the same key: #{filtered_datagrams}" if filtered_datagrams.any?
-      flunk(msg)
-    end
-    expectations -= matched_expectations
-
-    unless expectations.empty?
-      flunk("Unexpected StatsD calls; the following metric expectations " \
-        "were not satisfied: #{expectations.inspect}")
-    end
+        unless expectations.empty?
+          flunk("Unexpected StatsD calls; the following metric expectations " \
+            "were not satisfied: #{expectations.inspect}")
+        end
 
-    pass
-  end
+        pass
+      end
 
-  # For backwards compatibility
-  alias_method :assert_statsd_calls, :assert_statsd_expectations
-  alias_method :assert_statsd_expectation, :assert_statsd_expectations
+      # For backwards compatibility
+      alias_method :assert_statsd_calls, :assert_statsd_expectations
+      alias_method :assert_statsd_expectation, :assert_statsd_expectations
 
-  private
+      private
 
-  def capture_statsd_datagrams_with_exception_handling(client:, &block)
-    capture_statsd_datagrams(client: client, &block)
-  rescue => exception
-    flunk(<<~MESSAGE)
-      An exception occurred in the block provided to the StatsD assertion.
+      def capture_statsd_datagrams_with_exception_handling(client:, &block)
+        capture_statsd_datagrams(client: client, &block)
+      rescue => exception
+        flunk(<<~MESSAGE)
+          An exception occurred in the block provided to the StatsD assertion.
 
-      #{exception.class.name}: #{exception.message}
-      \t#{exception.backtrace.join("\n\t")}
+          #{exception.class.name}: #{exception.message}
+          \t#{(exception.backtrace || []).join("\n\t")}
 
-      If this exception is expected, make sure to handle it using `assert_raises`
-      inside the block provided to the StatsD assertion.
-    MESSAGE
+          If this exception is expected, make sure to handle it using `assert_raises`
+          inside the block provided to the StatsD assertion.
+        MESSAGE
+      end
+    end
   end
 end