rookout 0.1.25 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2bdf85b56744c08bb1dbd03f5e877a1e5ff9408f10f7ebc496c90616630d782
-  data.tar.gz: 8f8fd300f8ef303fb3f2ef136687ecb408aa490588af126d4ce0a6702932a948
+  metadata.gz: 49682fe35cb88044623330221963d1796926bd4d43274e52c6f5d2b9798939da
+  data.tar.gz: '08146067813084fe74e9c89b8cf4a242b2932a9c2c057144de1cf3a6893fa5a8'
 SHA512:
-  metadata.gz: 6e82f777a0498faee329e943cceed997111f1cb0ea75e9103294aac7b0cc53c4bd05d0af4060f748869159a1179586b0c8b0337b3652e83682f033fe2c3323a5
-  data.tar.gz: a765e0817ae1d2959a90c6c13902b42bb02566b1d5c1a7932fb2ca044c1c3fd1ea5882804555dca0d9c2afd6052aaa52d2dc178323b19302f0ebe8b28a25a1e2
+  metadata.gz: 02ca398a95c761881102ef4d1bf8e3dcc71b38ef65379651e2687dd583ea06bd5bd7fd7843745de1a4568055158cc10d021d9e510134d9d93d63c35578b09818
+  data.tar.gz: 55f7755051f8d26c407f4b0076975c20782d49b5427a8b55b7dad5e96f576e03519964a967665dd750e551765fc510551739a1a82b2a7582a308044f5fbb2cfd

data/lib/rookout/augs/aug_rate_limiter.rb

@@ -30,7 +30,6 @@ module Rookout
           @mutex.synchronize do
             # Clean old windows
             cleanup now_ns
-
             # Increase active count
             @active_count += 1
             active = true
@@ -58,6 +57,8 @@ module Rookout
 
       private
 
+      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
@@ -90,15 +91,7 @@ module Rookout
       end
 
       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_ns - @window_size * 5) }
-          end
-        end
+        @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 = "940d70afca76883c64c4a1e2892bfbca591e9cee".freeze
+  COMMIT = "7d24d368fe1a95d7c6b7e51a2f4ea2e143792b97".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,7 +111,11 @@ 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
       if Config.logger_log_to_stderr

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

@@ -62,20 +62,20 @@ module Rookout
         end
 
         def read_key key
-          if @obj.is_a? Array
+          if @obj.is_a?(Array) || @obj.is_a?(String)
             key_int = key.to_i
             return RubyObjectNamespace.new @obj[key_int] if key_int >= 0 && key_int < @obj.length
             raise Exceptions::RookKeyNotFound, key
 
           elsif @obj.is_a? Hash
             return RubyObjectNamespace.new @obj[key] if @obj.key? key
-            return RubyObjectNamespace.new @obj[key.to_sym] if key.is_a?(String) && @obj.key?(key.to_sym)
+            return RubyObjectNamespace.new @obj[key.to_sym] if @obj.key? key.to_s.to_sym
 
             @obj.each { |it, value| return RubyObjectNamespace.new value if it.to_s == key }
 
             raise Exceptions::RookKeyNotFound, key
           else
-            raise Exceptions::RookInvalidObjectForAccess.new(obj.class.to_s, "ReadKey")
+            raise Exceptions::RookInvalidObjectForAccess.new(@obj.class.to_s, "ReadKey")
           end
         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
 
@@ -101,7 +104,7 @@ module Rookout
           PositionMarker.new lineno, iseq
         elsif suggested_match? location, filename
           warning = Exceptions::RookSourceFilePathSuggestion.new location.filename, filename
-          location.notify_warning warning
+          location.notify_warning Processor::RookError.new warning
           # Must return nil in order to skip this script
           nil
         end

data/lib/rookout/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.29
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller