statsd-instrument 2.9.2 → 3.0.2

data/test/statsd_test.rb

@@ -5,29 +5,16 @@ require 'test_helper'
 class StatsDTest < Minitest::Test
   include StatsD::Instrument::Assertions
 
-  def teardown
-    StatsD.default_tags = nil
-  end
-
-  def test_statsd_passed_collections_to_backend
-    StatsD.backend.expects(:collect_metric).with(instance_of(StatsD::Instrument::Metric))
-    StatsD.increment('test')
-  end
-
   def test_statsd_measure_with_explicit_value
     metric = capture_statsd_call { StatsD.measure('values.foobar', 42) }
-    assert_equal 'values.foobar', metric.name
-    assert_equal 42, metric.value
-    assert_equal :ms, metric.type
-  end
-
-  def test_statsd_measure_without_value_or_block
-    assert_raises(ArgumentError) { StatsD.measure('values.foobar', tags: 123) }
+    assert_equal('values.foobar', metric.name)
+    assert_equal(42, metric.value)
+    assert_equal(:ms, metric.type)
   end
 
   def test_statsd_measure_with_explicit_value_and_sample_rate
     metric = capture_statsd_call { StatsD.measure('values.foobar', 42, sample_rate: 0.1) }
-    assert_equal 0.1, metric.sample_rate
+    assert_equal(0.1, metric.sample_rate)
   end
 
   def test_statsd_measure_with_benchmarked_block_duration
@@ -35,12 +22,12 @@ class StatsDTest < Minitest::Test
     metric = capture_statsd_call do
       StatsD.measure('values.foobar') { 'foo' }
     end
-    assert_equal 1120.0, metric.value
+    assert_equal(1120.0, metric.value)
   end
 
   def test_statsd_measure_returns_return_value_of_block
     return_value = StatsD.measure('values.foobar') { 'sarah' }
-    assert_equal 'sarah', return_value
+    assert_equal('sarah', return_value)
   end
 
   def test_statsd_measure_with_return_in_block_still_captures
@@ -54,8 +41,8 @@ class StatsDTest < Minitest::Test
       result = lambda.call
     end
 
-    assert_equal 'from lambda', result
-    assert_equal 1120.0, metric.value
+    assert_equal('from lambda', result)
+    assert_equal(1120.0, metric.value)
   end
 
   def test_statsd_measure_with_exception_in_block_still_captures
@@ -68,68 +55,69 @@ class StatsDTest < Minitest::Test
 
       begin
         result = lambda.call
-      rescue # rubocop:disable Lint/HandleExceptions:
+      rescue
+        # noop
       end
     end
 
-    assert_nil result
-    assert_equal 1120.0, metric.value
+    assert_nil(result)
+    assert_equal(1120.0, metric.value)
   end
 
   def test_statsd_increment
     metric = capture_statsd_call { StatsD.increment('values.foobar', 3) }
-    assert_equal :c, metric.type
-    assert_equal 'values.foobar', metric.name
-    assert_equal 3, metric.value
+    assert_equal(:c, metric.type)
+    assert_equal('values.foobar', metric.name)
+    assert_equal(3, metric.value)
   end
 
   def test_statsd_increment_with_hash_argument
     metric = capture_statsd_call { StatsD.increment('values.foobar', tags: ['test']) }
-    assert_equal StatsD.default_sample_rate, metric.sample_rate
-    assert_equal ['test'], metric.tags
-    assert_equal 1, metric.value
+    assert_equal(StatsD.singleton_client.default_sample_rate, metric.sample_rate)
+    assert_equal(['test'], metric.tags)
+    assert_equal(1, metric.value)
   end
 
   def test_statsd_gauge
     metric = capture_statsd_call { StatsD.gauge('values.foobar', 12) }
-    assert_equal :g, metric.type
-    assert_equal 'values.foobar', metric.name
-    assert_equal 12, metric.value
+    assert_equal(:g, metric.type)
+    assert_equal('values.foobar', metric.name)
+    assert_equal(12, metric.value)
   end
 
   def test_statsd_gauge_without_value
-    assert_raises(ArgumentError) { StatsD.gauge('values.foobar', tags: 123) }
+    assert_raises(ArgumentError) { StatsD.gauge('values.foobar') }
   end
 
   def test_statsd_set
     metric = capture_statsd_call { StatsD.set('values.foobar', 'unique_identifier') }
-    assert_equal :s, metric.type
-    assert_equal 'values.foobar', metric.name
-    assert_equal 'unique_identifier', metric.value
+    assert_equal(:s, metric.type)
+    assert_equal('values.foobar', metric.name)
+    assert_equal('unique_identifier', metric.value)
   end
 
   def test_statsd_histogram
     metric = capture_statsd_call { StatsD.histogram('values.foobar', 42) }
-    assert_equal :h, metric.type
-    assert_equal 'values.foobar', metric.name
-    assert_equal 42, metric.value
+    assert_equal(:h, metric.type)
+    assert_equal('values.foobar', metric.name)
+    assert_equal(42, metric.value)
   end
 
   def test_statsd_distribution
     metric = capture_statsd_call { StatsD.distribution('values.foobar', 42) }
-    assert_equal :d, metric.type
-    assert_equal 'values.foobar', metric.name
-    assert_equal 42, metric.value
+    assert_equal(:d, metric.type)
+    assert_equal('values.foobar', metric.name)
+    assert_equal(42, metric.value)
   end
 
   def test_statsd_distribution_with_benchmarked_block_duration
     Process.stubs(:clock_gettime).returns(5.0, 5.0 + 1.12)
     metric = capture_statsd_call do
       result = StatsD.distribution('values.foobar') { 'foo' }
-      assert_equal 'foo', result
+      assert_equal('foo', result)
     end
-    assert_equal :d, metric.type
-    assert_equal 1120.0, metric.value
+    assert_equal(:d, metric.type)
+    assert_equal(1120.0, metric.value)
   end
 
   def test_statsd_distribution_with_return_in_block_still_captures
@@ -144,9 +132,9 @@ class StatsDTest < Minitest::Test
       result = lambda.call
     end
 
-    assert_equal 'from lambda', result
-    assert_equal :d, metric.type
-    assert_equal 1120.0, metric.value
+    assert_equal('from lambda', result)
+    assert_equal(:d, metric.type)
+    assert_equal(1120.0, metric.value)
   end
 
   def test_statsd_distribution_with_exception_in_block_still_captures
@@ -159,13 +147,14 @@ class StatsDTest < Minitest::Test
 
       begin
         result = lambda.call
-      rescue # rubocop:disable Lint/HandleExceptions
+      rescue
+        # noop
       end
     end
 
-    assert_nil result
-    assert_equal :d, metric.type
-    assert_equal 1120.0, metric.value
+    assert_nil(result)
+    assert_equal(:d, metric.type)
+    assert_equal(1120.0, metric.value)
   end
 
   def test_statsd_distribution_with_block_and_options
@@ -173,25 +162,25 @@ class StatsDTest < Minitest::Test
     metric = capture_statsd_call do
       StatsD.distribution('values.foobar', tags: ['test'], sample_rate: 0.9) { 'foo' }
     end
-    assert_equal 1120.0, metric.value
-    assert_equal 'values.foobar', metric.name
-    assert_equal 0.9, metric.sample_rate
-    assert_equal ['test'], metric.tags
+    assert_equal(1120.0, metric.value)
+    assert_equal('values.foobar', metric.name)
+    assert_equal(0.9, metric.sample_rate)
+    assert_equal(['test'], metric.tags)
   end
 
   def test_statsd_distribution_returns_return_value_of_block
     return_value = StatsD.distribution('values.foobar') { 'sarah' }
-    assert_equal 'sarah', return_value
+    assert_equal('sarah', return_value)
   end
 
   def test_statsd_measure_returns_return_value_of_block_even_if_nil
     return_value = StatsD.distribution('values.foobar') { nil }
-    assert_nil return_value
+    assert_nil(return_value)
   end
 
   def test_statsd_duration_returns_time_in_seconds
     duration = StatsD::Instrument.duration {}
-    assert_kind_of Float, duration
+    assert_kind_of(Float, duration)
   end
 
   def test_statsd_duration_does_not_swallow_exceptions
@@ -200,25 +189,11 @@ class StatsDTest < Minitest::Test
     end
   end
 
-  def test_statsd_default_tags_get_normalized
-    StatsD.default_tags = { first_tag: 'first_value', second_tag: 'second_value' }
-    assert_equal ['first_tag:first_value', 'second_tag:second_value'], StatsD.default_tags
-  end
-
-  def test_name_prefix
-    StatsD.legacy_singleton_client.stubs(:prefix).returns('prefix')
-    m = capture_statsd_call { StatsD.increment('counter') }
-    assert_equal 'prefix.counter', m.name
-
-    m = capture_statsd_call { StatsD.increment('counter', no_prefix: true) }
-    assert_equal 'counter', m.name
-  end
-
   protected
 
   def capture_statsd_call(&block)
     metrics = capture_statsd_calls(&block)
-    assert_equal 1, metrics.length
+    assert_equal(1, metrics.length)
     metrics.first
   end
 end

data/test/test_helper.rb

@@ -4,15 +4,17 @@ ENV['ENV'] = 'test'
 
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'statsd-instrument'
 
 require_relative 'helpers/rubocop_helper'
 
-module StatsD::Instrument
-  def self.strict_mode_enabled?
-    StatsD::Instrument.const_defined?(:Strict) &&
-      StatsD.singleton_class.ancestors.include?(StatsD::Instrument::Strict)
+module StatsD
+  module Instrument
+    def self.strict_mode_enabled?
+      StatsD::Instrument.const_defined?(:Strict) &&
+        StatsD.singleton_class.ancestors.include?(StatsD::Instrument::Strict)
+    end
   end
 end
 

data/test/udp_sink_test.rb

@@ -19,19 +19,19 @@ class UDPSinkTest < Minitest::Test
     udp_sink << 'foo:1|c'
 
     datagram, _source = @receiver.recvfrom(100)
-    assert_equal 'foo:1|c', datagram
+    assert_equal('foo:1|c', datagram)
   end
 
   def test_sample?
     udp_sink = StatsD::Instrument::UDPSink.new(@host, @port)
-    assert udp_sink.sample?(1)
-    refute udp_sink.sample?(0)
+    assert(udp_sink.sample?(1))
+    refute(udp_sink.sample?(0))
 
     udp_sink.stubs(:rand).returns(0.3)
-    assert udp_sink.sample?(0.5)
+    assert(udp_sink.sample?(0.5))
 
     udp_sink.stubs(:rand).returns(0.7)
-    refute udp_sink.sample?(0.5)
+    refute(udp_sink.sample?(0.5))
   end
 
   def test_parallelism
@@ -43,7 +43,7 @@ class UDPSinkTest < Minitest::Test
       datagrams << datagram
     end
 
-    assert_equal 100, datagrams.size
+    assert_equal(100, datagrams.size)
   end
 
   def test_socket_error_should_invalidate_socket
@@ -74,8 +74,8 @@ class UDPSinkTest < Minitest::Test
     Process.kill('TERM', pid)
     _, exit_status = Process.waitpid2(pid)
 
-    assert_equal 0, exit_status, "The forked process did not exit cleanly"
-    assert_equal "exiting:1|c", @receiver.recvfrom_nonblock(100).first
+    assert_equal(0, exit_status, "The forked process did not exit cleanly")
+    assert_equal("exiting:1|c", @receiver.recvfrom_nonblock(100).first)
 
   rescue NotImplementedError
     pass("Fork is not implemented on #{RUBY_PLATFORM}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 3.0.2
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,106 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2021-01-20 00:00:00.000000000 Z
+dependencies: []
 description: A StatsD client for Ruby apps. Provides metaprogramming methods to inject
   StatsD instrumentation into your code.
 email:
@@ -123,7 +25,6 @@ files:
 - ".github/workflows/benchmark.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
-- ".rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml"
 - ".rubocop.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -133,17 +34,13 @@ files:
 - README.md
 - Rakefile
 - benchmark/README.md
-- benchmark/datagram-client
 - benchmark/send-metrics-to-dev-null-log
 - benchmark/send-metrics-to-local-udp-receiver
+- bin/rake
+- bin/rubocop
 - lib/statsd-instrument.rb
 - lib/statsd/instrument.rb
 - lib/statsd/instrument/assertions.rb
-- lib/statsd/instrument/backend.rb
-- lib/statsd/instrument/backends/capture_backend.rb
-- lib/statsd/instrument/backends/logger_backend.rb
-- lib/statsd/instrument/backends/null_backend.rb
-- lib/statsd/instrument/backends/udp_backend.rb
 - lib/statsd/instrument/capture_sink.rb
 - lib/statsd/instrument/client.rb
 - lib/statsd/instrument/datagram.rb
@@ -153,10 +50,8 @@ files:
 - lib/statsd/instrument/environment.rb
 - lib/statsd/instrument/expectation.rb
 - lib/statsd/instrument/helpers.rb
-- lib/statsd/instrument/legacy_client.rb
 - lib/statsd/instrument/log_sink.rb
 - lib/statsd/instrument/matchers.rb
-- lib/statsd/instrument/metric.rb
 - lib/statsd/instrument/null_sink.rb
 - lib/statsd/instrument/railtie.rb
 - lib/statsd/instrument/rubocop.rb
@@ -174,28 +69,22 @@ files:
 - lib/statsd/instrument/version.rb
 - shipit.rubygems.yml
 - statsd-instrument.gemspec
-- test/assertions_on_legacy_client_test.rb
 - test/assertions_test.rb
 - test/benchmark/clock_gettime.rb
 - test/benchmark/default_tags.rb
 - test/benchmark/metrics.rb
 - test/benchmark/tags.rb
-- test/capture_backend_test.rb
 - test/capture_sink_test.rb
 - test/client_test.rb
-- test/compatibility/dogstatsd_datagram_compatibility_test.rb
 - test/datagram_builder_test.rb
 - test/datagram_test.rb
-- test/deprecations_test.rb
 - test/dogstatsd_datagram_builder_test.rb
 - test/environment_test.rb
 - test/helpers/rubocop_helper.rb
 - test/helpers_test.rb
 - test/integration_test.rb
 - test/log_sink_test.rb
-- test/logger_backend_test.rb
 - test/matchers_test.rb
-- test/metric_test.rb
 - test/null_sink_test.rb
 - test/rubocop/measure_as_dist_argument_test.rb
 - test/rubocop/metaprogramming_positional_arguments_test.rb
@@ -209,12 +98,12 @@ files:
 - test/statsd_instrumentation_test.rb
 - test/statsd_test.rb
 - test/test_helper.rb
-- test/udp_backend_test.rb
 - test/udp_sink_test.rb
 homepage: https://github.com/Shopify/statsd-instrument
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -235,28 +124,22 @@ signing_key:
 specification_version: 4
 summary: A StatsD client for Ruby apps
 test_files:
-- test/assertions_on_legacy_client_test.rb
 - test/assertions_test.rb
 - test/benchmark/clock_gettime.rb
 - test/benchmark/default_tags.rb
 - test/benchmark/metrics.rb
 - test/benchmark/tags.rb
-- test/capture_backend_test.rb
 - test/capture_sink_test.rb
 - test/client_test.rb
-- test/compatibility/dogstatsd_datagram_compatibility_test.rb
 - test/datagram_builder_test.rb
 - test/datagram_test.rb
-- test/deprecations_test.rb
 - test/dogstatsd_datagram_builder_test.rb
 - test/environment_test.rb
 - test/helpers/rubocop_helper.rb
 - test/helpers_test.rb
 - test/integration_test.rb
 - test/log_sink_test.rb
-- test/logger_backend_test.rb
 - test/matchers_test.rb
-- test/metric_test.rb
 - test/null_sink_test.rb
 - test/rubocop/measure_as_dist_argument_test.rb
 - test/rubocop/metaprogramming_positional_arguments_test.rb
@@ -270,5 +153,4 @@ test_files:
 - test/statsd_instrumentation_test.rb
 - test/statsd_test.rb
 - test/test_helper.rb
-- test/udp_backend_test.rb
 - test/udp_sink_test.rb