statsd-instrument 2.6.0 → 2.7.0

data/test/statsd_test.rb

@@ -213,7 +213,7 @@ class StatsDTest < Minitest::Test
   end
 
   def test_name_prefix
-    StatsD.stubs(:prefix).returns('prefix')
+    StatsD.legacy_singleton_client.stubs(:prefix).returns('prefix')
     m = capture_statsd_call { StatsD.increment('counter') }
     assert_equal 'prefix.counter', m.name
 

data/test/test_helper.rb

@@ -5,8 +5,6 @@ ENV['ENV'] = 'test'
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'mocha/setup'
-require 'set'
-require 'logger'
 require 'statsd-instrument'
 
 require_relative 'helpers/rubocop_helper'

data/test/udp_backend_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 class UDPBackendTest < Minitest::Test
   def setup
-    StatsD.stubs(:backend).returns(@backend = StatsD::Instrument::Backends::UDPBackend.new)
+    StatsD.legacy_singleton_client.stubs(:backend).returns(@backend = StatsD::Instrument::Backends::UDPBackend.new)
     @backend.stubs(:rand).returns(0.0)
 
     UDPSocket.stubs(:new).returns(@socket = mock('socket'))

data/test/udp_sink_test.rb

@@ -2,8 +2,6 @@
 
 require 'test_helper'
 
-require 'statsd/instrument/client'
-
 class UDPSinktest < Minitest::Test
   def setup
     @receiver = UDPSocket.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,11 +150,12 @@ files:
 - lib/statsd/instrument/datagram_builder.rb
 - lib/statsd/instrument/dogstatsd_datagram_builder.rb
 - lib/statsd/instrument/environment.rb
+- lib/statsd/instrument/expectation.rb
 - lib/statsd/instrument/helpers.rb
+- lib/statsd/instrument/legacy_client.rb
 - lib/statsd/instrument/log_sink.rb
 - lib/statsd/instrument/matchers.rb
 - lib/statsd/instrument/metric.rb
-- lib/statsd/instrument/metric_expectation.rb
 - lib/statsd/instrument/null_sink.rb
 - lib/statsd/instrument/railtie.rb
 - lib/statsd/instrument/rubocop.rb
@@ -164,6 +165,7 @@ files:
 - lib/statsd/instrument/rubocop/metric_return_value.rb
 - lib/statsd/instrument/rubocop/metric_value_keyword_argument.rb
 - lib/statsd/instrument/rubocop/positional_arguments.rb
+- lib/statsd/instrument/rubocop/singleton_configuration.rb
 - lib/statsd/instrument/rubocop/splat_arguments.rb
 - lib/statsd/instrument/statsd_datagram_builder.rb
 - lib/statsd/instrument/strict.rb
@@ -171,6 +173,7 @@ files:
 - lib/statsd/instrument/version.rb
 - shipit.rubygems.yml
 - statsd-instrument.gemspec
+- test/assertions_on_legacy_client_test.rb
 - test/assertions_test.rb
 - test/benchmark/clock_gettime.rb
 - test/benchmark/default_tags.rb
@@ -181,6 +184,7 @@ files:
 - test/client_test.rb
 - test/compatibility/dogstatsd_datagram_compatibility_test.rb
 - test/datagram_builder_test.rb
+- test/datagram_test.rb
 - test/deprecations_test.rb
 - test/dogstatsd_datagram_builder_test.rb
 - test/environment_test.rb
@@ -198,6 +202,7 @@ files:
 - test/rubocop/metric_return_value_test.rb
 - test/rubocop/metric_value_keyword_argument_test.rb
 - test/rubocop/positional_arguments_test.rb
+- test/rubocop/singleton_configuration_test.rb
 - test/rubocop/splat_arguments_test.rb
 - test/statsd_datagram_builder_test.rb
 - test/statsd_instrumentation_test.rb
@@ -229,6 +234,7 @@ signing_key:
 specification_version: 4
 summary: A StatsD client for Ruby apps
 test_files:
+- test/assertions_on_legacy_client_test.rb
 - test/assertions_test.rb
 - test/benchmark/clock_gettime.rb
 - test/benchmark/default_tags.rb
@@ -239,6 +245,7 @@ test_files:
 - test/client_test.rb
 - test/compatibility/dogstatsd_datagram_compatibility_test.rb
 - test/datagram_builder_test.rb
+- test/datagram_test.rb
 - test/deprecations_test.rb
 - test/dogstatsd_datagram_builder_test.rb
 - test/environment_test.rb
@@ -256,6 +263,7 @@ test_files:
 - test/rubocop/metric_return_value_test.rb
 - test/rubocop/metric_value_keyword_argument_test.rb
 - test/rubocop/positional_arguments_test.rb
+- test/rubocop/singleton_configuration_test.rb
 - test/rubocop/splat_arguments_test.rb
 - test/statsd_datagram_builder_test.rb
 - test/statsd_instrumentation_test.rb

data/lib/statsd/instrument/metric_expectation.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-# @private
-class StatsD::Instrument::MetricExpectation
-  attr_accessor :times, :type, :name, :value, :sample_rate, :tags
-  attr_reader :ignore_tags
-
-  def initialize(options = {})
-    if options[:type]
-      @type = options[:type]
-    else
-      raise ArgumentError, "Metric :type is required."
-    end
-
-    if options[:name]
-      @name = options[:name]
-    else
-      raise ArgumentError, "Metric :name is required."
-    end
-
-    if options[:times]
-      @times = options[:times]
-    else
-      raise ArgumentError, "Metric :times is required."
-    end
-
-    @name = StatsD.prefix ? "#{StatsD.prefix}.#{@name}" : @name unless options[:no_prefix]
-    @tags = StatsD::Instrument::Metric.normalize_tags(options[:tags])
-    @sample_rate = options[:sample_rate]
-    @value = options[:value]
-    @ignore_tags = StatsD::Instrument::Metric.normalize_tags(options[:ignore_tags])
-  end
-
-  def matches(actual_metric)
-    return false if sample_rate && sample_rate != actual_metric.sample_rate
-    return false if value && value != actual_metric.value
-
-    if tags
-
-      expected_tags = Set.new(tags)
-      actual_tags = Set.new(actual_metric.tags)
-
-      if ignore_tags
-        ignored_tags = Set.new(ignore_tags) - expected_tags
-        actual_tags -= ignored_tags
-
-        if ignore_tags.is_a?(Array)
-          actual_tags.delete_if { |key| ignore_tags.include?(key.split(":").first) }
-        end
-      end
-
-      return expected_tags.subset?(actual_tags)
-    end
-    true
-  end
-
-  def default_value
-    1 if type == :c
-  end
-
-  TYPES = {
-    c: 'increment',
-    ms: 'measure',
-    g: 'gauge',
-    h: 'histogram',
-    d: 'distribution',
-    kv: 'key/value',
-    s: 'set',
-  }
-
-  def to_s
-    str = +"#{TYPES[type]} #{name}:#{value}"
-    str << " @#{sample_rate}" if sample_rate != 1.0
-    str << " " << tags.map { |t| "##{t}" }.join(' ') if tags
-    str << " times:#{times}" if times > 1
-    str
-  end
-
-  def inspect
-    "#<StatsD::Instrument::MetricExpectation #{self}>"
-  end
-end