statsd-instrument 2.3.0.beta4 → 2.3.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e554f96249614fda4598c73f8a374eb17d53aac
-  data.tar.gz: 0d2b774c6545501caf5a4e8a2c254a68fea40239
+  metadata.gz: 3778ad062c094c39ea30a024aea34b09399966d1
+  data.tar.gz: b7f1fa108b6125fb48778520abc947ce149e2317
 SHA512:
-  metadata.gz: 35310f0da894755a60b5517d8d555169805eb2e27c789c79d8a36fe8f87a0e7e14183814f6c81d4734338f4384ed329c6a9041df21f573b95e9c1d1e60ec9f55
-  data.tar.gz: 4c146f7e47bd0b181c3844e126fa8b0760ad6f6dd91f979cf83be422ac58e89bc9cb9e43744aa5a6096e592d5a5b43ed56688bbbf921bd5b80fba06f2dc9029a
+  metadata.gz: 143d81f6dfe35e31b3faf1d69007792b2498ef553148ed61e1eb357c170b2990ceba09d27e2b58c078d6cfd0d8c1d78fbc999f377d6142ff2d599f21b44b7058
+  data.tar.gz: 03c3d70cae11a1a9f92e6160b09c51fd23e275c485cb37bc468447b9ec4665431f83a1ca96ea5f4fc498ba80891573bc002ddb2a93e81353d92e18c264d95971

data/lib/statsd/instrument.rb

@@ -313,7 +313,8 @@ module StatsD
     result = nil
     value  = 1000 * StatsD::Instrument.duration { result = block.call } if block_given?
     metric = collect_metric(type, key, value, metric_options)
-    (result || metric)
+    result = metric unless block_given?
+    result
   end
 
   # Emits a counter metric.
@@ -375,7 +376,8 @@ module StatsD
     result = nil
     value  = 1000 * StatsD::Instrument.duration { result = block.call } if block_given?
     metric = collect_metric(:d, key, value, metric_options)
-    (result || metric)
+    result = metric unless block_given?
+    result
   end
 
   # Emits a key/value metric.

data/lib/statsd/instrument/version.rb

@@ -1,5 +1,5 @@
 module StatsD
   module Instrument
-    VERSION = "2.3.0.beta4"
+    VERSION = "2.3.0.beta5"
   end
 end

data/test/statsd_test.rb

@@ -65,6 +65,11 @@ class StatsDTest < Minitest::Test
     assert_equal 'sarah', return_value
   end
 
+  def test_statsd_measure_returns_return_value_of_block_even_if_nil
+    return_value = StatsD.measure('values.foobar', as_dist: true) { nil }
+    assert_nil return_value
+  end
+
   def test_statsd_increment
     result = nil
     metric = capture_statsd_call { result = StatsD.increment('values.foobar', 3) }
@@ -168,6 +173,11 @@ class StatsDTest < Minitest::Test
     assert_equal 'sarah', return_value
   end
 
+  def test_statsd_measure_returns_return_value_of_block_even_if_nil
+    return_value = StatsD.distribution('values.foobar') { nil }
+    assert_nil return_value
+  end
+
   def test_statsd_key_value
     result = nil
     metric = capture_statsd_call { result = StatsD.key_value('values.foobar', 42) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.3.0.beta4
+  version: 2.3.0.beta5
 platform: ruby
 authors:
 - Jesse Storimer