statsd-instrument 3.5.2 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7ef9b0c6e5682818fc957cbe2cf4cd37180aa8178329577d5e3d53845784073
-  data.tar.gz: f965e44fc446ff14a96ab0818871b97c9fe5980fad1dc45be32726b2d3b2d368
+  metadata.gz: 1f32c9e4ca930e72744cd789511b99b09c07cb2ad7766df3c36490df00911985
+  data.tar.gz: 8732469bca8f8592285978a49e9a318fafd12fef0576ac8850de9fd8bdabbd6a
 SHA512:
-  metadata.gz: e3830d435e3b3fc30412a0319dd58534bf4b871c40d5707a7471cd92a4d5327cc4c45a28287df14342e7402c609f8b98d36ba5a39cc3a07c1199f4e05389581d
-  data.tar.gz: 2b06036a80cfb1c5dcfdc16ee21a848fe2fe3165b3f05d4d64e1c9620c2fb84bab3eb48518117c3b11daea0b6d0ace2a692c78e58b1686272933e5f14626438d
+  metadata.gz: 124095c32f119942d8f1e20e210ad13f95f653ab8e6ed999e473abe677957e4295a81b968da319f94ac24a884be1e2750db9965188b1962150366b850a3c49b0
+  data.tar.gz: 6eb6efb88b13de4c47d9f17dd9fd8b954c81c7ce0aab5a8e26cc89707539900ef98fce9f44014d14c909c8f3b2d8e80fe13e755174e52d488d47413aefbe4523

data/CHANGELOG.md

@@ -6,6 +6,14 @@ section below.
 
 ## Unreleased changes
 
+## Version 3.5.4
+
+- Allow user to assert different tags using RSpec composable matcher
+
+## Version 3.5.3
+
+- Improve shapes friendliness for Ruby 3.2+
+
 ## Version 3.5.2
 
 - Fix bug on assertions to allow the user passes `times: 0` as expectation.

data/README.md

@@ -355,6 +355,13 @@ RSpec.describe 'Matchers' do
     it 'will pass if there is no matching StatsD call on negative expectation' do
       expect { StatsD.increment('other_counter') }.not_to trigger_statsd_increment('counter')
     end
+
+    it 'will pass if every statsD call matches its call tag variations' do
+      expect do
+        StatsD.increment('counter', tags: ['variation:a'])
+        StatsD.increment('counter', tags: ['variation:b'])
+      end.to trigger_statsd_increment('counter', times: 1, tags: ["variation:a"]).and trigger_statsd_increment('counter', times: 1, tags: ["variation:b"])
+    end
   end
 end
 ```

data/lib/statsd/instrument/matchers.rb

@@ -43,7 +43,11 @@ module StatsD
 
         def expect_statsd_call(metric_type, metric_name, options, &block)
           metrics = capture_statsd_calls(&block)
-          metrics = metrics.select { |m| m.type == metric_type && m.name == metric_name }
+          metrics = metrics.select do |m|
+            options_tags = options[:tags] || []
+            metric_tags = m.tags || []
+            m.type == metric_type && m.name == metric_name && metric_tags.all? { |t| options_tags.include?(t) }
+          end
 
           if metrics.empty?
             raise RSpec::Expectations::ExpectationNotMetError, "No StatsD calls for metric #{metric_name} were made."

data/lib/statsd/instrument/version.rb

@@ -2,6 +2,6 @@
 
 module StatsD
   module Instrument
-    VERSION = "3.5.2"
+    VERSION = "3.5.4"
   end
 end

data/lib/statsd/instrument.rb

@@ -360,6 +360,12 @@ module StatsD
 
     def_delegators :singleton_client, :increment, :gauge, :set, :measure,
       :histogram, :distribution, :event, :service_check
+
+    private
+
+    def extended(klass)
+      klass.statsd_instrumentations # eagerly define
+    end
   end
 end
 

data/test/matchers_test.rb

@@ -34,6 +34,26 @@ class MatchersTest < Minitest::Test
     }))
   end
 
+  def test_statsd_increment_compound_using_and_matched
+    matcher_1 = StatsD::Instrument::Matchers::Increment.new(:c, "counter", times: 1, tags: ["a"])
+    matcher_2 = StatsD::Instrument::Matchers::Increment.new(:c, "counter", times: 1, tags: ["b"])
+
+    assert(matcher_1.and(matcher_2).matches?(lambda {
+      StatsD.increment("counter", tags: ["a"])
+      StatsD.increment("counter", tags: ["b"])
+    }))
+  end
+
+  def test_statsd_increment_compound_using_and_not_matched
+    matcher_1 = StatsD::Instrument::Matchers::Increment.new(:c, "counter", times: 1, tags: ["a"])
+    matcher_2 = StatsD::Instrument::Matchers::Increment.new(:c, "counter", times: 1, tags: ["b"])
+
+    refute(matcher_1.and(matcher_2).matches?(lambda {
+      StatsD.increment("counter", tags: ["a"])
+      StatsD.increment("counter", tags: ["c"])
+    }))
+  end
+
   def test_statsd_increment_with_times_matched
     assert(StatsD::Instrument::Matchers::Increment.new(:c, "counter", times: 1)
       .matches?(lambda { StatsD.increment("counter") }))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.4
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies: []
 description: A StatsD client for Ruby apps. Provides metaprogramming methods to inject
   StatsD instrumentation into your code.