rookout 0.1.22 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1189352fe3bb2817944ec553c3a658bcd0d677781ffee90190521e1ed55189c3
-  data.tar.gz: 63bf916c9f3140c4bf2be89a3469ffd3f451f37edc4741c39c6336ef1373269c
+  metadata.gz: 71a48ffc9af42b9e823c1bb8511514e95954425a6ff43495b0f90f7defc98f9c
+  data.tar.gz: a525931c98fc3f8d23068f7d774a18c1b33b2edb756a1abea72a07efe8f2bef6
 SHA512:
-  metadata.gz: cace5dbc2f61f8e1987397345061080fecc85cbcaeb065976f8a8ae071621c01b717e46dd98df55a48fd399f7b2f02b467b786b335d9dcf4088e09a3094f1961
-  data.tar.gz: d33370845b6bb7166c93626e74b73a743d5a799f8b69722bae627561fbd747a36542c2a38e7f3135f099e90415d5b5219775407e942a8f3e25c60939a1be9012
+  metadata.gz: b7fac6cf5a613e6dc45c6071d5c6f6e133568911fa1ee6a66e17e50e22c61523dcd0706c1126ea8390320137e44ca832cb78946c4c57c2608fee0b4d590755b2
+  data.tar.gz: baad1dcec8ec04456aeb993825e36b5025d9c901aaf56970709b51801b55e397f25be02e14153a31978433f8127576e02484af4cdfcb4f34229a22463524669a

data/lib/rookout/augs/aug.rb

@@ -28,6 +28,11 @@ module Rookout
       def execute frame, extracted, output
         return unless @enabled
 
+        if output.user_messages_queue_full?
+          Logger.instance.warning "Skipping aug-\t#{id} execution because the queue is full"
+          return
+        end
+
         namespace = create_namespaces frame, extracted
         return if @condition && !@condition.evaluate(namespace)
 

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,22 @@ 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 +46,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 +57,15 @@ module Rookout
 
       private
 
-      def current_usage now_ms, current_window_key, prev_window_key
+      attr_reader :windows # will be used only in tests using <OBJ>.send(:windows)
+
+      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 +75,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,16 +90,8 @@ module Rookout
         @windows[current_window_key] += [duration, 5].max.to_f
       end
 
-      def cleanup now_ms
-        # 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) }
-          end
-        end
+      def cleanup now_ns
+        @windows.reject! { |key, _| key < (now_ns - @window_size * 5) } if @windows.length > 10
       end
     end
   end

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -23,6 +23,8 @@ module Rookout
     class AgentComWs
       include EventEmitter
 
+      attr_reader :pending_messages
+
       def initialize output, agent_host, agent_port, proxy, token, labels
         agent_host_with_protocl = agent_host.include?("://") ? agent_host : "ws://#{agent_host}"
         @uri = "#{agent_host_with_protocl}:#{agent_port}/v1"
@@ -62,6 +64,10 @@ module Rookout
         @pending_messages.push buffer if @pending_messages.length < Config.agent_com_max_queued_messages
       end
 
+      def queue_full?
+        @pending_messages.length >= Config.agent_com_max_queued_messages
+      end
+
       def connect
         @running = true
 

data/lib/rookout/com_ws/information.rb

@@ -11,11 +11,16 @@ module Rookout
       require_relative "git"
       include Git
 
-      def initialize labels
+      def initialize labels, k8s_file_path = "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
         @agent_id = nil
         @labels = labels.clone
         @labels["rookout_debug"] = "on" if Config.debug
 
+        k8_namespace = create_cluster_namespace k8s_file_path
+        unless k8_namespace == ""
+          @labels["k8s_namespace"] = k8_namespace
+        end
+
         @ip_addr = local_ip
 
         @scm_info = create_scm_information
@@ -49,7 +54,7 @@ module Rookout
                                            scm: @scm_info
       end
 
-      attr_accessor :agent_id
+      attr_accessor :agent_id, :labels
 
       private
 
@@ -65,6 +70,18 @@ module Rookout
       end
       # rubocop:enable Style/ParallelAssignment
 
+      def create_cluster_namespace k8s_file_path
+        return_value = ""
+
+        # No Kubernetes is valid
+        if File.file? k8s_file_path
+          # Read the file contents and return it as result
+          return_value = File.read k8s_file_path
+        end
+
+        return_value
+      end
+
       def create_scm_information
         user_git_origin = Config.user_git_origin || ENV["ROOKOUT_REMOTE_ORIGIN"]
         user_git_commit = Config.user_git_commit || ENV["ROOKOUT_COMMIT"]

data/lib/rookout/com_ws/output.rb

@@ -49,6 +49,10 @@ module Rookout
         Logger.instance.remove_output self
       end
 
+      def user_messages_queue_full?
+        @user_message_bucket.exhausted? || (!@agent_com.nil? && @agent_com.queue_full?)
+      end
+
       def send_warning rule_id, error
         send_rule_status rule_id, :Warning, error
       end

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "f6730b0a0901306d41b983fb4b7a8c7f85d46c81".freeze
+  COMMIT = "5dbaa8024d9dd61fbf97ca654094c5c30728d4f9".freeze
 end

data/lib/rookout/config.rb

@@ -25,7 +25,7 @@ module Rookout
       Rookout::Config.agent_com_ping_interval = 10
       Rookout::Config.agent_com_ping_timeout = 30
       Rookout::Config.agent_com_flush_timeout = 3
-      Rookout::Config.agent_com_max_queued_messages = 500
+      Rookout::Config.agent_com_max_queued_messages = 100
 
       attr_accessor :backoff_factor, :backoff_reset_time, :backoff_max_time
       Rookout::Config.backoff_factor = 0.2

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/services/tracer.rb

@@ -20,7 +20,7 @@ module Rookout
 
           begin
             trace_point.enable target: position.method, target_line: position.lineno
-          rescue ArgumentError => e
+          rescue RuntimeError, ArgumentError => e
             raise Exceptions::RookSetTracepointFailed.new(position.lineno, e)
           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.22".freeze
+  VERSION = "0.1.26".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.26
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-09-14 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