statsd-instrument 3.5.8 → 3.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 704d6e657601de493dc28e4a99f3d68529582693b7a74981a63a9837e99119e7
-  data.tar.gz: b801455560f15650dd460cd25cf3de3efde71ec180842016899b2d51896b4a78
+  metadata.gz: 58bc5f73b44ea7c3ac8268feaeb9defc2da36b9a7a5565cb11d34324f84f5381
+  data.tar.gz: 0d781d4945f02d7e1eb1bc89e68d647bac0b7062f7d26371b8aef95821080e06
 SHA512:
-  metadata.gz: 5a47689d821aeaab37d72af1021af0d1892d420bfbb3d75ded3f2318f73f16f2e36dde3706f82bf5c95b33b3669a028ceb11315f66fac6025c27da6da325ab59
-  data.tar.gz: 64388d0ec0a6a1107d455d54dc2b26d5a5caf26d7a1a6051ad117d2d4088cc1cb6527490f87bacd706a13be4d04f4146e3806fe7f5d5e2336f9f9e23ef8609ec
+  metadata.gz: 901993924629290a116505b73eea09c84dd422fb1fd96a274733e9b26223b73ec3087599b419e325c1e4728fd45f964bb2a800d881ae207fb90e84c4950e8e02
+  data.tar.gz: cdd79db9829b2317795330fba20238a122a04cfa15b65b53d2b910a50bb315d961bbcf1714a479c61adbf4a4a378272e71dd9132afe9607eaa96611b20ce332a

data/.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
         bundler-cache: true
 
     - name: Run Rubocop

data/CHANGELOG.md

@@ -6,6 +6,14 @@ section below.
 
 ## Unreleased changes
 
+## Version 3.5.10
+
+- Fix rubocop 1.30 compatibilitty
+
+## Version 3.5.9
+
+- Fix dynamic tags being evaluated only once.
+
 ## Version 3.5.8
 
 - Allow the `tag_error_class` option for `statsd_count_success` in strict mode.

data/Gemfile

@@ -8,6 +8,6 @@ gem "minitest"
 gem "rspec"
 gem "mocha"
 gem "yard"
-gem "rubocop", [">= 1.0", "< 1.30"] # TODO: Our cops are broken by rubocop 1.30, we need to figure out why
+gem "rubocop", ">= 1.0"
 gem "rubocop-shopify", require: false
 gem "benchmark-ips"

data/bin/rake

@@ -9,8 +9,10 @@
 #
 
 require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
+  "../../Gemfile",
+  Pathname.new(__FILE__).realpath,
+)
 
 bundle_binstub = File.expand_path("../bundle", __FILE__)
 

data/bin/rubocop

@@ -9,8 +9,10 @@
 #
 
 require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
+  "../../Gemfile",
+  Pathname.new(__FILE__).realpath,
+)
 
 bundle_binstub = File.expand_path("../bundle", __FILE__)
 

data/lib/statsd/instrument/batched_udp_sink.rb

@@ -10,14 +10,14 @@ module StatsD
       # https://docs.datadoghq.com/developers/dogstatsd/high_throughput/?code-lang=ruby#ensure-proper-packet-sizes
       DEFAULT_MAX_PACKET_SIZE = 1472
 
-      def self.for_addr(addr, **kwargs)
-        host, port_as_string = addr.split(":", 2)
-        new(host, Integer(port_as_string), **kwargs)
-      end
-
       attr_reader :host, :port
 
       class << self
+        def for_addr(addr, **kwargs)
+          host, port_as_string = addr.split(":", 2)
+          new(host, Integer(port_as_string), **kwargs)
+        end
+
         def finalize(dispatcher)
           proc { dispatcher.shutdown }
         end
@@ -122,7 +122,7 @@ module StatsD
 
             packet << next_datagram
             next_datagram = nil
-            unless packet.bytesize > @max_packet_size
+            if packet.bytesize <= @max_packet_size
               while (next_datagram = @buffer.pop_nonblock)
                 if @max_packet_size - packet.bytesize - 1 > next_datagram.bytesize
                   packet << NEWLINE << next_datagram

data/lib/statsd/instrument/client.rb

@@ -338,8 +338,14 @@ module StatsD
       #
       # @note Supported by the Datadog implementation only.
       def service_check(name, status, timestamp: nil, hostname: nil, tags: nil, message: nil, no_prefix: false)
-        emit(datagram_builder(no_prefix: no_prefix)._sc(name, status,
-          timestamp: timestamp, hostname: hostname, tags: tags, message: message))
+        emit(datagram_builder(no_prefix: no_prefix)._sc(
+          name,
+          status,
+          timestamp: timestamp,
+          hostname: hostname,
+          tags: tags,
+          message: message,
+        ))
       end
 
       # Emits an event. An event represents any record of activity noteworthy for engineers.
@@ -359,9 +365,17 @@ module StatsD
       def event(title, text, timestamp: nil, hostname: nil, aggregation_key: nil, priority: nil,
         source_type_name: nil, alert_type: nil, tags: nil, no_prefix: false)
 
-        emit(datagram_builder(no_prefix: no_prefix)._e(title, text, timestamp: timestamp,
-          hostname: hostname, tags: tags, aggregation_key: aggregation_key, priority: priority,
-          source_type_name: source_type_name, alert_type: alert_type))
+        emit(datagram_builder(no_prefix: no_prefix)._e(
+          title,
+          text,
+          timestamp: timestamp,
+          hostname: hostname,
+          tags: tags,
+          aggregation_key: aggregation_key,
+          priority: priority,
+          source_type_name: source_type_name,
+          alert_type: alert_type,
+        ))
       end
 
       # Instantiates a new StatsD client that uses the settings of the current client,
@@ -378,9 +392,13 @@ module StatsD
         default_tags: nil,
         datagram_builder_class: nil
       )
-        client = clone_with_options(sink: sink, prefix: prefix,
-          default_sample_rate: default_sample_rate, default_tags: default_tags,
-          datagram_builder_class: datagram_builder_class)
+        client = clone_with_options(
+          sink: sink,
+          prefix: prefix,
+          default_sample_rate: default_sample_rate,
+          default_tags: default_tags,
+          datagram_builder_class: datagram_builder_class,
+        )
 
         yield(client)
       end

data/lib/statsd/instrument/datagram.rb

@@ -40,7 +40,7 @@ module StatsD
       end
 
       def tags
-        @tags ||= parsed_datagram[:tags] ? parsed_datagram[:tags].split(",") : nil
+        @tags ||= parsed_datagram[:tags]&.split(",")
       end
 
       def inspect

data/lib/statsd/instrument/datagram_builder.rb

@@ -5,16 +5,18 @@ module StatsD
     # @note This class is part of the new Client implementation that is intended
     #   to become the new default in the next major release of this library.
     class DatagramBuilder
-      def self.unsupported_datagram_types(*types)
-        types.each do |type|
-          define_method(type) do |_, _, _, _|
-            raise NotImplementedError, "Type #{type} metrics are not supported by #{self.class.name}."
+      class << self
+        def unsupported_datagram_types(*types)
+          types.each do |type|
+            define_method(type) do |_, _, _, _|
+              raise NotImplementedError, "Type #{type} metrics are not supported by #{self.class.name}."
+            end
           end
         end
-      end
 
-      def self.datagram_class
-        StatsD::Instrument::Datagram
+        def datagram_class
+          StatsD::Instrument::Datagram
+        end
       end
 
       def initialize(prefix: nil, default_tags: nil)

data/lib/statsd/instrument/dogstatsd_datagram_builder.rb

@@ -7,10 +7,11 @@ module StatsD
     class DogStatsDDatagramBuilder < StatsD::Instrument::DatagramBuilder
       unsupported_datagram_types :kv
 
-      def self.datagram_class
-        StatsD::Instrument::DogStatsDDatagram
+      class << self
+        def datagram_class
+          StatsD::Instrument::DogStatsDDatagram
+        end
       end
-
       def latency_metric_type
         :d
       end

data/lib/statsd/instrument/helpers.rb

@@ -11,32 +11,34 @@ module StatsD
       # For backwards compatibility
       alias_method :capture_statsd_calls, :capture_statsd_datagrams
 
-      def self.add_tag(tags, key, value)
-        tags = tags.dup || {}
-
-        if tags.is_a?(String)
-          tags = tags.empty? ? "#{key}:#{value}" : "#{tags},#{key}:#{value}"
-        elsif tags.is_a?(Array)
-          tags << "#{key}:#{value}"
-        elsif tags.is_a?(Hash)
-          tags[key] = value
-        else
-          raise ArgumentError, "add_tag only supports string, array or hash, #{tags.class} provided"
+      class << self
+        def add_tag(tags, key, value)
+          tags = tags.dup || {}
+
+          if tags.is_a?(String)
+            tags = tags.empty? ? "#{key}:#{value}" : "#{tags},#{key}:#{value}"
+          elsif tags.is_a?(Array)
+            tags << "#{key}:#{value}"
+          elsif tags.is_a?(Hash)
+            tags[key] = value
+          else
+            raise ArgumentError, "add_tag only supports string, array or hash, #{tags.class} provided"
+          end
+
+          tags
         end
 
-        tags
-      end
-
-      def self.prefix_metric(metric_name, client: nil)
-        client ||= StatsD.singleton_client
-        client&.prefix ? "#{client.prefix}.#{metric_name}" : metric_name
-      end
+        def prefix_metric(metric_name, client: nil)
+          client ||= StatsD.singleton_client
+          client&.prefix ? "#{client.prefix}.#{metric_name}" : metric_name
+        end
 
-      def self.prefixed_metric?(metric_name, client: nil)
-        client ||= StatsD.singleton_client
-        return false unless client&.prefix
+        def prefixed_metric?(metric_name, client: nil)
+          client ||= StatsD.singleton_client
+          return false unless client&.prefix
 
-        metric_name =~ /\A#{Regexp.escape(client.prefix)}\./
+          metric_name =~ /\A#{Regexp.escape(client.prefix)}\./
+        end
       end
     end
   end

data/lib/statsd/instrument/rubocop/measure_as_dist_argument.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require_relative "../rubocop" unless defined?(RuboCop::Cop::StatsD)
 

data/lib/statsd/instrument/rubocop/metaprogramming_positional_arguments.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require_relative "../rubocop" unless defined?(RuboCop::Cop::StatsD)
 

data/lib/statsd/instrument/rubocop/metric_prefix_argument.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require_relative "../rubocop" unless defined?(RuboCop::Cop::StatsD)
 

data/lib/statsd/instrument/rubocop/metric_return_value.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require_relative "../rubocop" unless defined?(RuboCop::Cop::StatsD)
 

data/lib/statsd/instrument/rubocop/metric_value_keyword_argument.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require_relative "../rubocop" unless defined?(RuboCop::Cop::StatsD)
 

data/lib/statsd/instrument/rubocop/positional_arguments.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require_relative "../rubocop" unless defined?(RuboCop::Cop::StatsD)
 
@@ -14,7 +14,8 @@ module RuboCop
       #       --only StatsD/PositionalArguments
       #
       # This cop can autocorrect some offenses it finds, but not all of them.
-      class PositionalArguments < Cop
+      class PositionalArguments < Base
+        extend AutoCorrector
         include RuboCop::Cop::StatsD
 
         MSG = "Use keyword arguments for StatsD calls"
@@ -31,7 +32,9 @@ module RuboCop
           if metric_method?(node) && node.arguments.length >= 3
             case node.arguments[2].type
             when *REFUSED_ARGUMENT_TYPES
-              add_offense(node)
+              add_offense(node) do |corrector|
+                autocorrect(corrector, node)
+              end
             when *ACCEPTED_ARGUMENT_TYPES
               nil
             else
@@ -40,57 +43,56 @@ module RuboCop
           end
         end
 
-        def autocorrect(node)
-          ->(corrector) do
-            positional_arguments = if node.arguments.last.type == :block_pass
-              node.arguments[2...node.arguments.length - 1]
-            else
-              node.arguments[2...node.arguments.length]
-            end
+        def autocorrect(corrector, node)
+          positional_arguments = if node.arguments.last.type == :block_pass
+            node.arguments[2...node.arguments.length - 1]
+          else
+            node.arguments[2...node.arguments.length]
+          end
 
-            case positional_arguments[0].type
-            when *UNKNOWN_ARGUMENT_TYPES
-              # We don't know whether the method returns a hash, in which case it would be interpreted
-              # as keyword arguments. In this case, the fix would be to add a keyword splat:
-              #
-              # `StatsD.instrument('foo', 1, method_call)`
-              # => `StatsD.instrument('foo', 1, **method_call)`
-              #
-              # However, it's also possible this method returns a sample rate, in which case the fix
-              # above will not do the right thing.
-              #
-              # `StatsD.instrument('foo', 1, SAMPLE_RATE_CONSTANT)`
-              # => `StatsD.instrument('foo', 1, sample_rate: SAMPLE_RATE_CONSTANT)`
-              #
-              # Because of this, we will not auto-correct and let the user fix the issue manually.
-              return
+          case positional_arguments[0].type
+          when *UNKNOWN_ARGUMENT_TYPES
+            # We don't know whether the method returns a hash, in which case it would be interpreted
+            # as keyword arguments. In this case, the fix would be to add a keyword splat:
+            #
+            # `StatsD.instrument('foo', 1, method_call)`
+            # => `StatsD.instrument('foo', 1, **method_call)`
+            #
+            # However, it's also possible this method returns a sample rate, in which case the fix
+            # above will not do the right thing.
+            #
+            # `StatsD.instrument('foo', 1, SAMPLE_RATE_CONSTANT)`
+            # => `StatsD.instrument('foo', 1, sample_rate: SAMPLE_RATE_CONSTANT)`
+            #
+            # Because of this, we will not auto-correct and let the user fix the issue manually.
+            nil
 
-            when *POSITIONAL_ARGUMENT_TYPES
-              value_argument = node.arguments[1]
-              from = value_argument.source_range.end_pos
-              to = positional_arguments.last.source_range.end_pos
-              range = Parser::Source::Range.new(node.source_range.source_buffer, from, to)
-              corrector.remove(range)
+          when *POSITIONAL_ARGUMENT_TYPES
+            value_argument = node.arguments[1]
+            from = value_argument.source_range.end_pos
+            to = positional_arguments.last.source_range.end_pos
+            range = Parser::Source::Range.new(node.source_range.source_buffer, from, to)
+            corrector.remove(range)
 
-              keyword_arguments = []
-              sample_rate = positional_arguments[0]
-              if sample_rate && sample_rate.type != :nil
-                keyword_arguments << "sample_rate: #{sample_rate.source}"
-              end
+            keyword_arguments = []
+            sample_rate = positional_arguments[0]
+            if sample_rate && sample_rate.type != :nil
+              keyword_arguments << "sample_rate: #{sample_rate.source}"
+            end
 
-              tags = positional_arguments[1]
-              if tags && tags.type != :nil
-                keyword_arguments << if tags.type == :hash && tags.source[0] != "{"
-                  "tags: { #{tags.source} }"
-                else
-                  "tags: #{tags.source}"
-                end
+            tags = positional_arguments[1]
+            if tags && tags.type != :nil
+              keyword_arguments << if tags.type == :hash && tags.source[0] != "{"
+                "tags: { #{tags.source} }"
+              else
+                "tags: #{tags.source}"
               end
+            end
 
-              unless keyword_arguments.empty?
-                corrector.insert_after(value_argument.source_range, ", #{keyword_arguments.join(", ")}")
-              end
+            unless keyword_arguments.empty?
+              corrector.insert_after(value_argument.source_range, ", #{keyword_arguments.join(", ")}")
             end
+
           end
         end
       end

data/lib/statsd/instrument/rubocop/singleton_configuration.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require_relative "../rubocop" unless defined?(RuboCop::Cop::StatsD)
 

data/lib/statsd/instrument/rubocop/splat_arguments.rb

@@ -1,4 +1,4 @@
-# frozen-string-literal: true
+# frozen_string_literal: true
 
 require_relative "../rubocop" unless defined?(RuboCop::Cop::StatsD)
 

data/lib/statsd/instrument/rubocop.rb

@@ -5,11 +5,24 @@ module RuboCop
     module StatsD
       METRIC_METHODS = [:increment, :gauge, :measure, :set, :histogram, :distribution, :key_value]
 
-      METAPROGRAMMING_METHODS = [:statsd_measure, :statsd_distribution, :statsd_count_success, :statsd_count_if,
-                                 :statsd_count,]
+      METAPROGRAMMING_METHODS = [
+        :statsd_measure,
+        :statsd_distribution,
+        :statsd_count_success,
+        :statsd_count_if,
+        :statsd_count,
+      ]
 
-      SINGLETON_CONFIGURATION_METHODS = [:backend, :"backend=", :prefix, :"prefix=", :default_tags, :"default_tags=",
-                                         :default_sample_rate, :"default_sample_rate=",]
+      SINGLETON_CONFIGURATION_METHODS = [
+        :backend,
+        :"backend=",
+        :prefix,
+        :"prefix=",
+        :default_tags,
+        :"default_tags=",
+        :default_sample_rate,
+        :"default_sample_rate=",
+      ]
 
       private
 

data/lib/statsd/instrument/udp_sink.rb

@@ -5,9 +5,11 @@ module StatsD
     # @note This class is part of the new Client implementation that is intended
     #   to become the new default in the next major release of this library.
     class UDPSink
-      def self.for_addr(addr)
-        host, port_as_string = addr.split(":", 2)
-        new(host, Integer(port_as_string))
+      class << self
+        def for_addr(addr)
+          host, port_as_string = addr.split(":", 2)
+          new(host, Integer(port_as_string))
+        end
       end
 
       attr_reader :host, :port

data/lib/statsd/instrument/version.rb

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

data/lib/statsd/instrument.rb

@@ -27,42 +27,44 @@ module StatsD
       end
     end
 
-    # Generates a metric name for an instrumented method.
-    # @private
-    # @return [String]
-    def self.generate_metric_name(name, callee, *args)
-      name.respond_to?(:call) ? name.call(callee, args).gsub("::", ".") : name.gsub("::", ".")
-    end
+    class << self
+      # Generates a metric name for an instrumented method.
+      # @private
+      # @return [String]
+      def generate_metric_name(name, callee, *args)
+        name.respond_to?(:call) ? name.call(callee, args).gsub("::", ".") : name.gsub("::", ".")
+      end
 
-    # Generates the tags for an instrumented method.
-    # @private
-    # @return [Array[String]]
-    def self.generate_tags(tags, callee, *args)
-      return if tags.nil?
+      # Generates the tags for an instrumented method.
+      # @private
+      # @return [Array[String]]
+      def generate_tags(tags, callee, *args)
+        return if tags.nil?
 
-      tags.respond_to?(:call) ? tags.call(callee, args) : tags
-    end
+        tags.respond_to?(:call) ? tags.call(callee, args) : tags
+      end
 
-    # Even though this method is considered private, and is no longer used internally,
-    # applications in the wild rely on it. As a result, we cannot remove this method
-    # until the next major version.
-    #
-    # @deprecated Use Process.clock_gettime(Process::CLOCK_MONOTONIC) instead.
-    def self.current_timestamp
-      Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    end
+      # Even though this method is considered private, and is no longer used internally,
+      # applications in the wild rely on it. As a result, we cannot remove this method
+      # until the next major version.
+      #
+      # @deprecated Use Process.clock_gettime(Process::CLOCK_MONOTONIC) instead.
+      def current_timestamp
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
 
-    # Even though this method is considered private, and is no longer used internally,
-    # applications in the wild rely on it. As a result, we cannot remove this method
-    # until the next major version.
-    #
-    # @deprecated You can implement similar functionality yourself using
-    #   `Process.clock_gettime(Process::CLOCK_MONOTONIC)`. Think about what will
-    #   happen if an exception happens during the block execution though.
-    def self.duration
-      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      yield
-      Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+      # Even though this method is considered private, and is no longer used internally,
+      # applications in the wild rely on it. As a result, we cannot remove this method
+      # until the next major version.
+      #
+      # @deprecated You can implement similar functionality yourself using
+      #   `Process.clock_gettime(Process::CLOCK_MONOTONIC)`. Think about what will
+      #   happen if an exception happens during the block execution though.
+      def duration
+        start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        yield
+        Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+      end
     end
 
     # Adds execution duration instrumentation to a method as a timing.
@@ -79,8 +81,8 @@ module StatsD
         define_method(method) do |*args, &block|
           client ||= StatsD.singleton_client
           key = StatsD::Instrument.generate_metric_name(name, self, *args)
-          tags = StatsD::Instrument.generate_tags(tags, self, *args)
-          client.measure(key, sample_rate: sample_rate, tags: tags, no_prefix: no_prefix) do
+          generated_tags = StatsD::Instrument.generate_tags(tags, self, *args)
+          client.measure(key, sample_rate: sample_rate, tags: generated_tags, no_prefix: no_prefix) do
             super(*args, &block)
           end
         end
@@ -100,8 +102,8 @@ module StatsD
         define_method(method) do |*args, &block|
           client ||= StatsD.singleton_client
           key = StatsD::Instrument.generate_metric_name(name, self, *args)
-          tags = StatsD::Instrument.generate_tags(tags, self, *args)
-          client.distribution(key, sample_rate: sample_rate, tags: tags, no_prefix: no_prefix) do
+          generated_tags = StatsD::Instrument.generate_tags(tags, self, *args)
+          client.distribution(key, sample_rate: sample_rate, tags: generated_tags, no_prefix: no_prefix) do
             super(*args, &block)
           end
         end
@@ -145,10 +147,10 @@ module StatsD
           client ||= StatsD.singleton_client
           suffix = truthiness == false ? "failure" : "success"
           key = StatsD::Instrument.generate_metric_name(name, self, *args)
-          tags = StatsD::Instrument.generate_tags(tags, self, *args)
-          tags = Helpers.add_tag(tags, :error_class, error.class.name) if tag_error_class && error
+          generated_tags = StatsD::Instrument.generate_tags(tags, self, *args)
+          generated_tags = Helpers.add_tag(generated_tags, :error_class, error.class.name) if tag_error_class && error
 
-          client.increment("#{key}.#{suffix}", sample_rate: sample_rate, tags: tags, no_prefix: no_prefix)
+          client.increment("#{key}.#{suffix}", sample_rate: sample_rate, tags: generated_tags, no_prefix: no_prefix)
         end
       end
     end
@@ -185,8 +187,8 @@ module StatsD
           if truthiness
             client ||= StatsD.singleton_client
             key = StatsD::Instrument.generate_metric_name(name, self, *args)
-            tags = StatsD::Instrument.generate_tags(tags, self, *args)
-            client.increment(key, sample_rate: sample_rate, tags: tags, no_prefix: no_prefix)
+            generated_tags = StatsD::Instrument.generate_tags(tags, self, *args)
+            client.increment(key, sample_rate: sample_rate, tags: generated_tags, no_prefix: no_prefix)
           end
         end
       end
@@ -206,8 +208,8 @@ module StatsD
         define_method(method) do |*args, &block|
           client ||= StatsD.singleton_client
           key = StatsD::Instrument.generate_metric_name(name, self, *args)
-          tags = StatsD::Instrument.generate_tags(tags, self, *args)
-          client.increment(key, sample_rate: sample_rate, tags: tags, no_prefix: no_prefix)
+          generated_tags = StatsD::Instrument.generate_tags(tags, self, *args)
+          client.increment(key, sample_rate: sample_rate, tags: generated_tags, no_prefix: no_prefix)
           super(*args, &block)
         end
       end
@@ -294,7 +296,12 @@ module StatsD
       if instrumentation_module.respond_to?(:ruby2_keywords, true)
         instrumentation_module.send(:ruby2_keywords, method)
       end
-      prepend(instrumentation_module) unless self < instrumentation_module
+
+      if self < instrumentation_module
+        return
+      end
+
+      prepend(instrumentation_module)
     end
 
     def remove_from_method(method, name, action)
@@ -358,8 +365,15 @@ module StatsD
     # @!method service_check(name, status, tags: nil, hostname: nil, timestamp: nil, message: nil)
     #   (see StatsD::Instrument::Client#service_check)
 
-    def_delegators :singleton_client, :increment, :gauge, :set, :measure,
-      :histogram, :distribution, :event, :service_check
+    def_delegators :singleton_client,
+      :increment,
+      :gauge,
+      :set,
+      :measure,
+      :histogram,
+      :distribution,
+      :event,
+      :service_check
 
     private
 
@@ -385,6 +399,6 @@ require "statsd/instrument/environment"
 require "statsd/instrument/helpers"
 require "statsd/instrument/assertions"
 require "statsd/instrument/expectation"
-require "statsd/instrument/matchers" if defined?(::RSpec)
-require "statsd/instrument/railtie" if defined?(::Rails::Railtie)
+require "statsd/instrument/matchers" if defined?(RSpec)
+require "statsd/instrument/railtie" if defined?(Rails::Railtie)
 require "statsd/instrument/strict" if ENV["STATSD_STRICT_MODE"]

data/test/assertions_test.rb

@@ -89,7 +89,7 @@ class AssertionsTest < Minitest::Test
     assert_equal(assertion.message, "No StatsD calls for metric prefix.counter expected.")
 
     @test_case.expects(:warn).with(
-      "`assert_no_statsd_calls` will prefix metrics by default. `prefix.counter` skipped due to existing prefix."
+      "`assert_no_statsd_calls` will prefix metrics by default. `prefix.counter` skipped due to existing prefix.",
     )
     assertion = assert_raises(Minitest::Assertion) do
       @test_case.assert_no_statsd_calls("prefix.counter", client: client) do

data/test/client_test.rb

@@ -48,8 +48,12 @@ class ClientTest < Minitest::Test
       "STATSD_IMPLEMENTATION" => "statsd",
       "STATSD_ADDR" => "1.2.3.4:8125",
     )
-    client = StatsD::Instrument::Client.from_env(env,
-      prefix: "bar", implementation: "dogstatsd", sink: StatsD::Instrument::NullSink.new)
+    client = StatsD::Instrument::Client.from_env(
+      env,
+      prefix: "bar",
+      implementation: "dogstatsd",
+      sink: StatsD::Instrument::NullSink.new,
+    )
 
     assert_equal(0.1, client.default_sample_rate)
     assert_equal("bar", client.prefix)

data/test/dogstatsd_datagram_builder_test.rb

@@ -21,8 +21,14 @@ class DogStatsDDatagramBuilderTest < Minitest::Test
   end
 
   def test_complex_service_check
-    datagram = @datagram_builder._sc("service", :warning, timestamp: Time.parse("2019-09-30T04:22:12Z"),
-      hostname: "localhost", tags: { foo: "bar|baz" }, message: "blah")
+    datagram = @datagram_builder._sc(
+      "service",
+      :warning,
+      timestamp: Time.parse("2019-09-30T04:22:12Z"),
+      hostname: "localhost",
+      tags: { foo: "bar|baz" },
+      message: "blah",
+    )
     assert_equal("_sc|service|1|h:localhost|d:1569817332|#foo:barbaz|m:blah", datagram)
 
     parsed_datagram = StatsD::Instrument::DogStatsDDatagramBuilder.datagram_class.new(datagram)
@@ -46,11 +52,22 @@ class DogStatsDDatagramBuilderTest < Minitest::Test
   end
 
   def test_complex_event
-    datagram = @datagram_builder._e("testing", "with\nnewline", timestamp: Time.parse("2019-09-30T04:22:12Z"),
-      hostname: "localhost", aggregation_key: "my-key", priority: "low", source_type_name: "source",
-      alert_type: "success", tags: { foo: "bar|baz" })
-    assert_equal('_e{7,13}:testing|with\\nnewline|h:localhost|d:1569817332|k:my-key|' \
-      "p:low|s:source|t:success|#foo:barbaz", datagram)
+    datagram = @datagram_builder._e(
+      "testing",
+      "with\nnewline",
+      timestamp: Time.parse("2019-09-30T04:22:12Z"),
+      hostname: "localhost",
+      aggregation_key: "my-key",
+      priority: "low",
+      source_type_name: "source",
+      alert_type: "success",
+      tags: { foo: "bar|baz" },
+    )
+    assert_equal(
+      '_e{7,13}:testing|with\\nnewline|h:localhost|d:1569817332|k:my-key|' \
+        "p:low|s:source|t:success|#foo:barbaz",
+      datagram,
+    )
 
     parsed_datagram = StatsD::Instrument::DogStatsDDatagramBuilder.datagram_class.new(datagram)
     assert_equal(:_e, parsed_datagram.type)

data/test/helpers/rubocop_helper.rb

@@ -12,13 +12,13 @@ module RubocopHelper
   private_constant :RUBY_VERSION
 
   def assert_no_offenses(source)
-    investigate(RuboCop::ProcessedSource.new(source, RUBY_VERSION, nil))
-    assert_predicate(cop.offenses, :empty?, "Did not expect Rubocop to find offenses")
+    report = investigate(RuboCop::ProcessedSource.new(source, RUBY_VERSION, nil))
+    assert_predicate(report.offenses, :empty?, "Did not expect Rubocop to find offenses")
   end
 
   def assert_offense(source)
-    investigate(RuboCop::ProcessedSource.new(source, RUBY_VERSION, nil))
-    refute_predicate(cop.offenses, :empty?, "Expected Rubocop to find offenses")
+    report = investigate(RuboCop::ProcessedSource.new(source, RUBY_VERSION, nil))
+    refute_predicate(report.offenses, :empty?, "Expected Rubocop to find offenses")
   end
 
   def assert_no_autocorrect(source)
@@ -29,13 +29,27 @@ module RubocopHelper
   def autocorrect_source(source)
     RuboCop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {}
     RuboCop::Formatter::DisabledConfigFormatter.detected_styles = {}
-    cop.instance_variable_get(:@options)[:auto_correct] = true
+    cop.instance_variable_get(:@options)[:autocorrect] = true
+    cop.instance_variable_get(:@options)[:raise_error] = true
 
     processed_source = RuboCop::ProcessedSource.new(source, RUBY_VERSION, nil)
-    investigate(processed_source)
+    report = investigate(processed_source)
+    corrector = RuboCop::Cop::Legacy::Corrector.new(
+      processed_source.buffer,
+      correctors(report),
+    )
+    corrector.process
+  end
+
+  def correctors(report)
+    correctors = report.correctors.reject(&:nil?)
+    if correctors.empty?
+      return []
+    end
 
-    corrector = RuboCop::Cop::Legacy::Corrector.new(processed_source.buffer, cop.corrections)
-    corrector.rewrite
+    corrections_proxy = RuboCop::Cop::Legacy::CorrectionsProxy.new(correctors.first)
+    correctors.drop(1).each { |c| corrections_proxy.concat(c) }
+    corrections_proxy
   end
 
   def investigate(processed_source)
@@ -43,8 +57,7 @@ module RubocopHelper
       instances << klass.new([cop])
     end
 
-    commissioner = RuboCop::Cop::Commissioner.new([cop], forces, raise_error: true)
+    commissioner = RuboCop::Cop::Commissioner.new([cop], forces)
     commissioner.investigate(processed_source)
-    commissioner
   end
 end

data/test/statsd_instrumentation_test.rb

@@ -28,8 +28,10 @@ class StatsDInstrumentationTest < Minitest::Test
         false
       end
 
-      def self.sync
-        true
+      class << self
+        def sync
+          true
+        end
       end
     end
 
@@ -231,6 +233,9 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_increment("subgateway.foo", tags: { "key": "foo" }) do
       GatewaySubClass.new.purchase("foo")
     end
+    assert_statsd_increment("subgateway.bar", tags: { "key": "bar" }) do
+      GatewaySubClass.new.purchase("bar")
+    end
   ensure
     ActiveMerchant::Gateway.statsd_remove_count(:ssl_post, metric_namer)
   end
@@ -243,6 +248,9 @@ class StatsDInstrumentationTest < Minitest::Test
     assert_statsd_increment("subgateway.foo", tags: { "key": "foo" }) do
       GatewaySubClass.new.purchase("foo")
     end
+    assert_statsd_increment("subgateway.bar", tags: { "key": "bar" }) do
+      GatewaySubClass.new.purchase("bar")
+    end
   ensure
     ActiveMerchant::Gateway.statsd_remove_count(:ssl_post, metric_namer)
   end
@@ -411,8 +419,12 @@ class StatsDInstrumentationTest < Minitest::Test
   def test_statsd_macro_can_disable_prefix
     client = StatsD::Instrument::Client.new(prefix: "foo")
     ActiveMerchant::Gateway.singleton_class.extend(StatsD::Instrument)
-    ActiveMerchant::Gateway.singleton_class.statsd_count_success(:sync,
-      "ActiveMerchant.Gateway.sync", no_prefix: true, client: client)
+    ActiveMerchant::Gateway.singleton_class.statsd_count_success(
+      :sync,
+      "ActiveMerchant.Gateway.sync",
+      no_prefix: true,
+      client: client,
+    )
 
     datagrams = client.capture { ActiveMerchant::Gateway.sync }
     assert_equal(1, datagrams.length)

data/test/test_helper.rb

@@ -15,9 +15,11 @@ require_relative "helpers/rubocop_helper"
 
 module StatsD
   module Instrument
-    def self.strict_mode_enabled?
-      StatsD::Instrument.const_defined?(:Strict) &&
-        StatsD.singleton_class.ancestors.include?(StatsD::Instrument::Strict)
+    class << self
+      def strict_mode_enabled?
+        StatsD::Instrument.const_defined?(:Strict) &&
+          StatsD.singleton_class.ancestors.include?(StatsD::Instrument::Strict)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 3.5.8
+  version: 3.5.10
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-06-05 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.12
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: A StatsD client for Ruby apps