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

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

@@ -5,39 +5,39 @@ module SplitIoClient
     class Client
       RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
 
-      def get_api(url, config, api_key, params = {})
+      def get_api(url, api_key, params = {})
         api_client.get(url, params) do |req|
-          req.headers = common_headers(api_key, config).merge('Accept-Encoding' => 'gzip')
+          req.headers = common_headers(api_key).merge('Accept-Encoding' => 'gzip')
 
-          req.options[:timeout] = config.read_timeout
-          req.options[:open_timeout] = config.connection_timeout
+          req.options[:timeout] = SplitIoClient.configuration.read_timeout
+          req.options[:open_timeout] = SplitIoClient.configuration.connection_timeout
 
-          config.logger.debug("GET #{url} proxy: #{api_client.proxy}") if config.debug_enabled
+          SplitIoClient.configuration.logger.debug("GET #{url} proxy: #{api_client.proxy}") if SplitIoClient.configuration.debug_enabled
         end
       rescue StandardError => e
-        config.logger.warn("#{e}\nURL:#{url}\nparams:#{params}")
+        SplitIoClient.configuration.logger.warn("#{e}\nURL:#{url}\nparams:#{params}")
         raise 'Split SDK failed to connect to backend to retrieve information'
       end
 
-      def post_api(url, config, api_key, data, headers = {}, params = {})
+      def post_api(url, api_key, data, headers = {}, params = {})
         api_client.post(url) do |req|
-          req.headers = common_headers(api_key, config)
+          req.headers = common_headers(api_key)
             .merge('Content-Type' => 'application/json')
             .merge(headers)
 
           req.body = data.to_json
 
-          req.options[:timeout] = config.read_timeout
-          req.options[:open_timeout] = config.connection_timeout
+          req.options[:timeout] = SplitIoClient.configuration.read_timeout
+          req.options[:open_timeout] = SplitIoClient.configuration.connection_timeout
 
-          if config.transport_debug_enabled
-            config.logger.debug("POST #{url} #{req.body}")
-          elsif config.debug_enabled
-            config.logger.debug("POST #{url}")
+          if SplitIoClient.configuration.transport_debug_enabled
+            SplitIoClient.configuration.logger.debug("POST #{url} #{req.body}")
+          elsif SplitIoClient.configuration.debug_enabled
+            SplitIoClient.configuration.logger.debug("POST #{url}")
           end
         end
       rescue StandardError => e
-        config.logger.warn("#{e}\nURL:#{url}\ndata:#{data}\nparams:#{params}")
+        SplitIoClient.configuration.logger.warn("#{e}\nURL:#{url}\ndata:#{data}\nparams:#{params}")
 
         false
       end
@@ -51,18 +51,18 @@ module SplitIoClient
         end
       end
 
-      def common_headers(api_key, config)
+      def common_headers(api_key)
         {
           'Authorization' => "Bearer #{api_key}",
-          'SplitSDKVersion' => "#{config.language}-#{config.version}",
-          'SplitSDKMachineName' => config.machine_name,
-          'SplitSDKMachineIP' => config.machine_ip,
-          'Referer' => referer(config)
+          'SplitSDKVersion' => "#{SplitIoClient.configuration.language}-#{SplitIoClient.configuration.version}",
+          'SplitSDKMachineName' => SplitIoClient.configuration.machine_name,
+          'SplitSDKMachineIP' => SplitIoClient.configuration.machine_ip,
+          'Referer' => referer
         }
       end
 
-      def referer(config)
-        result = "#{config.language}-#{config.version}"
+      def referer
+        result = "#{SplitIoClient.configuration.language}-#{SplitIoClient.configuration.version}"
 
         result = "#{result}::#{SplitIoClient::SplitConfig.machine_hostname}" unless SplitIoClient::SplitConfig.machine_hostname == 'localhost'
 

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

@@ -1,22 +1,20 @@
 module SplitIoClient
   module Api
     class Events < Client
-      def initialize(api_key, config, events)
-        @config = config
+      def initialize(api_key, events)
         @api_key = api_key
         @events = events
       end
 
       def post
         if @events.empty?
-          @config.logger.debug('No events to report') if @config.debug_enabled
+          SplitIoClient.configuration.logger.debug('No events to report') if SplitIoClient.configuration.debug_enabled
           return
         end
 
-        @events.each_slice(@config.events_queue_size) do |event_slice|
+        @events.each_slice(SplitIoClient.configuration.events_queue_size) do |event_slice|
           result = post_api(
-            "#{@config.events_uri}/events/bulk",
-            @config,
+            "#{SplitIoClient.configuration.events_uri}/events/bulk",
             @api_key,
             event_slice.map { |event| formatted_event(event[:e]) },
             'SplitSDKMachineIP' => event_slice[0][:m][:i],
@@ -25,9 +23,9 @@ module SplitIoClient
           )
 
           if (200..299).include? result.status
-            @config.logger.debug("Events reported: #{event_slice.size}") if @config.debug_enabled
+            SplitIoClient.configuration.logger.debug("Events reported: #{event_slice.size}") if SplitIoClient.configuration.debug_enabled
           else
-            @config.logger.error("Unexpected status code while posting events: #{result.status}")
+            SplitIoClient.configuration.logger.error("Unexpected status code while posting events: #{result.status}")
           end
         end
       end

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

@@ -1,25 +1,24 @@
 module SplitIoClient
   module Api
     class Impressions < Client
-      def initialize(api_key, config, impressions)
-        @config = config
+      def initialize(api_key, impressions)
         @api_key = api_key
         @impressions = impressions
       end
 
       def post
         if @impressions.empty?
-          @config.logger.debug('No impressions to report') if @config.debug_enabled
+          SplitIoClient.configuration.logger.debug('No impressions to report') if SplitIoClient.configuration.debug_enabled
           return
         end
 
         impressions_by_ip.each do |ip, impressions|
-          result = post_api("#{@config.events_uri}/testImpressions/bulk", @config, @api_key, impressions, 'SplitSDKMachineIP' => ip)
+          result = post_api("#{SplitIoClient.configuration.events_uri}/testImpressions/bulk", @api_key, impressions, 'SplitSDKMachineIP' => ip)
 
           if (200..299).include? result.status
-            @config.logger.debug("Impressions reported: #{total_impressions(@impressions)}") if @config.debug_enabled
+            SplitIoClient.configuration.logger.debug("Impressions reported: #{total_impressions(@impressions)}") if SplitIoClient.configuration.debug_enabled
           else
-            @config.logger.error("Unexpected status code while posting impressions: #{result.status}")
+            SplitIoClient.configuration.logger.error("Unexpected status code while posting impressions: #{result.status}")
           end
         end
       end

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

@@ -1,8 +1,7 @@
 module SplitIoClient
   module Api
     class Metrics < Client
-      def initialize(api_key, config, metrics_repository)
-        @config = config
+      def initialize(api_key, metrics_repository)
         @api_key = api_key
         @metrics_repository = metrics_repository
       end
@@ -16,12 +15,12 @@ module SplitIoClient
 
       def post_latencies
         if @metrics_repository.latencies.empty?
-          @config.logger.debug('No latencies to report.') if @config.debug_enabled
+          SplitIoClient.configuration.logger.debug('No latencies to report.') if SplitIoClient.configuration.debug_enabled
         else
           @metrics_repository.latencies.each do |name, latencies|
             metrics_time = { name: name, latencies: latencies }
 
-            result = post_api("#{@config.events_uri}/metrics/time", @config, @api_key, metrics_time)
+            result = post_api("#{SplitIoClient.configuration.events_uri}/metrics/time", @api_key, metrics_time)
 
             log_status(result, metrics_time.size)
           end
@@ -32,12 +31,12 @@ module SplitIoClient
 
       def post_counts
         if @metrics_repository.counts.empty?
-          @config.logger.debug('No counts to report.') if @config.debug_enabled
+          SplitIoClient.configuration.logger.debug('No counts to report.') if SplitIoClient.configuration.debug_enabled
         else
           @metrics_repository.counts.each do |name, count|
             metrics_count = { name: name, delta: count }
 
-            result = post_api("#{@config.events_uri}/metrics/counter", @config, @api_key, metrics_count)
+            result = post_api("#{SplitIoClient.configuration.events_uri}/metrics/counter", @api_key, metrics_count)
 
             log_status(result, metrics_count.size)
           end
@@ -49,11 +48,11 @@ module SplitIoClient
 
       def log_status(result, info_to_log)
         if result == false
-          @config.logger.error("Failed to make a http request")
+          SplitIoClient.configuration.logger.error("Failed to make a http request")
         elsif (200..299).include? result.status
-          @config.logger.debug("Metric time reported: #{info_to_log}") if @config.debug_enabled
+          SplitIoClient.configuration.logger.debug("Metric time reported: #{info_to_log}") if SplitIoClient.configuration.debug_enabled
         else
-          @config.logger.error("Unexpected status code while posting time metrics: #{result.status}")
+          SplitIoClient.configuration.logger.error("Unexpected status code while posting time metrics: #{result.status}")
         end
       end
     end

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

@@ -6,8 +6,7 @@ module SplitIoClient
     class Segments < Client
       METRICS_PREFIX = 'segmentChangeFetcher'
 
-      def initialize(api_key, config, metrics, segments_repository)
-        @config = config
+      def initialize(api_key, metrics, segments_repository)
         @metrics = metrics
         @api_key = api_key
         @segments_repository = segments_repository
@@ -39,7 +38,7 @@ module SplitIoClient
       private
 
       def fetch_segment_changes(name, since)
-        response = get_api("#{@config.base_uri}/segmentChanges/#{name}", @config, @api_key, since: since)
+        response = get_api("#{SplitIoClient.configuration.base_uri}/segmentChanges/#{name}", @api_key, since: since)
 
         if response.success?
           segment = JSON.parse(response.body, symbolize_names: true)

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

@@ -6,16 +6,15 @@ module SplitIoClient
     class Splits < Client
       METRICS_PREFIX = 'splitChangeFetcher'
 
-      def initialize(api_key, config, metrics)
+      def initialize(api_key, metrics)
         @api_key = api_key
-        @config = config
         @metrics = metrics
       end
 
       def since(since)
         start = Time.now
 
-        response = get_api("#{@config.base_uri}/splitChanges", @config, @api_key, since: since)
+        response = get_api("#{SplitIoClient.configuration.base_uri}/splitChanges", @api_key, since: since)
 
         if response.success?
           result = splits_with_segment_names(response.body)

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

@@ -32,12 +32,9 @@ module SplitIoClient
     # @return [int] queue size
     attr_accessor :queue_size
 
-    def initialize(queue_size, config, repository)
+    def initialize(queue_size, repository)
       @queue_size = queue_size
       @binary_search = SplitIoClient::BinarySearchLatencyTracker.new
-
-      @config = config
-
       @repository = repository
     end
 

data/lib/splitclient-rb/engine/parser/split_adapter.rb

@@ -17,7 +17,6 @@ module SplitIoClient
     # Creates a new split api adapter instance that consumes split api endpoints
     #
     # @param api_key [String] the API key for your split account
-    # @param config [SplitConfig] SplitConfig instance
     # @param splits_repository [SplitsRepository] SplitsRepository instance to store splits in
     # @param segments_repository [SegmentsRepository] SegmentsRepository instance to store segments in
     # @param impressions_repository [ImpressionsRepository] ImpressionsRepository instance to store impressions in
@@ -25,18 +24,17 @@ module SplitIoClient
     # @param sdk_blocker [SDKBlocker] SDKBlocker instance which blocks splits_repository/segments_repository
     #
     # @return [SplitIoClient] split.io client instance
-    def initialize(api_key, config, splits_repository, segments_repository, impressions_repository, metrics_repository, events_repository, sdk_blocker)
+    def initialize(api_key, splits_repository, segments_repository, impressions_repository, metrics_repository, events_repository, sdk_blocker)
       @api_key = api_key
-      @config = config
       @splits_repository = splits_repository
       @segments_repository = segments_repository
       @impressions_repository = impressions_repository
       @metrics_repository = metrics_repository
       @events_repository = events_repository
-      @metrics = Metrics.new(100, @config, @metrics_repository)
+      @metrics = Metrics.new(100, @metrics_repository)
       @sdk_blocker = sdk_blocker
 
-      start_based_on_mode(@config.mode)
+      start_based_on_mode(SplitIoClient.configuration.mode)
     end
 
     def start_based_on_mode(mode)
@@ -62,27 +60,27 @@ module SplitIoClient
 
     # Starts thread which loops constantly and stores splits in the splits_repository of choice
     def split_store
-      SplitStore.new(@splits_repository, @config, @api_key, @metrics, @sdk_blocker).call
+      SplitStore.new(@splits_repository, @api_key, @metrics, @sdk_blocker).call
     end
 
     # Starts thread which loops constantly and stores segments in the segments_repository of choice
     def segment_store
-      SegmentStore.new(@segments_repository, @config, @api_key, @metrics, @sdk_blocker).call
+      SegmentStore.new(@segments_repository, @api_key, @metrics, @sdk_blocker).call
     end
 
     # Starts thread which loops constantly and sends impressions to the Split API
     def impressions_sender
-      ImpressionsSender.new(@impressions_repository, @config, @api_key).call
+      ImpressionsSender.new(@impressions_repository, @api_key).call
     end
 
     # Starts thread which loops constantly and sends metrics to the Split API
     def metrics_sender
-      MetricsSender.new(@metrics_repository, @config, @api_key).call
+      MetricsSender.new(@metrics_repository, @api_key).call
     end
 
     # Starts thread which loops constantly and sends events to the Split API
     def events_sender
-      EventsSender.new(@events_repository, @config, @api_key).call
+      EventsSender.new(@events_repository, @api_key).call
     end
   end
 end

data/lib/splitclient-rb/managers/split_manager.rb

@@ -6,9 +6,8 @@ module SplitIoClient
     # @param api_key [String] the API key for your split account
     #
     # @return [SplitIoManager] split.io client instance
-    def initialize(api_key, config = {}, adapter = nil, splits_repository = nil)
+    def initialize(api_key, adapter = nil, splits_repository = nil)
       @localhost_mode_features = []
-      @config = config
       @splits_repository = splits_repository
       @adapter = adapter
     end

data/lib/splitclient-rb/split_config.rb

@@ -2,6 +2,15 @@ require 'logger'
 require 'socket'
 
 module SplitIoClient
+
+  class << self
+      attr_accessor :configuration
+  end
+
+  def self.configure(opts={})
+    self.configuration ||= SplitConfig.new(opts)
+  end
+
   #
   # This class manages configuration options for the split client library.
   # If not custom configuration is required the default configuration values will be used
@@ -32,7 +41,7 @@ module SplitIoClient
       @redis_url = opts[:redis_url] || SplitConfig.default_redis_url
       @redis_namespace = opts[:redis_namespace] ? "#{opts[:redis_namespace]}.#{SplitConfig.default_redis_namespace}" : SplitConfig.default_redis_namespace
       @cache_adapter = SplitConfig.init_cache_adapter(
-        opts[:cache_adapter] || SplitConfig.default_cache_adapter, :map_adapter, @redis_url, false
+        opts[:cache_adapter] || SplitConfig.default_cache_adapter, :map_adapter
       )
       @connection_timeout = opts[:connection_timeout] || SplitConfig.default_connection_timeout
       @read_timeout = opts[:read_timeout] || SplitConfig.default_read_timeout
@@ -43,7 +52,7 @@ module SplitIoClient
       @impressions_refresh_rate = opts[:impressions_refresh_rate] || SplitConfig.default_impressions_refresh_rate
       @impressions_queue_size = opts[:impressions_queue_size] || SplitConfig.default_impressions_queue_size
       @impressions_adapter = SplitConfig.init_cache_adapter(
-        opts[:cache_adapter] || SplitConfig.default_cache_adapter, :queue_adapter, @redis_url, @impressions_queue_size
+        opts[:cache_adapter] || SplitConfig.default_cache_adapter, :queue_adapter, @impressions_queue_size
       )
       #Safeguard for users of older SDK versions.
       @disable_impressions = @impressions_queue_size == -1
@@ -51,7 +60,7 @@ module SplitIoClient
       @impressions_bulk_size = opts[:impressions_bulk_size] || @impressions_queue_size > 0 ? @impressions_queue_size : 0
 
       @metrics_adapter = SplitConfig.init_cache_adapter(
-        opts[:cache_adapter] || SplitConfig.default_cache_adapter, :map_adapter, @redis_url, false
+        opts[:cache_adapter] || SplitConfig.default_cache_adapter, :map_adapter
       )
 
       @logger = opts[:logger] || SplitConfig.default_logger
@@ -74,9 +83,9 @@ module SplitIoClient
       @events_push_rate = opts[:events_push_rate] || SplitConfig.default_events_push_rate
       @events_queue_size = opts[:events_queue_size] || SplitConfig.default_events_queue_size
       @events_adapter = SplitConfig.init_cache_adapter(
-        opts[:cache_adapter] || SplitConfig.default_cache_adapter, :queue_adapter, @redis_url, @events_queue_size
+        opts[:cache_adapter] || SplitConfig.default_cache_adapter, :queue_adapter, @events_queue_size
       )
-      SplitIoClient::SplitLogger.split_config(self)
+
       startup_log
     end
 
@@ -84,110 +93,110 @@ module SplitIoClient
     # The base URL for split API end points
     #
     # @return [String] The configured base URL for the split API end points
-    attr_reader :base_uri
+    attr_accessor :base_uri
 
     #
     # The base URL for split events API end points
     #
     # @return [String] The configured URL for the events API end points
-    attr_reader :events_uri
+    attr_accessor :events_uri
 
     #
     # The mode SDK will run
     #
     # @return [Symbol] One of the available SDK modes: standalone, consumer, producer
-    attr_reader :mode
+    attr_accessor :mode
 
     # The read timeout for network connections in seconds.
     #
     # @return [Int] The timeout in seconds.
-    attr_reader :read_timeout
+    attr_accessor :read_timeout
 
     #
     # The cache adapter to store splits/segments in
     #
     # @return [Object] Cache adapter instance
-    attr_reader :cache_adapter
+    attr_accessor :cache_adapter
 
     #
     # The cache adapter to store impressions in
     #
     # @return [Object] Impressions adapter instance
-    attr_reader :impressions_adapter
+    attr_accessor :impressions_adapter
 
     #
     # The cache adapter to store metrics in
     #
     # @return [Symbol] Metrics adapter
-    attr_reader :metrics_adapter
+    attr_accessor :metrics_adapter
 
     #
     # The cache adapter to store events in
     #
     # @return [Object] Metrics adapter
-    attr_reader :events_adapter
+    attr_accessor :events_adapter
 
     #
     # The connection timeout for network connections in seconds.
     #
     # @return [Int] The connect timeout in seconds.
-    attr_reader :connection_timeout
+    attr_accessor :connection_timeout
 
     #
     # The configured logger. The client library uses the log to
     # print warning and error messages.
     #
     # @return [Logger] The configured logger
-    attr_reader :logger
+    attr_accessor :logger
 
     #
     # The boolean that represents the state of the debug log level
     #
     # @return [Boolean] The value for the debug flag
-    attr_reader :debug_enabled
+    attr_accessor :debug_enabled
 
     #
     # Enable to log the content retrieved from endpoints
     #
     # @return [Boolean] The value for the debug flag
-    attr_reader :transport_debug_enabled
+    attr_accessor :transport_debug_enabled
 
     #
     # Enable logging labels and sending potentially sensitive information
     #
     # @return [Boolean] The value for the labels enabled flag
-    attr_reader :labels_enabled
+    attr_accessor :labels_enabled
 
     #
     # The number of seconds to wait for SDK readiness
     # or false to disable waiting
     # @return [Integer]/[FalseClass]
-    attr_reader :block_until_ready
+    attr_accessor :block_until_ready
 
-    attr_reader :machine_ip
-    attr_reader :machine_name
+    attr_accessor :machine_ip
+    attr_accessor :machine_name
 
-    attr_reader :language
-    attr_reader :version
+    attr_accessor :language
+    attr_accessor :version
 
-    attr_reader :features_refresh_rate
-    attr_reader :segments_refresh_rate
-    attr_reader :metrics_refresh_rate
-    attr_reader :impressions_refresh_rate
+    attr_accessor :features_refresh_rate
+    attr_accessor :segments_refresh_rate
+    attr_accessor :metrics_refresh_rate
+    attr_accessor :impressions_refresh_rate
 
-    attr_reader :impression_listener
-    attr_reader :impression_listener_refresh_rate
+    attr_accessor :impression_listener
+    attr_accessor :impression_listener_refresh_rate
 
     #
     # How big the impressions queue is before dropping impressions. -1 to disable it.
     #
     # @return [Integer]
-    attr_reader :impressions_queue_size
-    attr_reader :impressions_bulk_size
-    attr_reader :disable_impressions
+    attr_accessor :impressions_queue_size
+    attr_accessor :impressions_bulk_size
+    attr_accessor :disable_impressions
 
-    attr_reader :redis_url
-    attr_reader :redis_namespace
+    attr_accessor :redis_url
+    attr_accessor :redis_namespace
 
     attr_accessor :threads
 
@@ -195,13 +204,13 @@ module SplitIoClient
     # The schedule time for events flush after the first one
     #
     # @return [Integer]
-    attr_reader :events_push_rate
+    attr_accessor :events_push_rate
 
     #
     # The max size of the events queue
     #
     # @return [Integer]
-    attr_reader :events_queue_size
+    attr_accessor :events_queue_size
 
     #
     # The default split client configuration
@@ -223,7 +232,7 @@ module SplitIoClient
       'https://events.split.io/api/'
     end
 
-    def self.init_cache_adapter(adapter, data_structure, redis_url = nil, queue_size = nil)
+    def self.init_cache_adapter(adapter, data_structure, queue_size = nil)
       case adapter
       when :memory
         SplitIoClient::Cache::Adapters::MemoryAdapter.new(map_memory_adapter(data_structure, queue_size))
@@ -234,7 +243,7 @@ module SplitIoClient
           fail StandardError, 'To use Redis as a cache adapter you must include it in your Gemfile'
         end
 
-        SplitIoClient::Cache::Adapters::RedisAdapter.new(redis_url)
+        SplitIoClient::Cache::Adapters::RedisAdapter.new(@redis_url)
       end
     end