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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cbfeeb2dcc2629ed5dd0f85270e1f8ff722798df555d1f3e0e0e5febe6e01a0
-  data.tar.gz: 3959e2367b8e6e3eebf9b6942c85258359d75219138e454384935212b7e15173
+  metadata.gz: 25c646772ba955ff0e6518fef1f89835ef4243af4e950ff215ea7ff0f41ccbc6
+  data.tar.gz: b4bc3d6dcd6f1cca0d1b8542b61538c2759d49baa02c9afc2c571e75a171e037
 SHA512:
-  metadata.gz: eba1b91ade4fc43caa1cc5b8ef279a7c3a9731f579f0b36d4afb2cbcd61a501970bfc820f377400801ad0c83e050adb9a4fc76d9b17ec1d671c82ea157d4948d
-  data.tar.gz: a31068ee73192080187e368c97b19cb94db565bd70d565fe8aa2ff29a4b410211da2ffe839255b4e8639a71780fd52484fc54b12644c5103e62ab913f052a576
+  metadata.gz: 306aa83e80c33dbeb51c04cdbc4a2feccb8bea6d77006fc37545f315037d552cd4352074715e316ecc981cdcaa0cec31480c799d2308172e0ef75fc58d719042
+  data.tar.gz: 474204267fa780a89c4013fc7fbb83b8b273789571b050613d30841191f5c458261ce5495ce7bc40da2c03296d11a4220e4dc07b8523440633d372e9a2eddb0d

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: ruby
 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
   name: allocation_stats