splitclient-rb 3.2.3 → 3.2.4.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f88b9bc60d39e9fda1919c399fe45f137f2d8a47
-  data.tar.gz: 695fb50b166b6c6fbbf3d654368ff97163916525
+  metadata.gz: 9f0c2bd79b5a4b89a67fbf60f5df88573ea52e82
+  data.tar.gz: 5a5921c802fe03065300445e4e1c6c57ff554c03
 SHA512:
-  metadata.gz: c9eaffe8ffd6a8d0543852eb0302761a7650e69284d27618cbbf0566bc014565c552da1e8fa5358da44c471b82c4b307453e120a1e35da38de96158786ee3a7d
-  data.tar.gz: 98a60641d87bf4c45e3fc50519fb1a3f5cbf532a3291dd5e191b049635b107921ae6dc919f6a66c19559afe162721bb7c4379e214f0c16a7b6bcbdb11d62f481
+  metadata.gz: 8e9e5f105dc9435aaefc6784fb4d1fe561af0b9fa143f294d573da0255bfb4e76e6fb49d25549bb6fc0457ee92811ec3f2e4e5038f70aee75501cccf7cfbfc68
+  data.tar.gz: 207a06c7c9cc25f78625f43d48be2533c28f1c0c5c49090a3f1b0084c8a4179dc038ff7e7656577f004076208b8eef21f9dac9b2b60f75ddfed6d6537b564131

data/CHANGES.txt

@@ -1,3 +1,6 @@
+3.2.4
+- Fix Faraday compability issue (now compatible with Faraday 0.8.9)
+
 3.2.3
 - Fix Redis namespace issue to align with the spec
 - Allocate less memory by not creating Split model to check if Split is archived

data/Detailed-README.md

@@ -174,6 +174,22 @@ To use Redis, you have to include `redis-rb` in your app's Gemfile.
 
 *default value* = `memory`
 
+**language** : SDK runner language (used in metrics/impressions Redis namespace)
+
+*default value* = `'ruby'`
+
+**version** : SDK runner version (used in metrics/impressions Redis namespace)
+
+*default value* = `current version of Ruby SDK`
+
+**machine_ip** : SDK runner machine ip (used in metrics/impressions Redis namespace)
+
+*default value* = `current host's ip`
+
+**machine_name** : SDK runner machine name (used in metrics/impressions Redis namespace)
+
+*default value* = `current hostname`
+
 **redis_url** : Redis URL or hash with configuration for SDK to connect to.
 
 *default value* = `'redis://127.0.0.1:6379/0'`

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

@@ -13,8 +13,8 @@ module SplitIoClient
           # Store impression data in Redis
           def add(split_name, data)
             @adapter.add_to_set(
-              namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/impressions.#{split_name}"),
-              data.merge(split_name: split_name).to_json
+              impressions_metrics_key("impressions.#{split_name}"),
+              data.to_json
             )
           end
 
@@ -23,13 +23,12 @@ module SplitIoClient
               treatments_labels_change_numbers.each_slice(IMPRESSIONS_SLICE) do |treatments_labels_change_numbers_slice|
                 treatments_labels_change_numbers_slice.each do |split_name, treatment_label_change_number|
                   add(split_name,
-                    'key_name' => key,
-                    'bucketing_key' => bucketing_key,
-                    'treatment' => treatment_label_change_number[:treatment],
-                    'label' => @config.labels_enabled ? treatment_label_change_number[:label] : nil,
-                    'change_number' => treatment_label_change_number[:change_number],
-                    'time' => time
-                  )
+                      'keyName' => key,
+                      'bucketingKey' => bucketing_key,
+                      'treatment' => treatment_label_change_number[:treatment],
+                      'label' => @config.labels_enabled ? treatment_label_change_number[:label] : nil,
+                      'changeNumber' => treatment_label_change_number[:change_number],
+                      'time' => time)
                 end
               end
             end
@@ -39,14 +38,19 @@ module SplitIoClient
           # delete fetched impressions afterwards
           def clear
             impressions = impression_keys.each_with_object([]) do |key, memo|
-              _, _, ip, = key.split('/')
+              ip = key.split('/')[-2] # 'prefix/sdk_lang/ip/impressions.name' -> ip
+              if ip.nil?
+                @config.logger.warn("Impressions IP parse error for key: #{key}")
+                next
+              end
+              split_name = key.split('.').last
               members = @adapter.random_set_elements(key, @config.impressions_queue_size)
               members.each do |impression|
                 parsed_impression = JSON.parse(impression)
 
                 memo << {
-                  feature: parsed_impression['split_name'],
-                  impressions: parsed_impression.reject { |k| k == 'split_name' },
+                  feature: split_name,
+                  impressions: parsed_impression,
                   ip: ip
                 }
               end

data/lib/cache/repositories/metrics/redis_repository.rb

@@ -9,14 +9,14 @@ module SplitIoClient
           end
 
           def add_count(counter, delta)
-            prefixed_name = namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/count.#{counter}")
+            prefixed_name = impressions_metrics_key("count.#{counter}")
             counts = @adapter.find_strings_by_prefix(prefixed_name)
 
             @adapter.inc(prefixed_name, delta)
           end
 
           def add_latency(operation, time_in_ms, binary_search)
-            prefixed_name = namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/latency.#{operation}")
+            prefixed_name = impressions_metrics_key("latency.#{operation}")
             latencies = @adapter.find_strings_by_prefix(prefixed_name)
 
             if operation == 'sdk.get_treatment'
@@ -32,24 +32,24 @@ module SplitIoClient
           end
 
           def counts
-            keys = @adapter.find_strings_by_prefix(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/count"))
+            keys = @adapter.find_strings_by_prefix(impressions_metrics_key("count"))
 
             return [] if keys.empty?
 
             @adapter.multiple_strings(keys).map do |name, data|
-              [name.gsub(namespace_key("ruby-#{VERSION}/#{@config.machine_ip}/count."), ''), data]
+              [name.gsub(impressions_metrics_key('count.'), ''), data]
             end.to_h
           end
 
           def latencies
             collected_latencies = {}
             latencies_array = Array.new(BinarySearchLatencyTracker::BUCKETS.length, 0)
-            keys = @adapter.find_strings_by_prefix(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/latency"))
+            keys = @adapter.find_strings_by_prefix(impressions_metrics_key('latency'))
 
             return [] if keys.empty?
 
             found_latencies = @adapter.multiple_strings(keys).map do |name, data|
-              [name.gsub(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/latency."), ''), data]
+              [name.gsub(impressions_metrics_key('latency.'), ''), data]
             end.to_h
 
             found_latencies.each do |key, value|
@@ -73,12 +73,12 @@ module SplitIoClient
           end
 
           def clear_counts
-            keys = @adapter.find_strings_by_prefix(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/count"))
+            keys = @adapter.find_strings_by_prefix(impressions_metrics_key('count'))
             @adapter.delete(keys)
           end
 
           def clear_latencies
-            keys = @adapter.find_strings_by_prefix(namespace_key("/ruby-#{VERSION}/#{@config.machine_ip}/latency"))
+            keys = @adapter.find_strings_by_prefix(impressions_metrics_key('latency'))
             @adapter.delete(keys)
           end
 

data/lib/cache/repositories/repository.rb

@@ -14,6 +14,10 @@ module SplitIoClient
       def namespace_key(key)
         "#{@config.redis_namespace}#{key}"
       end
+
+      def impressions_metrics_key(key)
+        namespace_key("/#{@config.language}-#{@config.version}/#{@config.machine_ip}/#{key}")
+      end
     end
   end
 end

data/lib/cache/senders/impressions_formatter.rb

@@ -21,12 +21,12 @@ module SplitIoClient
                 .map do |impression|
                   ip = impression[:ip]
                   {
-                    keyName: impression[:impressions]['key_name'],
+                    keyName: impression[:impressions]['keyName'] || impression[:impressions]['key_name'],
                     treatment: impression[:impressions]['treatment'],
                     time: impression[:impressions]['time'],
-                    bucketingKey: impression[:impressions]['bucketing_key'],
+                    bucketingKey: impression[:impressions]['bucketingKey'] || impression[:impressions]['bucketing_key'],
                     label: impression[:impressions]['label'],
-                    changeNumber: impression[:impressions]['change_number'],
+                    changeNumber: impression[:impressions]['changeNumber'] || impression[:impressions]['change_number'],
                   }
                 end
 
@@ -62,9 +62,9 @@ module SplitIoClient
 
         def impression_hash(impression)
           "#{impression[:feature]}:" \
-          "#{impression[:impressions]['key_name']}:" \
-          "#{impression[:impressions]['bucketing_key']}:" \
-          "#{impression[:impressions]['change_number']}:" \
+          "#{impression[:impressions]['keyName']}:" \
+          "#{impression[:impressions]['bucketingKey']}:" \
+          "#{impression[:impressions]['changeNumber']}:" \
           "#{impression[:impressions]['treatment']}"
         end
       end

data/lib/engine/api/client.rb

@@ -9,10 +9,10 @@ module SplitIoClient
         api_client.get(url, params) do |req|
           req.headers = common_headers(api_key, config).merge('Accept-Encoding' => 'gzip')
 
-          req.options.timeout = config.read_timeout
-          req.options.open_timeout = config.connection_timeout
+          req.options[:timeout] = config.read_timeout
+          req.options[:open_timeout] = config.connection_timeout
 
-          config.logger.debug("GET #{url}") if config.debug_enabled
+          config.logger.debug("GET #{url} proxy: #{api_client.proxy}") if config.debug_enabled
         end
       rescue StandardError => e
         config.logger.warn("#{e}\nURL:#{url}\nparams:#{params}")
@@ -28,8 +28,8 @@ module SplitIoClient
 
           req.body = data.to_json
 
-          req.options.timeout = config.read_timeout
-          req.options.open_timeout = config.connection_timeout
+          req.options[:timeout] = config.read_timeout
+          req.options[:open_timeout] = config.connection_timeout
 
           if config.transport_debug_enabled
             config.logger.debug("POST #{url} #{req.body}")
@@ -55,15 +55,15 @@ module SplitIoClient
       def common_headers(api_key, config)
         {
           'Authorization' => "Bearer #{api_key}",
-          'SplitSDKVersion' => SplitIoClient::SplitConfig.sdk_version,
+          'SplitSDKVersion' => "#{config.language}-#{config.version}",
           'SplitSDKMachineName' => config.machine_name,
           'SplitSDKMachineIP' => config.machine_ip,
-          'Referer' => referer
+          'Referer' => referer(config)
         }
       end
 
-      def referer
-        result = SplitIoClient::SplitConfig.sdk_version
+      def referer(config)
+        result = "#{config.language}-#{config.version}"
 
         result = "#{result}::#{SplitIoClient::SplitConfig.get_hostname}" unless SplitIoClient::SplitConfig.get_hostname == 'localhost'
 

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

@@ -24,7 +24,7 @@ module SplitIoClient
     #
     # @return [string] version value for this sdk
     def self.sdk_version
-      'RubyClientSDK-'+SplitIoClient::VERSION
+      'ruby-'+SplitIoClient::VERSION
     end
 
     def get_treatments(key, split_names, attributes = nil)

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

@@ -124,13 +124,5 @@ module SplitIoClient
         treatment_label_change_number[:treatment]
       end
     end
-
-    #
-    # method that returns the sdk gem version
-    #
-    # @return [string] version value for this sdk
-    def self.sdk_version
-      'ruby-'+SplitIoClient::VERSION
-    end
   end
 end

data/lib/splitclient-rb/split_config.rb

@@ -53,8 +53,11 @@ module SplitIoClient
       @debug_enabled = opts[:debug_enabled] || SplitConfig.default_debug
       @transport_debug_enabled = opts[:transport_debug_enabled] || SplitConfig.default_debug
       @block_until_ready = opts[:ready] || opts[:block_until_ready] || 0
-      @machine_name = SplitConfig.get_hostname
-      @machine_ip = SplitConfig.get_ip
+      @machine_name = opts[:machine_name] || SplitConfig.get_hostname
+      @machine_ip = opts[:machine_ip] || SplitConfig.get_ip
+
+      @language = opts[:language] || 'ruby'
+      @version = opts[:version] || SplitIoClient::VERSION
 
       @labels_enabled = opts[:labels_enabled].nil? ? SplitConfig.default_labels_logging : opts[:labels_enabled]
 
@@ -142,6 +145,9 @@ module SplitIoClient
     attr_reader :machine_ip
     attr_reader :machine_name
 
+    attr_reader :language
+    attr_reader :version
+
     attr_reader :features_refresh_rate
     attr_reader :segments_refresh_rate
     attr_reader :metrics_refresh_rate
@@ -164,14 +170,6 @@ module SplitIoClient
       SplitConfig.new
     end
 
-    #
-    # method that returns the sdk gem version
-    #
-    # @return [string] version value for this sdk
-    def self.sdk_version
-      'ruby-'+SplitIoClient::VERSION
-    end
-
     #
     # The default base uri for api calls
     #

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '3.2.3'
+  VERSION = '3.2.4-rc1'
 end

data/splitio.yml.example

@@ -1,11 +1,7 @@
 ---
-:api_key: r2tdmvojm6rp6vugmd9svhoedv43e71ejolk
-#:base_uri: 'https://sdk-aws-staging.split.io/api'
-#:events_uri: 'https://events-aws-staging.split.io/api'
+:api_key: api_key 
 :mode: :producer
 :cache_adapter: :redis
 :debug_enabled: true
 :transport_debug_enabled: true
 :impressions_refresh_rate: 30
-:block_until_ready: 10
-:redis_namespace: "PATO"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4.pre.rc1
 platform: ruby
 authors:
 - Split Software
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -331,9 +331,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2