qubole-statsd-instrument 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0694d4ff0f7d5f512163a9b3bfc818a91bdda979
-  data.tar.gz: 7b589905601377964502e99086d82015af0ff333
+  metadata.gz: e129fa9743846586c8eb56fa80a81505498e04c8
+  data.tar.gz: f26f51980c279bd2445bd01759f42a51e255e7fc
 SHA512:
-  metadata.gz: eb4fc7372e4d8c70bb5a0431ca1c5621837e804eb2411dcc7b0719b703b1babae02a3fa8926af7550135a512692531e68ca7a6e8c366e5a793d3334fe7ed72ac
-  data.tar.gz: 18f7e78a40037fe3a410ecb7652fe2af190c6151e9b18b7af6229ceac11b080c66cce8e140bf630c294f31f49c56135f41ea39c4b3c097839cf6ca8d2f5f861f
+  metadata.gz: a1fe84cd8f8cad7c43719a471417429a5300906212d1df933f740460871eb658432d683d49ecd58154f29065a5881d5d9189ea35d0cf5bd5e56df33b83682692
+  data.tar.gz: 76f425d63f063edf641a00f6f6ddf2eaae65df97e7efcecac88c4640ca66361d365d1de2b4bb0d5570c49f6ca647239f832f5d0e13c1576e6230ee439991c5b3

data/lib/statsd/instrument/backends/udp_backend.rb

@@ -8,12 +8,13 @@ module StatsD::Instrument::Backends
     include MonitorMixin
 
     attr_reader :host, :port
-    attr_accessor :implementation
+    attr_accessor :implementation, :default_metric_tags
 
-    def initialize(server = nil, implementation = nil)
+    def initialize(server = nil, implementation = nil, default_metric_tags = {})
       super()
       self.server = server || "localhost:8125"
       self.implementation = (implementation || DEFAULT_IMPLEMENTATION).to_sym
+      self.default_metric_tags = default_metric_tags
     end
 
     def collect_metric(metric)
@@ -64,13 +65,30 @@ module StatsD::Instrument::Backends
     def generate_packet(metric)
       command = "#{metric.name}:#{metric.value}|#{metric.type}"
       command << "|@#{metric.sample_rate}" if metric.sample_rate < 1 || (implementation == :statsite && metric.sample_rate > 1)
+      
+      metric_tags_map = self.default_metric_tags
       if metric.tags
+        metric.tags.each do |tag|
+          key, value = tag.split(":") rescue nil
+          metric_tags_map[key] = value
+        end
+      end
+      
+      metric_tags = []
+      metric_tags_map.each do |k ,v|
+        if v.nil?
+          metric_tags << "#{k}"
+        else
+          metric_tags << "#{k}:#{v}"
+        end
+      end
+          
+      if metric_tags.size > 0
         if tags_supported?
           if implementation == :datadog
-            command << "|##{metric.tags.join(',')}"
+            command << "|##{metric_tags.join(',')}"
           elsif implementation == :collectd
-            metric_tags = "#{metric.tags.join(',')}"
-            metric_tags = metric_tags.prepend("[") << "]"
+            metric_tags = "[#{metric_tags.join(',')}]"
             command.prepend(metric_tags.gsub(":", "="))
           end
         else

data/lib/statsd/instrument/version.rb

@@ -1,5 +1,5 @@
 module StatsD
   module Instrument
-    VERSION = "2.1.4"
+    VERSION = "2.1.5"
   end
 end

data/test/udp_backend_with_default_tags.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class UDPBackendTestWithDefaultTags < Minitest::Test
+  def setup
+    @backend = StatsD::Instrument::Backends::UDPBackend.new("localhost:8125", :collectd, {pod_ip: "10.0.0.42"})
+  end
+
+  
+  def test_constructor_must_create_default_tags
+    default_tags = @backend.instance_eval { self.default_metric_tags }
+
+    assert_equal default_tags.class, Hash
+    assert_includes default_tags.keys, :pod_ip
+    assert_equal default_tags[:pod_ip], "10.0.0.42"
+  end
+  
+  def test_metric_with_no_tags_must_have_default_tags
+    metric = StatsD::Instrument::Metric.new(type: :c, name: 'test', sample_rate: 0.5)
+    command = @backend.generate_packet(metric)
+    assert command.include?("pod_ip=10.0.0.42")
+  end
+  
+  def test_metric_with_other_tags_must_have_default_tags
+    metric = StatsD::Instrument::Metric.new(type: :c, name: 'test', sample_rate: 0.5, tags: ["conduit:0.0"])
+    command = @backend.generate_packet(metric)
+    assert command.include?("pod_ip=10.0.0.42")
+    assert command.include?("conduit=0.0")
+
+  end
+  
+  def test_metric_with_same_tag_must_override_default_tags
+    metric = StatsD::Instrument::Metric.new(type: :c, name: 'test', sample_rate: 0.5, tags: ["pod_ip:10.0.0.43", "conduit=0.0"])
+    command = @backend.generate_packet(metric)
+    assert command.include?("conduit=0.0")
+    assert command.include?("pod_ip=10.0.0.43")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qubole-statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,6 +142,7 @@ files:
 - test/statsd_test.rb
 - test/test_helper.rb
 - test/udp_backend_test.rb
+- test/udp_backend_with_default_tags.rb
 homepage: https://github.com/Shopify/statsd-instrument
 licenses:
 - MIT
@@ -180,3 +181,4 @@ test_files:
 - test/statsd_test.rb
 - test/test_helper.rb
 - test/udp_backend_test.rb
+- test/udp_backend_with_default_tags.rb