splitclient-rb 7.1.4.pre.rc13-java → 7.1.4.pre.rc18-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3912a6de83eaeaae6268a36d7630c81eb9c50f
-  data.tar.gz: 18be80ec5e4e5b2e1bee1836e92381899f8b57bc
+  metadata.gz: ca9b57f69422589f373aaed9cbe0ca1352b70ed5
+  data.tar.gz: 4ccc742bbf83c966ab21498f5eb0fb4afc104a48
 SHA512:
-  metadata.gz: 2f4e8834691513a334c7aff11f09227cc23edd2688cf9475f2af01d8b24e41a8653a688354aae1c59eb42e75f1f100e890acae94083082b7c0fd0e1815ea59f0
-  data.tar.gz: 931b150f0a7f51fadf5dd649d0da157483122976468c2a37438f0b640ce34cd22b71b690046c0557acb05cb5a3da2750ced48e9e19ece000d2a966451ec1f737
+  metadata.gz: e932901095fea7a9d11fd846dd7e942cf97169cd3b1535f0678e81e5864b8e8545e3deefb1f07a6c16087b8916d4254f26020f0dd3868f0df4d7cb9b227b9e85
+  data.tar.gz: fc4e1ce6e5503eb4fb145f60ad0bb7af7b659343733e93510809cbfd6c4c2ec292e45090cf11b8c5ede9770bc0eec23b2e670facef936f49e08371e962cbfa87

data/lib/splitclient-rb/cache/repositories/impressions/redis_repository.rb

@@ -22,7 +22,7 @@ module SplitIoClient
             # Synchronizer might not be running
             @adapter.expire(key, EXPIRE_SECONDS) if impressions_json.size == impressions_list_size
           rescue StandardError => e
-            @config.logger.error("Exception while add_bulk_v2: #{e}")
+            @config.logger.error("Exception while add_bulk: #{e}")
           end
 
           def get_impressions(number_of_impressions = 0)

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

@@ -18,29 +18,29 @@ module SplitIoClient
       end
     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?
-      end
+    def add(impression)
+      enqueue(impression)
     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,16 +17,20 @@ module SplitIoClient
 
           impression_data[:pt] = @impression_observer.test_and_set(impression_data) unless redis?
 
+          impression_debug = impression(impression_data, params[:attributes])
+          impression_router.add(impression_debug)
+
           return impression_optimized(split_name, impression_data, params[:attributes]) if optimized? && !redis?
 
-          impression(impression_data, params[:attributes])
+          impression_debug
         rescue StandardError => error
           @config.log_found_exception(__method__.to_s, error)
         end
 
         def track(impressions)
+          return if impressions.empty?
+
           @impressions_repository.add_bulk(impressions)
-          @impression_router.add_bulk(impressions)
         rescue StandardError => error
           @config.log_found_exception(__method__.to_s, error)
         end
@@ -71,7 +74,8 @@ module SplitIoClient
         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)
@@ -81,6 +85,10 @@ module SplitIoClient
         def redis?
           @config.impressions_adapter.class.to_s == 'SplitIoClient::Cache::Adapters::RedisAdapter'
         end
+
+        def impression_router
+          @impression_router ||= SplitIoClient::ImpressionRouter.new(@config)
+        end
       end
     end
   end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.1.4.pre.rc13'
+  VERSION = '7.1.4.pre.rc18'
 end

metadata

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