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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ac10c0064665c6ade4cbf92da541d72df800f7
-  data.tar.gz: aa952ae204adb4cad8fcfe4535c6754e8b8ff38a
+  metadata.gz: ca9b57f69422589f373aaed9cbe0ca1352b70ed5
+  data.tar.gz: 4ccc742bbf83c966ab21498f5eb0fb4afc104a48
 SHA512:
-  metadata.gz: 1f1a8aa4ebd0e56d0e0abc537917fc95c2f7d30a8f968feab88dc6147922dd4018c958f096df2f0487435d618f4ff6c63573f6ed6948bd8727e99440c5c0f0ce
-  data.tar.gz: adf7f29d16ae67a0dedddec0abfbe5126be4854618f0964a36b008595137544e4c1592e5ce5067388d7551e84c7e27f345552a8948a2b4d6ea0523164a271d83
+  metadata.gz: e932901095fea7a9d11fd846dd7e942cf97169cd3b1535f0678e81e5864b8e8545e3deefb1f07a6c16087b8916d4254f26020f0dd3868f0df4d7cb9b227b9e85
+  data.tar.gz: fc4e1ce6e5503eb4fb145f60ad0bb7af7b659343733e93510809cbfd6c4c2ec292e45090cf11b8c5ede9770bc0eec23b2e670facef936f49e08371e962cbfa87

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

@@ -18,30 +18,27 @@ module SplitIoClient
       end
     end
 
-    def add_bulk(impressions)
-      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
-    rescue StandardError => error
-      @config.log_found_exception(__method__.to_s, error)
+    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
@@ -50,16 +47,11 @@ module SplitIoClient
       @config.threads[:impression_router] = Thread.new do
         loop do
           begin
-            @config.logger.warn("THREAD POP loop")
-            impression = @queue.pop
-            @config.logger.warn(impression.to_s)
-            @listener.log(impression)
+            @listener.log(@queue.pop)
           rescue StandardError => error
             @config.log_found_exception(__method__.to_s, error)
           end
         end
-
-        @config.logger.warn("final router loop thread..")
       end
     end
   end

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,9 +17,12 @@ 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
@@ -29,7 +31,6 @@ module SplitIoClient
           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
@@ -73,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)
@@ -83,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.rc17'
+  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.rc17
+  version: 7.1.4.pre.rc18
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement