splitclient-rb 7.1.4.pre.rc14-java → 7.1.4.pre.rc19-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb0473401cc1dff930c8c630d386ade15ed6078
-  data.tar.gz: c157c330de409f206bde72e310b3cf904e7812b8
+  metadata.gz: 90fcccf598ffb68bcd8a24572926db732d7a8597
+  data.tar.gz: 441fcced7138c622713e42b5405743fdd8d95a9e
 SHA512:
-  metadata.gz: 9a70724ea9ae614f94b31ad2273e5c847ebca75a90930a418e0087e0f7a7557f1c7ce174ba719fd9ed9350e50b849e43a01b6f1d6d42e134231ce2d0d22dbc96
-  data.tar.gz: 97b8f5ea2164cf6310bec91d2a4a63ac675289cc3ef1a0a59cbeb702489fa13bc45c056cf51e5652ab67f34b3530ccc7b0377aef089b053858ef023e9211f063
+  metadata.gz: 2b73e0212db9cc59f0c77369c931418ca067e0f1c9bec0b711213adbe5aa82ad67a9a3c6e1cbec8ac4b2f8598df909d178a5f9ad9c061cc3f405fb9ab34e2fdc
+  data.tar.gz: c56739c82ecea3c4626cc40e7495f16660099ed7be72956f423afc0b6819f827cd8e636bb1f7974d1d2948f9f54f03343d9e9956eae6625e4df14eefeb5aa7f8

data/lib/splitclient-rb/cache/routers/impression_router.rb

@@ -19,28 +19,30 @@ module SplitIoClient
     end
 
     def add_bulk(impressions)
-      return unless @listener
       impressions.each do |impression|
-        enqueue(
-          split_name: impression[:i][:f],
-          matching_key: impression[:i][:k],
-          bucketing_key: impression[:i][:b],
-          time: impression[:i][:m],
-          treatment: {
-            label: impression[:i][:r],
-            treatment: impression[:i][:t],
-            change_number: impression[:i][:c]
-          },
-          previous_time: impression[:i][:pt],
-          attributes: impression[:attributes]
-        ) unless impression.nil?
+        enqueue(impression)
       end
     end
 
     private
 
     def enqueue(impression)
-      @queue.push(impression) if @listener
+      imp = {
+        split_name: impression[:i][:f],
+        matching_key: impression[:i][:k],
+        bucketing_key: impression[:i][:b],
+        time: impression[:i][:m],
+        treatment: {
+          label: impression[:i][:r],
+          treatment: impression[:i][:t],
+          change_number: impression[:i][:c]
+        },
+        previous_time: impression[:i][:pt],
+        attributes: impression[:attributes]
+      }
+      @queue.push(imp) if @listener
+    rescue StandardError => error
+      @config.log_found_exception(__method__.to_s, error)
     end
 
     def router_thread

data/lib/splitclient-rb/engine/common/impressions_counter.rb

@@ -32,12 +32,12 @@ module SplitIoClient
           to_return
         end
 
-        def truncate_time_frame(timestamp_ms)
-          timestamp_ms - (timestamp_ms % TIME_INTERVAL_MS)
+        def make_key(split_name, time_frame)
+          "#{split_name}::#{ImpressionCounter.truncate_time_frame(time_frame)}"
         end
 
-        def make_key(split_name, time_frame)
-          "#{split_name}::#{truncate_time_frame(time_frame)}"
+        def self.truncate_time_frame(timestamp_ms)
+          timestamp_ms - (timestamp_ms % TIME_INTERVAL_MS)
         end
       end
     end

data/lib/splitclient-rb/engine/common/impressions_manager.rb

@@ -8,7 +8,6 @@ module SplitIoClient
           @config = config
           @impressions_repository = impressions_repository
           @impression_counter = impression_counter
-          @impression_router = SplitIoClient::ImpressionRouter.new(@config)
           @impression_observer = SplitIoClient::Observers::ImpressionObserver.new
         end
 
@@ -18,7 +17,7 @@ module SplitIoClient
 
           impression_data[:pt] = @impression_observer.test_and_set(impression_data) unless redis?
 
-          return impression_optimized(split_name, impression_data, params[:attributes]) if optimized? && !redis?
+          @impression_counter.inc(split_name, impression_data[:m]) if optimized? && !redis?
 
           impression(impression_data, params[:attributes])
         rescue StandardError => error
@@ -28,8 +27,14 @@ module SplitIoClient
         def track(impressions)
           return if impressions.empty?
 
-          @impressions_repository.add_bulk(impressions)
-          @impression_router.add_bulk(impressions)
+          impression_router.add_bulk(impressions)
+
+          if optimized? && !redis?
+            optimized_impressions = impressions.select { |imp| should_queue_impression?(imp[:i]) }
+            @impressions_repository.add_bulk(optimized_impressions)
+          else
+            @impressions_repository.add_bulk(impressions)
+          end
         rescue StandardError => error
           @config.log_found_exception(__method__.to_s, error)
         end
@@ -66,14 +71,9 @@ module SplitIoClient
           @config.impressions_mode == :optimized
         end
 
-        def impression_optimized(split_name, impression_data, attributes)
-          @impression_counter.inc(split_name, impression_data[:m])
-
-          impression(impression_data, attributes) if should_queue_impression?(impression_data)
-        end
-
         def should_queue_impression?(impression)
-          impression[:pt].nil? || (impression[:pt] < ((Time.now.to_f * 1000.0).to_i - Common::TIME_INTERVAL_MS))
+          impression[:pt].nil? ||
+            (ImpressionCounter.truncate_time_frame(impression[:pt]) != ImpressionCounter.truncate_time_frame(impression[:m]))
         end
 
         def impression(impression_data, attributes)
@@ -83,6 +83,12 @@ module SplitIoClient
         def redis?
           @config.impressions_adapter.class.to_s == 'SplitIoClient::Cache::Adapters::RedisAdapter'
         end
+
+        def impression_router
+          @impression_router ||= SplitIoClient::ImpressionRouter.new(@config)
+        rescue StandardError => error
+          @config.log_found_exception(__method__.to_s, error)
+        end
       end
     end
   end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.1.4.pre.rc14'
+  VERSION = '7.1.4.pre.rc19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.1.4.pre.rc14
+  version: 7.1.4.pre.rc19
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement