splitclient-rb 6.4.1.pre.rc1-java → 6.4.1.pre.rc2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0340c9f45b6fc4c14c474fbbcd5d7e0353854841
-  data.tar.gz: b10f424f243f68d30ae2c72538fbc399c9bf2b9d
+  metadata.gz: dad37daa663863c2fcf4ccf32ed89e3cd9ea2990
+  data.tar.gz: 3ce6331c5a3db0517531e656fe1c7cb0e1ea6f0c
 SHA512:
-  metadata.gz: 8b2e1794e636094b2d23dcd40e1b0a54669359ae3a9f7d256f75594d3eef91df3a1b3f16496244025a5eb27fdece01bcf9ab6c4771b140f2cfd0977d8a4bf9d8
-  data.tar.gz: fa055019094a1ae9c9da286693471b27de657825183fda21dd40f7cbbbd85177fd84412b96752dba8c901605dfb0447f85d35f6604f14f6987c58b83a7c68855
+  metadata.gz: e6a5edb228c15ff9e18fc93e271715a7a53a0e53e49b7b79e6c4985cfaec0d0acb049533e063d1d09723dff353f6eb4f46e7fa950c2d54eaa820441cc97186ac
+  data.tar.gz: e465c1d4d04702c9ee4067347fd85c0fcd6e3b3136d117ef9287fa97a17dc5a7ee3d5c26c0e03652abe7444b1f2c252d777ef5df9d8bb3a879035ad2c2589670

data/lib/splitclient-rb.rb

@@ -84,6 +84,9 @@ require 'splitclient-rb/engine/models/treatment'
 require 'splitclient-rb/utilitites'
 require 'splitclient-rb/validators'
 
+# redis metrics fixer
+require 'splitclient-rb/redis_metrics_fixer'
+
 # C extension
 require 'murmurhash/murmurhash_mri'
 

data/lib/splitclient-rb/cache/adapters/redis_adapter.rb

@@ -56,10 +56,14 @@ module SplitIoClient
         end
 
         def find_strings_by_prefix(prefix)
+          find_strings_by_pattern("#{prefix}*")
+        end
+
+        def find_strings_by_pattern(pattern)
           memo = { items: [], cursor: 0 }
 
           loop do
-            memo[:cursor], items = @redis.scan(memo[:cursor], match: "#{prefix}*", count: SCAN_SLICE)
+            memo[:cursor], items = @redis.scan(memo[:cursor], match: "#{pattern}", count: SCAN_SLICE)
 
             memo[:items].push(*items)
 

data/lib/splitclient-rb/cache/repositories/metrics/memory_repository.rb

@@ -23,27 +23,14 @@ module SplitIoClient
           end
 
           def add_latency(operation, time_in_ms, binary_search)
-            operation_hash = @latencies.find { |l| l[:operation] == operation }
-            if operation_hash.nil?
-              latencies_for_op = (OPERATIONS.include?(operation)) ? build_latencies_for_op(operation, binary_search.add_latency_millis(time_in_ms, true)) : [time_in_ms]
-              @latencies << { operation: operation, latencies: latencies_for_op }
+            if (OPERATIONS.include?(operation))
+              index = binary_search.add_latency_millis(time_in_ms, true)
+              increase_latency_bucket(operation, index)
             else
-              (OPERATIONS.include?(operation)) ? increase_latencies_for_op(operation_hash[:latencies], binary_search.add_latency_millis(time_in_ms, true)) : operation_hash[:latencies].push(time_in_ms)
+              concatenate_latency(operation, time_in_ms)
             end
           end
 
-          def build_latencies_for_op(operation, index)
-            latencies_array = Array.new(BinarySearchLatencyTracker::BUCKETS.length, 0)
-
-            latencies_array[index] = 1
-
-            latencies_array
-          end
-
-          def increase_latencies_for_op(operation_latencies_array, index)
-            operation_latencies_array[index] += 1
-          end
-
           def add_gauge(gauge, value)
             gauge_hash = @gauges.find { |g| g[:name] == gauge }
             if gauge_hash.nil?
@@ -71,6 +58,10 @@ module SplitIoClient
             # TODO
           end
 
+          def fix_latencies
+            # NOOP
+          end
+
           def clear_counts
             @counts = []
           end
@@ -134,6 +125,34 @@ module SplitIoClient
               @value = 0
             end
           end
+
+          private
+          
+          def increase_latency_bucket(operation, index)
+            operation_latencies = find_operation_latencies(operation)
+
+            if (operation_latencies.nil?)
+              latencies_array = Array.new(BinarySearchLatencyTracker::BUCKETS.length, 0)
+              latencies_array[index] = 1
+              @latencies << { operation: operation, latencies: latencies_array }
+            else
+              operation_latencies[:latencies][index] += 1
+            end
+          end
+
+          def concatenate_latency(operation, time_in_ms)
+            operation_latencies = find_operation_latencies(operation)
+
+            if (operation_latencies.nil?)
+              @latencies << { operation: operation, latencies: [time_in_ms] }
+            else
+              operation_latencies[:latencies].push(time_in_ms)
+            end
+          end
+
+          def find_operation_latencies(operation)
+            @latencies.find { |l| l[:operation] == operation }
+          end
         end
       end
     end

data/lib/splitclient-rb/cache/repositories/metrics/redis_repository.rb

@@ -38,30 +38,16 @@ module SplitIoClient
             keys = @adapter.find_strings_by_prefix(impressions_metrics_key('latency'))
             return [] if keys.empty?
 
-            found_latencies = @adapter.multiple_strings(keys).map do |name, data|
-              [name.gsub(impressions_metrics_key('latency.'), ''), data]
-            end.to_h
-
-            collected_latencies = {}
-
-            found_latencies.each do |key, value|
-              operation, bucket = key.split('.bucket.')
-              collected_latencies[operation] = {} unless collected_latencies[operation]
-              collected_latencies[operation].merge!({bucket => value})
-            end
-
-            latencies = {}
+            collected_latencies = collect_latencies(keys)
 
-            collected_latencies.keys.each do |operation|
-              latencies_array = Array.new(BinarySearchLatencyTracker::BUCKETS.length, 0)
+            collected_latencies.keys.each_with_object({}) do |operation, latencies|
+              operation_latencies = Array.new(BinarySearchLatencyTracker::BUCKETS.length, 0)
               collected_latencies[operation].each do |bucket, value|
-                latencies_array[bucket.to_i] = value.to_i
+                operation_latencies[bucket.to_i] = value.to_i
               end
 
-              latencies[operation] = latencies_array
+              latencies[operation] = operation_latencies
             end
-
-            latencies
           end
 
           def gauges
@@ -78,6 +64,35 @@ module SplitIoClient
             @adapter.delete(keys)
           end
 
+          # introduced to fix incorrect latencies
+          def fix_latencies
+            keys =[]
+
+            23.times do |index|
+              keys.concat @adapter.find_strings_by_pattern(latencies_to_be_deleted_key_pattern_prefix("sdk.get_treatment.#{index}"))
+            end
+
+            keys.concat @adapter.find_strings_by_pattern(latencies_to_be_deleted_key_pattern_prefix('sdk.get_treatments'))
+            keys.concat @adapter.find_strings_by_pattern(latencies_to_be_deleted_key_pattern_prefix('sdk.get_treatment_with_config'))
+            keys.concat @adapter.find_strings_by_pattern(latencies_to_be_deleted_key_pattern_prefix('sdk.get_treatments_with_config'))
+
+            keys.concat @adapter.find_strings_by_pattern(latencies_to_be_deleted_key_pattern_prefix('*.time'))
+
+            SplitIoClient.configuration.logger.info("Found incorrect latency keys, deleting. Keys: #{keys}") unless keys.size == 0
+
+            keys.each_slice(500) do |chunk|
+              @adapter.pipelined do
+                chunk.each do |key|
+                  @adapter.delete key
+                end
+              end
+            end
+          end
+
+          def latencies_to_be_deleted_key_pattern_prefix(key)
+            "#{SplitIoClient.configuration.redis_namespace}/#{SplitIoClient.configuration.language}-*/latency.#{key}"
+          end
+
           def clear_gauges
             # TODO
           end
@@ -87,6 +102,22 @@ module SplitIoClient
             clear_latencies
             clear_gauges
           end
+
+          private
+
+          def find_latencies(keys)
+            @adapter.multiple_strings(keys).map do |name, data|
+              [name.gsub(impressions_metrics_key('latency.'), ''), data]
+            end.to_h
+          end
+
+          def collect_latencies(keys)
+            find_latencies(keys).each_with_object({}) do |(key, value), collected_latencies|
+              operation, bucket = key.split('.bucket.')
+              collected_latencies[operation] = {} unless collected_latencies[operation]
+              collected_latencies[operation].merge!({bucket => value})
+            end
+          end
         end
       end
     end

data/lib/splitclient-rb/cache/repositories/metrics_repository.rb

@@ -5,7 +5,7 @@ module SplitIoClient
       class MetricsRepository < Repository
         extend Forwardable
         def_delegators :@adapter, :add_count, :add_latency, :add_gauge, :counts, :latencies, :gauges,
-                       :clear_counts, :clear_latencies, :clear_gauges, :clear
+                       :clear_counts, :clear_latencies, :clear_gauges, :clear, :fix_latencies
 
         def initialize(adapter)
           @adapter = case adapter.class.to_s

data/lib/splitclient-rb/redis_metrics_fixer.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module SplitIoClient
+  class RedisMetricsFixer
+    def initialize(metrics_repository)
+      @metrics_repository = metrics_repository
+    end
+
+    def call
+      return if ENV['SPLITCLIENT_ENV'] == 'test' || SplitIoClient.configuration.mode == :standalone
+
+      fixer_thread
+
+      if defined?(PhusionPassenger)
+        PhusionPassenger.on_event(:starting_worker_process) do |forked|
+          fixer_thread if forked
+        end
+      end
+    end
+
+    private
+
+    def fixer_thread
+      Thread.new do
+        begin
+          SplitIoClient.configuration.logger.info('Starting redis metrics fixer')
+
+          @metrics_repository.fix_latencies
+        rescue StandardError => error
+          SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
+        end
+      end
+    end
+  end
+end

data/lib/splitclient-rb/split_factory.rb

@@ -42,6 +42,8 @@ module SplitIoClient
 
       validate_api_key
 
+      RedisMetricsFixer.new(@metrics_repository).call
+
       @sdk_blocker.block if @sdk_blocker
     end
 

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '6.4.1.pre.rc1'
+  VERSION = '6.4.1.pre.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 6.4.1.pre.rc1
+  version: 6.4.1.pre.rc2
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -374,6 +374,7 @@ files:
 - lib/splitclient-rb/localhost_utils.rb
 - lib/splitclient-rb/managers/localhost_split_manager.rb
 - lib/splitclient-rb/managers/split_manager.rb
+- lib/splitclient-rb/redis_metrics_fixer.rb
 - lib/splitclient-rb/split_config.rb
 - lib/splitclient-rb/split_factory.rb
 - lib/splitclient-rb/split_factory_builder.rb