statsd-instrument 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b3d5d77001c8868328c05e1f62406ab13b92c03
-  data.tar.gz: 32b5ba8a24354acfb72f73ce2e514146e9e3773c
+  metadata.gz: 63dfe410622af6e685d7a2f6614f528152b36357
+  data.tar.gz: 104d234cfd0350fcd4f079bec5baf965f86da6f3
 SHA512:
-  metadata.gz: a94d925a45d26e5b5ebd366cc8aa2d2e61e06a577b79e5f4af908d1114598dad047cd24b0206d7864964be93f6a7e571f6f2d601ed68c26458433151cde8f540
-  data.tar.gz: d1bab44e9942aa4a7e1be4d1af6f88bcf33bf82106d7f8c3c5cfcb957579be583942693f30662f837a26e37f9a7adbadcebeea7a3c980ac06ae14e6931aa9bbc
+  metadata.gz: 69206e0b5124e2223184895448be069458c95023ff85bb684897bd9ff369d70f8b91e8dfbcec3cbf2f9e13c081612ef615fa1cfb21311a46ddea9fd5ad72aa6d
+  data.tar.gz: 471d932952f69c70e1f73e92e2e8ce08841d91f054353690002d2e4017571b866cc1c6cb86028eee3830f97ab7ce2080fe001acb20c97be85565c64d675f7971

data/CHANGELOG.md

@@ -7,6 +7,7 @@ please at an entry to the "unreleased changes" section below.
 
 - Drop support for Ruby 1.9.3.
 - Add support for Ruby 2.2.
+- Make library compatible with RSpec 2.
 
 ### Version 2.0.6
 

data/lib/statsd/instrument/assertions.rb

@@ -39,28 +39,36 @@ module StatsD::Instrument::Assertions
     metrics = metrics.select { |m| m.type == metric_type && m.name == metric_name }
     assert metrics.length > 0, "No StatsD calls for metric #{metric_name} were made."
     assert options[:times] === metrics.length, "The amount of StatsD calls for metric #{metric_name} was unexpected. Expected #{options[:times].inspect}, found #{metrics.length}"
-    metric = metrics.first
 
-    assert_equal options[:sample_rate], metric.sample_rate, "Unexpected StatsD sample rate for metric #{metric_name}" if options[:sample_rate]
-    assert_equal options[:value], metric.value, "Unexpected value submitted for StatsD metric #{metric_name}" if options[:value]
+    metrics.each do |metric|
 
-    if options[:tags]
-      expected_tags = Set.new(StatsD::Instrument::Metric.normalize_tags(options[:tags]))
-      actual_tags = Set.new(metric.tags)
+      assert within_numeric_range?(metric.sample_rate), "Unexpected sample rate type for metric #{metric_name}, must be numeric"
+      assert_equal options[:sample_rate], metric.sample_rate, "Unexpected StatsD sample rate for metric #{metric_name}" if options[:sample_rate]
+      assert_equal options[:value], metric.value, "Unexpected value submitted for StatsD metric #{metric_name}" if options[:value]
 
-      if options[:ignore_tags]
-        ignored_tags = Set.new(StatsD::Instrument::Metric.normalize_tags(options[:ignore_tags])) - expected_tags
-        actual_tags -= ignored_tags
+      if options[:tags]
 
-        if options[:ignore_tags].is_a?(Array)
-          actual_tags.delete_if{ |key| options[:ignore_tags].include?(key.split(":").first) }
+        expected_tags = Set.new(StatsD::Instrument::Metric.normalize_tags(options[:tags]))
+        actual_tags = Set.new(metric.tags)
+
+        if options[:ignore_tags]
+          ignored_tags = Set.new(StatsD::Instrument::Metric.normalize_tags(options[:ignore_tags])) - expected_tags
+          actual_tags -= ignored_tags
+
+          if options[:ignore_tags].is_a?(Array)
+            actual_tags.delete_if{ |key| options[:ignore_tags].include?(key.split(":").first) }
+          end
         end
+
+        assert_equal expected_tags, actual_tags,
+                     "Unexpected StatsD tags for metric #{metric_name}. Expected: #{expected_tags.inspect}, actual: #{actual_tags.inspect}"
       end
 
-      assert_equal expected_tags, actual_tags,
-        "Unexpected StatsD tags for metric #{metric_name}. Expected: #{expected_tags.inspect}, actual: #{actual_tags.inspect}"
+      metric
     end
+  end
 
-    metric
+  def within_numeric_range?(object)
+    object.kind_of?(Numeric) && (0.0..1.0).cover?(object)
   end
 end

data/lib/statsd/instrument/backends/udp_backend.rb

@@ -1,12 +1,17 @@
+require 'monitor'
+
 module StatsD::Instrument::Backends
   class UDPBackend < StatsD::Instrument::Backend
 
     DEFAULT_IMPLEMENTATION = :statsd
 
+    include MonitorMixin
+
     attr_reader :host, :port
     attr_accessor :implementation
 
     def initialize(server = nil, implementation = nil)
+      super()
       self.server = server || "localhost:8125"
       self.implementation = (implementation || DEFAULT_IMPLEMENTATION).to_sym
     end
@@ -76,7 +81,9 @@ module StatsD::Instrument::Backends
     end
 
     def write_packet(command)
-      socket.send(command, 0) > 0
+      synchronize do
+        socket.send(command, 0) > 0
+      end
     rescue SocketError, IOError, SystemCallError => e
       StatsD.logger.error "[StatsD] #{e.class.name}: #{e.message}"
     end

data/lib/statsd/instrument/matchers.rb

@@ -1,4 +1,5 @@
 require 'rspec/expectations'
+require 'rspec/version'
 
 module StatsD::Instrument::Matchers
   CUSTOM_MATCHERS = {
@@ -11,7 +12,7 @@ module StatsD::Instrument::Matchers
   }
 
   class Matcher
-    include RSpec::Matchers::Composable
+    include RSpec::Matchers::Composable if RSpec::Version::STRING.start_with?('3')
     include StatsD::Instrument::Helpers
 
     def initialize(metric_type, metric_name, options = {})

data/lib/statsd/instrument/version.rb

@@ -1,5 +1,5 @@
 module StatsD
   module Instrument
-    VERSION = "2.0.11"
+    VERSION = "2.0.12"
   end
 end

data/test/assertions_test.rb

@@ -80,6 +80,20 @@ class AssertionsTest < Minitest::Test
       end
     end
 
+    assert_no_assertion_triggered do
+      @test_case.assert_statsd_increment('counter', times: 2, tags: ['foo:1']) do
+        StatsD.increment('counter', tags: { foo: 1 })
+        StatsD.increment('counter', tags: { foo: 1 })
+      end
+    end
+
+    assert_assertion_triggered do
+      @test_case.assert_statsd_increment('counter', times: 2, tags: ['foo:1']) do
+        StatsD.increment('counter', tags: { foo: 1 })
+        StatsD.increment('counter', tags: { foo: 2 })
+      end
+    end
+
     assert_no_assertion_triggered do
       @test_case.assert_statsd_increment('counter', sample_rate: 0.5, tags: ['a', 'b']) do
         StatsD.increment('counter', sample_rate: 0.5, tags: ['a', 'b'])
@@ -149,6 +163,14 @@ class AssertionsTest < Minitest::Test
     end
   end
 
+  def test_assert_statsd_call_with_wrong_sample_rate_type
+    assert_assertion_triggered "Unexpected sample rate type for metric counter, must be numeric" do
+      @test_case.assert_statsd_increment('counter', tags: ['a', 'b']) do
+        StatsD.increment('counter', sample_rate: 'abc', tags:  ['a', 'b'])
+      end
+    end
+  end
+
   def test_nested_assertions
     assert_no_assertion_triggered do
       @test_case.assert_statsd_increment('counter1') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake