rookout 0.1.24 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74fa18f4c9039ebbfe3b13b7925213882bfe694e1084854d0e9765da7f9e89de
-  data.tar.gz: 9648b79a995a4ab76b80e4fec26a4f9208c2d5ed5aa1dca2f32fbfd07cd69d90
+  metadata.gz: 3056007f4e19ad4f973d551922cc733ceb394515a2cebad17f8e6d1186b3ec79
+  data.tar.gz: ee4920718d14a9ac843134a6fe37afa3b5292274924a6ded0c76247d9605f695
 SHA512:
-  metadata.gz: 9eb0e942f1522c6f13e190921ac5fdb895533ddb216dbe4a2e6920971e2281760a4c61e74eb975bf0144a73d3432222a5c9b485c1895290433ffc694f2ed2dd1
-  data.tar.gz: c21492f79edeb64879b18590934f31cfd366b61b63fd3d16744531e5c9ae7513339aff468bf3ac6055d534e3298d18d946023ffd9cb3b436dc0500060aabba63
+  metadata.gz: a7a7ae5c046fa155ba5146ef30a2e381abb439ddd0936f56f3302258f72d7ae499bc18359cd8d5156434e809fc9704b93250e383c98ed3f09f89a80b56877c71
+  data.tar.gz: c71d7b41cb93686cae932edab6ce62c21d79e56b1368befe548db2046a5cf366c64d48112b07d6c09b49fdb0cb05949f3ffcfe15df90f763bb75e537aef886eb

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

@@ -25,7 +25,7 @@ module Rookout
 
       attr_reader :pending_messages
 
-      def initialize output, agent_host, agent_port, proxy, token, labels
+      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 proxy.nil? || proxy.empty?
@@ -48,6 +48,8 @@ module Rookout
         @running = false
         @ready_event = Concurrent::Event.new
         once("Com::Rookout::InitialAugsCommand") { @ready_event.set }
+
+        @print_on_initial_connection = print_on_connect
       end
 
       def add message
@@ -101,6 +103,7 @@ module Rookout
 
       private
 
+      # rubocop:disable Style/StderrPuts
       def connection_thread
         backoff = Backoff.new
 
@@ -108,6 +111,10 @@ module Rookout
           begin
             client = open_new_connection
 
+            if @print_on_initial_connection
+              @print_on_initial_connection = false
+              STDERR.puts "[Rookout] Successfully connected to controller"
+            end
             Logger.instance.debug "WebSocket connected successfully"
             Logger.instance.info "Finished initialization"
 
@@ -127,7 +134,10 @@ module Rookout
           backoff.after_disconnect
           Logger.instance.debug "Reconnecting"
         end
+      rescue Exception => e
+        Logger.instance.error "Unexpected error in connection_thread", e
       end
+      # rubocop:enable Style/StderrPuts
 
       def open_new_connection
         client = WebsocketClient.new @uri, @proxy, @token
@@ -149,7 +159,14 @@ module Rookout
       ].freeze
 
       def connection_pump client
-        on_outgoing_exit = proc { client.close }
+        on_outgoing_exit = proc {
+          begin
+            client.close
+          rescue Exception => e
+            Logger.instance.error "Unexpected error exiting outgoing thread", e
+          end
+        }
+
         @outgoing_thread = Thread.new { outgoing client, on_outgoing_exit }
         @outgoing_thread.name = "rookout-outgoing-thread"
 

data/lib/rookout/com_ws/information.rb

@@ -17,7 +17,7 @@ module Rookout
         @labels["rookout_debug"] = "on" if Config.debug
 
         k8_namespace = create_cluster_namespace k8s_file_path
-        unless k8_namespace == ""
+        unless k8_namespace == "" || @labels.key?("k8s_namespace")
           @labels["k8s_namespace"] = k8_namespace
         end
 

data/lib/rookout/com_ws/websocket_client.rb

@@ -5,7 +5,6 @@ module Rookout
     require "uri"
 
     require_relative "../config"
-    require_relative "../logger"
     require_relative "../exceptions"
 
     class WebsocketClient
@@ -65,7 +64,7 @@ module Rookout
 
         begin
           @driver.close
-        rescue RuntimeError, Errno::EPIPE
+        rescue RuntimeError, Errno::EPIPE, OpenSSL::OpenSSLError
           # Protocol close may fail if the connection is already closed
           nil
         end

data/lib/rookout/commit.rb

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

data/lib/rookout/interface.rb

@@ -32,6 +32,7 @@ module Rookout
         configure options
 
         rook = RookoutSingleton.instance
+        @start_options[throw_errors: throw_errors]
         rook.connect(**@start_options)
       rescue LoadError
         raise if throw_errors

data/lib/rookout/logger.rb

@@ -99,6 +99,7 @@ module Rookout
       end
     end
 
+    # rubocop:disable Style/RescueStandardError
     def log level, message, args
       level_no = LOG_LEVELS.index level
       if level_no.nil?
@@ -110,11 +111,18 @@ module Rookout
 
       record = LogRecord.new level, message, args
       @handlers.each { |handler| handler.call record }
+    rescue
+      # Log may never throw
+      nil
     end
+    # rubocop:enable Style/RescueStandardError
 
     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/rookout_singleton.rb

@@ -40,7 +40,8 @@ module Rookout
       @services_started = false
     end
 
-    def connect token: nil, host: nil, port: nil, proxy: nil, labels: [], async_start: false, fork: false
+    def connect token: nil, host: nil, port: nil, proxy: nil, labels: [], async_start: false, fork: false,
+                throw_errors: false
       raise Exceptions::RookInterfaceException, "Multiple connection attempts not supported!" unless @agent_com.nil?
 
       if fork
@@ -52,7 +53,7 @@ module Rookout
 
       Logger.instance.debug "Initiating AgentCom-\t#{host}:#{port}"
 
-      @agent_com = ComWs::AgentComWs.new @output, host, port, proxy, token, labels
+      @agent_com = ComWs::AgentComWs.new @output, host, port, proxy, token, labels, !throw_errors
       @output.agent_com = @agent_com
       @command_handler = ComWs::CommandHandler.new @agent_com, @aug_manager
 

data/lib/rookout/services/position.rb

@@ -18,6 +18,7 @@ module Rookout
       def initialize tracer
         @tracer = tracer
         @augs = {}
+        @augs_lock = Mutex.new
         @iseqs = []
         @trace_point = TracePoint.new :script_compiled do |tp|
           begin
@@ -41,7 +42,7 @@ module Rookout
       def add_aug location
         positions = evaluate_all_scripts_to_location location
         @tracer.add_breakpoint_aug positions, location unless positions.empty?
-        @augs[location.id] = location
+        @augs_lock.synchronize { @augs[location.id] = location }
       end
 
       def remove_aug aug_id
@@ -73,11 +74,13 @@ module Rookout
         filename = iseq.absolute_path
         return if filename.nil?
 
-        @augs.each_value do |location|
-          position = evaluate_script_to_location iseq, filename, location
-          next if position.nil?
+        @augs_lock.synchronize do
+          @augs.each_value do |location|
+            position = evaluate_script_to_location iseq, filename, location
+            next if position.nil?
 
-          @tracer.add_breakpoint_aug [position], location
+            @tracer.add_breakpoint_aug [position], location
+          end
         end
       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.28".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.28
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-10-15 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