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

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.rc3'
+  VERSION = '8.0.0'
 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.rc3
+  version: 8.0.0
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-05-10 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,12 +533,12 @@ 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:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.6.14

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