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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ecbe59c9042526d3e16a7b070f67b32cd568e0f
-  data.tar.gz: bd42608fb164aee8534845d49d0dc3bf201c38eb
+  metadata.gz: 50290448b9a1544bdc740dbc0da2f1112e349b5f
+  data.tar.gz: 832954e70cb5be45522f703bd08709ada0ad08d8
 SHA512:
-  metadata.gz: 227f299ea31b5132703cc09b69aebfab968cec8eee605caf7541401910b93d444446800288e7776bf674a44620bc424e92988fee143ac38a437a51d77ab0d87a
-  data.tar.gz: f67e3353ca14adc45960aa58dad4b0f5b0b7f3746baac309da9e87fb74d02d47e5563b0f94064efce9220be2777a9858b36a88fa3472a5b3431f387527a12c4f
+  metadata.gz: ecaf4eb1ae87e477f21f7cee8e68d8de88a6dfa229b7a175c299a5e6cad7072495d78074bd412915a2bd5b9a8a2a139347b45b54c8b4870450b78e07d13060a0
+  data.tar.gz: 75202e34c65d7731bf1af6e0c215c02197604c6717429e28dfd8354fa0d7b0229ea720bd39edc07a58200edc9e100520e6930289a595217155700433b160c643

data/CHANGES.txt

@@ -1,5 +1,10 @@
-6.3.0 (Apr 30, 2019)
+6.4.1 (Jul 26, 2019)
+ - Fixed an issue in the latency metrics format preventing the synchronizer from correctly picking them up (consumer mode only). Old keys will be deleted on SDK startup. 
+
+6.4.0 (Jul 05, 2019)
+ - Added properties to track method.
 
+6.3.0 (Apr 30, 2019)
 - Added Dynamic Configurations support through two new methods that mimick the regular ones, changing the type of what is returned.
   - get_treatment_with_config: Same as get_treatment but returning the treatment with it's config.
   - get_treatments_with_config: Same as get_treatments, but instead of a map of string it returns a map of treatments with config.

data/NEWS

@@ -1,3 +1,6 @@
+6.4.0 (Jul 05, 2019)
+ - Added properties to track method.
+
 6.3.0 (Apr 30, 2019)
 
 - Added Dynamic Configurations support through two new methods that mimick the regular ones, changing the type of what is returned.

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

@@ -3,6 +3,8 @@ module SplitIoClient
     module Repositories
       module Metrics
         class MemoryRepository
+          OPERATIONS = %w(sdk.get_treatment sdk.get_treatments sdk.get_treatment_with_config sdk.get_treatments_with_config)
+
           def initialize(_ = nil, adapter)
             @counts = []
             @latencies = []
@@ -21,12 +23,11 @@ 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 = (operation == 'sdk.get_treatment') ? binary_search.add_latency_millis(time_in_ms) : [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
-              latencies_for_op = (operation == 'sdk.get_treatment') ? binary_search.add_latency_millis(time_in_ms) : operation_hash[:latencies].push(time_in_ms)
+              concatenate_latency(operation, time_in_ms)
             end
           end
 
@@ -57,6 +58,10 @@ module SplitIoClient
             # TODO
           end
 
+          def fix_latencies
+            # NOOP
+          end
+
           def clear_counts
             @counts = []
           end
@@ -120,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

@@ -17,12 +17,7 @@ module SplitIoClient
           def add_latency(operation, time_in_ms, binary_search)
             prefixed_name = impressions_metrics_key("latency.#{operation}")
 
-            if operation == 'sdk.get_treatment'
-              @adapter.inc("#{prefixed_name}.#{binary_search.add_latency_millis(time_in_ms, true)}")
-              return
-            end
-
-            @adapter.append_to_string(prefixed_name, "#{time_in_ms},")
+            @adapter.inc("#{prefixed_name}.bucket.#{binary_search.add_latency_millis(time_in_ms, true)}")
           end
 
           def add_gauge(gauge, value)
@@ -40,30 +35,19 @@ module SplitIoClient
           end
 
           def latencies
-            collected_latencies = {}
-            latencies_array = Array.new(BinarySearchLatencyTracker::BUCKETS.length, 0)
             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
-
-            found_latencies.each do |key, value|
-              if key.start_with?('sdk.get_treatment')
-                index = key.gsub('sdk.get_treatment.', '').to_i
-                latencies_array[index] = value.to_i
+            collected_latencies = collect_latencies(keys)
 
-                next
+            collected_latencies.keys.each_with_object({}) do |operation, latencies|
+              operation_latencies = Array.new(BinarySearchLatencyTracker::BUCKETS.length, 0)
+              collected_latencies[operation].each do |bucket, value|
+                operation_latencies[bucket.to_i] = value.to_i
               end
 
-              collected_latencies[key] = value.split(',').map(&:to_f)
+              latencies[operation] = operation_latencies
             end
-
-            collected_latencies['sdk.get_treatment'] = latencies_array unless latencies_array.reduce(:+) == 0
-
-            collected_latencies
           end
 
           def gauges
@@ -80,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
@@ -89,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_config.rb

@@ -41,7 +41,7 @@ module SplitIoClient
       @events_uri = (opts[:events_uri] || SplitConfig.default_events_uri).chomp('/')
       @mode = opts[:mode] || SplitConfig.default_mode
       @redis_url = opts[:redis_url] || SplitConfig.default_redis_url
-      @redis_namespace = opts[:redis_namespace] ? "#{opts[:redis_namespace]}.#{SplitConfig.default_redis_namespace}" : SplitConfig.default_redis_namespace
+      @redis_namespace = opts[:redis_namespace] && opts[:redis_namespace].to_s.length > 0 ? "#{opts[:redis_namespace]}.#{SplitConfig.default_redis_namespace}" : SplitConfig.default_redis_namespace
       @cache_adapter = SplitConfig.init_cache_adapter(
         opts[:cache_adapter] || SplitConfig.default_cache_adapter, :map_adapter, nil, @redis_url
       )

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.0.pre.rc1'
+  VERSION = '6.4.1'
 end

metadata

@@ -1,281 +1,281 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 6.4.0.pre.rc1
+  version: 6.4.1
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: allocation_stats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: allocation_stats
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: appraisal
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+  name: bundler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry-nav
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake-compiler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.59.0
+  name: rubocop
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.59.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: simplecov
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: timecop
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: webmock
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: concurrent-ruby
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
+  name: faraday
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+  name: json
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: lru_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: lru_redux
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.9'
+  name: net-http-persistent
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.9'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+  name: redis
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
+  name: thread_safe
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
-  prerelease: false
-  type: :runtime
 description: Ruby client for using split SDK.
 email:
 - pato@split.io
@@ -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
@@ -399,9 +400,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.6.14