splitclient-rb 6.4.1.pre.rc3-java → 7.0.0-java

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

@@ -6,14 +6,15 @@ module SplitIoClient
 
         attr_reader :adapter
 
-        def initialize(adapter)
-          @adapter = case adapter.class.to_s
+        def initialize(config)
+          super(config)
+          @adapter = case @config.cache_adapter.class.to_s
           when 'SplitIoClient::Cache::Adapters::RedisAdapter'
-            SplitIoClient::Cache::Adapters::CacheAdapter.new(adapter)
+            SplitIoClient::Cache::Adapters::CacheAdapter.new(@config)
           else
-            adapter
+            @config.cache_adapter
           end
-          @adapter.set_bool(namespace_key('.ready'), false) unless SplitIoClient.configuration.mode.equal?(:consumer)
+          @adapter.set_bool(namespace_key('.ready'), false) unless @config.mode.equal?(:consumer)
         end
 
         # Receives segment data, adds and removes segements from the store

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

@@ -6,14 +6,16 @@ module SplitIoClient
       class SplitsRepository < Repository
         attr_reader :adapter
 
-        def initialize(adapter)
-          @adapter = case adapter.class.to_s
+        def initialize(config)
+          super(config)
+          @tt_cache = {}
+          @adapter = case @config.cache_adapter.class.to_s
           when 'SplitIoClient::Cache::Adapters::RedisAdapter'
-            SplitIoClient::Cache::Adapters::CacheAdapter.new(adapter)
+            SplitIoClient::Cache::Adapters::CacheAdapter.new(@config)
           else
-            adapter
+            @config.cache_adapter
           end
-          unless SplitIoClient.configuration.mode.equal?(:consumer)
+          unless @config.mode.equal?(:consumer)
             @adapter.set_string(namespace_key('.splits.till'), '-1')
             @adapter.initialize_map(namespace_key('.segments.registered'))
           end
@@ -21,15 +23,27 @@ module SplitIoClient
 
         def add_split(split)
           return unless split[:name]
+          existing_split = get_split(split[:name])
+
+          if(!existing_split)
+            increase_tt_name_count(split[:trafficTypeName])
+          elsif(existing_split[:trafficTypeName] != split[:trafficTypeName])
+            increase_tt_name_count(split[:trafficTypeName])
+            decrease_tt_name_count(existing_split[:trafficTypeName])
+          end
 
           @adapter.set_string(namespace_key(".split.#{split[:name]}"), split.to_json)
         end
 
-        def remove_split(name)
-          @adapter.delete(namespace_key(".split.#{name}"))
+        def remove_split(split)
+          tt_name = split[:trafficTypeName]
+
+          decrease_tt_name_count(split[:trafficTypeName])
+
+          @adapter.delete(namespace_key(".split.#{split[:name]}"))
         end
 
-        def get_splits(names)
+        def get_splits(names, symbolize_names = true)
           splits = {}
           split_names = names.map { |name| namespace_key(".split.#{name}") }
           splits.merge!(
@@ -40,7 +54,8 @@ module SplitIoClient
 
           splits.map do |name, data|
             parsed_data = data ? JSON.parse(data, symbolize_names: true) : nil
-            [name.to_sym, parsed_data]
+            split_name = symbolize_names ? name.to_sym : name
+            [split_name, parsed_data]
           end.to_h
         end
 
@@ -51,13 +66,22 @@ module SplitIoClient
         end
 
         def splits
-          splits_hash = {}
+          get_splits(split_names, false)
+        end
 
-          split_names.each do |name|
-            splits_hash[name] = get_split(name)
+        def traffic_type_exists(tt_name)
+          case @adapter
+          when SplitIoClient::Cache::Adapters::CacheAdapter
+            tt_count = @adapter.string(namespace_key(".trafficType.#{tt_name}"))
+            begin
+              !tt_count.nil? && Integer(tt_count, 10) > 0
+            rescue StandardError => e
+              @config.logger.error("Error while parsing Traffic Type count: #{e.message}")
+              false
+            end
+          else
+            @tt_cache.key?(tt_name) && @tt_cache[tt_name] > 0
           end
-
-          splits_hash
         end
 
         # Return an array of Split Names excluding control keys like splits.till
@@ -99,8 +123,26 @@ module SplitIoClient
         end
 
         def clear
+          @tt_cache.clear
+
           @adapter.clear(namespace_key)
         end
+
+        private
+
+        def increase_tt_name_count(tt_name)
+          return unless tt_name
+
+          @tt_cache[tt_name] = 0 unless @tt_cache[tt_name]
+          @tt_cache[tt_name] += 1
+        end
+
+        def decrease_tt_name_count(tt_name)
+          return unless tt_name
+
+          @tt_cache[tt_name] -= 1 if @tt_cache[tt_name]
+          @tt_cache.delete(tt_name) if @tt_cache[tt_name] == 0
+        end
       end
     end
   end

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

@@ -2,8 +2,9 @@ module SplitIoClient
   class ImpressionRouter
     attr_reader :router_thread
 
-    def initialize
-      @listener = SplitIoClient.configuration.impression_listener
+    def initialize(config)
+      @config = config
+      @listener = @config.impression_listener
 
       return unless @listener
 
@@ -44,12 +45,12 @@ module SplitIoClient
     end
 
     def router_thread
-      SplitIoClient.configuration.threads[:impression_router] = Thread.new do
+      @config.threads[:impression_router] = Thread.new do
         loop do
           begin
             @listener.log(@queue.pop)
           rescue StandardError => error
-            SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
+            @config.log_found_exception(__method__.to_s, error)
           end
         end
       end

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

@@ -4,8 +4,9 @@ module SplitIoClient
   module Cache
     module Senders
       class EventsSender
-        def initialize(events_repository)
+        def initialize(events_repository, config)
           @events_repository = events_repository
+          @config = config
         end
 
         def call
@@ -25,19 +26,19 @@ module SplitIoClient
         private
 
         def events_thread
-          SplitIoClient.configuration.threads[:events_sender] = Thread.new do
+          @config.threads[:events_sender] = Thread.new do
             begin
-              SplitIoClient.configuration.logger.info('Starting events service')
-              
+              @config.logger.info('Starting events service')
+
               loop do
                 post_events
 
-                sleep(SplitIoClient::Utilities.randomize_interval(SplitIoClient.configuration.events_push_rate))
+                sleep(SplitIoClient::Utilities.randomize_interval(@config.events_push_rate))
               end
             rescue SplitIoClient::SDKShutdownException
               post_events
 
-              SplitIoClient.configuration.logger.info('Posting events due to shutdown')
+              @config.logger.info('Posting events due to shutdown')
             end
           end
         end

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

@@ -4,14 +4,15 @@ module SplitIoClient
   module Cache
     module Senders
       class ImpressionsSender
-        def initialize(impressions_repository, api_key)
+        def initialize(impressions_repository, api_key, config)
           @impressions_repository = impressions_repository
           @api_key = api_key
+          @config = config
         end
 
         def call
-          if SplitIoClient.configuration.disable_impressions
-            SplitIoClient.configuration.logger.info('Disabling impressions service by config')
+          if @config.disable_impressions
+            @config.logger.info('Disabling impressions service by config')
             return
           end
 
@@ -31,19 +32,19 @@ module SplitIoClient
         private
 
         def impressions_thread
-          SplitIoClient.configuration.threads[:impressions_sender] = Thread.new do
+          @config.threads[:impressions_sender] = Thread.new do
             begin
-              SplitIoClient.configuration.logger.info('Starting impressions service')
+              @config.logger.info('Starting impressions service')
 
               loop do
                 post_impressions(false)
 
-                sleep(SplitIoClient::Utilities.randomize_interval(SplitIoClient.configuration.impressions_refresh_rate))
+                sleep(SplitIoClient::Utilities.randomize_interval(@config.impressions_refresh_rate))
               end
             rescue SplitIoClient::SDKShutdownException
               post_impressions
 
-              SplitIoClient.configuration.logger.info('Posting impressions due to shutdown')
+              @config.logger.info('Posting impressions due to shutdown')
             end
           end
         end
@@ -54,11 +55,11 @@ module SplitIoClient
 
           impressions_api.post(formatted_impressions)
         rescue StandardError => error
-          SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
+          @config.log_found_exception(__method__.to_s, error)
         end
 
         def impressions_api
-          @impressions_api ||= SplitIoClient::Api::Impressions.new(@api_key)
+          @impressions_api ||= SplitIoClient::Api::Impressions.new(@api_key, @config)
         end
       end
     end

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

@@ -4,9 +4,10 @@ module SplitIoClient
   module Cache
     module Senders
       class MetricsSender
-        def initialize(metrics_repository, api_key)
+        def initialize(metrics_repository, api_key, config)
           @metrics_repository = metrics_repository
           @api_key = api_key
+          @config = config
         end
 
         def call
@@ -24,19 +25,19 @@ module SplitIoClient
         private
 
         def metrics_thread
-          SplitIoClient.configuration.threads[:metrics_sender] = Thread.new do
+          @config.threads[:metrics_sender] = Thread.new do
             begin
-              SplitIoClient.configuration.logger.info('Starting metrics service')
-              
+              @config.logger.info('Starting metrics service')
+
               loop do
                 post_metrics
 
-                sleep(SplitIoClient::Utilities.randomize_interval(SplitIoClient.configuration.metrics_refresh_rate))
+                sleep(SplitIoClient::Utilities.randomize_interval(@config.metrics_refresh_rate))
               end
             rescue SplitIoClient::SDKShutdownException
               post_metrics
 
-              SplitIoClient.configuration.logger.info('Posting metrics due to shutdown')
+              @config.logger.info('Posting metrics due to shutdown')
             end
           end
         end
@@ -44,11 +45,11 @@ module SplitIoClient
         def post_metrics
           metrics_api.post
         rescue StandardError => error
-          SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
+          @config.log_found_exception(__method__.to_s, error)
         end
 
         def metrics_api
-          @metrics_api ||= SplitIoClient::Api::Metrics.new(@api_key, @metrics_repository)
+          @metrics_api ||= SplitIoClient::Api::Metrics.new(@api_key, @metrics_repository, @config)
         end
       end
     end

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

@@ -7,37 +7,46 @@ module SplitIoClient
       class SDKBlocker
         attr_reader :splits_repository
 
-        def initialize(splits_repository, segments_repository)
+        def initialize(splits_repository, segments_repository, config)
           @splits_repository = splits_repository
           @segments_repository = segments_repository
+          @config = config
 
-          @splits_repository.not_ready!
-          @segments_repository.not_ready!
+          if @config.standalone?
+            @splits_repository.not_ready!
+            @segments_repository.not_ready!
+          end
         end
 
         def splits_ready!
-          @splits_repository.ready!
+          if !ready?
+            @splits_repository.ready!
+            @config.logger.info('splits are ready')
+          end
         end
 
         def segments_ready!
-          @segments_repository.ready!
+          if !ready?
+            @segments_repository.ready!
+            @config.logger.info('segments are ready')
+          end
         end
 
-        def block
+        def block(time = nil)
           begin
-            Timeout::timeout(SplitIoClient.configuration.block_until_ready) do
+            timeout = time || @config.block_until_ready
+            Timeout::timeout(timeout) do
               sleep 0.1 until ready?
             end
           rescue Timeout::Error
             fail SDKBlockerTimeoutExpiredException, 'SDK start up timeout expired'
           end
 
-          SplitIoClient.configuration.logger.info('SplitIO SDK is ready')
-          SplitIoClient.configuration.threads[:split_store].run
-          SplitIoClient.configuration.threads[:segment_store].run
+          @config.logger.info('SplitIO SDK is ready')
         end
 
         def ready?
+          return true if @config.consumer?
           @splits_repository.ready? && @segments_repository.ready?
         end
       end

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

@@ -4,10 +4,11 @@ module SplitIoClient
       class SegmentStore
         attr_reader :segments_repository
 
-        def initialize(segments_repository, api_key, metrics, sdk_blocker = nil)
+        def initialize(segments_repository, api_key, metrics, config, sdk_blocker = nil)
           @segments_repository = segments_repository
           @api_key = api_key
           @metrics = metrics
+          @config = config
           @sdk_blocker = sdk_blocker
         end
 
@@ -28,42 +29,28 @@ module SplitIoClient
         private
 
         def segments_thread
-          SplitIoClient.configuration.threads[:segment_store] = Thread.new do
-            SplitIoClient.configuration.logger.info('Starting segments fetcher service')
-            SplitIoClient.configuration.block_until_ready > 0 ? blocked_store : unblocked_store
-          end
-        end
+          @config.threads[:segment_store] = Thread.new do
+            @config.logger.info('Starting segments fetcher service')
 
-        def blocked_store
-          loop do
-            next unless @sdk_blocker.splits_repository.ready?
+            loop do
+              next unless @sdk_blocker.splits_repository.ready?
 
-            store_segments
-            SplitIoClient.configuration.logger.debug("Segment names: #{@segments_repository.used_segment_names.to_a}") if SplitIoClient.configuration.debug_enabled
+              store_segments
+              @config.logger.debug("Segment names: #{@segments_repository.used_segment_names.to_a}") if @config.debug_enabled
 
-            unless @sdk_blocker.ready?
-              @sdk_blocker.segments_ready!
-              SplitIoClient.configuration.logger.info('segments are ready')
+              sleep_for = random_interval(@config.segments_refresh_rate)
+              @config.logger.debug("Segments store is sleeping for: #{sleep_for} seconds") if @config.debug_enabled
+              sleep(sleep_for)
             end
-
-            sleep_for = random_interval(SplitIoClient.configuration.segments_refresh_rate)
-            SplitIoClient.configuration.logger.debug("Segments store is sleeping for: #{sleep_for} seconds") if SplitIoClient.configuration.debug_enabled
-            sleep(sleep_for)
-          end
-        end
-
-        def unblocked_store
-          loop do
-            store_segments
-
-            sleep(random_interval(SplitIoClient.configuration.segments_refresh_rate))
           end
         end
 
         def store_segments
           segments_api.store_segments_by_names(@segments_repository.used_segment_names)
+
+          @sdk_blocker.segments_ready!
         rescue StandardError => error
-          SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
+          @config.log_found_exception(__method__.to_s, error)
         end
 
         def random_interval(interval)
@@ -73,7 +60,7 @@ module SplitIoClient
         end
 
         def segments_api
-          @segments_api ||= SplitIoClient::Api::Segments.new(@api_key, @metrics, @segments_repository)
+          @segments_api ||= SplitIoClient::Api::Segments.new(@api_key, @metrics, @segments_repository, @config)
         end
       end
     end

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

@@ -4,10 +4,11 @@ module SplitIoClient
       class SplitStore
         attr_reader :splits_repository
 
-        def initialize(splits_repository, api_key, metrics, sdk_blocker = nil)
+        def initialize(splits_repository, api_key, metrics, config, sdk_blocker = nil)
           @splits_repository = splits_repository
           @api_key = api_key
           @metrics = metrics
+          @config = config
           @sdk_blocker = sdk_blocker
         end
 
@@ -28,12 +29,12 @@ module SplitIoClient
         private
 
         def splits_thread
-          SplitIoClient.configuration.threads[:split_store] = Thread.new do
-            SplitIoClient.configuration.logger.info('Starting splits fetcher service')
+          @config.threads[:split_store] = Thread.new do
+            @config.logger.info('Starting splits fetcher service')
             loop do
               store_splits
 
-              sleep(random_interval(SplitIoClient.configuration.features_refresh_rate))
+              sleep(random_interval(@config.features_refresh_rate))
             end
           end
         end
@@ -48,15 +49,12 @@ module SplitIoClient
           @splits_repository.set_segment_names(data[:segment_names])
           @splits_repository.set_change_number(data[:till])
 
-          SplitIoClient.configuration.logger.debug("segments seen(#{data[:segment_names].length}): #{data[:segment_names].to_a}") if SplitIoClient.configuration.debug_enabled
+          @config.logger.debug("segments seen(#{data[:segment_names].length}): #{data[:segment_names].to_a}") if @config.debug_enabled
 
-          if SplitIoClient.configuration.block_until_ready > 0 && !@sdk_blocker.ready?
-            @sdk_blocker.splits_ready!
-            SplitIoClient.configuration.logger.info('splits are ready')
-          end
+          @sdk_blocker.splits_ready!
 
         rescue StandardError => error
-          SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
+          @config.log_found_exception(__method__.to_s, error)
         end
 
         def random_interval(interval)
@@ -71,7 +69,7 @@ module SplitIoClient
 
         def add_split_unless_archived(split)
           if Engine::Models::Split.archived?(split)
-            SplitIoClient.configuration.logger.debug("Seeing archived split #{split[:name]}") if SplitIoClient.configuration.debug_enabled
+            @config.logger.debug("Seeing archived split #{split[:name]}") if @config.debug_enabled
 
             remove_archived_split(split)
           else
@@ -80,13 +78,13 @@ module SplitIoClient
         end
 
         def remove_archived_split(split)
-          SplitIoClient.configuration.logger.debug("removing split from store(#{split})") if SplitIoClient.configuration.debug_enabled
+          @config.logger.debug("removing split from store(#{split})") if @config.debug_enabled
 
-          @splits_repository.remove_split(split[:name])
+          @splits_repository.remove_split(split)
         end
 
         def store_split(split)
-          SplitIoClient.configuration.logger.debug("storing split (#{split[:name]})") if SplitIoClient.configuration.debug_enabled
+          @config.logger.debug("storing split (#{split[:name]})") if @config.debug_enabled
 
           @splits_repository.add_split(split)
         end
@@ -94,7 +92,7 @@ module SplitIoClient
         private
 
         def splits_api
-          @splits_api ||= SplitIoClient::Api::Splits.new(@api_key, @metrics)
+          @splits_api ||= SplitIoClient::Api::Splits.new(@api_key, @metrics, @config)
         end
       end
     end