ffwd-google-cloud 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2460bbc3a9e1c03e415c76926df07e8fb7f1f03a
-  data.tar.gz: 4c8c48826dde0239a18b0f50aa15342420a4d5da
+  metadata.gz: 0de09b03adb0d9ba7a5d7be850f0c69eb9eefdbf
+  data.tar.gz: e7286a3bcf680bbb58e8ad7a4a42dbff9fad20d6
 SHA512:
-  metadata.gz: f209e4155c96938adc579c63eb0fd8ccdf05b9f10eab55139f4c541dfd47db23bdf7a5d8f5a8795a863932b1b2cd63c1911f747dc3b611e0415813dc0f7995d3
-  data.tar.gz: 899ee149a5e79621a90ca817b9d79446784f21f7c38bfcd197f2e25817ca05ce5e1f8097566d3fcdb05ea1d158de6e8c577057e2044116add5f4011a42b71754
+  metadata.gz: 4f3c4c045aa77ae2bdd1e02caaeeb7acb130732ccddaa86a80830bbd167cafa6df73fa5d65cb43349c075a438d599f0886468f266bb05b234dcd7616dc038f5d
+  data.tar.gz: a4696557e9adae619a85089755d74eeaff55100d2a1cc0cb0e056b0ba40d0fb214c923e8865a5480f46ba9665e6c5c501b24aa6bb80eb3ba1f723f3682665bdf

data/lib/ffwd/plugin/google_cloud/utils.rb

@@ -33,12 +33,14 @@ module FFWD::Plugin::GoogleCloud
       buffer.each do |m|
         d = make_desc(m)
 
-        if seen.member?(d[:metric])
+        seen_key = [d[:metric], d[:labels].map{|k, v| [k, v]}.sort].hash
+
+        if seen.member?(seen_key)
           dropped += 1
           next
         end
 
-        seen.add(d[:metric])
+        seen.add(seen_key)
         result << {:timeseriesDesc => d, :point => make_point(m)}
       end
 
@@ -63,13 +65,14 @@ module FFWD::Plugin::GoogleCloud
       what ||= attributes.delete("what")
 
       entries << what unless what.nil?
-      entries += attributes.keys.sort.map(&:to_s)
       entries = entries.join('.')
 
+      hash = attributes.keys.sort.hash.abs.to_s(32)
+
       unless entries.empty?
-        "#{CUSTOM_PREFIX}/#{m.key}/#{entries}"
+        "#{CUSTOM_PREFIX}/#{m.key}/#{entries}-#{hash}"
       else
-        "#{CUSTOM_PREFIX}/#{m.key}"
+        "#{CUSTOM_PREFIX}/#{m.key}-#{other_keys}"
       end
     end
 

data/lib/ffwd/plugin/google_cloud/version.rb

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module GoogleCloud
-      VERSION = "0.4.3"
+      VERSION = "0.4.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - John-John Tedro
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement