statsd-instrument 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 852b64cbebc0760778a4d3332d4611f4652e64bd
-  data.tar.gz: fb0025c42ec04d18f7bdd1553d48dd75656e083f
+  metadata.gz: 332aeb4ca9870d03b48fae2f8322f81396e0a70b
+  data.tar.gz: aabec4e189d0e494b77be52fe604a43548b8f4c5
 SHA512:
-  metadata.gz: 58f1b9bf3fee6706e3bc543d4f0146dda3217c0dab443a624d9700f02083917d6a76169dbf0cd1d9372ed8f36ff9b51a9bfbf6cb121f62fa8c4e0798b48f86cc
-  data.tar.gz: f9a3abf6573ac684c6573c64dec24108ab0e6c56227ced05a6fa167dc0e4c4d0245b83dcdd53f2de2666e9138096b3668ed1f86529937ae06a70833e57849dc5
+  metadata.gz: b2f06ab8c82e1bfc4f2dfcedc9984d05ec7797e125da782dbca2fe4c60ba2948ec2920e8f3fcdee61e660568f6e2ab961b7694be7f29092f7c29a46d5925f30b
+  data.tar.gz: 9d1e015f071f34af4ca7294269ce923b05222e1297ed798adec1c8d080310fc878e76ece7c7a50dd2a5bf2366d421b4f0d07f437c7a3f38d8c2885e5bf8501a3

data/.gitignore

@@ -4,3 +4,4 @@ doc
 .bundle
 Gemfile.lock
 pkg/*
+vendor/

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - ruby-head
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby-19mode
   - rbx-2
+  - ruby-head
 
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -5,9 +5,8 @@ please at an entry to the "unreleased changes" section below.
 
 ### Unreleased changes
 
-- Nothing yet!
-
----
+- Drop support for Ruby 1.9.3.
+- Add support for Ruby 2.2.
 
 ### Version 2.0.6
 

data/README.md

@@ -261,7 +261,7 @@ end
 
 ### Compatibility
 
-Tested using Travis CI against Ruby 1.9.3, Ruby 2.0.0, Ruby 2.1.1, Rubinius, and JRuby
+Tested using Travis CI against Ruby 2.0, 2.1, 2.2, Rubinius, and JRuby.
 
 ### Reliance on DNS
 

data/lib/statsd/instrument/metric.rb

@@ -102,10 +102,7 @@ class StatsD::Instrument::Metric
   # @return [Array<String>, nil] the list of tags in canonical form.
   def self.normalize_tags(tags)
     return if tags.nil?
-    tags = tags.map { |k, v| "#{k}:#{v}" } if tags.is_a?(Hash)
-    tags.map do |tag|
-      components = tag.split(':', 2)
-      components.map { |c| c.gsub(/[^\w\.-]+/, '_') }.join(':')
-    end
+    tags = tags.map { |k, v| "#{k.to_s.tr(':', '')}:#{v.to_s.tr(':', '')}" } if tags.is_a?(Hash)
+    tags.map { |tag| tag.tr('|,'.freeze, ''.freeze) }
   end
 end

data/lib/statsd/instrument/version.rb

@@ -1,5 +1,5 @@
 module StatsD
   module Instrument
-    VERSION = "2.0.6"
+    VERSION = "2.0.7"
   end
 end

data/statsd-instrument.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'benchmark-ips'
 end

data/test/benchmark/tags.rb

@@ -0,0 +1,34 @@
+require 'statsd-instrument'
+require 'benchmark/ips'
+
+Benchmark.ips do |bench|
+  bench.report("normalized tags with simple hash") do
+    StatsD::Instrument::Metric.normalize_tags(:tag => 'value')
+  end
+
+  bench.report("normalized tags with simple array") do
+    StatsD::Instrument::Metric.normalize_tags(['test:test'])
+  end
+
+  bench.report("normalized tags with large hash") do
+    StatsD::Instrument::Metric.normalize_tags({
+      mobile: true,
+      pod: "1",
+      protocol: "https",
+      country: "Langbortistan",
+      complete: true,
+      shop: "omg shop that has a longer name",
+    })
+  end
+
+  bench.report("normalized tags with large array") do
+    StatsD::Instrument::Metric.normalize_tags([
+      "mobile:true",
+      "pod:1",
+      "protocol:https",
+      "country:Langbortistan",
+      "complete:true",
+      "shop:omg_shop_that_has_a_longer_name",
+    ])
+  end
+end

data/test/metric_test.rb

@@ -24,15 +24,13 @@ class MetricTest < Minitest::Test
     assert_equal 'counter', m.name
   end
 
-  def test_rewrite_shitty_tags
-    assert_equal ['igno_red'], StatsD::Instrument::Metric.normalize_tags(['igno,red'])
-    assert_equal ['igno_red'], StatsD::Instrument::Metric.normalize_tags(['igno  red'])
-    assert_equal ['test:test_test'], StatsD::Instrument::Metric.normalize_tags(['test:test:test'])
-    assert_equal ['topic:foo_foo', 'bar_'], StatsD::Instrument::Metric.normalize_tags(['topic:foo : foo', 'bar '])
+  def test_handle_bad_tags
+    assert_equal ['ignored'], StatsD::Instrument::Metric.normalize_tags(['igno|red'])
+    assert_equal ['lolclass:omglol'], StatsD::Instrument::Metric.normalize_tags({ :"lol::class" => "omg::lol" })
   end
-  
+
   def test_rewrite_tags_provided_as_hash
     assert_equal ['tag:value'], StatsD::Instrument::Metric.normalize_tags(:tag => 'value')
     assert_equal ['tag:value', 'tag2:value2'], StatsD::Instrument::Metric.normalize_tags(:tag => 'value', :tag2 => 'value2')
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,6 +68,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A StatsD client for Ruby apps. Provides metaprogramming methods to inject
   StatsD instrumentation into your code.
 email:
@@ -99,6 +113,7 @@ files:
 - shipit.rubygems.yml
 - statsd-instrument.gemspec
 - test/assertions_test.rb
+- test/benchmark/tags.rb
 - test/capture_backend_test.rb
 - test/environment_test.rb
 - test/integration_test.rb
@@ -134,6 +149,7 @@ specification_version: 4
 summary: A StatsD client for Ruby apps
 test_files:
 - test/assertions_test.rb
+- test/benchmark/tags.rb
 - test/capture_backend_test.rb
 - test/environment_test.rb
 - test/integration_test.rb