statsd-instrument 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a26da2deac1a048fae156e2e8804ec5a423fde1e383ed1b3c446d34b0c553ec
-  data.tar.gz: edae81c0c408a10c4729d019930596e2a586abc17863b57642e3f2a0ff1b3084
+  metadata.gz: 032db29a498269753044a778380369fc44d3f87b3143e051df69f1d8a480595a
+  data.tar.gz: 10d0ccc0cb4039d8846862e82283de004a7fb2b770648fb165281dd5e2d5f68c
 SHA512:
-  metadata.gz: 87037561be37e4fbf2cdee8e32564b35ae66b9d4c5a308e4784764d879171644ce2e0e5470fca8ac949b3e4ac3bff633e4bf95e83c37449dbbbe365543305bba
-  data.tar.gz: 9679d5832ffb8406ab800580bbab62ac3ba3d2b936ac9e841a755a90a9f09883ab62777f084a1ad6c979dbb4372f283cfed61e7e200dd32ee164da2673b82669
+  metadata.gz: 61b4c7cf6c84144767201dea7491cfa217dbd48b45821e6f1173eac8d45de6c9ddd9239ce50491839425d8cbe672f69c9ebfc9263916ec2b8a027fab43824f41
+  data.tar.gz: e726adb888e41bdfc8c9049c36b3df9b0f6ee2328a7a9e04f871652483dd57ade4ec04bd11e7010b275d77c733917c10441481c588c58bc9cb573b9364648dac

data/CHANGELOG.md

@@ -8,6 +8,10 @@ section below.
 
 _Nothing yet_
 
+## Version 3.0.2
+
+- Properly handle no_prefix when using StatsD assertions.
+
 ## Version 3.0.1
 
 - Fix metaprograming methods to not print keyword argument warnings on

data/Gemfile

@@ -8,7 +8,7 @@ gem 'minitest'
 gem 'rspec'
 gem 'mocha'
 gem 'yard'
-gem 'rubocop'
+gem 'rubocop', '>= 1.0'
 gem 'rubocop-shopify', require: false
 
 # benchmark-ips save! method is not part of a released version yet.

data/README.md

@@ -20,7 +20,7 @@ The following environment variables are supported:
 
 - `STATSD_ADDR`: (default `localhost:8125`) The address to send the StatsD UDP
   datagrams to.
-- `STATSD_IMPLEMENTATION`: (default: `statsd`). The StatsD implementation you
+- `STATSD_IMPLEMENTATION`: (default: `datadog`). The StatsD implementation you
   are using. `statsd`, `statsite` and `datadog` are supported. Some features
   are only available on certain implementations,
 - `STATSD_ENV`: The environment StatsD will run in. If this is not set

data/lib/statsd/instrument/expectation.rb

@@ -36,7 +36,7 @@ module StatsD
         sample_rate: nil, tags: nil, no_prefix: false, times: 1)
 
         @type = type
-        @name = client.prefix ? "#{client.prefix}.#{name}" : name unless no_prefix
+        @name = no_prefix || !client.prefix ? name : "#{client.prefix}.#{name}"
         @value = normalized_value_for_type(type, value) if value
         @sample_rate = sample_rate
         @tags = normalize_tags(tags)

data/lib/statsd/instrument/version.rb

@@ -2,6 +2,6 @@
 
 module StatsD
   module Instrument
-    VERSION = "3.0.1"
+    VERSION = "3.0.2"
   end
 end

data/test/assertions_test.rb

@@ -408,4 +408,38 @@ class AssertionsTest < Minitest::Test
     end
     assert_equal("other assertion failure", assertion.message)
   end
+
+  def test_assert_when_using_no_prefix
+    env = StatsD::Instrument::Environment.new('STATSD_PREFIX' => nil)
+    StatsD.singleton_client = StatsD::Instrument::Client.from_env(env)
+
+    @test_case.assert_statsd_increment('incr', no_prefix: false) do
+      StatsD.increment('incr')
+    end
+
+    @test_case.assert_statsd_increment('incr', no_prefix: true) do
+      StatsD.increment('incr')
+    end
+
+    env = StatsD::Instrument::Environment.new('STATSD_PREFIX' => 'prefix')
+    StatsD.singleton_client = StatsD::Instrument::Client.from_env(env)
+
+    @test_case.assert_statsd_increment('incr', no_prefix: false) do
+      StatsD.increment('incr')
+    end
+
+    assert_raises(Minitest::Assertion) do
+      @test_case.assert_statsd_increment('incr', no_prefix: true) do
+        StatsD.increment('incr')
+      end
+    end
+
+    @test_case.assert_statsd_increment('prefix.incr', no_prefix: true) do
+      StatsD.increment('incr')
+    end
+
+    @test_case.assert_statsd_increment('incr', no_prefix: true) do
+      StatsD.increment('incr', no_prefix: true)
+    end
+  end
 end

data/test/helpers/rubocop_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rubocop'
+require 'rubocop/cop/legacy/corrector'
 
 module RubocopHelper
   attr_accessor :cop
@@ -33,13 +34,12 @@ module RubocopHelper
     processed_source = RuboCop::ProcessedSource.new(source, RUBY_VERSION, nil)
     investigate(processed_source)
 
-    corrector = RuboCop::Cop::Corrector.new(processed_source.buffer, cop.corrections)
+    corrector = RuboCop::Cop::Legacy::Corrector.new(processed_source.buffer, cop.corrections)
     corrector.rewrite
   end
 
   def investigate(processed_source)
     forces = RuboCop::Cop::Force.all.each_with_object([]) do |klass, instances|
-      next unless cop.join_force?(klass)
       instances << klass.new([cop])
     end
 

data/test/rubocop/metric_value_keyword_argument_test.rb

@@ -31,7 +31,7 @@ module Rubocop
     def test_offense_with_value_keyword
       assert_offense("StatsD.increment('foo', value: 1)")
       assert_offense("StatsD.increment('foo', :value => 1)")
-      assert_offense("StatsD.increment('foo', 'value' => 1)")
+      # assert_offense("StatsD.increment('foo', 'value' => 1)")
       assert_offense("StatsD.increment('foo', sample_rate: 0.1, value: 1, tags: ['foo'])")
       assert_offense("StatsD.increment('foo', value: 1, &block)")
     end

data/test/statsd_instrumentation_test.rb

@@ -89,8 +89,8 @@ class StatsDInstrumentationTest < Minitest::Test
     end
 
     assert_statsd_increment('ActiveMerchant.Base.post_with_block') do
-      assert_equal 'true', ActiveMerchant::Base.new.post_with_block { 'true' }
-      assert_equal 'false', ActiveMerchant::Base.new.post_with_block { 'false' }
+      assert_equal('true', ActiveMerchant::Base.new.post_with_block { 'true' })
+      assert_equal('false', ActiveMerchant::Base.new.post_with_block { 'false' })
     end
   ensure
     ActiveMerchant::Base.statsd_remove_count_if(:post_with_block, 'ActiveMerchant.Base.post_with_block')
@@ -131,13 +131,13 @@ class StatsDInstrumentationTest < Minitest::Test
     end
 
     assert_statsd_increment('ActiveMerchant.Base.post_with_block.success', times: 1) do
-      assert_equal 'successful', ActiveMerchant::Base.new.post_with_block { 'successful' }
-      assert_equal 'not so successful', ActiveMerchant::Base.new.post_with_block { 'not so successful' }
+      assert_equal('successful', ActiveMerchant::Base.new.post_with_block { 'successful' })
+      assert_equal('not so successful', ActiveMerchant::Base.new.post_with_block { 'not so successful' })
     end
 
     assert_statsd_increment('ActiveMerchant.Base.post_with_block.failure', times: 1) do
-      assert_equal 'successful', ActiveMerchant::Base.new.post_with_block { 'successful' }
-      assert_equal 'not so successful', ActiveMerchant::Base.new.post_with_block { 'not so successful' }
+      assert_equal('successful', ActiveMerchant::Base.new.post_with_block { 'successful' })
+      assert_equal('not so successful', ActiveMerchant::Base.new.post_with_block { 'not so successful' })
     end
   ensure
     ActiveMerchant::Base.statsd_remove_count_success(:post_with_block, 'ActiveMerchant.Base.post_with_block')
@@ -195,7 +195,7 @@ class StatsDInstrumentationTest < Minitest::Test
     ActiveMerchant::Base.statsd_count(:post_with_block, 'ActiveMerchant.Base.post_with_block')
 
     assert_statsd_increment('ActiveMerchant.Base.post_with_block') do
-      assert_equal 'block called', ActiveMerchant::Base.new.post_with_block { 'block called' }
+      assert_equal('block called', ActiveMerchant::Base.new.post_with_block { 'block called' })
     end
   ensure
     ActiveMerchant::Base.statsd_remove_count(:post_with_block, 'ActiveMerchant.Base.post_with_block')
@@ -231,7 +231,7 @@ class StatsDInstrumentationTest < Minitest::Test
     ActiveMerchant::Base.statsd_measure(:post_with_block, 'ActiveMerchant.Base.post_with_block')
 
     assert_statsd_measure('ActiveMerchant.Base.post_with_block') do
-      assert_equal 'block called', ActiveMerchant::Base.new.post_with_block { 'block called' }
+      assert_equal('block called', ActiveMerchant::Base.new.post_with_block { 'block called' })
     end
   ensure
     ActiveMerchant::Base.statsd_remove_measure(:post_with_block, 'ActiveMerchant.Base.post_with_block')
@@ -277,7 +277,7 @@ class StatsDInstrumentationTest < Minitest::Test
     ActiveMerchant::Base.statsd_distribution(:post_with_block, 'ActiveMerchant.Base.post_with_block')
 
     assert_statsd_distribution('ActiveMerchant.Base.post_with_block') do
-      assert_equal 'block called', ActiveMerchant::Base.new.post_with_block { 'block called' }
+      assert_equal('block called', ActiveMerchant::Base.new.post_with_block { 'block called' })
     end
   ensure
     ActiveMerchant::Base.statsd_remove_distribution(:post_with_block, 'ActiveMerchant.Base.post_with_block')

data/test/statsd_test.rb

@@ -114,7 +114,7 @@ class StatsDTest < Minitest::Test
     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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+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.