ffwd-google-cloud 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 545a58cedb871175a2eae3b65422f5ddfd03851d
-  data.tar.gz: 93bae64294e5dbeb5c5a654dac9878f4178a45bb
+  metadata.gz: 361e6fba065147958d18bf71cc0b48bb96f8f5bb
+  data.tar.gz: 8dedd6d559bc81c6542a3bdfa39d3ed8ebd7e8b5
 SHA512:
-  metadata.gz: 3e1d6d266b9e1304bf2ef70ca80c238ddbc3e4438faa5f8552537346c695f933a4a70f53c73fd71bb9dfd1a73e98c49b79bc027722bfefddd58357982ecb0511
-  data.tar.gz: ea0a626db8c218dd2e985e3b0627b25b3cea0e79da8f790ef8a67528d1d970459d24b258185be082b90e6a3daeb7088dd5f8172db0e41c33405e49a30ec54e82
+  metadata.gz: b6e8bcbc321302513fb3814e3d4e9975da9640e2ebbbc552ed7e3816953a3888b68160b035064fbf995cf3c3f2b7b5572d0419a34dad5f4d43f9f7133601f640
+  data.tar.gz: 8682ee6cabafb38d1117279dd99f38db593dcd967c869c851e677db08b797d2bf11385e830ea21eec145bd0b94a9071f68e4c3a390ce09378c0c84d47799977d

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

@@ -13,11 +13,14 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 require 'set'
+require 'zlib'
 
 module FFWD::Plugin::GoogleCloud
   CUSTOM_PREFIX = "custom.cloudmonitoring.googleapis.com"
 
   module Utils
+    M64 = 1 << 64
+
     def self.make_common_labels buffer
       return nil if buffer.empty?
       make_labels buffer.first.fixed_attr
@@ -33,7 +36,8 @@ module FFWD::Plugin::GoogleCloud
       buffer.each do |m|
         d = make_desc(m)
 
-        seen_key = [d[:metric], d[:labels].map{|k, v| [k, v]}.sort].hash
+        # using built-in hash OK since we are only internally de-duplicating.
+        seen_key = [d[:metric], d[:labels].keys.sort].hash
 
         if seen.member?(seen_key)
           dropped += 1
@@ -67,7 +71,9 @@ module FFWD::Plugin::GoogleCloud
       entries << what unless what.nil?
       entries = entries.join('.')
 
-      hash = attributes.keys.sort.hash.abs.to_s(32)
+      # ruby Object#hash is inconsistent across runs, so we will instead
+      # perform a custom hashing.
+      hash = hash_labels(attributes).to_s(32)
 
       unless entries.empty?
         "#{CUSTOM_PREFIX}/#{m.key}/#{entries}-#{hash}"
@@ -76,6 +82,12 @@ module FFWD::Plugin::GoogleCloud
       end
     end
 
+    def self.hash_labels attributes
+      attributes.keys.sort.map{|v| Zlib::crc32(v.to_s)}.reduce(33){|k, v|
+        (63 * k + v).modulo(M64)
+      }
+    end
+
     def self.make_labels attr
       Hash[attr.select{|k, v| k.to_s != "what"}.map{|k, v|
         ["#{CUSTOM_PREFIX}/#{k}", v]

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

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module GoogleCloud
-      VERSION = "0.4.5"
+      VERSION = "0.4.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement