statsd-instrument 3.5.3 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba71c5241926a499e771c33d9f1d4778a06b1cd419ecdbab19bd6e7b45629ef4
-  data.tar.gz: 65ae8d434fd664932456a5126453043dd662b60302435e44dbb38918434b9c2d
+  metadata.gz: 0b4caa06189952666d3dd979521ec76bcf4bbf4265605c2d9d30198773f74ab8
+  data.tar.gz: ec65748283c1a32434f6388e24b167133ba53ec36353c4ec5f8ccfe920657b58
 SHA512:
-  metadata.gz: bbdbb0774e5a2aba45e51a5e724384debd0e8503936741958ebe01a547780b935a9098491b4bbcd357d8fd950cd9815392c6713dc09b8d23daa7bc8ff0cc00db
-  data.tar.gz: 06b848a06d4e88843f9245a9c6ffe681e692fb2225d13e29f328b0738ebdd591a848899208c2eac8690f2d86854520151aa62252aa8070305afc106adf981412
+  metadata.gz: af4a6f52973f439a4d9246fff0d68c74751173998b1a76c9fdbff87ac001f2718ccc8fe2c5abb6d5bdaa5555f9c82150f196c8fe6f819e913a6828ef269a2e14
+  data.tar.gz: 79f76342bc46cf2d07fd96f1d72bbe5bc2367251ff93b05b6c4ed938fe96d85bf44c8178ca4f1f4a7186f10921bfbaea456b2ce2d32e64db806ec526b2894d71

data/CHANGELOG.md

@@ -6,6 +6,14 @@ 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
+
 ## Version 3.5.3
 
 - Improve shapes friendliness for Ruby 3.2+

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,12 @@ 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|
+            metric_tags = m.tags || []
+            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?
             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.3"
+    VERSION = "3.5.5"
   end
 end

data/test/matchers_test.rb

@@ -34,6 +34,37 @@ 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_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.3
+  version: 3.5.5
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-16 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.