Merge branch 'development' into Feature/Semver

Author: chillaq

CHANGES.txt

@@ -1,7 +1,8 @@
 CHANGES
 
-Next release (TBD)
+8.3.1 (Mar 22, 2024)
 - Fixed ruby process hanging due to failed thread.join command, when calling destroy and a http request still active.
+- Fixed streaming notification parser. Issue ref: https://github.com/splitio/ruby-client/issues/511
 
 8.3.0 (Dec 11, 2023)
 - Added support for Flag Sets on the SDK, which enables grouping feature flags and interacting with the group rather than individually (more details in our documentation):

lib/splitclient-rb.rb

@@ -111,6 +111,8 @@
 require 'splitclient-rb/engine/synchronizer'
 require 'splitclient-rb/utilitites'
 
+require 'splitclient-rb/spec.rb'
+
 # SSE
 require 'splitclient-rb/sse/event_source/client'
 require 'splitclient-rb/sse/event_source/event_parser'

lib/splitclient-rb/cache/repositories/events/memory_repository.rb

@@ -29,6 +29,10 @@ def clear
             @adapter.clear
           end
 
+          def empty?
+            @adapter.empty?
+          end
+
           def batch
             return [] if @config.events_queue_size.zero?
 

lib/splitclient-rb/cache/repositories/events_repository.rb

@@ -25,6 +25,10 @@ def post_events
           @config.log_found_exception(__method__.to_s, e)
         end
 
+        def empty?
+          @repository.empty?
+         end
+
         protected
 
         def metadata

lib/splitclient-rb/cache/repositories/splits_repository.rb

@@ -5,7 +5,7 @@ module Cache
     module Repositories
       class SplitsRepository < Repository
         attr_reader :adapter
-        DEFAULT_CONDITIONS_TEMPLATE =   {
+        DEFAULT_CONDITIONS_TEMPLATE = [{
           conditionType: "ROLLOUT",
           matcherGroup: {
               combiner: "AND",
@@ -30,7 +30,8 @@ class SplitsRepository < Repository
               }
           ],
           label: "unsupported matcher type"
-      }
+        }]
+
         def initialize(config, flag_sets_repository, flag_set_filter)
           super(config)
           @tt_cache = {}
@@ -182,7 +183,7 @@ def add_feature_flag(split)
 
           if check_undefined_matcher(split)
             @config.logger.warn("Feature Flag #{split[:name]} has undefined matcher, setting conditions to default template.")
-            split[:conditions] = [SplitsRepository::DEFAULT_CONDITIONS_TEMPLATE]
+            split[:conditions] = SplitsRepository::DEFAULT_CONDITIONS_TEMPLATE
           end
           if !split[:sets].nil?
             for flag_set in split[:sets]

lib/splitclient-rb/clients/split_client.rb

@@ -96,7 +96,16 @@ def get_treatments_with_config_by_flag_sets(key, flag_sets, attributes = {})
 
     def destroy
       @config.logger.info('Split client shutdown started...') if @config.debug_enabled
-
+      if !@config.cache_adapter.is_a?(SplitIoClient::Cache::Adapters::RedisAdapter) && @config.impressions_mode != :none &&
+          (!@impressions_repository.empty? || !@events_repository.empty?)
+        @config.logger.debug("Impressions and/or Events cache is not empty")
+        # Adding small delay to ensure sender threads are fully running
+        sleep(0.1)
+        if !@config.threads.key?(:impressions_sender) || !@config.threads.key?(:events_sender)
+          @config.logger.debug("Periodic data recording thread has not started yet, waiting for service startup.")
+          @config.threads[:start_sdk].join(5) if @config.threads.key?(:start_sdk)
+        end
+      end
       @config.threads.select { |name, thread| name.to_s.end_with? 'sender' }.values.each do |thread|
         thread.raise(SplitIoClient::SDKShutdownException)
         thread.join

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

@@ -10,6 +10,7 @@ def initialize(config)
       end
 
       def get_api(url, api_key, params = {}, cache_control_headers = false)
+        api_client.options.params_encoder.sort_params = false
         api_client.get(url, params) do |req|
           req.headers = common_headers(api_key).merge('Accept-Encoding' => 'gzip')
           req.headers = req.headers.merge('Cache-Control' => 'no-cache') if cache_control_headers
@@ -29,7 +30,7 @@ def post_api(url, api_key, data, headers = {}, params = {})
           req.headers = common_headers(api_key)
                         .merge('Content-Type' => 'application/json')
                         .merge(headers)
-          
+
           machine_ip = @config.machine_ip
           machine_name = @config.machine_name
 
@@ -55,6 +56,7 @@ def api_client
         @api_client ||= Faraday.new do |builder|
           builder.use SplitIoClient::FaradayMiddleware::Gzip
           builder.adapter :net_http_persistent
+          builder.options.params_encoder = Faraday::FlatParamsEncoder
         end
       end
 

lib/splitclient-rb/engine/api/splits.rb

@@ -4,17 +4,18 @@ module SplitIoClient
   module Api
     # Retrieves split definitions from the Split Backend
     class Splits < Client
+
       def initialize(api_key, config, telemetry_runtime_producer)
         super(config)
         @api_key = api_key
         @telemetry_runtime_producer = telemetry_runtime_producer
         @flag_sets_filter = @config.flag_sets_filter
       end
 
-      def since(since, fetch_options = { cache_control_headers: false, till: nil, sets: nil })
+      def since(since, fetch_options = { cache_control_headers: false, till: nil, sets: nil})
         start = Time.now
 
-        params = { since: since }
+        params = { s: SplitIoClient::Spec::FeatureFlags::SPEC_VERSION, since: since }
         params[:till] = fetch_options[:till] unless fetch_options[:till].nil?
         params[:sets] = @flag_sets_filter.join(",") unless @flag_sets_filter.empty?
         @config.logger.debug("Fetching from splitChanges with #{params}: ")

lib/splitclient-rb/engine/auth_api_client.rb

@@ -14,7 +14,7 @@ def initialize(config, telemetry_runtime_producer)
 
       def authenticate(api_key)
         start = Time.now
-        response = @api_client.get_api(@config.auth_service_url, api_key)
+        response = @api_client.get_api("#{@config.auth_service_url}?s=#{SplitIoClient::Spec::FeatureFlags::SPEC_VERSION}", api_key)
 
         return process_success(response, start) if response.success?
 

lib/splitclient-rb/spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module SplitIoClient
+  module Spec
+    class FeatureFlags
+      SPEC_VERSION = "1.1"
+    end
+  end
+end