splitclient-rb 7.3.5.pre.rc4-java → 8.0.0.pre.rc2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 056032ef5843a8944e848f07d7a75471a193bdba
-  data.tar.gz: 94812fea82d41a99a9537555e3b04f617215807d
+  metadata.gz: c9beda4470bef68acfea1cb18a857d0b0d6a0f29
+  data.tar.gz: 677de7caceaa230cbb5b667e319865c93785da6c
 SHA512:
-  metadata.gz: 0b792cec62ca90569dbed5bcc8b4bb1a8bd3774add314806c0dc4fa10a09e560fbacf3927453348812f53fffdf88016a60b22fb47c4bb7bbf74d3cbdffd4e27d
-  data.tar.gz: 5b1e2eecf0de9f94bb6248eb145dc206f5927c2a0e068f2c3aeea57894ec358e9afec70409f5f109e3ed67e8de71b89317bc71d5abafa63861d7195e8e9a5c3f
+  metadata.gz: cc648ee9e65658304075aafd08e5cae96cd358b29d9c200dec09ab32b7ee3216ebffe6212923e1b2ffdb57b36cf3adf475bcb5f7817b36835b9a2316854252e2
+  data.tar.gz: c112ef70383f4025ca72a30d340aa6d749dbf9a4c9999ad7d3da5767c7c88cadee9491c10bd52b9412681ce8533941e0590b6bbdc69cd4d955f1ac06ac5234c0

data/.github/workflows/ci.yml

@@ -1,10 +1,4 @@
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   test:
@@ -14,16 +8,20 @@ jobs:
         image: redis
         ports:
           - 6379:6379
+    strategy:
+      matrix:
+        ruby: [ '2.5.0', '3.1.1' ]
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: ${{ matrix.ruby }}
 
       - name: Install dependencies
         run: bundle install

data/.rubocop.yml

@@ -27,20 +27,6 @@ Metrics/ParameterLists:
 
 Metrics/LineLength:
   Max: 135
-  Exclude:
-    - spec/sse/**/*
-    - spec/integrations/**/*
-    - spec/engine/sync_manager_spec.rb
-    - spec/engine/auth_api_client_spec.rb
-    - spec/telemetry/synchronizer_spec.rb
-    - spec/splitclient/split_config_spec.rb
-    - spec/engine/push_manager_spec.rb
-    - spec/cache/senders/impressions_sender_adapter_spec.rb
-
-Style/BracesAroundHashParameters:
-  Exclude:
-    - spec/integrations/push_client_spec.rb
-    - spec/engine/synchronizer_spec.rb
 
 Metrics/BlockLength:
   Exclude:
@@ -51,8 +37,24 @@ Naming/FileName:
   Exclude:
     - splitclient-rb.gemspec
 
+Style/OptionalBooleanParameter:
+  Exclude:
+    - lib/splitclient-rb/engine/matchers/between_matcher.rb
+    - lib/splitclient-rb/engine/matchers/combining_matcher.rb
+    - lib/splitclient-rb/engine/matchers/equal_to_matcher.rb
+    - lib/splitclient-rb/engine/matchers/less_than_or_equal_to_matcher.rb
+    - lib/splitclient-rb/engine/matchers/greater_than_or_equal_to_matcher.rb
+
+Style/HashTransformKeys:
+  Exclude:
+    - lib/splitclient-rb/engine/matchers/combining_matcher.rb
+
+Style/RedundantReturn:
+  Exclude:
+    - lib/splitclient-rb/engine/common/impressions_manager.rb
+
 AllCops:
-  TargetRubyVersion: 2.3.6
+  TargetRubyVersion: 2.5
   Exclude:
     - gemfiles/* # excluded as appraisal generates them with errors
     - lib/*
@@ -70,3 +72,5 @@ AllCops:
     - lib/splitclient-rb/engine/synchronizer.rb
     - tmp/**/*
     - lib/splitclient-rb/sse/event_source/client.rb
+    - spec/**/*
+    - .simplecov

data/README.md

@@ -7,7 +7,7 @@ This SDK is designed to work with Split, the platform for controlled rollouts, w
 [![Twitter Follow](https://img.shields.io/twitter/follow/splitsoftware.svg?style=social&label=Follow&maxAge=1529000)](https://twitter.com/intent/follow?screen_name=splitsoftware)
 
 ## Compatibility
-The Ruby SDK support Ruby version 2.3.0 or later and JRuby or 9.1.17 o later.
+The Ruby SDK support Ruby version 2.5.0 or later and JRuby or 9.1.17 o later.
 
 Also the Ruby SDK has been tested as a standalone app as well as using the following web servers:
  - Puma

data/Rakefile

@@ -3,7 +3,6 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-require 'appraisal'
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
@@ -26,10 +25,4 @@ else
   end
 end
 
-if !ENV['APPRAISAL_INITIALIZED']
-  task :default do
-    sh 'appraisal install && rake appraisal && rake rubocop'
-  end
-else
-  task default: %i[spec rubocop]
-end
+task default: %i[spec rubocop]

data/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb

@@ -30,16 +30,16 @@ module SplitIoClient
               fetch_segment(name, fetch_options) if change_number == -1
             end
           end
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def fetch_segment(name, fetch_options = { cache_control_headers: false, till: nil })
           @semaphore.synchronize do
             segments_api.fetch_segments_by_names([name], fetch_options)
           end
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def fetch_segments
@@ -48,8 +48,8 @@ module SplitIoClient
 
             true
           end
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           false
         end
 

data/lib/splitclient-rb/cache/fetchers/split_fetcher.rb

@@ -36,8 +36,8 @@ module SplitIoClient
 
             { segment_names: data[:segment_names], success: true }
           end
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           { segment_names: [], success: false }
         end
 

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

@@ -19,8 +19,8 @@ module SplitIoClient
             post_events if @size >= EVENTS_MAX_SIZE_BYTES || @adapter.length == @config.events_queue_size
 
             @telemetry_runtime_producer.record_events_stats(Telemetry::Domain::Constants::EVENTS_QUEUED, 1)
-          rescue StandardError => error
-            @config.log_found_exception(__method__.to_s, error)
+          rescue StandardError => e
+            @config.log_found_exception(__method__.to_s, e)
             @telemetry_runtime_producer.record_events_stats(Telemetry::Domain::Constants::EVENTS_DROPPED, 1)
           end
 

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

@@ -21,8 +21,8 @@ module SplitIoClient
 
         def post_events
           events_api.post(self.clear)
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         protected

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

@@ -78,8 +78,8 @@ module SplitIoClient
           end
           
           keys
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           0
         end
 

data/lib/splitclient-rb/cache/routers/impression_router.rb

@@ -41,8 +41,8 @@ module SplitIoClient
         attributes: impression[:attributes]
       }
       @queue.push(imp) if @listener
-    rescue StandardError => error
-      @config.log_found_exception(__method__.to_s, error)
+    rescue StandardError => e
+      @config.log_found_exception(__method__.to_s, e)
     end
 
     def router_thread
@@ -50,8 +50,8 @@ module SplitIoClient
         loop do
           begin
             @listener.log(@queue.pop)
-          rescue StandardError => error
-            @config.log_found_exception(__method__.to_s, error)
+          rescue StandardError => e
+            @config.log_found_exception(__method__.to_s, e)
           end
         end
       end

data/lib/splitclient-rb/cache/senders/impressions_adapter/memory_sender.rb

@@ -31,17 +31,17 @@ module SplitIoClient
         def uniques_formatter(uniques)
           return if uniques.nil? || uniques.empty?
 
-          to_return = { mtks: [] }
+          to_return = { keys: [] }
           uniques.each do |key, value|
-            to_return[:mtks] << {
+            to_return[:keys] << {
               f: key,
               ks: value.to_a
             }
           end
 
           to_return
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           nil
         end
 
@@ -61,8 +61,8 @@ module SplitIoClient
           end
 
           formated_counts
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           nil
         end
       end

data/lib/splitclient-rb/cache/senders/impressions_adapter/redis_sender.rb

@@ -29,8 +29,6 @@ module SplitIoClient
             impressions_count.each do |key, value|
               pipeline.hincrby(impressions_count_key, key, value)
             end
-            
-            @future = pipeline.hlen(impressions_count_key)
           end
 
           expire_impressions_count_key(impressions_count, result)
@@ -67,8 +65,8 @@ module SplitIoClient
           end
 
           to_return
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
           nil
         end
       end

data/lib/splitclient-rb/cache/senders/impressions_count_sender.rb

@@ -24,7 +24,7 @@ module SplitIoClient
                 sleep(@config.counter_refresh_rate)
                 post_impressions_count                
               end
-            rescue SplitIoClient::SDKShutdownException              
+            rescue SplitIoClient::SDKShutdownException
               post_impressions_count
 
               @config.logger.info('Posting impressions count due to shutdown')
@@ -34,8 +34,8 @@ module SplitIoClient
 
         def post_impressions_count
           @impressions_sender_adapter.record_impressions_count(@impression_counter.pop_all)
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
       end
     end

data/lib/splitclient-rb/cache/senders/impressions_sender.rb

@@ -39,8 +39,8 @@ module SplitIoClient
             .call(fetch_all_impressions)
 
           impressions_api.post(formatted_impressions)
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def impressions_api

data/lib/splitclient-rb/cache/stores/localhost_split_store.rb

@@ -46,10 +46,10 @@ module SplitIoClient
           end
 
           @status_manager.ready! if @status_manager
-        rescue StandardError => error
+        rescue StandardError => e
           @config.logger.error('Error while parsing the split file. ' \
             'Check that the input file matches the expected format')
-          @config.log_found_exception(__method__.to_s, error)
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def store_split(split)

data/lib/splitclient-rb/clients/split_client.rb

@@ -110,8 +110,8 @@ module SplitIoClient
       @events_repository.add(key.to_s, traffic_type_name.downcase, event_type.to_s, (Time.now.to_f * 1000).to_i, value, properties, properties_size)
       record_latency(TRACK, start)
       true
-    rescue StandardError => error
-      @config.log_found_exception(__method__.to_s, error)
+    rescue StandardError => e
+      @config.log_found_exception(__method__.to_s, e)
       record_exception(TRACK)
 
       false
@@ -291,8 +291,8 @@ module SplitIoClient
         
         impression = @impressions_manager.build_impression(matching_key, bucketing_key, split_name, treatment_data, { attributes: attributes, time: nil })
         impressions << impression unless impression.nil?
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
 
         record_exception(calling_method)
 

data/lib/splitclient-rb/engine/api/client.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'net/http/persistent'
-
 module SplitIoClient
   module Api
     class Client
@@ -54,33 +52,12 @@ module SplitIoClient
       private
 
       def api_client
-        if needs_patched_net_http_persistent_adapter?
-          require 'splitclient-rb/engine/api/faraday_adapter/patched_net_http_persistent'
-
-          Faraday::Adapter.register_middleware(
-            net_http_persistent: SplitIoClient::FaradayAdapter::PatchedNetHttpPersistent
-          )
-        end
-
         @api_client ||= Faraday.new do |builder|
           builder.use SplitIoClient::FaradayMiddleware::Gzip
           builder.adapter :net_http_persistent
         end
       end
 
-      def needs_patched_net_http_persistent_adapter?
-        new_net_http_persistent? && incompatible_faraday_version?
-      end
-
-      def incompatible_faraday_version?
-        version = Faraday::VERSION.split('.')[0..1]
-        version[0].to_i == 0 && version[1].to_i < 13
-      end
-
-      def new_net_http_persistent?
-        Net::HTTP::Persistent::VERSION.split('.').first.to_i >= 3
-      end
-
       def common_headers(api_key)
         {
           'Authorization' => "Bearer #{api_key}",

data/lib/splitclient-rb/engine/api/telemetry_api.rb

@@ -18,9 +18,9 @@ module SplitIoClient
       end
 
       def record_unique_keys(uniques)
-        return if uniques[:mtks].empty?
+        return if uniques[:keys].empty?
 
-        post_telemetry("#{@config.telemetry_service_url}/mtks/ss", uniques, 'mtks')
+        post_telemetry("#{@config.telemetry_service_url}/keys/ss", uniques, 'unique_keys')
       rescue StandardError => e
         @config.log_found_exception(__method__.to_s, e)
       end

data/lib/splitclient-rb/engine/auth_api_client.rb

@@ -85,8 +85,8 @@ module SplitIoClient
         control_pri = SplitIoClient::Constants::CONTROL_PRI
         control_sec = SplitIoClient::Constants::CONTROL_SEC
         channels_string = channels_string.gsub(control_pri, "#{prefix}#{control_pri}")
-        channels_string = channels_string.gsub(control_sec, "#{prefix}#{control_sec}")
-        channels_string
+
+        channels_string.gsub(control_sec, "#{prefix}#{control_sec}")
       end
     end
   end

data/lib/splitclient-rb/engine/common/impressions_manager.rb

@@ -64,8 +64,8 @@ module SplitIoClient
 
         def impression_router
           @impression_router ||= SplitIoClient::ImpressionRouter.new(@config)
-        rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+        rescue StandardError => e
+          @config.log_found_exception(__method__.to_s, e)
         end
 
         def record_stats(stats)

data/lib/splitclient-rb/engine/matchers/contains_all_matcher.rb

@@ -6,10 +6,6 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array, logger)
-      super(attribute, remote_array, logger)
-    end
-
     def match?(args)
       if @remote_set.empty?
         @logger.log_if_debug('[ContainsAllMatcher] Remote Set Empty')

data/lib/splitclient-rb/engine/matchers/contains_any_matcher.rb

@@ -6,10 +6,6 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array, logger)
-      super(attribute, remote_array, logger)
-    end
-
     def match?(args)
       matches = local_set(args[:attributes], @attribute).intersect? @remote_set
       @logger.log_if_debug("[ContainsAnyMatcher] Remote Set #{@remote_set} contains any \

data/lib/splitclient-rb/engine/matchers/equal_to_set_matcher.rb

@@ -6,10 +6,6 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array, logger)
-      super(attribute, remote_array, logger)
-    end
-
     def match?(args)
       set = local_set(args[:attributes], @attribute)
       matches = set == @remote_set

data/lib/splitclient-rb/engine/matchers/part_of_set_matcher.rb

@@ -6,10 +6,6 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array, logger)
-      super(attribute, remote_array, logger)
-    end
-
     def match?(args)
       @local_set = local_set(args[:attributes], @attribute)
 

data/lib/splitclient-rb/engine/push_manager.rb

@@ -41,17 +41,20 @@ module SplitIoClient
       private
 
       def schedule_next_token_refresh(time)
-        @config.threads[:schedule_next_token_refresh] = Thread.new do
-          begin
-            @config.logger.debug("schedule_next_token_refresh refresh in #{time} seconds.") if @config.debug_enabled
-            sleep(time)
-            @config.logger.debug('schedule_next_token_refresh starting ...') if @config.debug_enabled
-            @sse_handler.stop
-            start_sse
-          rescue StandardError => e
-            @config.logger.debug("schedule_next_token_refresh error: #{e.inspect}") if @config.debug_enabled
-          end
-        end
+        @config.threads[:schedule_next_token_refresh] = Thread.new { refresh_token_task(time) }
+      end
+
+      def refresh_token_task(time)
+        @config.logger.debug("schedule_next_token_refresh refresh in #{time} seconds.") if @config.debug_enabled
+
+        sleep(time)
+
+        @config.logger.debug('schedule_next_token_refresh starting ...') if @config.debug_enabled
+        @sse_handler.stop
+
+        start_sse
+      rescue StandardError => e
+        @config.logger.debug("schedule_next_token_refresh error: #{e.inspect}") if @config.debug_enabled
       end
 
       def record_telemetry(time)

data/lib/splitclient-rb/engine/synchronizer.rb

@@ -96,8 +96,8 @@ module SplitIoClient
         else
           @config.logger.debug("No changes fetched after #{attempts} attempts with CDN bypassed.") if @config.debug_enabled
         end
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def fetch_segment(name, target_change_number)
@@ -132,8 +132,8 @@ module SplitIoClient
         else
           @config.logger.debug("No changes fetched for segment #{name} after #{attempts} attempts with CDN bypassed.") if @config.debug_enabled
         end
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       private

data/lib/splitclient-rb/split_config.rb

@@ -51,7 +51,7 @@ module SplitIoClient
 
       @segments_refresh_rate = opts[:segments_refresh_rate] || SplitConfig.default_segments_refresh_rate
 
-      @impressions_mode = init_impressions_mode(opts[:impressions_mode])
+      @impressions_mode = init_impressions_mode(opts[:impressions_mode], opts[:cache_adapter])
 
       @impressions_refresh_rate = SplitConfig.init_impressions_refresh_rate(@impressions_mode, opts[:impressions_refresh_rate], SplitConfig.default_impressions_refresh_rate)
       @impressions_queue_size = opts[:impressions_queue_size] || SplitConfig.default_impressions_queue_size
@@ -314,14 +314,16 @@ module SplitIoClient
       :optimized
     end
 
-    def init_impressions_mode(impressions_mode)
+    def init_impressions_mode(impressions_mode, adapter)
       impressions_mode ||= SplitConfig.default_impressions_mode
 
+      return :debug if adapter == :redis
+
       case impressions_mode
       when :debug
         return :debug
-      when :none
-        return :none
+      # when :none  // we not support :none impression mode yet. Defaulting to :optimized mode
+      #  return :none
       else
         @logger.error('You passed an invalid impressions_mode, impressions_mode should be one of the following values: :debug or :optimized. Defaulting to :optimized mode') unless impressions_mode == :optimized
         return :optimized

data/lib/splitclient-rb/sse/notification_manager_keeper.rb

@@ -61,10 +61,11 @@ module SplitIoClient
       end
 
       def update_publishers(channel, publishers)
-        if channel == Constants::CONTROL_PRI
+        case channel
+        when Constants::CONTROL_PRI
           @telemetry_runtime_producer.record_streaming_event(Telemetry::Domain::Constants::OCCUPANCY_PRI, publishers)
           @publishers_pri.value = publishers
-        elsif channel == Constants::CONTROL_SEC
+        when Constants::CONTROL_SEC
           @telemetry_runtime_producer.record_streaming_event(Telemetry::Domain::Constants::OCCUPANCY_SEC, publishers)
           @publishers_sec.value = publishers
         end

data/lib/splitclient-rb/telemetry/memory/memory_evaluation_consumer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class MemoryEvaluationConsumer < EvaluationConsumer
+    class MemoryEvaluationConsumer
       def initialize(config)
         @config = config
         @adapter = config.telemetry_adapter

data/lib/splitclient-rb/telemetry/memory/memory_evaluation_producer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class MemoryEvaluationProducer < EvaluationProducer
+    class MemoryEvaluationProducer
       def initialize(config)
         @config = config
         @adapter = config.telemetry_adapter
@@ -10,14 +10,14 @@ module SplitIoClient
 
       def record_latency(method, bucket)
         @adapter.latencies.find { |l| l[:method] == method }[:latencies][bucket] += 1
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_exception(method)
         @adapter.exceptions.find { |l| l[:method] == method }[:exceptions].increment
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
     end
   end

data/lib/splitclient-rb/telemetry/memory/memory_init_consumer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class MemoryInitConsumer < InitConsumer
+    class MemoryInitConsumer
       DEFAULT_VALUE = 0
 
       def initialize(config)

data/lib/splitclient-rb/telemetry/memory/memory_init_producer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class MemoryInitProducer < InitProducer
+    class MemoryInitProducer
       def initialize(config)
         @config = config
         @adapter = config.telemetry_adapter
@@ -14,14 +14,14 @@ module SplitIoClient
 
       def record_bur_timeout
         find_factory_counters(Domain::Constants::BUR_TIMEOUT)[:counts].increment
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_non_ready_usages
         find_factory_counters(Domain::Constants::NON_READY_USAGES)[:counts].increment
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       private

data/lib/splitclient-rb/telemetry/memory/memory_runtime_consumer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class MemoryRuntimeConsumer < RuntimeConsumer
+    class MemoryRuntimeConsumer
       DEFAULT_VALUE = 0
 
       def initialize(config)

data/lib/splitclient-rb/telemetry/memory/memory_runtime_producer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class MemoryRuntimeProducer < RuntimeProducer
+    class MemoryRuntimeProducer
       def initialize(config)
         @config = config
         @adapter = config.telemetry_adapter
@@ -16,22 +16,22 @@ module SplitIoClient
 
       def record_impressions_stats(type, count)
         @adapter.impressions_data_records.find { |l| l[:type] == type }[:value].value += count unless count.zero?
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_events_stats(type, count)
         @adapter.events_data_records.find { |l| l[:type] == type }[:value].value += count unless count.zero?
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_successful_sync(type, value = nil)
         value = (Time.now.to_f * 1000.0).to_i if value.nil?
 
         @adapter.last_synchronization.find { |l| l[:type] == type }[:value] = Concurrent::AtomicFixnum.new(value)
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_sync_error(type, status)
@@ -39,42 +39,42 @@ module SplitIoClient
 
         begin
           http_errors[status] += 1
-        rescue StandardError => _
+        rescue StandardError => _e
           http_errors[status] = 1
         end
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_sync_latency(type, bucket)
         @adapter.http_latencies.find { |l| l[:type] == type }[:value][bucket] += 1
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_auth_rejections
         @adapter.auth_rejections.increment
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_token_refreshes
         @adapter.token_refreshes.increment
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_streaming_event(type, data = nil, timestamp = nil)
         timestamp ||= (Time.now.to_f * 1000.0).to_i
         @adapter.streaming_events << { e: type, d: data, t: timestamp } unless @adapter.streaming_events.length >= 19
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_session_length(session)
         @adapter.session_length.value = session
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
     end
   end

data/lib/splitclient-rb/telemetry/memory/memory_synchronizer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class MemorySynchronizer < Synchronizer
+    class MemorySynchronizer
       def initialize(config,
                      telemtry_consumers,
                      repositories,
@@ -37,8 +37,8 @@ module SplitIoClient
                           @telemetry_runtime_consumer.pop_tags)
 
         @telemetry_api.record_stats(format_stats(usage))
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def synchronize_config(active_factories = nil, redundant_active_factories = nil, time_until_ready = nil)
@@ -75,8 +75,8 @@ module SplitIoClient
                                      @telemetry_init_consumer.non_ready_usages)
 
         @telemetry_api.record_init(fornat_init_config(init_config))
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       private

data/lib/splitclient-rb/telemetry/redis/redis_evaluation_producer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class RedisEvaluationProducer < EvaluationProducer
+    class RedisEvaluationProducer
       def initialize(config)
         @config = config
         @adapter = config.telemetry_adapter

data/lib/splitclient-rb/telemetry/redis/redis_init_producer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class RedisInitProducer < InitProducer
+    class RedisInitProducer
       def initialize(config)
         @config = config
         @adapter = config.telemetry_adapter
@@ -11,12 +11,12 @@ module SplitIoClient
       def record_config(config_data)
         return if config_data.nil?
 
-        data = { m: { i: @config.machine_ip, n: @config.machine_name, s: "#{@config.language}-#{@config.version}" },
-                 t: { oM: config_data.om, st: config_data.st, aF: config_data.af, rF: config_data.rf, t: config_data.t } }
+        data = { t: { oM: config_data.om, st: config_data.st, aF: config_data.af, rF: config_data.rf, t: config_data.t } }
+        field = "#{@config.language}-#{@config.version}/#{@config.machine_name}/#{@config.machine_ip}"
 
-        @adapter.add_to_queue(config_key, data.to_json)
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+        @adapter.add_to_map(config_key, field, data.to_json)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
 
       def record_bur_timeout
@@ -30,7 +30,7 @@ module SplitIoClient
       private
 
       def config_key
-        "#{@config.redis_namespace}.telemetry.config"
+        "#{@config.redis_namespace}.telemetry.init"
       end
     end
   end

data/lib/splitclient-rb/telemetry/redis/redis_synchronizer.rb

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Telemetry
-    class RedisSynchronizer < Synchronizer
+    class RedisSynchronizer
       def initialize(config,
                      telemetry_init_producer)
         @config = config
@@ -20,8 +20,8 @@ module SplitIoClient
         init_config = ConfigInit.new(@config.mode, 'redis', active_factories, redundant_active_factories, tags)
 
         @telemetry_init_producer.record_config(init_config)
-      rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+      rescue StandardError => e
+        @config.log_found_exception(__method__.to_s, e)
       end
     end
   end

data/lib/splitclient-rb/telemetry/sync_task.rb

@@ -15,21 +15,21 @@ module SplitIoClient
       private
 
       def stats_thread
-        @config.threads[:telemetry_stats_sender] = Thread.new do
-          begin
-            @config.logger.info('Starting Telemetry Sync Task')
+        @config.threads[:telemetry_stats_sender] = Thread.new { telemetry_sync_task }
+      end
 
-            loop do
-              sleep(@config.telemetry_refresh_rate)
+      def telemetry_sync_task
+        @config.logger.info('Starting Telemetry Sync Task')
 
-              @telemetry_synchronizer.synchronize_stats
-            end
-          rescue SplitIoClient::SDKShutdownException
-            @telemetry_synchronizer.synchronize_stats
+        loop do
+          sleep(@config.telemetry_refresh_rate)
 
-            @config.logger.info('Posting Telemetry due to shutdown')
-          end
+          @telemetry_synchronizer.synchronize_stats
         end
+      rescue SplitIoClient::SDKShutdownException
+        @telemetry_synchronizer.synchronize_stats
+
+        @config.logger.info('Posting Telemetry due to shutdown')
       end
     end
   end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.3.5.pre.rc4'
+  VERSION = '8.0.0.pre.rc2'
 end

data/lib/splitclient-rb.rb

@@ -49,7 +49,6 @@ require 'splitclient-rb/validators'
 require 'splitclient-rb/split_factory_registry'
 
 require 'splitclient-rb/engine/api/faraday_middleware/gzip'
-require 'splitclient-rb/engine/api/faraday_adapter/patched_net_http_persistent'
 require 'splitclient-rb/engine/api/client'
 require 'splitclient-rb/engine/api/impressions'
 require 'splitclient-rb/engine/api/segments'

data/splitclient-rb.gemspec

@@ -8,16 +8,15 @@ Gem::Specification.new do |spec|
   spec.name          = 'splitclient-rb'
   spec.version       = SplitIoClient::VERSION
   spec.authors       = ['Split Software']
-  spec.email         = ['pato@split.io']
-
+  spec.email         = ['mauro.sanz@split.io']
   spec.summary       = 'Ruby client for split SDK.'
   spec.description   = 'Ruby client for using split SDK.'
   spec.homepage      = 'https://github.com/splitio/ruby-client'
   spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|features|ext)/}) }
-
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5.0'
 
   if defined?(JRUBY_VERSION)
     spec.platform = 'java'
@@ -37,22 +36,22 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_development_dependency 'allocation_stats', '~> 0.1'
-  spec.add_development_dependency 'appraisal', '~> 2.4'
   spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'pry', '~> 0.14'
   spec.add_development_dependency 'pry-nav', '~> 1.0'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rake-compiler', '~> 1.1'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '0.59.0'
+  spec.add_development_dependency 'rubocop', '1.28.2'
   spec.add_development_dependency 'simplecov', '~> 0.20'
   spec.add_development_dependency 'simplecov-json', '~> 0.2'
   spec.add_development_dependency 'timecop', '~> 0.9'
   spec.add_development_dependency 'webmock', '~> 3.14'
+  spec.add_development_dependency 'webrick', '~> 1.7'
 
   spec.add_runtime_dependency 'bitarray', '~> 1.3'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_runtime_dependency 'faraday', '>= 0.8', '< 2.0'
+  spec.add_runtime_dependency 'faraday', '>= 1.1', '< 2.0'
   spec.add_runtime_dependency 'json', '>= 1.8', '< 3.0'
   spec.add_runtime_dependency 'jwt', '>= 1.0.0', '< 3.0'
   spec.add_runtime_dependency 'lru_redux', '~> 1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.3.5.pre.rc4
+  version: 8.0.0.pre.rc2
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  name: appraisal
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -85,7 +71,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   name: rake
   prerelease: false
   type: :development
@@ -93,7 +79,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -127,7 +113,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.59.0
+        version: 1.28.2
   name: rubocop
   prerelease: false
   type: :development
@@ -135,7 +121,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.59.0
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -192,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.14'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  name: webrick
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -225,7 +225,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -236,7 +236,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -370,7 +370,7 @@ dependencies:
         version: '0.3'
 description: Ruby client for using split SDK.
 email:
-- pato@split.io
+- mauro.sanz@split.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -381,7 +381,6 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".simplecov"
-- Appraisals
 - CHANGES.txt
 - CONTRIBUTORS-GUIDE.md
 - Gemfile
@@ -432,7 +431,6 @@ files:
 - lib/splitclient-rb/constants.rb
 - lib/splitclient-rb/engine/api/client.rb
 - lib/splitclient-rb/engine/api/events.rb
-- lib/splitclient-rb/engine/api/faraday_adapter/patched_net_http_persistent.rb
 - lib/splitclient-rb/engine/api/faraday_middleware/gzip.rb
 - lib/splitclient-rb/engine/api/impressions.rb
 - lib/splitclient-rb/engine/api/segments.rb
@@ -535,7 +533,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/Appraisals

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-appraise 'faraday-before-0.13' do
-  gem 'faraday', '>= 0.9', '< 0.13'
-  gem 'net-http-persistent', '~> 3.0'
-end
-
-appraise 'faraday-after-0.13' do
-  gem 'faraday', '> 0.13'
-end

data/lib/splitclient-rb/engine/api/faraday_adapter/patched_net_http_persistent.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module SplitIoClient
-  module FaradayAdapter
-    class PatchedNetHttpPersistent < Faraday::Adapter::NetHttpPersistent
-      ##
-      # Borrowed directly from the latest `NetHttpPersistent` adapter implementation.
-      #
-      # https://github.com/lostisland/faraday/blob/master/lib/faraday/adapter/net_http_persistent.rb
-      #
-      def net_http_connection(env)
-        @cached_connection ||=
-          if Net::HTTP::Persistent.instance_method(:initialize).parameters.first == [:key, :name]
-            Net::HTTP::Persistent.new(name: 'Faraday')
-          else
-            Net::HTTP::Persistent.new('Faraday')
-          end
-
-        proxy_uri                = proxy_uri(env)
-        @cached_connection.proxy = proxy_uri if @cached_connection.proxy_uri != proxy_uri
-        @cached_connection
-      end
-
-      def proxy_uri(env)
-        proxy_uri = nil
-        if (proxy = env[:request][:proxy])
-          proxy_uri      = ::URI::HTTP === proxy[:uri] ? proxy[:uri].dup : ::URI.parse(proxy[:uri].to_s)
-          proxy_uri.user = proxy_uri.password = nil
-          # awful patch for net-http-persistent 2.8 not unescaping user/password
-          (
-          class << proxy_uri;
-            self;
-          end).class_eval do
-            define_method(:user) { proxy[:user] }
-            define_method(:password) { proxy[:password] }
-          end if proxy[:user]
-        end
-        proxy_uri
-      end
-
-      def with_net_http_connection(env)
-        yield net_http_connection(env)
-      end
-    end
-  end
-end