statsd-instrument 2.9.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28a52ac92cfb09e796f1eb8af9fde1a701255e61ac7377d32a7f6e92569c0e05
-  data.tar.gz: bae7f0b29a3ce2ed62486a0866e592ca29ac5d18c11ad0815e7cb71991de50a8
+  metadata.gz: 9e941d77f1b0893b2a919f8c36e902e119c657338e6a4e8b45fc5eaa7b5a05a3
+  data.tar.gz: f80105adf47e4379a59716bd7bb46080db3ed9751edf9ef21ef64689ce39920a
 SHA512:
-  metadata.gz: 87f9772a163d3ed4f400203f83db6c39dc946b75e21288fdd7a6ab7aa5b43646fcfa2fd3564d61b2795d192bcc82ae196dc1ec765d465b098620b9bcaf05c013
-  data.tar.gz: d74cc5375319064d64e23e8fd1a6bf7583781783d296c12fb1ae233e45ddaecff8dd4bbfa9c1bf912fcd48daacb8f47511b019d4bf26b74a2ca235267054012b
+  metadata.gz: 3518393ed260edb75f138168afad1e0f1cbd604bf12511dd73596b84d1721d0008cae138cfdef03291895bd4f8b861dd18b641dcfda093e84976a0d446da5bd3
+  data.tar.gz: 4fd2bc2646b88b497802103eaed1538234e37619ef35363ed061b43ce100dd4d59f03de037b5b766c46e8937b7c926fbba2a0dba7f10d5610fae43e2c31f17f2

data/.github/workflows/ci.yml

@@ -4,24 +4,17 @@ on: push
 
 jobs:
   test:
-    name: Ruby ${{ matrix.ruby }} on ${{ matrix.platform }}
-    runs-on: ${{ matrix.platform }}
+    name: Ruby ${{ matrix.ruby }} on ubuntu-18.04
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        # Windows started failing on the following command for some reason.
-        #
-        #     gem install bundler && bundle install --jobs 4 --retry 3
-        #                         ~~
-        #     The token '&&' is not a valid statement separator in this version.
-        #
-        # Temporarily disable Windows builds to unblock CI.
-        #
-        # platform: [ubuntu-18.04, windows-2019, macOS-10.14]
-        platform: [ubuntu-18.04, macOS-10.14]
-        ruby: [2.3, 2.4, 2.5, 2.6]
-
-        exclude:
+        # Windows on macOS builds started failing, so they are disabled for noew
+
+        ruby: [2.4, 2.5, 2.6]
+        # platform: [windows-2019, macOS-10.14, ubuntu-18.04]
+
+        # exclude:
         # The Windows environment does not support older Ruby versions. We only test against the latest version
         # - platform: windows-2019
         #   ruby: 2.3
@@ -31,12 +24,12 @@ jobs:
         #   ruby: 2.5
 
         # On macOS, we only test against the Ruby version macOS ships with (2.3)
-        - platform: macOS-10.14
-          ruby: 2.4
-        - platform: macOS-10.14
-          ruby: 2.5
-        - platform: macOS-10.14
-          ruby: 2.6
+        # - platform: macOS-10.14
+        #   ruby: 2.4
+        # - platform: macOS-10.14
+        #   ruby: 2.5
+        # - platform: macOS-10.14
+        #   ruby: 2.6
 
     steps:
     - uses: actions/checkout@v1

data/.rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml

@@ -20,7 +20,7 @@ Style/Alias:
   - prefer_alias
   - prefer_alias_method
 
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: key
   EnforcedColonStyle: key
   EnforcedLastArgumentHashStyle: ignore_implicit
@@ -30,7 +30,7 @@ Layout/AlignHash:
   - ignore_implicit
   - ignore_explicit
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
   SupportedStyles:
   - with_first_parameter
@@ -172,7 +172,7 @@ Naming/FileName:
   Regex:
   IgnoreExecutableScripts: true
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   EnforcedStyle: consistent
   SupportedStyles:
   - consistent
@@ -225,7 +225,7 @@ Layout/IndentationConsistency:
 Layout/IndentationWidth:
   Width: 2
 
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
   SupportedStyles:
   - special_inside_parentheses
@@ -233,10 +233,10 @@ Layout/IndentFirstArrayElement:
   - align_brackets
   IndentationWidth:
 
-Layout/IndentAssignment:
+Layout/AssignmentIndentation:
   IndentationWidth:
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
   SupportedStyles:
   - special_inside_parentheses
@@ -340,9 +340,9 @@ Style/PercentQLiterals:
 Naming/PredicateName:
   NamePrefix:
   - is_
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
   - is_
-  NameWhitelist:
+  AllowedMethods:
   - is_a?
   Exclude:
   - 'spec/**/*'
@@ -467,7 +467,7 @@ Style/TernaryParentheses:
   - require_no_parentheses
   AllowSafeAssignment: true
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   EnforcedStyle: final_newline
   SupportedStyles:
   - final_newline
@@ -478,7 +478,7 @@ Style/TrivialAccessors:
   AllowPredicates: true
   AllowDSLWriters: false
   IgnoreClassMethods: false
-  Whitelist:
+  AllowedMethods:
   - to_ary
   - to_a
   - to_c
@@ -561,7 +561,7 @@ Lint/UnusedMethodArgument:
 Naming/AccessorMethodName:
   Enabled: true
 
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Enabled: true
 
 Style/ArrayJoin:
@@ -840,7 +840,7 @@ Style/WhileUntilDo:
 Style/ZeroLengthPredicate:
   Enabled: true
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   EnforcedStyle: squiggly
 
 Lint/AmbiguousOperator:
@@ -864,7 +864,7 @@ Lint/DeprecatedClassMethods:
 Lint/DuplicateMethods:
   Enabled: true
 
-Lint/DuplicatedKey:
+Lint/DuplicateHashKey:
   Enabled: true
 
 Lint/EachWithObjectArgument:
@@ -891,7 +891,7 @@ Lint/FloatOutOfRange:
 Lint/FormatParameterMismatch:
   Enabled: true
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   AllowComments: true
 
 Lint/ImplicitStringConcatenation:
@@ -947,7 +947,7 @@ Lint/ShadowedException:
 Lint/ShadowingOuterLocalVariable:
   Enabled: true
 
-Lint/StringConversionInInterpolation:
+Lint/RedundantStringCoercion:
   Enabled: true
 
 Lint/UnderscorePrefixedVariableName:

data/CHANGELOG.md

@@ -6,6 +6,50 @@ section below.
 
 ### Unreleased changes
 
+_Nothing yet_
+
+## Version 3.0.0
+
+This version makes the new client that was added in version 2.6+ the default
+client, and removes the legacy client.
+
+- All previously deprecated functionality has been removed (since version 2.5,
+  see below).
+- Support for the StatSite implementation has been dropped.
+- Support for Ruby version older than 2.4 has been dropped.
+- The default implementation has been changed to DataDog. To use the standard
+  StatsD implementation (which was the default in v2), set the
+  `STATSD_IMPLEMENTATION` environment variable to `statsd`.
+
+To upgrade, follow the following process:
+
+1. Upgrade to version 2.9.2.
+2. Switch to the new client by setting the `STATSD_USE_NEW_CLIENT` environment
+   variable to 1.
+   - You may want to use the Rubocop rules that ship with this library, and
+     strict mode to find and fix deprecated usage patterns. See below for more
+     information about strict mode and the available Rubocop rules.
+3. Upgrade to version 3.0.0, and unset `STATSD_USE_NEW_CLIENT`.
+
+## Version 2.9.2
+
+- Allow providing a value as second positional argument to `assert_statsd_*`
+  methods, rather than as keyword argument. This matches the arguments to the
+  StatsD metric call.
+  ``` ruby
+    assert_statsd_increment('batch_size', 10) do
+      StatsD.increment('batch_size', 10)
+    end
+  ```
+
+## Version 2.9.1
+
+- The `VOID` object being returned by metric methods (e.g. `StatsD.increment`)
+  is now a subclass of `Object` rather than `BasicObject`, which means that
+  common methods will work as expected (`#class`, `#tap`).
+
+## Version 2.9.0
+
 - ⚠️ **DEPRECATION:**  The `StatsD.key_value` metric method is deprecated
   and will be removed in version 3.0. The new client does not have StatSite
   support. Due to the lack of active contributors that can port this metric

data/benchmark/send-metrics-to-dev-null-log

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
+require 'tmpdir'
 require 'benchmark/ips'
 
 revision = %x(git rev-parse HEAD).rstrip
@@ -25,8 +26,10 @@ report = Benchmark.ips do |bench|
     StatsD.measure('StatsD.measure') { 1 + 1 }
     StatsD.gauge('StatsD.gauge', 12.0, tags: ["foo:bar", "quc"])
     StatsD.set('StatsD.set', 'value', tags: { foo: 'bar', baz: 'quc' })
-    StatsD.event('StasD.event', "12345")
-    StatsD.service_check("StatsD.service_check", "ok")
+    if StatsD.singleton_client.datagram_builder_class == StatsD::Instrument::DogStatsDDatagramBuilder
+      StatsD.event('StasD.event', "12345")
+      StatsD.service_check("StatsD.service_check", "ok")
+    end
   end
 
   # Store the results in between runs

data/benchmark/send-metrics-to-local-udp-receiver

@@ -3,7 +3,9 @@
 
 require 'bundler/setup'
 require 'benchmark/ips'
+require 'tmpdir'
 require 'socket'
+require 'statsd-instrument'
 
 revision = %x(git rev-parse HEAD).rstrip
 master_revision = %x(git rev-parse origin/master).rstrip
@@ -20,11 +22,11 @@ FileUtils.mkdir_p(File.dirname(intermediate_results_filename))
 receiver = UDPSocket.new
 receiver.bind('localhost', 0)
 
-ENV['ENV'] = "production"
-ENV['STATSD_ADDR'] = "#{receiver.addr[2]}:#{receiver.addr[1]}"
-ENV['STATSD_IMPLEMENTATION'] ||= 'datadog'
-
-require 'statsd-instrument'
+StatsD.singleton_client = StatsD::Instrument::Environment.new(
+  'STATSD_ADDR' => "#{receiver.addr[2]}:#{receiver.addr[1]}",
+  'STATSD_IMPLEMENTATION' => 'dogstatsd',
+  'STATSD_ENV' => 'production',
+).client
 
 report = Benchmark.ips do |bench|
   bench.report("StatsD metrics to local UDP receiver (branch: #{branch}, sha: #{revision[0, 7]})") do
@@ -32,7 +34,7 @@ report = Benchmark.ips do |bench|
     StatsD.measure('StatsD.measure') { 1 + 1 }
     StatsD.gauge('StatsD.gauge', 12.0, tags: ["foo:bar", "quc"])
     StatsD.set('StatsD.set', 'value', tags: { foo: 'bar', baz: 'quc' })
-    if StatsD.backend.implementation == :datadog
+    if StatsD.singleton_client.datagram_builder_class == StatsD::Instrument::DogStatsDDatagramBuilder
       StatsD.event('StasD.event', "12345")
       StatsD.service_check("StatsD.service_check", "ok")
     end

data/lib/statsd/instrument.rb

@@ -4,90 +4,14 @@ require 'socket'
 require 'logger'
 require 'forwardable'
 
-# The StatsD module contains low-level metrics for collecting metrics and sending them to the backend.
+# The `StatsD` module contains low-level metrics for collecting metrics and
+# sending them to the backend.
 #
-# @!attribute client
-#   @return [StatsD::Instrument::Backend] The client that will handle singleton method calls in the next
-#     major version of this library.
-#   @note This new Client implementation is intended to become the new default in
-#     the next major release of this library. While this class may already be functional,
-#     we provide no guarantees about the API and the behavior may change.
-#
-# @!attribute backend
-#   The backend that is being used to emit the metrics.
-#   @return [StatsD::Instrument::Backend] the currently active backend. If there is no active backend
-#     yet, it will call {StatsD::Instrument::Environment#default_backend} to obtain a
-#     default backend for the environment.
-#   @see StatsD::Instrument::Environment#default_backend
-#   @deprecated
-#
-# @!attribute prefix
-#   The prefix to apply to metric names. This can be useful to group all the metrics
-#   for an application in a shared StatsD server.
-#
-#   When using a prefix a dot will be included automatically to separate the prefix
-#   from the metric name.
-#
-#   @return [String, nil] The prefix, or <tt>nil</tt> when no prefix is used
-#   @see StatsD::Instrument::Metric#name
-#   @deprecated
-#
-# @!attribute default_sample_rate
-#   The sample rate to use if the sample rate is unspecified for a metric call.
-#   @return [Float] Default is 1.0.
-#   @deprecated
-#
-# @!attribute logger
-#   The logger to use in case of any errors. The logger is also used as default logger
-#   for the LoggerBackend (although this can be overwritten).
-#   @see StatsD::Instrument::Backends::LoggerBackend
-#   @return [Logger]
-#
-# @!attribute default_tags
-#   The tags to apply to all metrics.
-#   @return [Array<String>, Hash<String, String>, nil] The default tags, or <tt>nil</tt> when no default tags is used
-#   @deprecated
-#
-# @!attribute legacy_singleton_client
-#   @nodoc
-#   @deprecated
-#
-# @!attribute singleton_client
-#   @nodoc
-#   @deprecated
-#
-# @!method measure(name, value = nil, sample_rate: nil, tags: nil, &block)
-#   (see StatsD::Instrument::LegacyClient#measure)
-#
-# @!method increment(name, value = 1, sample_rate: nil, tags: nil)
-#   (see StatsD::Instrument::LegacyClient#increment)
-#
-# @!method gauge(name, value, sample_rate: nil, tags: nil)
-#   (see StatsD::Instrument::LegacyClient#gauge)
-#
-# @!method set(name, value, sample_rate: nil, tags: nil)
-#   (see StatsD::Instrument::LegacyClient#set)
-#
-# @!method histogram(name, value, sample_rate: nil, tags: nil)
-#   (see StatsD::Instrument::LegacyClient#histogram)
-#
-# @!method distribution(name, value = nil, sample_rate: nil, tags: nil, &block)
-#   (see StatsD::Instrument::LegacyClient#distribution)
-#
-# @!method key_value(name, value)
-#   (see StatsD::Instrument::LegacyClient#key_value)
-#
-# @!method event(title, text, tags: nil, hostname: nil, timestamp: nil, aggregation_key: nil, priority: nil, source_type_name: nil, alert_type: nil) # rubocop:disable Metrics/LineLength
-#   (see StatsD::Instrument::LegacyClient#event)
-#
-# @!method service_check(name, status, tags: nil, hostname: nil, timestamp: nil, message: nil)
-#   (see StatsD::Instrument::LegacyClient#service_check)
-#
-# @see StatsD::Instrument <tt>StatsD::Instrument</tt> contains module to instrument
+# @see .singleton_client Metric method calls on the `StatsD` singleton will
+#   be handled by the client assigned to `StatsD.singleton_client`.
+# @see StatsD::Instrument `StatsD::Instrument` contains module to instrument
 #    existing methods with StatsD metrics
 module StatsD
-  extend self
-
   # The StatsD::Instrument module provides metaprogramming methods to instrument your methods with
   # StatsD metrics. E.g., you can create counters on how often a method is called, how often it is
   # successful, the duration of the methods call, etc.
@@ -103,11 +27,11 @@ module StatsD
       end
     end
 
+    # Generates a metric name for an instrumented method.
     # @private
-    def self.generate_metric_name(prefix, key, callee, *args)
-      name = key.respond_to?(:call) ? key.call(callee, args).gsub('::', '.') : key.gsub('::', '.')
-      name = "#{prefix}.#{name}" if prefix
-      name
+    # @return [String]
+    def self.generate_metric_name(name, callee, *args)
+      name.respond_to?(:call) ? name.call(callee, args).gsub('::', '.') : name.gsub('::', '.')
     end
 
     # Even though this method is considered private, and is no longer used internally,
@@ -139,21 +63,12 @@ module StatsD
     #    callable to dynamically generate a metric name
     # @param metric_options (see StatsD#measure)
     # @return [void]
-    def statsd_measure(method, name, deprecated_sample_rate_arg = nil, deprecated_tags_arg = nil,
-      as_dist: false, sample_rate: deprecated_sample_rate_arg, tags: deprecated_tags_arg,
-      prefix: nil, no_prefix: false, client: nil)
-
-      if as_dist
-        return statsd_distribution(method, name, # rubocop:disable StatsD/MetricPrefixArgument
-          sample_rate: sample_rate, tags: tags, prefix: prefix, no_prefix: no_prefix)
-      end
-
+    def statsd_measure(method, name, sample_rate: nil, tags: nil, no_prefix: false, client: nil)
       add_to_method(method, name, :measure) do
         define_method(method) do |*args, &block|
           client ||= StatsD.singleton_client
-          prefix ||= client.prefix unless no_prefix
-          key = StatsD::Instrument.generate_metric_name(prefix, name, self, *args)
-          client.measure(key, sample_rate: sample_rate, tags: tags, no_prefix: true) do
+          key = StatsD::Instrument.generate_metric_name(name, self, *args)
+          client.measure(key, sample_rate: sample_rate, tags: tags, no_prefix: no_prefix) do
             super(*args, &block)
           end
         end
@@ -168,16 +83,12 @@ module StatsD
     # @param metric_options (see StatsD#measure)
     # @return [void]
     # @note Supported by the datadog implementation only (in beta)
-    def statsd_distribution(method, name, deprecated_sample_rate_arg = nil, deprecated_tags_arg = nil,
-      sample_rate: deprecated_sample_rate_arg, tags: deprecated_tags_arg,
-      prefix: nil, no_prefix: false, client: nil)
-
+    def statsd_distribution(method, name, sample_rate: nil, tags: nil, no_prefix: false, client: nil)
       add_to_method(method, name, :distribution) do
         define_method(method) do |*args, &block|
           client ||= StatsD.singleton_client
-          prefix ||= client.prefix unless no_prefix
-          key = StatsD::Instrument.generate_metric_name(prefix, name, self, *args)
-          client.distribution(key, sample_rate: sample_rate, tags: tags, no_prefix: true) do
+          key = StatsD::Instrument.generate_metric_name(name, self, *args)
+          client.distribution(key, sample_rate: sample_rate, tags: tags, no_prefix: no_prefix) do
             super(*args, &block)
           end
         end
@@ -199,10 +110,7 @@ module StatsD
     # @yieldreturn [Boolean] Return true iff the return value is considered a success, false otherwise.
     # @return [void]
     # @see #statsd_count_if
-    def statsd_count_success(method, name, deprecated_sample_rate_arg = nil, deprecated_tags_arg = nil,
-      sample_rate: deprecated_sample_rate_arg, tags: deprecated_tags_arg,
-      prefix: nil, no_prefix: false, client: nil)
-
+    def statsd_count_success(method, name, sample_rate: nil, tags: nil, no_prefix: false, client: nil)
       add_to_method(method, name, :count_success) do
         define_method(method) do |*args, &block|
           begin
@@ -222,10 +130,8 @@ module StatsD
           ensure
             client ||= StatsD.singleton_client
             suffix = truthiness == false ? 'failure' : 'success'
-            prefix ||= client.prefix unless no_prefix
-            key = StatsD::Instrument.generate_metric_name(prefix, name, self, *args)
-            client.increment("#{key}.#{suffix}",
-              sample_rate: sample_rate, tags: tags, no_prefix: true)
+            key = StatsD::Instrument.generate_metric_name(name, self, *args)
+            client.increment("#{key}.#{suffix}", sample_rate: sample_rate, tags: tags, no_prefix: no_prefix)
           end
         end
       end
@@ -243,10 +149,7 @@ module StatsD
     # @yieldreturn (see #statsd_count_success)
     # @return [void]
     # @see #statsd_count_success
-    def statsd_count_if(method, name, deprecated_sample_rate_arg = nil, deprecated_tags_arg = nil,
-      sample_rate: deprecated_sample_rate_arg, tags: deprecated_tags_arg,
-      prefix: nil, no_prefix: false, client: nil)
-
+    def statsd_count_if(method, name, sample_rate: nil, tags: nil, no_prefix: false, client: nil)
       add_to_method(method, name, :count_if) do
         define_method(method) do |*args, &block|
           begin
@@ -266,9 +169,8 @@ module StatsD
           ensure
             if truthiness
               client ||= StatsD.singleton_client
-              prefix ||= client.prefix unless no_prefix
-              key = StatsD::Instrument.generate_metric_name(prefix, name, self, *args)
-              client.increment(key, sample_rate: sample_rate, tags: tags, no_prefix: true)
+              key = StatsD::Instrument.generate_metric_name(name, self, *args)
+              client.increment(key, sample_rate: sample_rate, tags: tags, no_prefix: no_prefix)
             end
           end
         end
@@ -284,16 +186,12 @@ module StatsD
     # @param name (see #statsd_measure)
     # @param metric_options (see #statsd_measure)
     # @return [void]
-    def statsd_count(method, name, deprecated_sample_rate_arg = nil, deprecated_tags_arg = nil,
-      sample_rate: deprecated_sample_rate_arg, tags: deprecated_tags_arg,
-      prefix: nil, no_prefix: false, client: nil)
-
+    def statsd_count(method, name, sample_rate: nil, tags: nil, no_prefix: false, client: nil)
       add_to_method(method, name, :count) do
         define_method(method) do |*args, &block|
           client ||= StatsD.singleton_client
-          prefix ||= client.prefix unless no_prefix
-          key = StatsD::Instrument.generate_metric_name(prefix, name, self, *args)
-          client.increment(key, sample_rate: sample_rate, tags: tags, no_prefix: true)
+          key = StatsD::Instrument.generate_metric_name(name, self, *args)
+          client.increment(key, sample_rate: sample_rate, tags: tags, no_prefix: no_prefix)
           super(*args, &block)
         end
       end
@@ -344,9 +242,9 @@ module StatsD
       remove_from_method(method, name, :distribution)
     end
 
-    VoidClass = Class.new(BasicObject)
+    VoidClass = Class.new
     private_constant :VoidClass
-    VOID = VoidClass.new
+    VOID = VoidClass.new.freeze
 
     private
 
@@ -395,33 +293,68 @@ module StatsD
     end
   end
 
-  attr_accessor :logger
-  attr_writer :singleton_client
+  class << self
+    extend Forwardable
 
-  extend Forwardable
+    # The logger to use in case of any errors.
+    #
+    # @return [Logger]
+    # @see StatsD::Instrument::LogSink
+    attr_accessor :logger
 
-  def legacy_singleton_client
-    StatsD::Instrument::LegacyClient.singleton
-  end
+    # The StatsD client that handles method calls on the StatsD singleton.
+    #
+    # E.g. a call to `StatsD.increment` will be handled by this client.
+    #
+    # @return [StatsD::Instrument::Client]
+    attr_writer :singleton_client
 
-  def singleton_client
-    @singleton_client ||= StatsD::Instrument::Environment.current.client
-  end
+    # The StatsD client that handles method calls on the StatsD singleton
+    # @return [StatsD::Instrument::Client]
+    def singleton_client
+      @singleton_client ||= StatsD::Instrument::Environment.current.client
+    end
 
-  # Singleton methods will be delegated to the singleton client.
-  def_delegators :singleton_client, :increment, :gauge, :set, :measure,
-    :histogram, :distribution, :key_value, :event, :service_check
+    # @!method measure(name, value = nil, sample_rate: nil, tags: nil, &block)
+    #   (see StatsD::Instrument::Client#measure)
+    #
+    # @!method increment(name, value = 1, sample_rate: nil, tags: nil)
+    #   (see StatsD::Instrument::Client#increment)
+    #
+    # @!method gauge(name, value, sample_rate: nil, tags: nil)
+    #   (see StatsD::Instrument::Client#gauge)
+    #
+    # @!method set(name, value, sample_rate: nil, tags: nil)
+    #   (see StatsD::Instrument::Client#set)
+    #
+    # @!method histogram(name, value, sample_rate: nil, tags: nil)
+    #   (see StatsD::Instrument::Client#histogram)
+    #
+    # @!method distribution(name, value = nil, sample_rate: nil, tags: nil, &block)
+    #   (see StatsD::Instrument::Client#distribution)
+    #
+    # @!method event(title, text, tags: nil, hostname: nil, timestamp: nil, aggregation_key: nil, priority: nil, source_type_name: nil, alert_type: nil) # rubocop:disable Metrics/LineLength
+    #   (see StatsD::Instrument::Client#event)
+    #
+    # @!method service_check(name, status, tags: nil, hostname: nil, timestamp: nil, message: nil)
+    #   (see StatsD::Instrument::Client#service_check)
 
-  # Deprecated methods will be delegated to the legacy client
-  def_delegators :legacy_singleton_client, :default_tags, :default_tags=,
-    :default_sample_rate, :default_sample_rate=, :prefix, :prefix=, :backend, :backend=
+    def_delegators :singleton_client, :increment, :gauge, :set, :measure,
+      :histogram, :distribution, :event, :service_check
+  end
 end
 
 require 'statsd/instrument/version'
-require 'statsd/instrument/metric'
-require 'statsd/instrument/legacy_client'
-require 'statsd/instrument/backend'
 require 'statsd/instrument/client'
+require 'statsd/instrument/datagram'
+require 'statsd/instrument/dogstatsd_datagram'
+require 'statsd/instrument/datagram_builder'
+require 'statsd/instrument/statsd_datagram_builder'
+require 'statsd/instrument/dogstatsd_datagram_builder'
+require 'statsd/instrument/null_sink'
+require 'statsd/instrument/udp_sink'
+require 'statsd/instrument/capture_sink'
+require 'statsd/instrument/log_sink'
 require 'statsd/instrument/environment'
 require 'statsd/instrument/helpers'
 require 'statsd/instrument/assertions'