statsd-instrument 3.5.10 → 3.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58bc5f73b44ea7c3ac8268feaeb9defc2da36b9a7a5565cb11d34324f84f5381
-  data.tar.gz: 0d781d4945f02d7e1eb1bc89e68d647bac0b7062f7d26371b8aef95821080e06
+  metadata.gz: c9124bb941a7f03e9d64ea7969fb4b2f47b44bae2ca4ec56fe3f0653bb3df8a4
+  data.tar.gz: a70c8e54c4cbd9e5b24981c613ca674d89deb2ba8b7087447ee0cc56faf4d5d9
 SHA512:
-  metadata.gz: 901993924629290a116505b73eea09c84dd422fb1fd96a274733e9b26223b73ec3087599b419e325c1e4728fd45f964bb2a800d881ae207fb90e84c4950e8e02
-  data.tar.gz: cdd79db9829b2317795330fba20238a122a04cfa15b65b53d2b910a50bb315d961bbcf1714a479c61adbf4a4a378272e71dd9132afe9607eaa96611b20ce332a
+  metadata.gz: 20a8b1a8308e5dd2862b367e0e3321b9255039c1887d9830a608812eadc2f29e4b6f916b3245293b7d200ac148f89179712492a024fb2bedd3e36887eb20c0bb
+  data.tar.gz: 797ca0e4d0f22ed3cbe87acae0fba3a434c36b8b5059bfb7808c93498c0e028ee9b64af1f4b3e06e796e36ba8053109c66ed4c619de7fb672107818bda7024b5

data/CHANGELOG.md

@@ -6,6 +6,10 @@ section below.
 
 ## Unreleased changes
 
+## Version 3.5.11
+
+- Fix a bug where passing `nil` to `clone_with_options` did not overwrite existing values
+
 ## Version 3.5.10
 
 - Fix rubocop 1.30 compatibilitty

data/lib/statsd/instrument/client.rb

@@ -378,6 +378,8 @@ module StatsD
         ))
       end
 
+      NO_CHANGE = Object.new
+
       # Instantiates a new StatsD client that uses the settings of the current client,
       # except for the provided overrides.
       #
@@ -386,11 +388,11 @@ module StatsD
       #   will be disposed after the block returns
       # @return The return value of the block will be passed on as return value.
       def with_options(
-        sink: nil,
-        prefix: nil,
-        default_sample_rate: nil,
-        default_tags: nil,
-        datagram_builder_class: nil
+        sink: NO_CHANGE,
+        prefix: NO_CHANGE,
+        default_sample_rate: NO_CHANGE,
+        default_tags: NO_CHANGE,
+        datagram_builder_class: NO_CHANGE
       )
         client = clone_with_options(
           sink: sink,
@@ -404,18 +406,19 @@ module StatsD
       end
 
       def clone_with_options(
-        sink: nil,
-        prefix: nil,
-        default_sample_rate: nil,
-        default_tags: nil,
-        datagram_builder_class: nil
+        sink: NO_CHANGE,
+        prefix: NO_CHANGE,
+        default_sample_rate: NO_CHANGE,
+        default_tags: NO_CHANGE,
+        datagram_builder_class: NO_CHANGE
       )
         self.class.new(
-          sink: sink || @sink,
-          prefix: prefix || @prefix,
-          default_sample_rate: default_sample_rate || @default_sample_rate,
-          default_tags: default_tags || @default_tags,
-          datagram_builder_class: datagram_builder_class || @datagram_builder_class,
+          sink: sink == NO_CHANGE ? @sink : sink,
+          prefix: prefix == NO_CHANGE ? @prefix : prefix,
+          default_sample_rate: default_sample_rate == NO_CHANGE ? @default_sample_rate : default_sample_rate,
+          default_tags: default_tags == NO_CHANGE ? @default_tags : default_tags,
+          datagram_builder_class:
+            datagram_builder_class == NO_CHANGE ? @datagram_builder_class : datagram_builder_class,
         )
       end
 

data/lib/statsd/instrument/rubocop.rb

@@ -51,7 +51,7 @@ module RuboCop
       end
 
       def keyword_arguments(node)
-        return nil if node.arguments.empty?
+        return if node.arguments.empty?
 
         last_argument = if node.arguments.last&.type == :block_pass
           node.arguments[node.arguments.length - 2]

data/lib/statsd/instrument/version.rb

@@ -2,6 +2,6 @@
 
 module StatsD
   module Instrument
-    VERSION = "3.5.10"
+    VERSION = "3.5.11"
   end
 end

data/test/client_test.rb

@@ -223,4 +223,18 @@ class ClientTest < Minitest::Test
     original_client.increment("metric")
     client_with_other_options.increment("metric")
   end
+
+  def test_clone_can_remove_prefix
+    # Both clients will use the same sink.
+    mock_sink = mock("sink")
+    mock_sink.stubs(:sample?).returns(true)
+    mock_sink.expects(:<<).with("foo.metric:1|c").returns(mock_sink)
+    mock_sink.expects(:<<).with("metric:1|c").returns(mock_sink)
+
+    original_client = StatsD::Instrument::Client.new(sink: mock_sink, prefix: "foo")
+    client_with_other_options = original_client.clone_with_options(prefix: nil)
+
+    original_client.increment("metric")
+    client_with_other_options.increment("metric")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 3.5.10
+  version: 3.5.11
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies: []
 description: A StatsD client for Ruby apps. Provides metaprogramming methods to inject
   StatsD instrumentation into your code.
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.17
 signing_key: 
 specification_version: 4
 summary: A StatsD client for Ruby apps