ff-ruby-server-sdk 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2bcc6b6312ee2462bbf6a2a689ddee47c6000bc010db561eb72b5204a7c8d8f
-  data.tar.gz: 7058cd57f6e72cb2c649b51071eaebed405ff3aac691f4aa186a096da70692b9
+  metadata.gz: 21ede6e2de94f3ed2aec871c40b8dbee7a9feec6adbdec14726e5237caedbb0b
+  data.tar.gz: e89c0b57ae84666c87dccf6b25a67f0d0ca77990220ee014c9abe1a1225993c9
 SHA512:
-  metadata.gz: 85ff6d9cda7f5579a7eeedce0f7ea293ccf95ff426b413f53aa09c22a0caa4bc1890607c63d67a0b3c58295d537f830a85e81ae45a2a6afafdd4d0521daa60df
-  data.tar.gz: '089aeb5abb536d43e118bade66a80fde7b70e1b74ce1a96fa32d53d7a4a61f08ec7b4c5d35a987e60f11fc4a8791b7233bad01c742bfc4ebc5545a738a13038d'
+  metadata.gz: 943c5b49c1bf887dd6ff24edce3e03cd2bff1badde8dd0802fdc8bda042e2e260b2cd7929c18189ec9dfb39f8b8189bec5b49e32ab021c722a17da71268bcccb
+  data.tar.gz: 5f32b626e8c49fd3074401db1ef6810acfb79b4cdba6f03e7f55e31a2a6e921b73ce273d71780f30dc90f18e74f691e4a203da6503bb0a473a60e49b0b56d37b

data/lib/ff/ruby/server/sdk/api/cf_client.rb

@@ -1,56 +1,23 @@
-
+require 'singleton'
 require_relative "../../generated/lib/openapi_client"
 require_relative "../common/closeable"
 require_relative "inner_client"
 
 class CfClient < Closeable
-
-  # Static:
-  class << self
-
-    @@instance = CfClient.new
-
-    def instance
-
-      @@instance
+  include Singleton
+
+  def init(api_key, config, connector = nil)
+    # Only initialize if @client is nil to avoid reinitialization
+    unless @client
+      @config = config || ConfigBuilder.new.build
+      @client = InnerClient.new(api_key, @config, connector)
+      @config.logger.debug "Client initialized with API key: #{api_key}"
     end
+    @client
   end
 
-  # Static - End
-
-  def initialize(api_key = nil, config = nil, connector = nil)
-
-    if config == nil
-
-      @config = ConfigBuilder.new.build
-    else
-
-      @config = config
-    end
-
-    @client = InnerClient.new(api_key, config, connector)
-
-    @config.logger.debug "Client (1): " + @client.to_s
-  end
-
-  def init(api_key = nil, config = nil, connector = nil)
-
-    if @client == nil
-
-      @config = config
-
-      @client = InnerClient.new(
-
-        api_key = api_key,
-        config = config,
-        connector = connector
-      )
-
-      @config.logger.debug "Client (2): " + @client.to_s
-    end
-  end
 
-  def wait_for_initialization(timeout_ms: nil)
+def wait_for_initialization(timeout_ms: nil)
     if @client != nil
       @client.wait_for_initialization(timeout: timeout_ms)
     end

data/lib/ff/ruby/server/sdk/api/metrics_processor.rb

@@ -78,28 +78,25 @@ class MetricsProcessor < Closeable
 
     @executor = Concurrent::FixedThreadPool.new(10)
 
+    # Used for locking the evalution and target metrics maps before we clone them
+    @metric_maps_mutex = Mutex.new
     @evaluation_metrics = FrequencyMap.new
     @target_metrics = Concurrent::Map.new
 
     # Keep track of targets that have already been sent to avoid sending them again
     @seen_targets = Concurrent::Map.new
 
-    @max_buffer_size = config.buffer_size - 1
-
-    # Max 100k targets per interval
-    @max_targets_buffer_size = 100000
-
-    @evaluation_warning_issued = Concurrent::AtomicBoolean.new
-    @target_warning_issued = Concurrent::AtomicBoolean.new
-
     @callback.on_metrics_ready
   end
 
   def start
-    @config.logger.debug "Starting metrics processor with request interval: " + @config.frequency.to_s
-    start_async
+    @config.logger.debug "Starting metrics processor with request interval: #{@config.frequency}"
+    if @running
+      @config.logger.warn "Metrics processor is already running."
+    else
+      start_async
+    end
   end
-
   def stop
     @config.logger.debug "Stopping metrics processor"
     stop_async
@@ -139,28 +136,13 @@ class MetricsProcessor < Closeable
       return
     end
 
-
-    if @evaluation_metrics.size > @max_buffer_size
-      unless @evaluation_warning_issued.true?
-        SdkCodes.warn_metrics_evaluations_max_size_exceeded(@config.logger)
-        @evaluation_warning_issued.make_true
-      end
-      return
-    end
-
     event = MetricsEvent.new(feature_config, GLOBAL_TARGET, variation, @config.logger)
-    @evaluation_metrics.increment event
+    @metric_maps_mutex.synchronize do
+      @evaluation_metrics.increment event
+    end
   end
 
   def register_target_metric(target)
-    if @target_metrics.size > @max_targets_buffer_size
-      unless @target_warning_issued.true?
-        SdkCodes.warn_metrics_targets_max_size_exceeded(@config.logger)
-        @target_warning_issued.make_true
-      end
-      return
-    end
-
     if target.is_private
       return
     end
@@ -171,34 +153,39 @@ class MetricsProcessor < Closeable
       return
     end
 
-    @target_metrics.put(target.identifier, target)
+    @metric_maps_mutex.synchronize do
+      @target_metrics.put(target.identifier, target)
+    end
   end
 
   def run_one_iteration
     send_data_and_reset_cache(@evaluation_metrics, @target_metrics)
-
-    @config.logger.debug "metrics: frequency map size #{@evaluation_metrics.size}. targets map size #{@target_metrics.size} global target size #{@seen_targets.size}"
   end
 
   def send_data_and_reset_cache(evaluation_metrics_map, target_metrics_map)
-    # Clone and clear evaluation metrics map
-    evaluation_metrics_map_clone = Concurrent::Map.new
+    # A single lock is used to synchronise access to both the evaluation and target metrics maps.
+    # While separate locks could be applied to each map individually, we want an interval's eval/target
+    # metrics to be processed in an atomic unit.
+    evaluation_metrics_map_clone, target_metrics_map_clone = @metric_maps_mutex.synchronize do
+
+      clone_evaluations = Concurrent::Map.new
+      clone_targets = Concurrent::Map.new
+      # Clone and clear evaluation metrics map
+      evaluation_metrics_map.each_pair do |key, value|
+        clone_evaluations[key] = value
+      end
 
-    evaluation_metrics_map.each_pair do |key, value|
-      evaluation_metrics_map_clone[key] = value
-    end
+      evaluation_metrics_map.clear
 
-    evaluation_metrics_map.clear
-    target_metrics_map_clone = Concurrent::Map.new
+      target_metrics_map.each_pair do |key, value|
+        clone_targets[key] = value
+      end
 
-    target_metrics_map.each_pair do |key, value|
-      target_metrics_map_clone[key] = value
-    end
+      target_metrics_map.clear
 
-    target_metrics_map.clear
+      [clone_evaluations, clone_targets]
 
-    @evaluation_warning_issued.make_false
-    @target_warning_issued.make_false
+    end
 
     metrics = prepare_summary_metrics_body(evaluation_metrics_map_clone, target_metrics_map_clone)
 
@@ -286,6 +273,7 @@ class MetricsProcessor < Closeable
   def start_async
     @config.logger.debug "Async starting: " + self.to_s
     @ready = true
+    @running = true
     @thread = Thread.new do
       @config.logger.debug "Async started: " + self.to_s
       while @ready do
@@ -303,8 +291,14 @@ class MetricsProcessor < Closeable
   def stop_async
     @ready = false
     @initialized = false
+    if @thread && @thread.alive?
+      @thread.join
+      @config.logger.debug "Metrics processor thread has been stopped."
+    end
+    @running = false
   end
 
+
   def get_version
     Ff::Ruby::Server::Sdk::VERSION
   end

data/lib/ff/ruby/server/sdk/version.rb

@@ -5,7 +5,7 @@ module Ff
     module Server
       module Sdk
 
-        VERSION = "1.4.1"
+        VERSION = "1.4.3"
       end
     end
   end

data/scripts/sdk_specs.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 export ff_ruby_sdk="ff-ruby-server-sdk"
-export ff_ruby_sdk_version="1.4.1"
+export ff_ruby_sdk_version="1.4.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ff-ruby-server-sdk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - 'Miloš Vasić, cyr.: Милош Васић'
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake