splitclient-rb 5.1.0.pre.rc1-java → 5.1.1-java

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

@@ -2,9 +2,8 @@ module SplitIoClient
   module Cache
     module Senders
       class EventsSender
-        def initialize(events_repository, config, api_key)
+        def initialize(events_repository, api_key)
           @events_repository = events_repository
-          @config = config
           @api_key = api_key
         end
 
@@ -25,21 +24,21 @@ module SplitIoClient
         private
 
         def events_thread
-          @config.threads[:events_sender] = Thread.new do
-            @config.logger.info('Starting events service')
+          SplitIoClient.configuration.threads[:events_sender] = Thread.new do
+            SplitIoClient.configuration.logger.info('Starting events service')
 
             loop do
               post_events
 
-              sleep(SplitIoClient::Utilities.randomize_interval(@config.events_push_rate))
+              sleep(SplitIoClient::Utilities.randomize_interval(SplitIoClient.configuration.events_push_rate))
             end
           end
         end
 
         def post_events
-          SplitIoClient::Api::Events.new(@api_key, @config, @events_repository.clear).post
+          SplitIoClient::Api::Events.new(@api_key, @events_repository.clear).post
         rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+          SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
         end
       end
     end

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

@@ -2,15 +2,14 @@ module SplitIoClient
   module Cache
     module Senders
       class ImpressionsSender
-        def initialize(impressions_repository, config, api_key)
+        def initialize(impressions_repository, api_key)
           @impressions_repository = impressions_repository
-          @config = config
           @api_key = api_key
         end
 
         def call
-          if @config.disable_impressions
-            @config.logger.info('Disabling impressions service by config')
+          if SplitIoClient.configuration.disable_impressions
+            SplitIoClient.configuration.logger.info('Disabling impressions service by config')
             return
           end
 
@@ -30,14 +29,14 @@ module SplitIoClient
         private
 
         def impressions_thread
-          @config.threads[:impressions_sender] = Thread.new do
+          SplitIoClient.configuration.threads[:impressions_sender] = Thread.new do
             begin
-              @config.logger.info('Starting impressions service')
+              SplitIoClient.configuration.logger.info('Starting impressions service')
 
               loop do
                 post_impressions
 
-                sleep(SplitIoClient::Utilities.randomize_interval(@config.impressions_refresh_rate))
+                sleep(SplitIoClient::Utilities.randomize_interval(SplitIoClient.configuration.impressions_refresh_rate))
               end
             rescue SplitIoClient::ImpressionShutdownException
               post_impressions
@@ -50,7 +49,7 @@ module SplitIoClient
         def post_impressions
           impressions_client.post
         rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+          SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
         end
 
         def formatted_impressions(raw_impressions = nil)
@@ -58,7 +57,7 @@ module SplitIoClient
         end
 
         def impressions_client
-          SplitIoClient::Api::Impressions.new(@api_key, @config, formatted_impressions)
+          SplitIoClient::Api::Impressions.new(@api_key, formatted_impressions)
         end
       end
     end

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

@@ -2,9 +2,8 @@ module SplitIoClient
   module Cache
     module Senders
       class MetricsSender
-        def initialize(metrics_repository, config, api_key)
+        def initialize(metrics_repository, api_key)
           @metrics_repository = metrics_repository
-          @config = config
           @api_key = api_key
         end
 
@@ -23,13 +22,13 @@ module SplitIoClient
         private
 
         def metrics_thread
-          @config.threads[:metrics_sender] = Thread.new do
-            @config.logger.info('Starting metrics service')
+          SplitIoClient.configuration.threads[:metrics_sender] = Thread.new do
+            SplitIoClient.configuration.logger.info('Starting metrics service')
 
             loop do
               post_metrics
 
-              sleep(SplitIoClient::Utilities.randomize_interval(@config.metrics_refresh_rate))
+              sleep(SplitIoClient::Utilities.randomize_interval(SplitIoClient.configuration.metrics_refresh_rate))
             end
           end
         end
@@ -37,11 +36,11 @@ module SplitIoClient
         def post_metrics
           metrics_client.post
         rescue StandardError => error
-          @config.log_found_exception(__method__.to_s, error)
+          SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
         end
 
         def metrics_client
-          SplitIoClient::Api::Metrics.new(@api_key, @config, @metrics_repository)
+          SplitIoClient::Api::Metrics.new(@api_key, @metrics_repository)
         end
       end
     end

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

@@ -8,8 +8,7 @@ module SplitIoClient
         attr_reader :splits_repository
         attr_writer :splits_thread, :segments_thread
 
-        def initialize(config, splits_repository, segments_repository)
-          @config = config
+        def initialize(splits_repository, segments_repository)
           @splits_repository = splits_repository
           @segments_repository = segments_repository
 
@@ -27,14 +26,14 @@ module SplitIoClient
 
         def block
           begin
-            Timeout::timeout(@config.block_until_ready) do
+            Timeout::timeout(SplitIoClient.configuration.block_until_ready) do
               sleep 0.1 until ready?
             end
           rescue Timeout::Error
             fail SDKBlockerTimeoutExpiredException, 'SDK start up timeout expired'
           end
 
-          @config.logger.info('SplitIO SDK is ready')
+          SplitIoClient.configuration.logger.info('SplitIO SDK is ready')
           @splits_thread.run
           @segments_thread.run
         end

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

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

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

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

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

@@ -42,12 +42,12 @@ module SplitIoClient
     # @return [Treatment]  treatment constant value
     def get_treatment(id, feature, attributes = nil)
       unless id
-        @config.logger.warn('id was null for feature: ' + feature)
+        SplitIoClient.configuration.logger.warn('id was null for feature: ' + feature)
         return SplitIoClient::Engine::Models::Treatment::CONTROL
       end
 
       unless feature
-        @config.logger.warn('feature was null for id: ' + id)
+        SplitIoClient.configuration.logger.warn('feature was null for id: ' + id)
         return SplitIoClient::Engine::Models::Treatment::CONTROL
       end
 

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

@@ -6,9 +6,7 @@ module SplitIoClient
     # @param api_key [String] the API key for your split account
     #
     # @return [SplitIoClient] split.io client instance
-    def initialize(api_key, config = {}, adapter = nil, splits_repository, segments_repository, impressions_repository, metrics_repository, events_repository)
-      @config = config
-
+    def initialize(api_key, adapter = nil, splits_repository, segments_repository, impressions_repository, metrics_repository, events_repository)
       @splits_repository = splits_repository
       @segments_repository = segments_repository
       @impressions_repository = impressions_repository
@@ -21,13 +19,16 @@ module SplitIoClient
     def get_treatments(key, split_names, attributes = {})
       bucketing_key, matching_key = keys_from_key(key)
       evaluator = Engine::Parser::Evaluator.new(@segments_repository, @splits_repository, true)
-
+      start = Time.now
       treatments_labels_change_numbers =
         @splits_repository.get_splits(split_names).each_with_object({}) do |(name, data), memo|
           memo.merge!(name => get_treatment(key, name, attributes, data, false, true, evaluator))
         end
+      latency = (Time.now - start) * 1000.0
+      # Measure
+      @adapter.metrics.time('sdk.get_treatments', latency)
 
-      unless @config.disable_impressions
+      unless SplitIoClient.configuration.disable_impressions
         time = (Time.now.to_f * 1000.0).to_i
         @impressions_repository.add_bulk(
           matching_key, bucketing_key, treatments_labels_change_numbers, time
@@ -63,12 +64,12 @@ module SplitIoClient
       evaluator ||= Engine::Parser::Evaluator.new(@segments_repository, @splits_repository)
 
       if matching_key.nil?
-        @config.logger.warn('matching_key was null for split_name: ' + split_name.to_s)
+        SplitIoClient.configuration.logger.warn('matching_key was null for split_name: ' + split_name.to_s)
         return parsed_treatment(multiple, treatment_data)
       end
 
       if split_name.nil?
-        @config.logger.warn('split_name was null for key: ' + key)
+        SplitIoClient.configuration.logger.warn('split_name was null for key: ' + key)
         return parsed_treatment(multiple, treatment_data)
       end
 
@@ -78,7 +79,7 @@ module SplitIoClient
         split = multiple ? split_data : @splits_repository.get_split(split_name)
 
         if split.nil?
-          @config.logger.debug("split_name: #{split_name} does not exist. Returning CONTROL")
+          SplitIoClient.configuration.logger.debug("split_name: #{split_name} does not exist. Returning CONTROL")
           return parsed_treatment(multiple, treatment_data)
         else
           treatment_data =
@@ -87,7 +88,7 @@ module SplitIoClient
           )
         end
       rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+        SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
 
         store_impression(
           split_name, matching_key, bucketing_key,
@@ -106,9 +107,9 @@ module SplitIoClient
         split && store_impression(split_name, matching_key, bucketing_key, treatment_data, store_impressions, attributes)
 
         # Measure
-        @adapter.metrics.time('sdk.get_treatment', latency)
+        @adapter.metrics.time('sdk.get_treatment', latency) unless multiple
       rescue StandardError => error
-        @config.log_found_exception(__method__.to_s, error)
+        SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
 
         store_impression(
           split_name, matching_key, bucketing_key,
@@ -126,10 +127,10 @@ module SplitIoClient
     end
 
     def destroy
-      @config.logger.info('Split client shutdown started...') if @config.debug_enabled
+      SplitIoClient.configuration.logger.info('Split client shutdown started...') if SplitIoClient.configuration.debug_enabled
 
-      @config.threads[:impressions_sender].raise(SplitIoClient::ImpressionShutdownException)
-      @config.threads.reject { |k, _| k == :impressions_sender }.each do |name, thread|
+      SplitIoClient.configuration.threads[:impressions_sender].raise(SplitIoClient::ImpressionShutdownException)
+      SplitIoClient.configuration.threads.reject { |k, _| k == :impressions_sender }.each do |name, thread|
         Thread.kill(thread)
       end
 
@@ -138,19 +139,19 @@ module SplitIoClient
       @segments_repository.clear
       @events_repository.clear
 
-      @config.logger.info('Split client shutdown complete') if @config.debug_enabled
+      SplitIoClient.configuration.logger.info('Split client shutdown complete') if SplitIoClient.configuration.debug_enabled
     end
 
     def store_impression(split_name, matching_key, bucketing_key, treatment, store_impressions, attributes)
       time = (Time.now.to_f * 1000.0).to_i
 
-      return if @config.disable_impressions || !store_impressions
+      return if SplitIoClient.configuration.disable_impressions || !store_impressions
 
       @impressions_repository.add(split_name,
         'keyName' => matching_key,
         'bucketingKey' => bucketing_key,
         'treatment' => treatment[:treatment],
-        'label' => @config.labels_enabled ? treatment[:label] : nil,
+        'label' => SplitIoClient.configuration.labels_enabled ? treatment[:label] : nil,
         'time' => time,
         'changeNumber' => treatment[:change_number]
       )
@@ -158,7 +159,7 @@ module SplitIoClient
       route_impression(split_name, matching_key, bucketing_key, time, treatment, attributes)
 
     rescue StandardError => error
-      @config.log_found_exception(__method__.to_s, error)
+      SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
     end
 
     def route_impression(split_name, matching_key, bucketing_key, time, treatment, attributes)
@@ -184,7 +185,7 @@ module SplitIoClient
     end
 
     def impression_router
-      @impression_router ||= SplitIoClient::ImpressionRouter.new(@config)
+      @impression_router ||= SplitIoClient::ImpressionRouter.new
     end
 
     def track(key, traffic_type, event_type, value = nil)