rookout 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a2d9fa41fdf140e81f22c1a46f47bbaf5412b31d1ab62c1f59460c07113c03
-  data.tar.gz: 9dd40c49cc6b8417aa3424cedd26aad1b8e63813fe0e2fcc063749d03c20f602
+  metadata.gz: 1b7b251222795c20881099bbd6f64cb0e9c66c24f837403aecc29d5fc8737d22
+  data.tar.gz: 488333717b7f9a0ef507d5a621caa4a37a99bd87a3f966e63808ba773aeb83ef
 SHA512:
-  metadata.gz: 7204403b2efd52cce60b533b396c93ffc963b60554d3fbf4fbc414f4a2d6a80c0ced39e7d6c6cceda6d2470ee46563cc8704871b058957599f8b6f7ad1d433ff
-  data.tar.gz: 2a05c92e5f984035bcbe84e5e4f2f25be8b2458032272c03fd4e94f8e94252bcaf8c11d7989c294e5a7d07773e95170bb7f479c3806945636869b2b7b491349d
+  metadata.gz: fc9945c4fad24e0ebdee3bb83a1f71d353cef33bd14f9881007324ad2e82aba3292ba63cf54e54c14922547b1b68f6da58a1cdff99426dfd2a9bb85da78516cc
+  data.tar.gz: 1848074ffaa23f2632457e42dec7c04f4527cb4cad80af234e9bc7dc3c7c72f63c786ee7dfcae3e1e3bff44eb8665fcfabf5be7dcde2ead58eb3234d72909796

data/lib/rookout/augs/aug.rb

@@ -27,7 +27,7 @@ module Rookout
         return unless @enabled
 
         if output.user_messages_queue_full?
-          Logger.instance.warning "Skipping aug-\t#{id} execution because the queue is full"
+          output.send_output_queue_full_warning @id
           return
         end
 

data/lib/rookout/augs/aug_factory.rb

@@ -67,8 +67,10 @@ module Rookout
       def create_limits_manager configuration
         limiters = []
         if global_rate_limiter.nil?
-          rate_limit = parse_rate_limit configuration["rateLimit"], configuration["rateLimitModifier"], 200, 5000
-          limiters.append AugRateLimiter.new(*rate_limit)
+          rate_limit = parse_rate_limit configuration["rateLimit"], configuration["rateLimitModifier"], 200, 5000, 1
+          unless rate_limit.nil?
+            limiters.append AugRateLimiter.new(*rate_limit)
+          end
         else
           limiters.append global_rate_limiter
         end
@@ -78,7 +80,19 @@ module Rookout
 
       def global_rate_limiter
         if @global_rate_limiter.nil? && Rookout::Config.global_rate_limit != ""
-          rate_limit = parse_rate_limit Rookout::Config.global_rate_limit, "0", 0, 0
+          begin
+            rate_limit = parse_rate_limit Rookout::Config.global_rate_limit,
+                                          "0", 0, 0, Rookout::Config.global_rate_limit_multiplier
+            if rate_limit.nil?
+              raise Exceptions::RookInvalidRateLimitConfiguration, Rookout::Config.global_rate_limit
+            end
+          rescue Exceptions::RookInvalidRateLimitConfiguration => e
+            Logger.instance.warning "Failed to create global rate limiter: #{e.message}"
+            err = Processor::RookError.new e
+            UserWarnings.notify_error err
+            return nil
+          end
+
           @global_rate_limiter = AugRateLimiter.new(*rate_limit)
           Logger.instance.debug "Using global rate limiter with configuration: #{rate_limit}"
           Rookout::Config.using_global_rate_limiter = true
@@ -87,7 +101,7 @@ module Rookout
         @global_rate_limiter
       end
 
-      def parse_rate_limit config, modifier_config, default_quota, default_window
+      def parse_rate_limit config, modifier_config, default_quota, default_window, multiplier
         window_quota = default_quota
         window_size = default_window
 
@@ -105,7 +119,15 @@ module Rookout
         window_size_ns = Utils.milliseconds_to_nanoseconds window_size
         rate_limit_modifier = modifier_config.to_i || 5
 
-        [window_quota_ns, window_size_ns, rate_limit_modifier]
+        if window_quota_ns == 0
+          return nil
+        end
+
+        if window_quota_ns >= window_size_ns
+          raise Exceptions::RookInvalidRateLimitConfiguration, config
+        end
+
+        [window_quota_ns * multiplier, window_size_ns, rate_limit_modifier]
       end
     end
   end

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -26,8 +26,12 @@ module Rookout
       attr_reader :pending_messages
 
       def initialize output, agent_host, agent_port, proxy, token, labels, print_on_connect
-        agent_host_with_protocl = agent_host.include?("://") ? agent_host : "ws://#{agent_host}"
-        @uri = "#{agent_host_with_protocl}:#{agent_port}/v1"
+        if agent_host.nil? || agent_host.empty?
+          @uri = ""
+        else
+          agent_host_with_protocl = agent_host.include?("://") ? agent_host : "ws://#{agent_host}"
+          @uri = "#{agent_host_with_protocl}:#{agent_port}/v1"
+        end
         if proxy.nil? || proxy.empty?
           @proxy = nil
         else
@@ -57,14 +61,7 @@ module Rookout
         msg_size = envelope_wrapper.calculate_size
         if @pending_messages_length + msg_size > Config.agent_com_max_queue_messages_length ||
            queue_full?
-          exc = Exceptions::RookMessageSizeExceeded.new msg_size, Config.agent_com_max_queue_messages_length
-          warning = Processor::RookError.new exc
-          UserWarnings.notify_warning warning
-
-          Logger.instance.warning "Dropping message, size was #{msg_size}, pedning messages: #{@pending_messages_length}
-                                  which is over the message size limit #{Config.agent_com_max_queue_messages_length},
-                                  queue length: #{@pending_messages.length}"
-          return
+          raise Exceptions::RookOutputQueueFull
         end
 
         @pending_messages.push envelope_wrapper

data/lib/rookout/com_ws/output.rb

@@ -11,11 +11,15 @@ module Rookout
     require_relative "token_bucket"
     require_relative "envelope_wrapper"
 
+    require "concurrent"
+
     class Output
       def initialize
         @agent_id = nil
         @agent_com = nil
 
+        @skipped_aug_ids = Concurrent::Set.new
+
         @rule_status_update_bucket = TokenBucket.new Config.output_max_status_updates,
                                                      Config.output_bucket_refresh_rate do
           Logger.instance.error "Limit reached, dropping status updates"
@@ -55,6 +59,17 @@ module Rookout
         @user_message_bucket.exhausted? || (!@agent_com.nil? && @agent_com.queue_full?)
       end
 
+      def send_output_queue_full_warning aug_id
+        if @skipped_aug_ids.include? aug_id
+          return
+        end
+
+        @skipped_aug_ids.add aug_id
+        error = Processor::RookError.new Exceptions::RookOutputQueueFull.new
+        send_rule_status aug_id, :Warning, error
+        Logger.instance.warning "Skipping aug-\t#{aug_id} execution because the queue is full"
+      end
+
       def send_warning rule_id, error
         send_rule_status rule_id, :Warning, error
       end
@@ -63,6 +78,10 @@ module Rookout
         return if @closing || !@agent_com
 
         @rule_status_update_bucket.if_available do
+          if active == "Deleted"
+            @skipped_aug_ids.delete? rule_id
+          end
+
           status = Com::Rookout::RuleStatusMessage.new agent_id: @agent_id,
                                                        rule_id: rule_id,
                                                        active: active
@@ -73,7 +92,11 @@ module Rookout
 
           envelope_wrapper = EnvelopeWrapper.new status
 
-          @agent_com.add envelope_wrapper
+          begin
+            @agent_com.add envelope_wrapper
+          rescue Exceptions::RookOutputQueueFull
+            # Ignored
+          end
         end
       end
 
@@ -100,7 +123,12 @@ module Rookout
             )
           end
 
-          @agent_com.add envelope_wrapper
+          begin
+            @agent_com.add envelope_wrapper
+            @skipped_aug_ids.delete? aug_id
+          rescue Exceptions::RookOutputQueueFull
+            send_output_queue_full_warning aug_id
+          end
         end
       end
 
@@ -144,7 +172,11 @@ module Rookout
 
         envelope_wrapper = EnvelopeWrapper.new msg
 
-        @agent_com.add envelope_wrapper
+        begin
+          @agent_com.add envelope_wrapper
+        rescue Exceptions::RookOutputQueueFull
+          # Ignored
+        end
       end
     end
   end

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "ed682099e24a661d30178506cb58f2a25d4af877".freeze
+  COMMIT = "17ed82e31d57aaaecc1244c11f0e10e673069d7e".freeze
 end

data/lib/rookout/config.rb

@@ -76,10 +76,16 @@ module Rookout
 
       Rookout::Config.true_values = ["y", "Y", "yes", "Yes", "YES", "true", "True", "TRUE", "1"]
 
+      attr_accessor :global_rate_limit_quota
+      attr_accessor :global_rate_limit_window_size
       attr_accessor :global_rate_limit
+      attr_accessor :global_rate_limit_multiplier
       attr_accessor :using_global_rate_limiter
 
+      Rookout::Config.global_rate_limit_quota = ""
+      Rookout::Config.global_rate_limit_window_size = ""
       Rookout::Config.global_rate_limit = ""
+      Rookout::Config.global_rate_limit_multiplier = 1
       Rookout::Config.using_global_rate_limiter = false
 
       def update_config configuration
@@ -103,7 +109,12 @@ module Rookout
       def update_global_rate_limit_config configuration
         global_rate_limit = ENV["ROOKOUT_GLOBAL_RATE_LIMIT"]
         if global_rate_limit.nil?
-          global_rate_limit = configuration["RUBY_GLOBAL_RATE_LIMIT"]
+          quota = configuration["RUBY_GLOBAL_RATE_LIMIT_QUOTA_MS"]
+          window_size = configuration["RUBY_GLOBAL_RATE_LIMIT_WINDOW_SIZE_MS"]
+
+          if quota != "" && window_size != ""
+            global_rate_limit = "#{quota}/#{window_size}"
+          end
         end
 
         return if global_rate_limit.nil? || global_rate_limit == ""

data/lib/rookout/exceptions.rb

@@ -95,6 +95,13 @@ module Rookout
       end
     end
 
+    class RookOutputQueueFull < ToolException
+      def initialize
+        super "Breakpoint triggered but output queue is full. " \
+              "Data collection will be disabled until the queue has emptied."
+      end
+    end
+
     class RookRuleAugRateLimited < ToolException
       def initialize
         super "Breakpoint was disabled due to rate-limiting. " \

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.41".freeze
+  VERSION = "0.1.42".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller