statsd-instrument 3.5.4 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f32c9e4ca930e72744cd789511b99b09c07cb2ad7766df3c36490df00911985
-  data.tar.gz: 8732469bca8f8592285978a49e9a318fafd12fef0576ac8850de9fd8bdabbd6a
+  metadata.gz: 0b4caa06189952666d3dd979521ec76bcf4bbf4265605c2d9d30198773f74ab8
+  data.tar.gz: ec65748283c1a32434f6388e24b167133ba53ec36353c4ec5f8ccfe920657b58
 SHA512:
-  metadata.gz: 124095c32f119942d8f1e20e210ad13f95f653ab8e6ed999e473abe677957e4295a81b968da319f94ac24a884be1e2750db9965188b1962150366b850a3c49b0
-  data.tar.gz: 6eb6efb88b13de4c47d9f17dd9fd8b954c81c7ce0aab5a8e26cc89707539900ef98fce9f44014d14c909c8f3b2d8e80fe13e755174e52d488d47413aefbe4523
+  metadata.gz: af4a6f52973f439a4d9246fff0d68c74751173998b1a76c9fdbff87ac001f2718ccc8fe2c5abb6d5bdaa5555f9c82150f196c8fe6f819e913a6828ef269a2e14
+  data.tar.gz: 79f76342bc46cf2d07fd96f1d72bbe5bc2367251ff93b05b6c4ed938fe96d85bf44c8178ca4f1f4a7186f10921bfbaea456b2ce2d32e64db806ec526b2894d71

data/CHANGELOG.md

@@ -6,6 +6,10 @@ section below.
 
 ## Unreleased changes
 
+## Version 3.5.5
+
+- Fix issue on 3.5.4, allowing user to specify compound matcher without tags
+
 ## Version 3.5.4
 
 - Allow user to assert different tags using RSpec composable matcher

data/lib/statsd/instrument/matchers.rb

@@ -44,9 +44,10 @@ module StatsD
         def expect_statsd_call(metric_type, metric_name, options, &block)
           metrics = capture_statsd_calls(&block)
           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) }
+            options_tags = options[:tags] || []
+            tag_matches = options_tags.empty? || metric_tags.all? { |t| options_tags.include?(t) }
+            m.type == metric_type && m.name == metric_name && tag_matches
           end
 
           if metrics.empty?

data/lib/statsd/instrument/version.rb

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

data/test/matchers_test.rb

@@ -54,6 +54,17 @@ class MatchersTest < Minitest::Test
     }))
   end
 
+  def test_statsd_increment_compound_without_explicit_tags_using_and_matched
+    matcher_1 = StatsD::Instrument::Matchers::Increment.new(:c, "first_counter", times: 2)
+    matcher_2 = StatsD::Instrument::Matchers::Increment.new(:c, "second_counter", times: 1)
+
+    assert(matcher_1.and(matcher_2).matches?(lambda {
+      StatsD.increment("first_counter", tags: ["a"])
+      StatsD.increment("first_counter", tags: ["b"])
+      StatsD.increment("second_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.4
+  version: 3.5.5
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies: []
 description: A StatsD client for Ruby apps. Provides metaprogramming methods to inject
   StatsD instrumentation into your code.