rookout 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74fa18f4c9039ebbfe3b13b7925213882bfe694e1084854d0e9765da7f9e89de
-  data.tar.gz: 9648b79a995a4ab76b80e4fec26a4f9208c2d5ed5aa1dca2f32fbfd07cd69d90
+  metadata.gz: a2bdf85b56744c08bb1dbd03f5e877a1e5ff9408f10f7ebc496c90616630d782
+  data.tar.gz: 8f8fd300f8ef303fb3f2ef136687ecb408aa490588af126d4ce0a6702932a948
 SHA512:
-  metadata.gz: 9eb0e942f1522c6f13e190921ac5fdb895533ddb216dbe4a2e6920971e2281760a4c61e74eb975bf0144a73d3432222a5c9b485c1895290433ffc694f2ed2dd1
-  data.tar.gz: c21492f79edeb64879b18590934f31cfd366b61b63fd3d16744531e5c9ae7513339aff468bf3ac6055d534e3298d18d946023ffd9cb3b436dc0500060aabba63
+  metadata.gz: 6e82f777a0498faee329e943cceed997111f1cb0ea75e9103294aac7b0cc53c4bd05d0af4060f748869159a1179586b0c8b0337b3652e83682f033fe2c3323a5
+  data.tar.gz: a765e0817ae1d2959a90c6c13902b42bb02566b1d5c1a7932fb2ca044c1c3fd1ea5882804555dca0d9c2afd6052aaa52d2dc178323b19302f0ebe8b28a25a1e2

data/lib/rookout/augs/aug_factory.rb

@@ -10,6 +10,7 @@ module Rookout
     require_relative "locations/location_exception_handler"
     require_relative "aug_rate_limiter"
     require_relative "aug"
+    require_relative "../utils"
 
     class AugFactory
       def initialize output
@@ -34,7 +35,8 @@ module Rookout
 
         rate_limit = create_rate_limit configuration
 
-        aug = Aug.new aug_id, action, condition, rate_limit, max_aug_time
+        max_aug_time_ns = Utils.milliseconds_to_nanoseconds max_aug_time
+        aug = Aug.new aug_id, action, condition, rate_limit, max_aug_time_ns
 
         location_configuration = configuration["location"]
         raise Exceptions::RookAugInvalidKey.new("location", configuration) unless location_configuration.is_a? Hash
@@ -72,7 +74,10 @@ module Rookout
 
         rate_limit_modifier = configuration["rateLimitModifier"] || 5
 
-        AugRateLimiter.new window_quota, window_size, rate_limit_modifier
+        window_quota_ns = Utils.milliseconds_to_nanoseconds window_quota
+        window_size_ns = Utils.milliseconds_to_nanoseconds window_size
+
+        AugRateLimiter.new window_quota_ns, window_size_ns, rate_limit_modifier
       end
     end
   end

data/lib/rookout/augs/aug_rate_limiter.rb

@@ -1,10 +1,12 @@
 module Rookout
   module Augs
     require_relative "../exceptions"
+    require_relative "../utils"
 
     class AugRateLimiter
       def initialize quota, window_size, active_limit
         @quota = quota
+        @has_quota = !@quota.nil? && (@quota > 0)
         @window_size = window_size
         @active_weight = quota / active_limit
 
@@ -18,24 +20,23 @@ module Rookout
         start_time ||= Time.now
 
         # If quota, verify it
-        if @quota && @quota > 0
+        if @has_quota
           # Get current time
-          now_ms = (start_time.to_f * 1000).to_i
+          now_ns = Utils.time_to_nanoseconds start_time
 
           # Calculate window keys
-          current_window_key = (now_ms / @window_size) * @window_size
-          prev_window_key = current_window_key - @window_size
+          current_window_key, prev_window_key = timestamp_to_window_keys now_ns
 
           @mutex.synchronize do
             # Clean old windows
-            cleanup now_ms
+            cleanup now_ns
 
             # Increase active count
             @active_count += 1
             active = true
 
             # If exceeding quota
-            if current_usage(now_ms, current_window_key, prev_window_key) > @quota
+            if current_usage(now_ns, current_window_key, prev_window_key) > @quota
               warning = Processor::RookError.new Exceptions::RookRuleRateLimited.new
               UserWarnings.notify_warning warning
               return
@@ -46,7 +47,9 @@ module Rookout
         begin
           yield
         ensure
-          @mutex.synchronize { record_usage current_window_key, (Time.now - start_time) * 1000 } if @quota && @quota > 0
+          if @has_quota
+            @mutex.synchronize { record_usage current_window_key, Utils.time_to_nanoseconds(Time.now) - now_ns }
+          end
         end
       ensure
         # Reduce active count
@@ -55,7 +58,13 @@ module Rookout
 
       private
 
-      def current_usage now_ms, current_window_key, prev_window_key
+      def timestamp_to_window_keys now_ns
+        current_window_key = (now_ns / @window_size) * @window_size
+        prev_window_key = current_window_key - @window_size
+        [current_window_key, prev_window_key]
+      end
+
+      def current_usage now_ns, current_window_key, prev_window_key
         # Get usage information
         current_window_usage = @windows[current_window_key]
         if current_window_usage.nil?
@@ -65,7 +74,7 @@ module Rookout
         prev_window_usage = @windows[prev_window_key] || 0
 
         # Previous window weight
-        prev_weight = 1 - (now_ms - current_window_key) / @window_size.to_f
+        prev_weight = 1 - (now_ns - current_window_key) / @window_size.to_f
 
         # Final weighted usage
         (prev_window_usage * prev_weight) + (@active_count * @active_weight) + current_window_usage
@@ -80,14 +89,14 @@ module Rookout
         @windows[current_window_key] += [duration, 5].max.to_f
       end
 
-      def cleanup now_ms
+      def cleanup now_ns
         # Don't bother with contention
         return if @mutex.locked?
 
         @mutex.synchronize do
           # every 5 windows-times, clear windows older than 10 window-times
           if @windows.length > 10
-            @windows.reject! { |key, _| key < (now_ms - @window_size * 5) }
+            @windows.reject! { |key, _| key < (now_ns - @window_size * 5) }
           end
         end
       end

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "9ab942ecb3c996d6e4fc6516d79a95aa15bd1c95".freeze
+  COMMIT = "940d70afca76883c64c4a1e2892bfbca591e9cee".freeze
 end

data/lib/rookout/logger.rb

@@ -113,8 +113,11 @@ module Rookout
     end
 
     def build_handlers
-      @handlers.push new_file_handler unless Config.logger_filename.nil? || Config.logger_filename.empty?
-      @handlers.push new_stderr_handler if Config.logger_log_to_stderr
+      if Config.logger_log_to_stderr
+        @handlers.push new_file_handler unless Config.logger_filename.nil? || Config.logger_filename.empty?
+        @handlers.push new_stderr_handler
+      end
+
       @handlers.push new_remote_handler
     end
 

data/lib/rookout/processor/namespaces/ruby_object_namespace.rb

@@ -49,6 +49,8 @@ module Rookout
             @dump_config = OBJECT_DUMP_CONFIG_STRING
           elsif @obj.is_a?(Hash) || @obj.is_a?(Array)
             @dump_config = OBJECT_DUMP_CONFIG_COLLECTION
+          else
+            @dump_config = OBJECT_DUMP_CONFIG_TOLERANT
           end
           self
         end

data/lib/rookout/utils.rb

@@ -6,4 +6,15 @@ module Utils
   def uuid
     SecureRandom.uuid.gsub(/-/, "")
   end
+
+  def milliseconds_to_nanoseconds milliseconds
+    nano = milliseconds * (10**6)
+    nano.to_i
+  end
+
+  def time_to_nanoseconds time_obj
+    secs = time_obj.to_i
+    nsecs = time_obj.nsec
+    (10**9) * secs + nsecs
+  end
 end

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.24".freeze
+  VERSION = "0.1.25".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 3.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 3.17.3
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement