ff-ruby-server-sdk 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2bcc6b6312ee2462bbf6a2a689ddee47c6000bc010db561eb72b5204a7c8d8f
-  data.tar.gz: 7058cd57f6e72cb2c649b51071eaebed405ff3aac691f4aa186a096da70692b9
+  metadata.gz: d40a21b8332b96f4c3f507f2adece4bc12a9475fb87518323c3b79f959d2782a
+  data.tar.gz: 4be776d630a6c97cc563e801b74b8c25e6250ea3611fa83b6a1b26274ead4d06
 SHA512:
-  metadata.gz: 85ff6d9cda7f5579a7eeedce0f7ea293ccf95ff426b413f53aa09c22a0caa4bc1890607c63d67a0b3c58295d537f830a85e81ae45a2a6afafdd4d0521daa60df
-  data.tar.gz: '089aeb5abb536d43e118bade66a80fde7b70e1b74ce1a96fa32d53d7a4a61f08ec7b4c5d35a987e60f11fc4a8791b7233bad01c742bfc4ebc5545a738a13038d'
+  metadata.gz: d11cd5ae4daddce986eae1faa3ca10d16e68a0c708e4e15131d0ee74883e67bac88af39cedfa1ee5497f7ac916bfd270bd8067bcbf71c3e90de242520ff49cd1
+  data.tar.gz: bfc9bc6662bc500c25281c36bb9d8352ba16bdf8ad9f43c06b44074aa4ff791e2ddb8e1e84b1796bd4fb10bfe819190d6eb33bde7ac315eff02e918784653fcb

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,6 +78,8 @@ 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
 
@@ -181,21 +183,27 @@ class MetricsProcessor < Closeable
   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
+    target_metrics_map_clone = Concurrent::Map.new
 
-    evaluation_metrics_map.each_pair do |key, value|
-      evaluation_metrics_map_clone[key] = value
-    end
+    # 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.
+    @metric_maps_mutex.synchronize do
+      # Clone and clear evaluation metrics map
+      evaluation_metrics_map.each_pair do |key, value|
+        evaluation_metrics_map_clone[key] = value
+      end
 
-    evaluation_metrics_map.clear
-    target_metrics_map_clone = Concurrent::Map.new
+      evaluation_metrics_map.clear
 
-    target_metrics_map.each_pair do |key, value|
-      target_metrics_map_clone[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
+    end
 
     @evaluation_warning_issued.make_false
     @target_warning_issued.make_false

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.2"
       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.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ff-ruby-server-sdk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - 'Miloš Vasić, cyr.: Милош Васић'