splitclient-rb 7.0.1.pre.rc3-java → 7.0.1.pre.rc4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f06ff490d26a6c2496a122f207dbb7e867f92374
-  data.tar.gz: 7932e399420c15cc1a8fb0b9e9b2eaa2aac1b5f7
+  metadata.gz: 2d7fb0aac1322c96814f636b8b14ab290e360387
+  data.tar.gz: bc03504719ee0679e6574cab51afd87ea595375e
 SHA512:
-  metadata.gz: 5904c40d72cc43ef41d6be006371c1062e2ff527f1f23fd9cb17cb15bcb6d1385ffeeb51555579a07e215b3567b072beb6a1a8d320760607f00719bbf9568434
-  data.tar.gz: 9f27a5392e2d1c1ebf90d58c9f6ca22ea4a051224ad2c5577ac143e66de54e70dccb407c1ecd836e470a7e5bae88b1d7203e8e800738e6f87706d16358f35e2b
+  metadata.gz: 20b148bdaf3420f5958d0056e6ffd5c07bdb32afdf7e47161f524b46b5cac4865bc960b752d31b05fbbb2ef05e7a17ca1e754b1b2ef38d49af1840ef91fbc673
+  data.tar.gz: 41096dd760d13ec1be83418bd6e00ded008cfbf18dda533f182683544d8d2aae92eef3fbf558ebc4fb12e6d043b83ec5327654bc3d6aed2aef88042134dfdd26

data/CHANGES.txt

@@ -1,7 +1,10 @@
-7.0.1 (Sep 13, 2019)
+7.0.1 (Oct 25, 2019)
  - Updated localhost mode so that parsing of test files results in JSON data for splits analogous to that returned by the Split backend.
  - Resulting localhost data is now used indifferently from actual backend data by the SDK code.
  - Removed specific spare code dealing with localhost operations.
+ - Removed the disable_impressions configuration param.
+ - Fixed an issue about Event properties were not sent to be.
+ - Added ip_addresses_enabled to enable/disable sending MachineName and MachineIP headers when data is posted to Split Servers.
 
 7.0.0 (Aug 23, 2019)
  - BREAKING CHANGE: block_until_ready is now a method in both split_client and split_manager that needs to be explicitly called. The block_until_ready parameter is now ignored if passed in the configuration, and defaults to 15s unless passed as a parameter of the block_until_ready method.

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

@@ -30,6 +30,9 @@ module SplitIoClient
           req.headers = common_headers(api_key)
                         .merge('Content-Type' => 'application/json')
                         .merge(headers)
+                        
+          req.headers = req.headers.merge('SplitSDKMachineIP' => @config.machine_ip) unless @config.machine_ip.empty?
+          req.headers = req.headers.merge('SplitSDKMachineName' => @config.machine_name) unless @config.machine_name.empty?
 
           req.body = data.to_json
 
@@ -78,19 +81,8 @@ module SplitIoClient
         {
           'Authorization' => "Bearer #{api_key}",
           'SplitSDKVersion' => "#{@config.language}-#{@config.version}",
-          'SplitSDKMachineName' => @config.machine_name,
-          'SplitSDKMachineIP' => @config.machine_ip,
-          'Referer' => referer
         }
       end
-
-      def referer
-        result = "#{@config.language}-#{@config.version}"
-
-        result = "#{result}::#{SplitIoClient::SplitConfig.machine_hostname}" unless SplitIoClient::SplitConfig.machine_hostname == 'localhost'
-
-        result
-      end
     end
   end
 end

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

@@ -18,10 +18,7 @@ module SplitIoClient
           response = post_api(
             "#{@config.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]
+            events_slice.map { |event| formatted_event(event[:e]) }
           )
 
           if response.success?

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

@@ -15,7 +15,7 @@ module SplitIoClient
         end
 
         impressions_by_ip(impressions).each do |ip, impressions_ip|
-          response = post_api("#{@config.events_uri}/testImpressions/bulk", @api_key, impressions_ip, 'SplitSDKMachineIP' => ip)
+          response = post_api("#{@config.events_uri}/testImpressions/bulk", @api_key, impressions_ip)
 
           if response.success?
             @config.split_logger.log_if_debug("Impressions reported: #{total_impressions(impressions)}")

data/lib/splitclient-rb/split_config.rb

@@ -69,8 +69,10 @@ module SplitIoClient
       @transport_debug_enabled = opts[:transport_debug_enabled] || SplitConfig.default_debug
       @block_until_ready = SplitConfig.default_block_until_ready
 
-      @machine_name = opts[:machine_name] || SplitConfig.machine_hostname
-      @machine_ip = opts[:machine_ip] || SplitConfig.machine_ip
+      @ip_addresses_enabled = opts[:ip_addresses_enabled].nil? ? SplitConfig.default_ip_addresses_enabled : opts[:ip_addresses_enabled]
+
+      @machine_name = SplitConfig.machine_hostname(@ip_addresses_enabled, opts[:machine_name], opts[:cache_adapter] || SplitConfig.default_cache_adapter)
+      @machine_ip = SplitConfig.machine_ip(@ip_addresses_enabled, opts[:machine_ip], opts[:cache_adapter] || SplitConfig.default_cache_adapter)
 
       @cache_ttl = opts[:cache_ttl] || SplitConfig.cache_ttl
       @max_cache_size = opts[:max_cache_size] || SplitConfig.max_cache_size
@@ -251,6 +253,8 @@ module SplitIoClient
 
     attr_accessor :localhost_mode
 
+    attr_accessor :ip_addresses_enabled
+
     #
     # The default split client configuration
     #
@@ -412,6 +416,14 @@ module SplitIoClient
       15
     end
 
+    #
+    # The default ip addresses enabled value
+    #
+    # @return [boolean]
+    def self.default_ip_addresses_enabled
+      true
+    end
+
     #
     # The default transport_debug_enabled value
     #
@@ -478,23 +490,49 @@ module SplitIoClient
     # gets the hostname where the sdk gem is running
     #
     # @return [string]
-    def self.machine_hostname
-      Socket.gethostname
-    rescue
-      'localhost'.freeze
+    def self.machine_hostname(ip_addresses_enabled, machine_name, adapter)
+      if ip_addresses_enabled
+        begin
+          return machine_name || Socket.gethostname
+        rescue
+          return 'unknown'.freeze
+        end
+      else
+        case adapter
+        when :redis
+          return 'NA'.freeze
+        end
+      end
+      
+      return ''.freeze
     end
 
     #
     # gets the ip where the sdk gem is running
     #
     # @return [string]
-    def self.machine_ip
-      loopback_ip = Socket.ip_address_list.find { |ip| ip.ipv4_loopback? }
-      private_ip = Socket.ip_address_list.find { |ip| ip.ipv4_private? }
+    def self.machine_ip(ip_addresses_enabled, machine_ip, adapter)
+      if ip_addresses_enabled
+        begin
+          return machine_ip unless machine_ip.blank?
+
+          loopback_ip = Socket.ip_address_list.find { |ip| ip.ipv4_loopback? }
+          private_ip = Socket.ip_address_list.find { |ip| ip.ipv4_private? }
 
-      addr_info = private_ip || loopback_ip
+          addr_info = private_ip || loopback_ip
+
+          return addr_info.ip_address
+        rescue
+          return 'unknown'.freeze
+        end
+      else
+        case adapter
+        when :redis
+          return 'NA'.freeze
+        end
+      end
 
-      addr_info.ip_address
+      return ''.freeze
     end
   end
 end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.0.1.pre.rc3'
+  VERSION = '7.0.1.pre.rc4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.0.1.pre.rc3
+  version: 7.0.1.pre.rc4
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement