splitclient-rb 5.1.3.pre.rc4-java → 5.1.4.pre.rc1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde1928ad4eddf2d5e0d485476c318ca4944cb5b
-  data.tar.gz: 753fa3a304dfed18da1820375f4071e1f7783efc
+  metadata.gz: 0a45f8a3640a0089cccadfe8cc6bbeb3b21f7d57
+  data.tar.gz: dfcfabfd547fc59bdd4884a23133f89721f2a605
 SHA512:
-  metadata.gz: '08abb04c5d063ce28654f665b302a36acce2a2f265c8ccbd1402a9885163a77d2e2c690576b6ef4ca5a891fdf3e5f46586abe3b74d84bed1a0839d4de23bdeba'
-  data.tar.gz: 6f2fb60a7fb1c6609090b8cea1857ab29643f4d1ca3b27f9beac7f3a36ac14e6514eaac2429475ca8310b6d818a74fc23fc76a78afc0a4287bf7e9b58a1421d3
+  metadata.gz: f7fe35021e61db088ef74c6bb0b6ab8da7deff8e6a88b22c265c3ff2dd8cbbbd9db21871e70dd3cdc4abfa35743503a6d806789f9e3f475a8de7e7b612fdd28e
+  data.tar.gz: 594ee2a4ffa7cbe7f4d0bbad4fedc4a60e9c033d749c0ca1c019c6434de95dd2873969560ad92d15dd2f738e36e087847017f3b8a515f5adf43b4d3e77416a85

data/.rubocop.yml

@@ -1,6 +1,3 @@
-Documentation:
-    Enabled: false
-
 Metrics/MethodLength:
   Max: 15
 
@@ -11,6 +8,7 @@ Metrics/BlockLength:
   Exclude:
     - spec/**/*
     - splitclient-rb.gemspec
+    - exe/splitio
 
 Naming/FileName:
   Exclude:

data/Detailed-README.md

@@ -72,17 +72,6 @@ else
 end
 ```
 
-**Note**: You can ensure the SDK resources are loaded before querying for treatments by using `block_until_ready`. See [Advanced Configuration](#advanced-configuration).
-``` ruby
-options = {
-  block_until_ready: 10
-}
-
-# Then init the factory passing the options hash
-factory  = SplitIoClient::SplitFactoryBuilder.build('YOUR_API_KEY', options)
-split_client = factory.client
-```
-
 For features that use targeting rules based on user attributes, you can call the `get_treatment` method the following way:
 
 ```ruby
@@ -250,7 +239,7 @@ The following values can be customized:
 
 *default value* = `60`
 
-**impressions_queue_size** : The size of the impressions queue in case of `cache_adapter == :memory`. When the queue is full, existing impressions will be dropped.
+**impressions_queue_size** : The size of the impressions queue in case of `cache_adapter == :memory`.
 
 *default value* = 5000
 
@@ -258,10 +247,6 @@ The following values can be customized:
 
 *default value* = defaults to `impressions_queue_size`
 
-**events_queue_size** : The size of the events queue in case of `cache_adapter == :memory`. When the queue is full, existing events will be dropped.
-
-*default value* = 500
-
 **debug_enabled** : Enables extra logging (verbose mode).
 
 *default value* = `false`
@@ -344,9 +329,15 @@ options = {
 
 ```ruby
 options = {
-  # other options
+  connection_timeout: 10,
+  read_timeout: 5,
+  features_refresh_rate: 120,
+  segments_refresh_rate: 120,
+  metrics_refresh_rate: 360,
+  impressions_refresh_rate: 360,
+  logger: Logger.new('logfile.log'),
   cache_adapter: :redis,
-  mode: :consumer,
+  mode: :standalone,
   redis_url: 'redis://127.0.0.1:6379/0'
 }
 begin
@@ -397,10 +388,10 @@ In the example above, the listener simply takes an impression and logs it to the
 
 The SDK is capable of running in two different modes to fit in different infrastructure configurations:
 
-- `:standalone` - (default) : The SDK will retrieve information (e.g. split definitions) periodically from the Split servers, and store it in the memory cache. It'll also store the application execution information (e.g. impressions) in the cache and send it periodically to the Split servers. As it name implies, in this mode, the SDK neither relies nor synchronizes with any other component. _This mode is only available when using the `memory` cache adapter._
-- `:consumer` - If using a load balancer or more than one SDK in your application, guaranteeing that all changes in split definitions are picked up by all SDK instances at the same time is highly recommended in order to ensure consistent results across your infrastructure (i.e. getting the same treatment for a specific split and user pair). To achieve this, use the [Split Synchronizer](https://docs.split.io/docs/split-synchronizer)) and setup your SDKs to work in the `consumer` mode. Setting the components this way, all communication with the Split server is orchestrated by the Synchronizer, while the SDKs pick up definitions and store the execution information from / into a shared Redis data store. _This mode is only available when using the `redis` cache adapter._
+- `:standalone` - (default) : The SDK will retrieve information (e.g. split definitions) periodically from the Split servers, and store it in the chosen cache (memory / Redis). It'll also store the application execution information (e.g. impressions) in the cache and send it periodically to the Split servers. As it name implies, in this mode, the SDK neither relies nor synchronizes with any other component.
+- `:consumer` - If using a load balancer or more than one SDK in your application, guaranteeing that all changes in split definitions are picked up by all SDK instances at the same time is highly recommended in order to ensure consistent results across your infrastructure (i.e. getting the same treatment for a specific split and user pair). To achieve this, use the [Split Synchronizer](https://docs.split.io/docs/split-synchronizer)) and setup your SDKs to work in the `consumer` mode. Setting the components this way, all communication with the Split server is orchestrated by the Synchronizer, while the SDKs pick up definitions and store the execution information from / into a shared Redis data store.
 
-_You can choose between these 2 modes setting the `mode` option in the config. An invalid combination of `cache_adaper` and `mode` will result in an Invalid Mode exception being raised._
+_You can choose between these 2 modes setting the `mode` option in the config._
 
 ## SDK Server Compatibility
 

data/exe/splitio

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+lib = File.expand_path('../lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'optparse'
+require 'yaml'
+require_relative '../lib/splitclient-rb'
+
+# ARGV << '-h' if ARGV.empty?
+
+config_path = ''
+options = {}
+opt_parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: splitio [options]'
+
+  opts.on('-cPATH', '--config=PATH', 'Set the path to splitio.yml config file') do |c|
+    config_path = c
+  end
+
+  opts.on('--base-uri=BASE_URI', 'Set the base uri for Split SDK') do |c|
+    options[:base_uri] = c
+  end
+
+  opts.on('--events-uri=EVENTS_URI', 'Set the events uri for Split SDK') do |c|
+    options[:events_uri] = c
+  end
+
+  opts.on('--api-key=API_KEY', 'Set the API Key for Split SDK') do |c|
+    options[:api_key] = c
+  end
+
+  opts.on('--read-timeout=READ_TIMEOUT', 'Read timeout in seconds') do |c|
+    options[:read_timeout] = c
+  end
+
+  opts.on('--connection-timeout=CONNECTION_TIMEOUT', 'Connection timeout in seconds') do |c|
+    options[:connection_timeout] = c
+  end
+
+  opts.on('--features-refresh-rate=FEATURES_REFRESH_RATE', 'Features refresh rate in seconds') do |c|
+    options[:features_refresh_rate] = c
+  end
+
+  opts.on('--segments-refresh-rate=SEGMENTS_REFRESH_RATE', 'Segments refresh rate in seconds') do |c|
+    options[:segments_refresh_rate] = c
+  end
+
+  opts.on('--metrics-refresh-rate=METRICS_REFRESH_RATE', 'Metrics refresh rate in seconds') do |c|
+    options[:metrics_refresh_rate] = c
+  end
+
+  opts.on('--impressions-refresh-rate=IMPRESSIONS_REFRESH_RATE', 'Impressions refresh rate in seconds') do |c|
+    options[:impressions_refresh_rate] = c
+  end
+
+  opts.on('--ready=SECONDS', 'Seconds to block the app until SDK is ready or false to run in non-blocking mode') do |c|
+    options[:ready] = c
+  end
+
+  opts.on('--redis-url=REDIS_URL', 'Set base uri for Split SDK') do |c|
+    options[:redis_url] = c
+  end
+
+  opts.on('--transport-debug', 'Enable transport debug') do
+    options[:transport_debug_enabled] = true
+  end
+
+  opts.on('-d', '--debug', 'Enable debug mode') do
+    options[:debug_enabled] = true
+  end
+
+  opts.on_tail('-h', '--help', 'Prints this help') do
+    puts opts
+    exit
+  end
+end
+
+begin
+  opt_parser.parse!(ARGV)
+rescue OptionParser::InvalidOption => e
+  puts e
+  puts opt_parser
+  exit(1)
+end
+
+config = config_path != '' ? YAML.load_file(config_path) : {}
+config
+  .merge!(mode: :producer, cache_adapter: :redis)
+  .merge!(options)
+  .merge!(api_key: ENV['API_KEY'] || config[:api_key])
+  .merge!(base_uri: ENV['SDK_URI'] || config[:base_uri])[:events_uri] = ENV['EVENTS_URI'] || config[:events_uri]
+# IDENTIFY_BASE_URI
+
+SplitIoClient::SplitFactory.new(config[:api_key], config)

data/lib/splitclient-rb/cache/adapters/redis_adapter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'json'
 
 module SplitIoClient
@@ -87,8 +85,8 @@ module SplitIoClient
         end
 
         # Set
-        alias initialize_set initialize_map
-        alias find_sets_by_prefix find_strings_by_prefix
+        alias_method :initialize_set, :initialize_map
+        alias_method :find_sets_by_prefix, :find_strings_by_prefix
 
         def add_to_set(key, val)
           @redis.sadd(key, val)
@@ -128,7 +126,7 @@ module SplitIoClient
         def get_from_queue(key, count)
           items = @redis.lrange(key, 0, count - 1)
           fetched_count = items.size
-          items_to_remove = fetched_count == count ? count : fetched_count
+          items_to_remove = (fetched_count == count) ? count : fetched_count
 
           @redis.ltrim(key, items_to_remove, -1)
 
@@ -150,9 +148,9 @@ module SplitIoClient
           @redis.incrby(key, inc)
         end
 
-        def pipelined
+        def pipelined(&block)
           @redis.pipelined do
-            yield
+            block.call
           end
         end
 
@@ -161,10 +159,6 @@ module SplitIoClient
 
           keys.map { |key| @redis.del(key) }
         end
-
-        def expire(key, seconds)
-          @redis.expire(key, seconds)
-        end
       end
     end
   end

data/lib/splitclient-rb/cache/repositories/impressions/memory_repository.rb

@@ -1,44 +1,42 @@
-# frozen_string_literal: true
-
 module SplitIoClient
   module Cache
     module Repositories
       module Impressions
-        class MemoryRepository < ImpressionsRepository
+        class MemoryRepository
+
           def initialize(adapter)
             @adapter = adapter
           end
 
           # Store impression data in the selected adapter
-          def add(matching_key, bucketing_key, split_name, treatment, time)
-            @adapter.add_to_queue(
-              m: metadata,
-              i: impression_data(
-                matching_key,
-                bucketing_key,
-                split_name,
-                treatment,
-                time
-              )
-            )
+          def add(split_name, data)
+            @adapter.add_to_queue(feature: split_name, impressions: data)
           rescue ThreadError # queue is full
             if random_sampler.rand(1..1000) <= 2 # log only 0.2 % of the time
-              SplitIoClient.configuration.logger.warn("Dropping impressions. Current size is \
-                #{SplitIoClient.configuration.impressions_queue_size}. " \
-                'Consider increasing impressions_queue_size')
+              SplitIoClient.configuration.logger.warn("Dropping impressions. Current size is #{SplitIoClient.configuration.impressions_queue_size}. " \
+                                  "Consider increasing impressions_queue_size")
             end
           end
 
           def add_bulk(key, bucketing_key, treatments, time)
             treatments.each do |split_name, treatment|
-              add(key, bucketing_key, split_name, treatment, time)
+              add(
+                split_name,
+                'keyName' => key,
+                'bucketingKey' => bucketing_key,
+                'treatment' => treatment[:treatment],
+                'label' => SplitIoClient.configuration.labels_enabled ? treatment[:label] : nil,
+                'changeNumber' => treatment[:change_number],
+                'time' => time
+              )
             end
           end
 
-          def batch
-            return [] if SplitIoClient.configuration.impressions_bulk_size.zero?
-
-            @adapter.get_batch(SplitIoClient.configuration.impressions_bulk_size)
+          def get_batch
+            return [] if SplitIoClient.configuration.impressions_bulk_size == 0
+            @adapter.get_batch(SplitIoClient.configuration.impressions_bulk_size).map do |impression|
+              impression.update(ip: SplitIoClient.configuration.machine_ip)
+            end
           end
 
           private

data/lib/splitclient-rb/cache/repositories/impressions/redis_repository.rb

@@ -1,53 +1,75 @@
-# frozen_string_literal: true
-
 module SplitIoClient
   module Cache
     module Repositories
       module Impressions
-        class RedisRepository < ImpressionsRepository
-          EXPIRE_SECONDS = 3600
+        class RedisRepository < Repository
 
           def initialize(adapter)
             @adapter = adapter
           end
 
-          def add(matching_key, bucketing_key, split_name, treatment, time)
-            add_bulk(matching_key, bucketing_key, { split_name => treatment }, time)
+          # Store impression data in Redis
+          def add(split_name, data)
+            @adapter.add_to_set(
+              impressions_metrics_key("impressions.#{split_name}"),
+              data.to_json
+            )
           end
 
-          def add_bulk(matching_key, bucketing_key, treatments, time)
-            impressions = treatments.map do |split_name, treatment|
-              {
-                m: metadata,
-                i: impression_data(
-                  matching_key,
-                  bucketing_key,
-                  split_name,
-                  treatment,
-                  time
-                )
-              }.to_json
+          def add_bulk(key, bucketing_key, treatments, time)
+            @adapter.redis.pipelined do
+              treatments.each do |split_name, treatment|
+                add(split_name,
+                    'keyName' => key,
+                    'bucketingKey' => bucketing_key,
+                    'treatment' => treatment[:treatment],
+                    'label' => SplitIoClient.configuration.labels_enabled ? treatment[:label] : nil,
+                    'changeNumber' => treatment[:change_number],
+                    'time' => time)
+              end
             end
+          end
 
-            impressions_list_size = @adapter.add_to_queue(key, impressions)
+          # Get random impressions from redis in batches of size SplitIoClient.configuration.impressions_bulk_size,
+          # delete fetched impressions afterwards
+          def get_batch
+            impressions = impression_keys.each_with_object([]) do |key, memo|
+              ip = key.split('/')[-2] # 'prefix/sdk_lang/ip/impressions.name' -> ip
+              if ip.nil?
+                SplitIoClient.configuration.logger.warn("Impressions IP parse error for key: #{key}")
+                next
+              end
+              split_name = key.split('.').last
+              members = @adapter.random_set_elements(key, SplitIoClient.configuration.impressions_bulk_size)
+              members.each do |impression|
+                parsed_impression = JSON.parse(impression)
 
-            # Synchronizer might not be running
-            @adapter.expire(key, EXPIRE_SECONDS) if impressions.size == impressions_list_size
-          end
+                memo << {
+                  feature: split_name.to_sym,
+                  impressions: parsed_impression,
+                  ip: ip
+                }
+              end
+
+              @adapter.delete_from_set(key, members)
 
-          def batch
-            @adapter.get_from_queue(key, SplitIoClient.configuration.impressions_bulk_size).map do |e|
-              impression = JSON.parse(e, symbolize_names: true)
-              impression[:i][:f] = impression[:i][:f].to_sym
-              impression
             end
+            impressions
           rescue StandardError => e
             SplitIoClient.configuration.logger.error("Exception while clearing impressions cache: #{e}")
+
             []
           end
 
-          def key
-            @key ||= namespace_key('.impressions')
+          private
+
+          # Get all sets by prefix
+          def impression_keys
+            @adapter.find_sets_by_prefix("#{SplitIoClient.configuration.redis_namespace}/*/impressions.*")
+          rescue StandardError => e
+            SplitIoClient.configuration.logger.error("Exception while fetching impression_keys: #{e}")
+
+            []
           end
         end
       end

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

@@ -1,46 +1,18 @@
-# frozen_string_literal: true
-
 module SplitIoClient
   module Cache
     module Repositories
       # Repository which forwards impressions interface to the selected adapter
       class ImpressionsRepository < Repository
         extend Forwardable
-        def_delegators :@adapter, :add, :add_bulk, :batch, :empty?
+        def_delegators :@adapter, :add, :add_bulk, :get_batch, :empty?
 
         def initialize(adapter)
           @adapter = case adapter.class.to_s
-                     when 'SplitIoClient::Cache::Adapters::MemoryAdapter'
-                       Repositories::Impressions::MemoryRepository.new(adapter)
-                     when 'SplitIoClient::Cache::Adapters::RedisAdapter'
-                       Repositories::Impressions::RedisRepository.new(adapter)
-                     end
-        end
-
-        protected
-
-        def impression_data(matching_key, bucketing_key, split_name, treatment, timestamp)
-          {
-            k: matching_key,
-            b: bucketing_key,
-            f: split_name,
-            t: treatment[:treatment],
-            r: applied_rule(treatment[:label]),
-            c: treatment[:change_number],
-            m: timestamp
-          }
-        end
-
-        def metadata
-          {
-            s: "#{SplitIoClient.configuration.language}-#{SplitIoClient.configuration.version}",
-            i: SplitIoClient.configuration.machine_ip,
-            n: SplitIoClient.configuration.machine_name
-          }
-        end
-
-        def applied_rule(label)
-          SplitIoClient.configuration.labels_enabled ? label : nil
+          when 'SplitIoClient::Cache::Adapters::MemoryAdapter'
+            Repositories::Impressions::MemoryRepository.new(adapter)
+          when 'SplitIoClient::Cache::Adapters::RedisAdapter'
+            Repositories::Impressions::RedisRepository.new(adapter)
+          end
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module SplitIoClient
   module Cache
     module Senders
@@ -38,14 +36,10 @@ module SplitIoClient
         end
 
         def post_events
-          events_api.post(@events_repository.clear)
+          SplitIoClient::Api::Events.new(@api_key, @events_repository.clear).post
         rescue StandardError => error
           SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
         end
-
-        def events_api
-          @events_api ||= SplitIoClient::Api::Events.new(@api_key)
-        end
       end
     end
   end

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module SplitIoClient
   module Cache
     module Senders
@@ -9,15 +7,29 @@ module SplitIoClient
         end
 
         def call(raw_impressions)
-          impressions = raw_impressions || @impressions_repository.batch
+          impressions = raw_impressions ? raw_impressions : @impressions_repository.get_batch
+          formatted_impressions = []
           filtered_impressions = filter_impressions(impressions)
 
           return [] if impressions.empty? || filtered_impressions.empty?
 
           formatted_impressions = unique_features(filtered_impressions).each_with_object([]) do |feature, memo|
-            feature_impressions = feature_impressions(filtered_impressions, feature)
-            ip = feature_impressions.first[:m][:i]
-            current_impressions = current_impressions(feature_impressions)
+            ip = nil
+            current_impressions =
+              filtered_impressions
+                .select { |impression| impression[:feature] == feature }
+                .map do |impression|
+                  ip = impression[:ip]
+                  {
+                    keyName: impression[:impressions]['keyName'] || impression[:impressions]['key_name'],
+                    treatment: impression[:impressions]['treatment'],
+                    time: impression[:impressions]['time'],
+                    bucketingKey: impression[:impressions]['bucketingKey'] || impression[:impressions]['bucketing_key'],
+                    label: impression[:impressions]['label'],
+                    changeNumber: impression[:impressions]['changeNumber'] || impression[:impressions]['change_number'],
+                  }
+                end
+
             memo << {
               testName: feature.to_sym,
               keyImpressions: current_impressions,
@@ -30,27 +42,8 @@ module SplitIoClient
 
         private
 
-        def feature_impressions(filtered_impressions, feature)
-          filtered_impressions.select do |impression|
-            impression[:i][:f] == feature
-          end
-        end
-
-        def current_impressions(feature_impressions)
-          feature_impressions.map do |impression|
-            {
-              keyName: impression[:i][:k],
-              treatment: impression[:i][:t],
-              time: impression[:i][:m],
-              bucketingKey: impression[:i][:b],
-              label: impression[:i][:r],
-              changeNumber: impression[:i][:c]
-            }
-          end
-        end
-
         def unique_features(impressions)
-          impressions.map { |impression| impression[:i][:f] }.uniq
+          impressions.map { |impression| impression[:feature] }.uniq
         end
 
         # Filter seen impressions by impression_hash
@@ -68,11 +61,11 @@ module SplitIoClient
         end
 
         def impression_hash(impression)
-          "#{impression[:i][:f]}:" \
-          "#{impression[:i][:k]}:" \
-          "#{impression[:i][:b]}:" \
-          "#{impression[:i][:c]}:" \
-          "#{impression[:i][:t]}"
+          "#{impression[:feature]}:" \
+          "#{impression[:impressions]['keyName']}:" \
+          "#{impression[:impressions]['bucketingKey']}:" \
+          "#{impression[:impressions]['changeNumber']}:" \
+          "#{impression[:impressions]['treatment']}"
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module SplitIoClient
   module Cache
     module Senders
@@ -49,7 +47,7 @@ module SplitIoClient
         end
 
         def post_impressions
-          impressions_api.post(formatted_impressions)
+          impressions_client.post
         rescue StandardError => error
           SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
         end
@@ -58,8 +56,8 @@ module SplitIoClient
           ImpressionsFormatter.new(@impressions_repository).call(raw_impressions)
         end
 
-        def impressions_api
-          @impressions_api ||= SplitIoClient::Api::Impressions.new(@api_key)
+        def impressions_client
+          SplitIoClient::Api::Impressions.new(@api_key, formatted_impressions)
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module SplitIoClient
   module Cache
     module Senders
@@ -36,13 +34,13 @@ module SplitIoClient
         end
 
         def post_metrics
-          metrics_api.post
+          metrics_client.post
         rescue StandardError => error
           SplitIoClient.configuration.log_found_exception(__method__.to_s, error)
         end
 
-        def metrics_api
-          @metrics_api ||= SplitIoClient::Api::Metrics.new(@api_key, @metrics_repository)
+        def metrics_client
+          SplitIoClient::Api::Metrics.new(@api_key, @metrics_repository)
         end
       end
     end

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

@@ -73,7 +73,7 @@ module SplitIoClient
         end
 
         def segments_api
-          @segments_api ||= SplitIoClient::Api::Segments.new(@api_key, @metrics, @segments_repository)
+          SplitIoClient::Api::Segments.new(@api_key, @metrics, @segments_repository)
         end
       end
     end

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

@@ -66,7 +66,7 @@ module SplitIoClient
         end
 
         def splits_since(since)
-          splits_api.since(since)
+          SplitIoClient::Api::Splits.new(@api_key, @metrics).since(since)
         end
 
         def add_split_unless_archived(split)
@@ -90,12 +90,6 @@ module SplitIoClient
 
           @splits_repository.add_split(split)
         end
-
-        private
-
-        def splits_api
-          @splits_api ||= SplitIoClient::Api::Splits.new(@api_key, @metrics)
-        end
       end
     end
   end

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

@@ -136,12 +136,13 @@ module SplitIoClient
 
       return if SplitIoClient.configuration.disable_impressions || !store_impressions
 
-      @impressions_repository.add(
-        matching_key,
-        bucketing_key,
-        split_name,
-        treatment,
-        time
+      @impressions_repository.add(split_name,
+        'keyName' => matching_key,
+        'bucketingKey' => bucketing_key,
+        'treatment' => treatment[:treatment],
+        'label' => SplitIoClient.configuration.labels_enabled ? treatment[:label] : nil,
+        'time' => time,
+        'changeNumber' => treatment[:change_number]
       )
 
       route_impression(split_name, matching_key, bucketing_key, time, treatment, attributes)

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

@@ -38,7 +38,8 @@ module SplitIoClient
         end
       rescue StandardError => e
         SplitIoClient.configuration.logger.warn("#{e}\nURL:#{url}\ndata:#{data}\nparams:#{params}")
-        raise 'Split SDK failed to connect to backend to retrieve information'
+
+        false
       end
 
       private

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

@@ -1,32 +1,31 @@
 module SplitIoClient
   module Api
     class Events < Client
-      def initialize(api_key)
+      def initialize(api_key, events)
         @api_key = api_key
+        @events = events
       end
 
-      def post(events)
-        if events.empty?
+      def post
+        if @events.empty?
           SplitIoClient.configuration.logger.debug('No events to report') if SplitIoClient.configuration.debug_enabled
           return
         end
 
-        events.each_slice(SplitIoClient.configuration.events_queue_size) do |events_slice|
+        @events.each_slice(SplitIoClient.configuration.events_queue_size) do |event_slice|
           result = post_api(
             "#{SplitIoClient.configuration.events_uri}/events/bulk",
             @api_key,
-            events_slice.map { |event| formatted_event(event[:e]) },
-            'SplitSDKMachineIP' => events_slice[0][:m][:i],
-            'SplitSDKMachineName' => events_slice[0][:m][:n],
-            'SplitSDKVersion' => events_slice[0][:m][:s]
+            event_slice.map { |event| formatted_event(event[:e]) },
+            'SplitSDKMachineIP' => event_slice[0][:m][:i],
+            'SplitSDKMachineName' => event_slice[0][:m][:n],
+            'SplitSDKVersion' => event_slice[0][:m][:s]
           )
 
-          if response.success?
-            SplitLogger.log_if_debug("Events reported: #{events_slice.size}")
+          if (200..299).include? result.status
+            SplitIoClient.configuration.logger.debug("Events reported: #{event_slice.size}") if SplitIoClient.configuration.debug_enabled
           else
-            SplitLogger.log_error("Unexpected status code while posting events: #{response.status}." \
-            " - Check your API key and base URI")
-            raise 'Split SDK failed to connect to backend to post events'
+            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)
+      def initialize(api_key, impressions)
         @api_key = api_key
+        @impressions = impressions
       end
 
-      def post(impressions)
-        if impressions.empty?
+      def post
+        if @impressions.empty?
           SplitIoClient.configuration.logger.debug('No impressions to report') if SplitIoClient.configuration.debug_enabled
           return
         end
 
-        impressions_by_ip(impressions).each do |ip, impressions_ip|
-          result = post_api("#{SplitIoClient.configuration.events_uri}/testImpressions/bulk", @api_key, impressions_ip, 'SplitSDKMachineIP' => ip)
+        impressions_by_ip.each do |ip, impressions|
+          result = post_api("#{SplitIoClient.configuration.events_uri}/testImpressions/bulk", @api_key, impressions, 'SplitSDKMachineIP' => ip)
 
-          if response.success?
-            SplitLogger.log_if_debug("Impressions reported: #{total_impressions(impressions)}")
+          if (200..299).include? result.status
+            SplitIoClient.configuration.logger.debug("Impressions reported: #{total_impressions(@impressions)}") if SplitIoClient.configuration.debug_enabled
           else
-            SplitLogger.log_error("Unexpected status code while posting impressions: #{response.status}." \
-            " - Check your API key and base URI")
-            raise 'Split SDK failed to connect to backend to post impressions'
+            SplitIoClient.configuration.logger.error("Unexpected status code while posting impressions: #{result.status}")
           end
         end
       end
@@ -34,8 +33,8 @@ module SplitIoClient
 
       private
 
-      def impressions_by_ip(impressions)
-        impressions.group_by { |impression| impression[:ip] }
+      def impressions_by_ip
+        @impressions.group_by { |impression| impression[:ip] }
       end
     end
   end

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

@@ -20,9 +20,9 @@ module SplitIoClient
           @metrics_repository.latencies.each do |name, latencies|
             metrics_time = { name: name, latencies: latencies }
 
-            response = post_api("#{SplitIoClient.configuration.events_uri}/metrics/time", @api_key, metrics_time)
+            result = post_api("#{SplitIoClient.configuration.events_uri}/metrics/time", @api_key, metrics_time)
 
-            log_status(response, metrics_time.size)
+            log_status(result, metrics_time.size)
           end
         end
 
@@ -36,9 +36,9 @@ module SplitIoClient
           @metrics_repository.counts.each do |name, count|
             metrics_count = { name: name, delta: count }
 
-            response = post_api("#{SplitIoClient.configuration.events_uri}/metrics/counter", @api_key, metrics_count)
+            result = post_api("#{SplitIoClient.configuration.events_uri}/metrics/counter", @api_key, metrics_count)
 
-            log_status(response, metrics_count.size)
+            log_status(result, metrics_count.size)
           end
         end
         @metrics_repository.clear_counts
@@ -46,13 +46,13 @@ module SplitIoClient
 
       private
 
-      def log_status(response, info_to_log)
-        if response.success?
-          SplitLogger.log_if_debug("Metric time reported: #{info_to_log}")
+      def log_status(result, info_to_log)
+        if result == false
+          SplitIoClient.configuration.logger.error("Failed to make a http request")
+        elsif (200..299).include? result.status
+          SplitIoClient.configuration.logger.debug("Metric time reported: #{info_to_log}") if SplitIoClient.configuration.debug_enabled
         else
-          SplitLogger.log_error("Unexpected status code while posting time metrics: #{response.status}" \
-          " - Check your API key and base URI")
-          raise 'Split SDK failed to connect to backend to post metrics'
+          SplitIoClient.configuration.logger.error("Unexpected status code while posting time metrics: #{result.status}")
         end
       end
     end

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

@@ -51,7 +51,7 @@ module SplitIoClient
               if split[:trafficAllocation] < 100
                 bucket = splitter.bucket(splitter.count_hash(key, split[:trafficAllocationSeed].to_i, legacy_algo))
 
-                if bucket > split[:trafficAllocation]
+                if bucket >= split[:trafficAllocation]
                   return treatment_hash(Models::Label::NOT_IN_SPLIT, split[:defaultTreatment], split[:changeNumber])
                 end
               end

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

@@ -24,15 +24,7 @@ module SplitIoClient
     # @param sdk_blocker [SDKBlocker] SDKBlocker instance which blocks splits_repository/segments_repository
     #
     # @return [SplitIoClient] split.io client instance
-    def initialize(
-      api_key,
-      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
       @splits_repository = splits_repository
       @segments_repository = segments_repository
@@ -42,15 +34,28 @@ module SplitIoClient
       @metrics = Metrics.new(100, @metrics_repository)
       @sdk_blocker = sdk_blocker
 
-      start_standalone_components if SplitIoClient.configuration.mode == :standalone
+      start_based_on_mode(SplitIoClient.configuration.mode)
     end
 
-    def start_standalone_components
-      split_store
-      segment_store
-      metrics_sender
-      impressions_sender
-      events_sender
+    def start_based_on_mode(mode)
+      case mode
+      when :standalone
+        split_store
+        segment_store
+        metrics_sender
+        impressions_sender
+        events_sender
+      when :consumer
+        # Do nothing in background
+      when :producer
+        split_store
+        segment_store
+        impressions_sender
+        metrics_sender
+        events_sender
+
+        sleep unless ENV['SPLITCLIENT_ENV'] == 'test'
+      end
     end
 
     # Starts thread which loops constantly and stores splits in the splits_repository of choice

data/lib/splitclient-rb/split_config.rb

@@ -109,7 +109,7 @@ module SplitIoClient
     #
     # The mode SDK will run
     #
-    # @return [Symbol] One of the available SDK modes: standalone, consumer
+    # @return [Symbol] One of the available SDK modes: standalone, consumer, producer
     attr_accessor :mode
 
     # The read timeout for network connections in seconds.

data/lib/splitclient-rb/split_factory.rb

@@ -8,9 +8,6 @@ module SplitIoClient
     def initialize(api_key, config_hash = {})
       @api_key = api_key
       SplitIoClient.configure(config_hash)
-
-      raise 'Invalid SDK mode' unless valid_mode
-
       @cache_adapter = SplitIoClient.configuration.cache_adapter
 
       @splits_repository = SplitsRepository.new(@cache_adapter)
@@ -36,34 +33,6 @@ module SplitIoClient
       SplitIoClient.configuration.threads.each { |_, t| t.exit }
     end
 
-    def valid_mode
-      valid_startup_mode = false
-      case SplitIoClient.configuration.mode
-      when :consumer
-        if SplitIoClient.configuration.cache_adapter.is_a? SplitIoClient::Cache::Adapters::RedisAdapter
-          valid_startup_mode = true
-        else
-          SplitIoClient.configuration.logger.error('Consumer mode cannot be used with Memory adapter. ' \
-            'Use Redis adapter instead.')
-        end
-      when :standalone
-        if SplitIoClient.configuration.cache_adapter.is_a? SplitIoClient::Cache::Adapters::MemoryAdapter
-          valid_startup_mode = true
-        else
-          SplitIoClient.configuration.logger.error('Standalone mode cannot be used with Redis adapter. ' \
-            'Use Memory adapter instead.')
-        end
-      when :producer
-        SplitIoClient.configuration.logger.error('Producer mode is no longer supported. Use Split Synchronizer. ' \
-          'See: https://github.com/splitio/split-synchronizer')
-      else
-        SplitIoClient.configuration.logger.error('Invalid SDK mode selected. ' \
-          "Valid modes are 'standalone with memory adapter' and 'consumer with redis adapter'")
-      end
-
-      valid_startup_mode
-    end
-
     alias resume! start!
   end
 end

data/lib/splitclient-rb/validators.rb

@@ -1,14 +1,9 @@
-# frozen_string_literal: true
-
 module SplitIoClient
   module Validators
     extend self
 
     def valid_get_treatment_parameters(key, split_name, matching_key, bucketing_key)
-      valid_key?(key) &&
-        valid_split_name?(split_name) &&
-        valid_matching_key?(matching_key) &&
-        valid_bucketing_key?(key, bucketing_key)
+      valid_key?(key) && valid_split_name?(split_name) && valid_matching_key?(matching_key) && valid_bucketing_key?(bucketing_key)
     end
 
     def valid_get_treatments_parameters(split_names)
@@ -16,10 +11,7 @@ module SplitIoClient
     end
 
     def valid_track_parameters(key, traffic_type_name, event_type, value)
-      valid_track_key?(key) &&
-        valid_traffic_type_name?(traffic_type_name) &&
-        valid_event_type?(event_type) &&
-        valid_value?(value)
+      valid_track_key?(key) && valid_traffic_type_name?(traffic_type_name) && valid_event_type?(event_type) && valid_value?(value)
     end
 
     def valid_split_parameters(split_name)
@@ -52,7 +44,7 @@ module SplitIoClient
       SplitIoClient.configuration.logger.warn("#{method}: #{key} is not of type String, converting to String")
     end
 
-    def valid_split_name?(split_name, method = :get_treatment)
+    def valid_split_name?(split_name, method=:get_treatment)
       if split_name.nil?
         log_nil(:split_name, method)
         return false
@@ -63,7 +55,7 @@ module SplitIoClient
         return false
       end
 
-      true
+      return true
     end
 
     def valid_key?(key)
@@ -72,7 +64,7 @@ module SplitIoClient
         return false
       end
 
-      true
+      return true
     end
 
     def valid_matching_key?(matching_key)
@@ -86,16 +78,16 @@ module SplitIoClient
         return false
       end
 
-      log_convert_numeric(:matching_key, :get_treatment) if matching_key.is_a? Numeric
+      if matching_key.is_a? Numeric
+        log_convert_numeric(:matching_key, :get_treatment)
+      end
 
-      true
+      return true
     end
 
-    def valid_bucketing_key?(key, bucketing_key)
+    def valid_bucketing_key?(bucketing_key)
       if bucketing_key.nil?
-        if key.is_a? Hash
-          SplitIoClient.configuration.logger.warn('get_treatment: key object should have bucketing_key set')
-        end
+        SplitIoClient.configuration.logger.warn('get_treatment: key object should have bucketing_key set')
         return true
       end
 
@@ -104,9 +96,11 @@ module SplitIoClient
         return false
       end
 
-      log_convert_numeric(:bucketing_key, :get_treatment) if bucketing_key.is_a? Numeric
+      if bucketing_key.is_a? Numeric
+        log_convert_numeric(:bucketing_key, :get_treatment)
+      end
 
-      true
+      return true
     end
 
     def valid_split_names?(split_names)
@@ -120,7 +114,7 @@ module SplitIoClient
         return false
       end
 
-      true
+      return true
     end
 
     def valid_track_key?(key)
@@ -134,9 +128,11 @@ module SplitIoClient
         return false
       end
 
-      log_convert_numeric(:key, :track) if key.is_a? Numeric
+      if key.is_a? Numeric
+        log_convert_numeric(:key, :track)
+      end
 
-      true
+      return true
     end
 
     def valid_event_type?(event_type)
@@ -155,7 +151,7 @@ module SplitIoClient
         return false
       end
 
-      true
+      return true
     end
 
     def valid_traffic_type_name?(traffic_type_name)
@@ -174,7 +170,7 @@ module SplitIoClient
         return false
       end
 
-      true
+      return true
     end
 
     def valid_value?(value)
@@ -183,7 +179,7 @@ module SplitIoClient
         return false
       end
 
-      true
+      return true
     end
   end
 end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '5.1.3.pre.rc4'
+  VERSION = '5.1.4.pre.rc1'
 end

data/splitclient-rb.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|features|ext)/}) }
 
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   if defined?(JRUBY_VERSION)
@@ -51,7 +53,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday', '>= 0.8'
   spec.add_runtime_dependency 'json', '>= 1.8'
   spec.add_runtime_dependency 'lru_redux'
-  spec.add_runtime_dependency 'net-http-persistent', '>= 2.9'
+  spec.add_runtime_dependency 'net-http-persistent', '~> 3.0'
   spec.add_runtime_dependency 'redis', '>= 3.2'
   spec.add_runtime_dependency 'thread_safe', '>= 0.3'
 end

data/splitio.yml.example

@@ -0,0 +1,7 @@
+---
+:api_key: api_key 
+:mode: :producer
+:cache_adapter: :redis
+:debug_enabled: true
+:transport_debug_enabled: true
+:impressions_refresh_rate: 30

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 5.1.3.pre.rc4
+  version: 5.1.4.pre.rc1
 platform: java
 authors:
 - Split Software
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -223,17 +223,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
   name: net-http-persistent
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -265,7 +265,8 @@ dependencies:
 description: Ruby client for using split SDK.
 email:
 - pato@split.io
-executables: []
+executables:
+- splitio
 extensions: []
 extra_rdoc_files: []
 files:
@@ -278,6 +279,7 @@ files:
 - NEWS
 - README.md
 - Rakefile
+- exe/splitio
 - ext/murmurhash/MurmurHash3.java
 - lib/murmurhash/base.rb
 - lib/murmurhash/murmurhash.jar
@@ -361,6 +363,7 @@ files:
 - lib/splitclient-rb/validators.rb
 - lib/splitclient-rb/version.rb
 - splitclient-rb.gemspec
+- splitio.yml.example
 - tasks/benchmark_get_treatment.rake
 - tasks/irb.rake
 - tasks/rspec.rake