rookout 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 559c0c4b76d3815a418977ebe848a66f9640128be5a900286afedbf658a26e1e
-  data.tar.gz: dfeb5ba84b8b6665de0b0c1e5dec2fe687c3cb420485664f4d626bbb24213c7a
+  metadata.gz: 0e078b8f3c64dbe7a289ead5d7a50abbaf002dc0b0148bc96dd05c04cd95c549
+  data.tar.gz: 62854fbcaeb3756e2e7d23241ae62f1372a3c9157e27be0e8425eb7bbd9b0db8
 SHA512:
-  metadata.gz: d83bee904b048be0d9d4c221b2e5c797fa61a24a0dd43666b7211b8a5df917581aab351874cc819de11c853e08044454625d75d59594b197f8792d61e84f6d3c
-  data.tar.gz: e59f969f44d7f8311dbb96c7724be58900b45d294ce868742baf468856cbeba9219b14e67a32985619e98af895676df0fcc89ac6828fd89ac75b66d0d04f084b
+  metadata.gz: 291fbf595b9000be2260adfd5a3fc4f5dbdcaf59b5fd3c66517d38a87f06c4371e91ce888ab130e57937cbeeeac39c9b5cc5bef62ea09a619c57abb8325eae89
+  data.tar.gz: beca8ae64522885a42c300685c16385b1b1b5f16925cf725b37bd9c5cb8363bc37aab76de7424d886c66a3da347d9f6d9fa20405cc7f6d3ea14573d03813b134

data/lib/rookout/atfork.rb

@@ -0,0 +1,73 @@
+module Rookout
+  class ForkManager
+    require "singleton"
+    include Singleton
+
+    def initialize
+      @active = false
+    end
+
+    def activate!
+      @active = true
+    end
+
+    def disable!
+      @active = false
+    end
+
+    def active?
+      @active
+    end
+
+    def fork_hook original_fork
+      if block_given?
+        original_fork.call do
+          post_fork_child if active?
+          yield
+        end
+      else
+        res = original_fork.call
+        post_fork_child if active? && !res
+        res
+      end
+    end
+
+    def post_fork_child
+      require_relative "rookout_singleton"
+      require_relative "interface"
+
+      RookoutSingleton.instance.post_fork_clean
+      Interface.instance.stop
+      Interface.instance.start post_fork: true
+
+      # Disable fork handler in child process
+      disable!
+    end
+  end
+end
+
+alias _rookout_original_fork fork
+
+def self.fork &block
+  Rookout::ForkManager.instance.fork_hook method(:_rookout_original_fork), &block
+end
+
+def fork &block
+  Rookout::ForkManager.instance.fork_hook method(:_rookout_original_fork), &block
+end
+
+module Kernel
+  alias _rookout_original_fork fork
+
+  def self.fork &block
+    Rookout::ForkManager.instance.fork_hook method(:_rookout_original_fork), &block
+  end
+end
+
+module Process
+  alias _rookout_original_fork fork
+
+  def self.fork &block
+    Rookout::ForkManager.instance.fork_hook method(:_rookout_original_fork), &block
+  end
+end

data/lib/rookout/augs/aug.rb

@@ -46,7 +46,8 @@ module Rookout
           "store" => Processor::Namespaces::ContainerNamespace.new,
           "temp" => Processor::Namespaces::ContainerNamespace.new,
           "utils" => Processor::Namespaces::RubyUtilsNamespace.new,
-          "trace" => Processor::Namespaces::NoopNamespace.new
+          "trace" => Processor::Namespaces::NoopNamespace.new,
+          "state" => Processor::Namespaces::NoopNamespace.new
         )
       end
     end

data/lib/rookout/augs/aug_factory.rb

@@ -7,6 +7,7 @@ module Rookout
     require_relative "actions/action_run_processor"
     require_relative "conditions/condition"
     require_relative "locations/location_file_line"
+    require_relative "locations/location_exception_handler"
     require_relative "aug_rate_limiter"
     require_relative "aug"
 
@@ -45,9 +46,15 @@ module Rookout
       def create_location configuration, aug
         name = configuration["name"]
         raise Exceptions.RookObjectNameMissing if name.nil?
-        raise Exceptions.RookUnsupportedLocation if name != "file_line"
 
-        Locations::LocationFileLine.new configuration, @output, aug
+        case name
+        when "file_line"
+          return Locations::LocationFileLine.new configuration, @output, aug
+        when "exception_handler"
+          return Locations::LocationExceptionHandler.new configuration, @output, aug
+        else
+          raise Exceptions.RookUnsupportedLocation if name != "file_line"
+        end
       end
 
       def create_rate_limit configuration

data/lib/rookout/augs/augs_manager.rb

@@ -2,6 +2,8 @@ module Rookout
   module Augs
     require_relative "../logger"
 
+    require_relative "../processor/rook_error"
+
     require_relative "aug_factory"
 
     class AugsManager
@@ -43,7 +45,7 @@ module Rookout
             return
           end
 
-          error = RookError.new e, message
+          error = Rookout::Processor::RookError.new e, message
           @output.send_rule_status aug_id, "Error", error
           return
         end

data/lib/rookout/augs/locations/location_exception_handler.rb

@@ -0,0 +1,22 @@
+module Rookout
+  module Augs
+    require_relative "../../logger"
+
+    require_relative "../../processor/rook_error"
+
+    module Locations
+      require_relative "location"
+
+      class LocationExceptionHandler < Location
+        NAME = "exception_handler".freeze
+
+        def initialize _arguments, output, aug
+          super output, aug
+        end
+
+        def add_aug _trigger_services
+        end
+      end
+    end
+  end
+end

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -39,7 +39,8 @@ module Rookout
         @info = Information.new labels
         reset_id
 
-        @thread = nil
+        @main_thread = nil
+        @outgoing_thread = nil
         @pending_messages = Queue.new
 
         @running = false
@@ -64,8 +65,17 @@ module Rookout
       def connect
         @running = true
 
-        @thread = Thread.new { connection_thread }
-        @thread.name = "rookout-connection-thread"
+        @main_thread = Thread.new { connection_thread }
+        @main_thread.name = "rookout-connection-thread"
+      end
+
+      def stop
+        @running = false
+
+        # Ask outgoing thread to exit (if running)
+        @pending_messages << ExitMessage.new(@outgoing_thread)
+
+        @main_thread.join
       end
 
       def wait_for_ready
@@ -133,8 +143,8 @@ module Rookout
 
       def connection_pump client
         on_outgoing_exit = proc { client.close }
-        send_thread = Thread.new { outgoing client, on_outgoing_exit }
-        send_thread.name = "rookout-outgoing-thread"
+        @outgoing_thread = Thread.new { outgoing client, on_outgoing_exit }
+        @outgoing_thread.name = "rookout-outgoing-thread"
 
         message_handler = proc do |raw_message|
           envelope = Com::Rookout::Envelope.decode raw_message.pack("c*")
@@ -150,7 +160,8 @@ module Rookout
         Logger.instance.debug "Incoming loop - socket disconnected"
 
         @pending_messages.push ExitMessage.new(send_thread)
-        send_thread.join
+        @outgoing_thread.join
+        @outgoing_thread = nil
       end
 
       def outgoing client, on_exit

data/lib/rookout/com_ws/output.rb

@@ -57,19 +57,13 @@ module Rookout
         return if @closing || !@agent_com
 
         @rule_status_update_bucket.if_available do
-          protobuf_error = nil
+          status = Com::Rookout::RuleStatusMessage.new agent_id: @agent_id,
+                                                       rule_id: rule_id,
+                                                       active: active
           if error
-            protobuf_error = Com::Rookout::Error.new message: error.message,
-                                                     type: error.type
-            protobuf_error.parameters.copy_from error.parameters
-            protobuf_error.exc.copy_from error.exc
-            protobuf_error.traceback.copy_from error.traceback
+            status.error = error.dumps
           end
 
-          status = Com::Rookout::RuleStatusMessage.new agent_id: @agent_id,
-                                                       rule_id: rule_id,
-                                                       active: active,
-                                                       error: protobuf_error
           @agent_com.add status
         end
       end

data/lib/rookout/interface.rb

@@ -9,6 +9,7 @@ module Rookout
 
     def initialize
       @rook = nil
+      @start_options = nil
     end
 
     def start options = {}
@@ -19,14 +20,20 @@ module Rookout
       begin
         require_relative "rookout_singleton"
 
-        configure_logging options
-        configure_git options
+        # If we are running post fork, use previous start_options
+        if options[:post_fork]
+          # Don't re-enable the fork handler
+          @start_options[:fork] = false
+        else
+          configure_logging options
+          configure_git options
 
-        start_options = configure_start_options options
-        print_config start_options
+          @start_options = configure_start_options options
+          print_config @start_options
+        end
 
         rook = RookoutSingleton.instance
-        rook.connect(**start_options)
+        rook.connect(**@start_options)
       rescue RookMissingToken, RookInvalidToken, RookInvalidOptions, RookVersionNotSupported => e
         raise if throw_errors
         STDERR.puts "[Rookout] Failed to start Rookout: #{e.message}"
@@ -84,7 +91,7 @@ module Rookout
       raise RookMissingToken if token.nil? && host == "wss://control.rookout.com"
       verify_token token if token
 
-      labels = options[:labels] || parse_labels(ENV["ROOKOUT_LABELS"])
+      labels = stringify_labels(options[:labels]) || parse_labels(ENV["ROOKOUT_LABELS"])
       validate_labels labels
 
       async_start = true? ENV["ROOKOUT_ASYNC_START"]
@@ -108,6 +115,18 @@ module Rookout
       default
     end
 
+    def stringify_labels labels
+      return nil unless labels
+
+      stringified_labels = {}
+
+      labels.each do |label_name, label_value|
+        stringified_labels[label_name.to_s] = label_value.to_s
+      end
+
+      stringified_labels
+    end
+
     def parse_labels raw_labels
       labels = {}
       return labels if raw_labels.nil?

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

@@ -12,6 +12,7 @@ module Rookout
         end
 
         def read_attribute name
+          return RubyObjectNamespace.new @binding.receiver if name == "self"
           raise Exceptions::RookAttributeNotFound, name unless @binding.local_variable_defined? name
           RubyObjectNamespace.new @binding.local_variable_get name
         end

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

@@ -123,6 +123,7 @@ module Rookout
         end
 
         def dump_string obj, variant, config
+          obj = obj.to_s
           if obj.length > config.max_string
             final_obj = obj[0...config.max_string]
           else

data/lib/rookout/rookout_singleton.rb

@@ -40,9 +40,14 @@ module Rookout
       @services_started = false
     end
 
-    def connect token: nil, host: nil, port: nil, proxy: nil, labels: [], async_start: false, **_
+    def connect token: nil, host: nil, port: nil, proxy: nil, labels: [], async_start: false, fork: false
       raise Exceptions::RookInterfaceException, "Multiple connection attempts not supported!" unless @agent_com.nil?
 
+      if fork
+        require_relative "atfork"
+        Rookout::ForkManager.instance.activate!
+      end
+
       start_trigger_services
 
       Logger.instance.debug "Initiating AgentCom-\t#{host}:#{port}"
@@ -61,6 +66,16 @@ module Rookout
       @output.flush_messages if !@output.nil && !@agent_com.nil?
     end
 
+    def post_fork_clean
+      @agent_com.stop
+      @agent_com = nil
+
+      @command_handler = nil
+
+      # We don't disable services because we will lose all loaded scripts
+      @services.clear_augs
+    end
+
     attr_reader :services
 
     private

data/lib/rookout/services/position.rb

@@ -18,14 +18,14 @@ module Rookout
       def initialize tracer
         @tracer = tracer
         @augs = {}
-        @iseqs = {}
+        @iseqs = []
         @trace_point = TracePoint.new :script_compiled do |tp|
           begin
             begin
               iseq = tp.instruction_sequence
               # Ignore script without sources
               if iseq.absolute_path
-                @iseqs[tp.path] = iseq
+                @iseqs << iseq
                 evaluate_script iseq
               end
             rescue Exception => e
@@ -83,7 +83,7 @@ module Rookout
 
       def evaluate_all_scripts_to_location location
         positions = []
-        @iseqs.each_value do |iseq|
+        @iseqs.each do |iseq|
           position = evaluate_script_to_location iseq, iseq.absolute_path, location
           next if position.nil?
 
@@ -98,7 +98,7 @@ module Rookout
           lineno = find_updated_line filename, location
           return if lineno == -1
 
-          PositionMarker.new location.lineno, iseq
+          PositionMarker.new lineno, iseq
         elsif suggested_match? location, filename
           warning = Exceptions::RookSourceFilePathSuggestion.new location.filename, filename
           location.notify_warning warning

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2020-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -189,6 +189,7 @@ files:
 - LICENSE
 - bin/rookout
 - lib/rookout.rb
+- lib/rookout/atfork.rb
 - lib/rookout/augs/actions/action.rb
 - lib/rookout/augs/actions/action_run_processor.rb
 - lib/rookout/augs/aug.rb
@@ -197,6 +198,7 @@ files:
 - lib/rookout/augs/augs_manager.rb
 - lib/rookout/augs/conditions/condition.rb
 - lib/rookout/augs/locations/location.rb
+- lib/rookout/augs/locations/location_exception_handler.rb
 - lib/rookout/augs/locations/location_file_line.rb
 - lib/rookout/com_ws/agent_com_ws.rb
 - lib/rookout/com_ws/backoff.rb