amplitude-experiment 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63ef7a08ffb4bb4b179da3f088c12598d2212ba7edd35a2f48ebb029420f33c0
-  data.tar.gz: c46a6553343175e1bda5287907f565009217b58a97b611684eb5afe073ea58ab
+  metadata.gz: 2c2b4d645d6bc1a63154135eca42b2123dbaef5fb6597e77ea3c4d602235bbe7
+  data.tar.gz: b521d6b1f7af00b62fc9ec14e8c8e1db63a63b9330e8e73139fcf09ffb5f5dca
 SHA512:
-  metadata.gz: f127b8d728912018fa3d4f2a96c091f474f71b38d5f4d72ca06076f52204c6999511a2e65f2f43ba1ad7ab4f92906ba3c827343bf7c1af0085d766b46df6f8ba
-  data.tar.gz: 29d5c170df67401d9f43f8a2fa5c689693ef535cb4977aa799fc6c3d61194df304d203f2dfd5b921a8cb3ff0b32defeaa4b064d370886b410f2e4bc1260f03cb
+  metadata.gz: 68d5921c26baf78c5f1dcff97e4b58124e35f5be6de93b02be240e593c12f67d32ecba973ea95cb8df66908132c280a55e94d9be2025f351c536129663359570
+  data.tar.gz: 5a66ce54c1ed89ae0bef261578ad006151c34292805aa6cf68725b7a61085089de4a96769401a52631fb2a57a759d89b0b7fe6a2e570ca25af49415badd5a1c2

data/lib/amplitude-experiment.rb

@@ -15,6 +15,7 @@ require 'experiment/local/assignment/assignment_service'
 require 'experiment/local/assignment/assignment_config'
 require 'experiment/util/lru_cache'
 require 'experiment/util/hash'
+require 'experiment/error'
 
 # Amplitude Experiment Module
 module AmplitudeExperiment

data/lib/experiment/error.rb

@@ -0,0 +1,11 @@
+module AmplitudeExperiment
+  # FetchError
+  class FetchError < StandardError
+    attr_reader :status_code
+
+    def initialize(status_code, message)
+      super(message)
+      @status_code = status_code
+    end
+  end
+end

data/lib/experiment/remote/client.rb

@@ -61,12 +61,14 @@ module AmplitudeExperiment
       do_fetch(user, @config.fetch_timeout_millis)
     rescue StandardError => e
       @logger.error("[Experiment] Fetch failed: #{e.message}")
-      begin
-        return retry_fetch(user)
-      rescue StandardError => err
-        @logger.error("[Experiment] Retry Fetch failed: #{err.message}")
+      if should_retry_fetch?(e)
+        begin
+          retry_fetch(user)
+        rescue StandardError => err
+          @logger.error("[Experiment] Retry Fetch failed: #{err.message}")
+        end
       end
-      throw e
+      raise e
     end
 
     # @param [User] user
@@ -108,6 +110,8 @@ module AmplitudeExperiment
       end_time = Time.now
       elapsed = (end_time - start_time) * 1000.0
       @logger.debug("[Experiment] Fetch complete in #{elapsed.round(3)} ms")
+      raise FetchError.new(response.code.to_i, "Fetch error response: status=#{response.code} #{response.message}") if response.code != '200'
+
       json = JSON.parse(response.body)
       variants = parse_json_variants(json)
       @logger.debug("[Experiment] Fetched variants: #{variants}")
@@ -140,5 +144,11 @@ module AmplitudeExperiment
       user.library = "experiment-ruby-server/#{VERSION}"
       user
     end
+
+    def should_retry_fetch?(err)
+      return err.status_code < 400 || err.status_code >= 500 || err.status_code == 429 if err.is_a?(FetchError)
+
+      true
+    end
   end
 end

data/lib/experiment/user.rb

@@ -28,6 +28,10 @@ module AmplitudeExperiment
     # @return [String, nil] the value of dma
     attr_accessor :dma
 
+    # Predefined field, must be manually provided
+    # @return [String, nil] the value of ip address
+    attr_accessor :ip_address
+
     # Predefined field, must be manually provided
     # @return [String, nil] the value of language
     attr_accessor :language
@@ -74,6 +78,7 @@ module AmplitudeExperiment
     # @param [String, nil] city Predefined field, must be manually provided
     # @param [String, nil] region Predefined field, must be manually provided
     # @param [String, nil] dma Predefined field, must be manually provided
+    # @param [String, nil] ip_address Predefined field, must be manually provided
     # @param [String, nil] language Predefined field, must be manually provided
     # @param [String, nil] platform Predefined field, must be manually provided
     # @param [String, nil] version Predefined field, must be manually provided
@@ -84,7 +89,7 @@ module AmplitudeExperiment
     # @param [String, nil] carrier Predefined field, must be manually provided
     # @param [String, nil] library Predefined field, auto populated, can be manually overridden
     # @param [Hash, nil] user_properties Custom user properties
-    def initialize(device_id: nil, user_id: nil, country: nil, city: nil, region: nil, dma: nil, language: nil,
+    def initialize(device_id: nil, user_id: nil, country: nil, city: nil, region: nil, dma: nil, ip_address: nil, language: nil,
                    platform: nil, version: nil, os: nil, device_manufacturer: nil, device_brand: nil,
                    device_model: nil, carrier: nil, library: nil, user_properties: nil)
       @device_id = device_id
@@ -93,6 +98,7 @@ module AmplitudeExperiment
       @city = city
       @region = region
       @dma = dma
+      @ip_address = ip_address
       @language = language
       @platform = platform
       @version = version
@@ -115,6 +121,7 @@ module AmplitudeExperiment
         city: @city,
         region: @region,
         dma: @dma,
+        ip_address: @ip_address,
         language: @language,
         platform: @platform,
         version: @version,

data/lib/experiment/version.rb

@@ -1,3 +1,3 @@
 module AmplitudeExperiment
-  VERSION = '1.2.4'.freeze
+  VERSION = '1.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amplitude-experiment
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Amplitude
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-17 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -176,6 +176,7 @@ files:
 - lib/amplitude/utils.rb
 - lib/amplitude/workers.rb
 - lib/experiment/cookie.rb
+- lib/experiment/error.rb
 - lib/experiment/factory.rb
 - lib/experiment/local/assignment/assignment.rb
 - lib/experiment/local/assignment/assignment_config.rb