splitclient-rb 7.3.5.pre.rc3-java → 8.0.0.pre.rc1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 186060ea5e282d91426d8c220d060fe34cf8a316
-  data.tar.gz: 2217aae3d87f3dd8ba0a09128ba5d7a064fb1fae
+  metadata.gz: 3361d3010afe34c3f431e3acea95c91dacf6a835
+  data.tar.gz: 13e9c1f8f7b32a9769ab474934c34c844636fbff
 SHA512:
-  metadata.gz: e3e69c550554845b3b27ae2132a86c25e2d2f0b49c001baacdea33feec117f8ce5778ff004ccfe44388841b384d9a086db43eeb89997e2159503361adda3525b
-  data.tar.gz: fdc0ec71a389b8f48f9d941cca7bf2571d3e91cd85ee0f1ac03413e53ac8ea4367eb5d8d00b414c5649262f88cba4be8e70726d38d67cbf2f0a8c813ee830fa6
+  metadata.gz: 4f0d7bc586a3452dceeadad1aa70f662ff789ff6c8fdfeb879772dd8e92a1d37f7c81d78eb78ce27dfdb6d57a25f1daed9556c790733f7d8423f6e606cfdd6b5
+  data.tar.gz: 3fe42c3ebfaf805648381194f882d063a2b02027c21d428ada11eee2eb5273a8f97b632cb024b4d645d28a358dc60c25d8fa3cd5af88f1c452168c889d5d3783

data/.github/workflows/ci.yml

@@ -1,10 +1,4 @@
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   test:
@@ -21,7 +15,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.5
 

data/.rubocop.yml

@@ -52,7 +52,7 @@ Naming/FileName:
     - splitclient-rb.gemspec
 
 AllCops:
-  TargetRubyVersion: 2.3.6
+  TargetRubyVersion: 2.5
   Exclude:
     - gemfiles/* # excluded as appraisal generates them with errors
     - lib/*

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/senders/impressions_adapter/memory_sender.rb

@@ -31,9 +31,9 @@ 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
             }

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)

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')

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/common/impressions_manager.rb

@@ -9,15 +9,13 @@ module SplitIoClient
                        impression_counter,
                        telemetry_runtime_producer,
                        impression_observer,
-                       unique_keys_tracker,
-                       impression_router)
+                       unique_keys_tracker)
           @config = config
           @impressions_repository = impressions_repository
           @impression_counter = impression_counter
           @impression_observer = impression_observer
           @telemetry_runtime_producer = telemetry_runtime_producer
           @unique_keys_tracker = unique_keys_tracker
-          @impression_router = impression_router
         end
 
         def build_impression(matching_key, bucketing_key, split_name, treatment, params = {})
@@ -58,12 +56,18 @@ module SplitIoClient
             @config.log_found_exception(__method__.to_s, e)
           ensure
             record_stats(stats)
-            @impression_router.add_bulk(impressions)
+            impression_router.add_bulk(impressions)
           end
         end
 
         private
 
+        def impression_router
+          @impression_router ||= SplitIoClient::ImpressionRouter.new(@config)
+        rescue StandardError => error
+          @config.log_found_exception(__method__.to_s, error)
+        end
+
         def record_stats(stats)
           return if redis?
 

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/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/split_factory.rb

@@ -65,7 +65,7 @@ module SplitIoClient
       build_streaming_components
       build_sync_manager
 
-      @sync_manager.start if @config.valid_mode
+      @sync_manager.start
     end
 
     def stop!
@@ -127,10 +127,10 @@ module SplitIoClient
     def validate_api_key
       if(@api_key.nil?)
         @config.logger.error('Factory Instantiation: you passed a nil api_key, api_key must be a non-empty String')
-        @config.valid_mode = false
+        @config.valid_mode =  false
       elsif (@api_key.empty?)
         @config.logger.error('Factory Instantiation: you passed and empty api_key, api_key must be a non-empty String')
-        @config.valid_mode = false
+        @config.valid_mode =  false
       end
     end
 
@@ -249,8 +249,7 @@ module SplitIoClient
       build_impressions_observer
       build_impression_counter
 
-      impression_router = ImpressionRouter.new(@config)
-      @impressions_manager = Engine::Common::ImpressionManager.new(@config, @impressions_repository, @impression_counter, @runtime_producer, @impression_observer, @unique_keys_tracker, impression_router)
+      @impressions_manager = Engine::Common::ImpressionManager.new(@config, @impressions_repository, @impression_counter, @runtime_producer, @impression_observer, @unique_keys_tracker)
     end
   end
 end

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

@@ -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/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.rc3'
+  VERSION = '8.0.0.pre.rc1'
 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,11 +36,10 @@ 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'
@@ -49,10 +47,11 @@ Gem::Specification.new do |spec|
   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.rc3
+  version: 8.0.0.pre.rc1
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-05-03 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:
@@ -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