splitclient-rb 8.1.0-java → 8.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffc81241db89baa5be678177e9c396b458fa45c1
-  data.tar.gz: '0049e2aa1fa6e804f53264b8cd77fe6f4567a892'
+  metadata.gz: 01cdc1656620b10e95e29e7a8c78030a288ab1ab
+  data.tar.gz: a7191857f7cecf0c80d6c4b30cbcafb55ea5cdc4
 SHA512:
-  metadata.gz: 262f726d941f05d2deb3804b66ce24f3cb231dbe615bc23181fb70ff58ce4e48ae2776cf7812a98ca00fcedff43b5e4b19ff82de7d63b2d5143f4c1d73523976
-  data.tar.gz: 544496e2d48c24daf8989558cee739bb48971b14ca9039b2844074c8e0737f5c0714594fc1d819a0b38c35d409c0ba8aa4d21338f5ef218c90dab4eef9f990a5
+  metadata.gz: 907c2a55092aa4dcd44ae8e07637a56150d28d779731c0da2860c6c903d577c805345c9fb6980233f11e664a22412176e1307ffbdff17aa4f74eb847c8f9673a
+  data.tar.gz: df92c8ee881b1d5edf5e74ba5ae2d0eff4052dbd80ecc6d93b63d5c1fa0925c31ec9b5eb7277b95d0f93c5823478897935a55e8d6d070a930149e90faabd41a6

data/CHANGES.txt

@@ -1,5 +1,10 @@
 CHANGES
 
+8.1.1 (Mar 17, 2023)
+- Added retries with backoff when the sdk tries to connect to the Streaming service and it is not available.
+- Updated the way that the sdk write mtks in redis.
+- Fixed calculation of timeUntilReady in telemetry.
+
 8.1.0 (Oct 5, 2022)
 - Added a new impressions mode for the SDK called NONE , to be used in factory when there is no desire to capture impressions on an SDK factory to feed Split's analytics engine. Running NONE mode, the SDK will only capture unique keys evaluated for a particular feature flag instead of full blown impressions.
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2022 Split Software, Inc.
+Copyright © 2023 Split Software, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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

@@ -99,7 +99,7 @@ module SplitIoClient
         alias find_sets_by_prefix find_strings_by_prefix
 
         def add_to_set(key, val)
-          @redis.sadd(key, val)
+          @redis.sadd?(key, val)
         end
 
         def delete_from_set(key, val)

data/lib/splitclient-rb/cache/senders/impressions_adapter/redis_sender.rb

@@ -12,14 +12,11 @@ module SplitIoClient
         end
 
         def record_uniques_key(uniques)
-          return if uniques.nil? || uniques == {}
+          return if uniques.nil? || uniques.empty?
 
-          formatted = uniques_formatter(uniques).to_json
+          size = @adapter.add_to_queue(unique_keys_key, uniques_formatter(uniques))
 
-          unless formatted.nil?
-            size = @adapter.add_to_queue(unique_keys_key, formatted)
-            @adapter.expire(unique_keys_key, EXPIRE_SECONDS) if formatted.size == size
-          end
+          @adapter.expire(unique_keys_key, EXPIRE_SECONDS) if uniques.length == size
         rescue StandardError => e
           @config.log_found_exception(__method__.to_s, e)
         end
@@ -47,29 +44,24 @@ module SplitIoClient
           @adapter.expire(impressions_count_key, EXPIRE_SECONDS) if impressions_count.size == hlen && (pipeline_result.sum - hlen) == total_count
         end
 
-        def impressions_count_key
-          "#{@config.redis_namespace}.impressions.count"
-        end
-
-        def unique_keys_key
-          "#{@config.redis_namespace}.uniquekeys"
-        end
-
         def uniques_formatter(uniques)
-          return if uniques.nil? || uniques.empty?
-
           to_return = []
           uniques.each do |key, value|
             to_return << {
               f: key,
-              k: value.to_a
-            }
+              ks: value.to_a
+            }.to_json
           end
 
           to_return
-        rescue StandardError => e
-          @config.log_found_exception(__method__.to_s, e)
-          nil
+        end
+
+        def impressions_count_key
+          "#{@config.redis_namespace}.impressions.count"
+        end
+
+        def unique_keys_key
+          "#{@config.redis_namespace}.uniquekeys"
         end
       end
     end

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

@@ -59,11 +59,7 @@ module SplitIoClient
 
       def process_success(response, start)
         @config.logger.debug("Success connection to: #{@config.auth_service_url}") if @config.debug_enabled
-
-        bucket = BinarySearchLatencyTracker.get_bucket((Time.now - start) * 1000.0)
-        @telemetry_runtime_producer.record_sync_latency(Telemetry::Domain::Constants::TOKEN_SYNC, bucket)
-        timestamp = (Time.now.to_f * 1000.0).to_i
-        @telemetry_runtime_producer.record_successful_sync(Telemetry::Domain::Constants::TOKEN_SYNC, timestamp)
+        record_telemetry(start)
 
         body_json = JSON.parse(response.body, symbolize_names: true)
         push_enabled = body_json[:pushEnabled]
@@ -77,7 +73,7 @@ module SplitIoClient
           @telemetry_runtime_producer.record_token_refreshes
         end
 
-        { push_enabled: push_enabled, token: token, channels: channels, exp: exp, retry: false }
+        { push_enabled: push_enabled, token: token, channels: channels, exp: exp, retry: true }
       end
 
       def control_channels(channels_string)
@@ -88,6 +84,13 @@ module SplitIoClient
 
         channels_string.gsub(control_sec, "#{prefix}#{control_sec}")
       end
+
+      def record_telemetry(start)
+        bucket = BinarySearchLatencyTracker.get_bucket((Time.now - start) * 1000.0)
+        @telemetry_runtime_producer.record_sync_latency(Telemetry::Domain::Constants::TOKEN_SYNC, bucket)
+        timestamp = (Time.now.to_f * 1000.0).to_i
+        @telemetry_runtime_producer.record_successful_sync(Telemetry::Domain::Constants::TOKEN_SYNC, timestamp)
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@
 
 module SplitIoClient
   module Engine
-    BACKOFF_MAX_ALLOWED = 1.8
+    BACKOFF_MAX_ALLOWED = 1800
     class BackOff
       def initialize(back_off_base, attempt = 0, max_allowed = BACKOFF_MAX_ALLOWED)
         @attempt = attempt

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

@@ -14,7 +14,6 @@ module SplitIoClient
 
       def start_sse
         response = @auth_api_client.authenticate(@api_key)
-
         @config.logger.debug("Auth service response push_enabled: #{response[:push_enabled]}") if @config.debug_enabled
 
         if response[:push_enabled] && @sse_handler.start(response[:token], response[:channels])
@@ -26,7 +25,6 @@ module SplitIoClient
         end
 
         stop_sse
-
         schedule_next_token_refresh(@back_off.interval) if response[:retry]
         false
       rescue StandardError => e
@@ -35,7 +33,8 @@ module SplitIoClient
 
       def stop_sse
         @sse_handler.stop
-        SplitIoClient::Helpers::ThreadHelper.stop(:schedule_next_token_refresh, @config)
+      rescue StandardError => e
+        @config.logger.error(e.inspect)
       end
 
       private

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

@@ -6,8 +6,6 @@ module SplitIoClient
       include SplitIoClient::Cache::Fetchers
       include SplitIoClient::Cache::Senders
 
-      ON_DEMAND_FETCH_BACKOFF_BASE_SECONDS = 10
-      ON_DEMAND_FETCH_BACKOFF_MAX_WAIT_SECONDS = 60
       ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES = 10
 
       def initialize(
@@ -27,6 +25,9 @@ module SplitIoClient
         @telemetry_synchronizer = params[:telemetry_synchronizer]
         @impressions_sender_adapter = params[:impressions_sender_adapter]
         @unique_keys_tracker = params[:unique_keys_tracker]
+
+        @splits_sync_backoff = Engine::BackOff.new(10, 0, 60)
+        @segments_sync_backoff = Engine::BackOff.new(10, 0, 60)
       end
 
       def sync_all(asynchronous = true)
@@ -140,7 +141,7 @@ module SplitIoClient
 
       def attempt_segment_sync(name, target_cn, fetch_options, max_retries, retry_delay_seconds, with_backoff)
         remaining_attempts = max_retries
-        backoff = Engine::BackOff.new(ON_DEMAND_FETCH_BACKOFF_BASE_SECONDS, 0, ON_DEMAND_FETCH_BACKOFF_MAX_WAIT_SECONDS) if with_backoff
+        @segments_sync_backoff.reset
 
         loop do
           remaining_attempts -= 1
@@ -150,14 +151,14 @@ module SplitIoClient
           return sync_result(true, remaining_attempts) if target_cn <= @segments_repository.get_change_number(name).to_i
           return sync_result(false, remaining_attempts) if remaining_attempts <= 0
 
-          delay = with_backoff ? backoff.interval : retry_delay_seconds
+          delay = with_backoff ? @segments_sync_backoff.interval : retry_delay_seconds
           sleep(delay)
         end
       end
 
       def attempt_splits_sync(target_cn, fetch_options, max_retries, retry_delay_seconds, with_backoff)
         remaining_attempts = max_retries
-        backoff = Engine::BackOff.new(ON_DEMAND_FETCH_BACKOFF_BASE_SECONDS, 0, ON_DEMAND_FETCH_BACKOFF_MAX_WAIT_SECONDS) if with_backoff
+        @splits_sync_backoff.reset
 
         loop do
           remaining_attempts -= 1
@@ -167,7 +168,7 @@ module SplitIoClient
           return sync_result(true, remaining_attempts, result[:segment_names]) if target_cn <= @splits_repository.get_change_number
           return sync_result(false, remaining_attempts, result[:segment_names]) if remaining_attempts <= 0
 
-          delay = with_backoff ? backoff.interval : retry_delay_seconds
+          delay = with_backoff ? @splits_sync_backoff.interval : retry_delay_seconds
           sleep(delay)
         end
       end

data/lib/splitclient-rb/split_config.rb

@@ -117,7 +117,7 @@ module SplitIoClient
 
       @counter_refresh_rate = SplitConfig.default_counter_refresh_rate(@cache_adapter)
 
-      @sdk_start_time = Time.now
+      @sdk_start_time = Time.now.to_f
 
       @on_demand_fetch_retry_delay_seconds = SplitConfig.default_on_demand_fetch_retry_delay_seconds
       @on_demand_fetch_max_retries = SplitConfig.default_on_demand_fetch_max_retries

data/lib/splitclient-rb/telemetry/domain/structs.rb

@@ -13,9 +13,10 @@ module SplitIoClient
     # s: sdkUrl, e: eventsUrl, a: authUrl, st: streamUrl, t: telemetryUrl
     UrlOverrides = Struct.new(:s, :e, :a, :st, :t)
 
-    # om: operationMode, se: streamingEnabled, st: storage, rr: refreshRate, uo: urlOverrides, iq: impressionsQueueSize,
-    # eq: eventsQueueSize, im: impressionsMode, il: impressionListenerEnabled, hp: httpProxyDetected, af: activeFactories,
-    # rf: redundantActiveFactories, tr: timeUntilSdkReady, bt: burTimeouts, nr: sdkNotReadyUsage, t: tags, i: integrations
+    # om: operationMode, st: storage, af: activeFactories, rf: redundantActiveFactories, t: tags, se: streamingEnabled,
+    # rr: refreshRate, uo: urlOverrides, iq: impressionsQueueSize, eq: eventsQueueSize, im: impressionsMode,
+    # il: impressionListenerEnabled, hp: httpProxyDetected, tr: timeUntilSdkReady, bt: burTimeouts,
+    # nr: sdkNotReadyUsage, i: integrations
     ConfigInit = Struct.new(:om, :st, :af, :rf, :t, :se, :rr, :uo, :iq, :eq, :im, :il, :hp, :tr, :bt, :nr, :i)
 
     # ls: lastSynchronization, ml: clientMethodLatencies, me: clientMethodExceptions, he: httpErros, hl: httpLatencies,

data/lib/splitclient-rb/telemetry/memory/memory_synchronizer.rb

@@ -56,6 +56,7 @@ module SplitIoClient
 
         active_factories ||= SplitIoClient.split_factory_registry.active_factories
         redundant_active_factories ||= SplitIoClient.split_factory_registry.redundant_active_factories
+        time_until_ready ||= ((Time.now.to_f - @config.sdk_start_time) * 1000.0).to_i
 
         init_config = ConfigInit.new(mode,
                                      'memory',
@@ -70,7 +71,7 @@ module SplitIoClient
                                      impressions_mode,
                                      !@config.impression_listener.nil?,
                                      http_proxy_detected?,
-                                     time_until_ready || Time.now.to_i - @config.sdk_start_time.to_i,
+                                     time_until_ready,
                                      @telemetry_init_consumer.bur_timeouts,
                                      @telemetry_init_consumer.non_ready_usages)
 

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '8.1.0'
+  VERSION = '8.1.1'
 end

data/splitclient-rb.gemspec

@@ -57,7 +57,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'jwt', '>= 1.0.0', '< 3.0'
   spec.add_runtime_dependency 'lru_redux', '~> 1.1'
   spec.add_runtime_dependency 'net-http-persistent', '>= 2.9', '< 5.0'
-  spec.add_runtime_dependency 'redis', '>= 4.0.0', '< 5.0'
+  spec.add_runtime_dependency 'redis', '>= 4.0.0', '< 6.0'
   spec.add_runtime_dependency 'socketry', '>= 0.4', '< 1.0'
   spec.add_runtime_dependency 'thread_safe', '~> 0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.1.1
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -342,7 +342,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   name: redis
   prerelease: false
   type: :runtime
@@ -353,7 +353,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: