rookout 0.1.52 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8854b65da599e09232b62dadbe87cb092dccd93e2a3153dae13e5aa703fcd4e0
-  data.tar.gz: 8fb0f255e23b6eac93f293632a4230e7b24fa80fcdd49d0288d78582ebd121e0
+  metadata.gz: e96a2d7b2fdc74a8731a9c547940f6c03a1bf2ee103ed433a65fdac6bff90e40
+  data.tar.gz: 21bdac9616f7b5f7bcbcf781fdb2df81ff8ad7bfb0413ed96dea91565df61652
 SHA512:
-  metadata.gz: a0008b3f484e1967418b7cd8bd9db5b8550658a1eb211b5f1ce6f6e731a9fca6733361fd03413f1904dd2aebea889be20418b5fcde963ffd14d116290e8421cf
-  data.tar.gz: 3d2282c21829a747f961e6063435433aa19e88be46ae3f572c8239355ef6dfda585fd12c8d12c4b401d427d7fd0f9040c744b0c27a673b2d9a87a0ac6705ca56
+  metadata.gz: 9886ef4e56f478fa227a5a50281179df07b2dc3aa28573d815969b2a57e0935b8b783ebe2738dee480de5eb559b28f5ab8f51357af3d21a50b3e3a2a95fcb7f6
+  data.tar.gz: 65e7aa8a863b61994278f58540b95c27166543141145545f463cf2f0bd9a2cc989de3cdd6449353110659cca7558dd892214901008f862fcf3716d2da1c0af3f

data/lib/rookout/augs/aug.rb

@@ -24,7 +24,7 @@ module Rookout
 
       attr_reader :id
 
-      def execute frame, extracted, output
+      def execute frame_binding, stack_trace, extracted, output
         return unless @enabled
 
         if output.user_messages_queue_full?
@@ -32,7 +32,7 @@ module Rookout
           return
         end
 
-        namespace = create_namespaces frame, extracted
+        namespace = create_namespaces frame_binding, stack_trace, extracted
         return if @condition && !@condition.evaluate(namespace)
 
         should_skip_limiters = @condition.nil? && !@executed
@@ -46,10 +46,10 @@ module Rookout
 
       private
 
-      def create_namespaces frame, extracted
+      def create_namespaces frame_binding, stack_trace, extracted
         Processor::Namespaces::ContainerNamespace.new(
-          "frame" => Processor::Namespaces::FrameNamespace.new(frame[1]),
-          "stack" => Processor::Namespaces::StackNamespace.new(frame, 1),
+          "frame" => Processor::Namespaces::FrameNamespace.new(frame_binding, stack_trace[0]),
+          "stack" => Processor::Namespaces::StackNamespace.new(stack_trace),
           "extracted" => Processor::Namespaces::ContainerNamespace.new(extracted),
           "store" => Processor::Namespaces::ContainerNamespace.new,
           "temp" => Processor::Namespaces::ContainerNamespace.new,

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

@@ -20,10 +20,10 @@ module Rookout
           @aug.id
         end
 
-        def execute frame, extracted
+        def execute frame_binding, stack_trace, extracted
           UserWarnings.with self do
             begin
-              @aug.execute frame, extracted, @output
+              @aug.execute frame_binding, stack_trace, extracted, @output
             rescue SystemExit
               raise
             rescue Exception => e

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -130,6 +130,11 @@ module Rookout
               @ready_event.set
             end
 
+            if e.message.include? "400"
+              @connection_error = Exceptions::RookWebSocketError.new 400
+              @ready_event.set
+            end
+
             Logger.instance.warning "Connection failed; reason = #{e.message}"
           end
 

data/lib/rookout/com_ws/information.rb

@@ -85,10 +85,40 @@ module Rookout
         return_value
       end
 
+      def parse_raw_git_sources
+        git_sources_raw = ENV["ROOKOUT_SOURCES"]
+        if git_sources_raw.nil?
+          return nil
+        end
+
+        git_sources = git_sources_raw.split ";"
+        user_git_sources = {}
+        git_sources.each do |url|
+          url_parts = url.split "#"
+          if url_parts.length != 2
+            next
+          end
+
+          remote_url = url_parts[0]
+          commit = url_parts[1]
+          user_git_sources[remote_url] = commit
+        end
+
+        user_git_sources
+      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"]
 
+        user_git_sources = Config.user_git_sources || parse_raw_git_sources
+
+        if !user_git_sources.nil? && !user_git_sources.empty?
+          user_git_sources = user_git_sources.map do |remote_url, commit|
+            Com::Rookout::SCMInformation::SourceInfo.new remoteOriginUrl: remote_url, commit: commit
+          end
+        end
+
         if user_git_origin.nil? && user_git_commit.nil?
           search_path = File.dirname File.absolute_path($PROGRAM_NAME)
           git_root = find_root search_path
@@ -98,7 +128,7 @@ module Rookout
           end
         end
 
-        Com::Rookout::SCMInformation.new origin: user_git_origin, commit: user_git_commit
+        Com::Rookout::SCMInformation.new origin: user_git_origin, commit: user_git_commit, sources: user_git_sources
       end
 
       def aws_lambda?

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "3e5cbb5882385eff12a3113f93dfde79418d5061".freeze
+  COMMIT = "9db1dfad4593de7df40d98fba0722f8778ef7528".freeze
 end

data/lib/rookout/config.rb

@@ -60,9 +60,11 @@ module Rookout
 
       attr_accessor :user_git_commit
       attr_accessor :user_git_origin
+      attr_accessor :user_git_sources
 
       Rookout::Config.user_git_commit = nil
       Rookout::Config.user_git_origin = nil
+      Rookout::Config.user_git_sources = nil
 
       attr_accessor :rookout_version
       attr_accessor :rookout_commit

data/lib/rookout/exceptions.rb

@@ -132,6 +132,13 @@ module Rookout
       end
     end
 
+    class RookWebSocketError < ToolException
+      def initialize http_status
+        super "Received HTTP status #{http_status} from the controller," \
+              "Please make sure WebSocket is enabled on the load balancer."
+      end
+    end
+
     class RookSourceFilePathSuggestion < ToolException
       def initialize wanted_path, matching_path
         super "Rookout found alternative file path: #{matching_path}",
@@ -258,5 +265,11 @@ module Rookout
         super "Live Logger is not supported. Try using Rookout Live Debugger instead."
       end
     end
+
+    class RookLocalsUnavailable < ToolException
+      def initialize
+        super "Can't collect local variables up the stack"
+      end
+    end
   end
 end

data/lib/rookout/interface.rb

@@ -39,7 +39,8 @@ module Rookout
         raise if throw_errors
         $stderr.puts "[Rookout] Failed to load Rookout. Please make sure to force build native extensions by setting" \
                      "'bundle config force_ruby_platform true'"
-      rescue RookMissingToken, RookInvalidToken, RookInvalidOptions, RookVersionNotSupported, RookBadProtobuf => e
+      rescue RookMissingToken, RookInvalidToken, RookInvalidOptions,
+             RookVersionNotSupported, RookBadProtobuf, RookWebSocketError => e
         raise if throw_errors
         $stderr.puts "[Rookout] Failed to start Rookout: #{e.message}"
       rescue RookCommunicationException => e
@@ -92,6 +93,12 @@ module Rookout
       $stderr.puts error.message
     end
 
+    def configure_scm options
+      Config.user_git_origin = options[:git_origin] if options[:git_origin]
+      Config.user_git_commit = options[:git_commit] if options[:git_commit]
+      Config.user_git_sources = options[:git_sources] if options[:git_sources] && options[:git_sources].is_a?(Hash)
+    end
+
     def configure_globals options
       if Config.debug
         log_to_stderr = true
@@ -107,8 +114,7 @@ module Rookout
       Config.logger_filename = log_file unless log_file.nil?
       Config.logger_log_level = log_level unless log_level.nil?
 
-      Config.user_git_origin = options[:git_origin] if options[:git_origin]
-      Config.user_git_commit = options[:git_commit] if options[:git_commit]
+      configure_scm options
     end
 
     def configure_start_options options

data/lib/rookout/processor/namespace_serializer2.rb

@@ -314,12 +314,12 @@ module Rookout
 
         namespace.depth.times do |i|
           position = i + namespace.offset
-          break if position >= namespace.backtrace.length
-          frame = namespace.backtrace[position]
+          break if position >= namespace.stack_trace.length
+          frame_info = namespace.stack_trace[position]
 
-          code_object = Com::Rookout::Variant::CodeObject.new filename: frame.source_location[0],
-                                                              lineno: frame.source_location[1],
-                                                              name: frame.eval("__method__").to_s
+          code_object = Com::Rookout::Variant::CodeObject.new filename: frame_info.path,
+                                                              lineno: frame_info.lineno,
+                                                              name: frame_info.label
           variant.code_values << code_object
           # See dump_code_object
           @estimated_pending_bytes += 14 # Header + size + (header + number) * 4

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

@@ -7,33 +7,35 @@ module Rookout
       require_relative "../../exceptions"
 
       class FrameNamespace < Namespace
-        def initialize binding
+        def initialize frame_binding, top_frame_info
           super()
-          @binding = binding
+          @frame_binding = frame_binding
+          @top_frame_info = top_frame_info
         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
+          raise Exceptions::RookLocalsUnavailable if @frame_binding.nil?
+          return RubyObjectNamespace.new @frame_binding.receiver if name == "self"
+          raise Exceptions::RookAttributeNotFound, name unless @frame_binding.local_variable_defined? name
+          RubyObjectNamespace.new @frame_binding.local_variable_get name
         end
 
         def call_method name, args
           case name
           when "filename", "module"
-            RubyObjectNamespace.new @binding.source_location[0]
+            RubyObjectNamespace.new @top_frame_info.path
           when "line"
-            RubyObjectNamespace.new @binding.source_location[1]
+            RubyObjectNamespace.new @top_frame_info.lineno
           when "function"
-            RubyObjectNamespace.new @binding.eval("__method__").to_s
+            RubyObjectNamespace.new @top_frame_info.label
           when "locals"
             locals args
           when "dump"
             result = {
-              "filename" => RubyObjectNamespace.new(@binding.source_location[0]),
-              "line" => RubyObjectNamespace.new(@binding.source_location[1]),
-              "function" => RubyObjectNamespace.new(@binding.eval("__method__").to_s),
-              "module" => RubyObjectNamespace.new(@binding.source_location[0]),
+              "filename" => RubyObjectNamespace.new(@top_frame_info.path),
+              "line" => RubyObjectNamespace.new(@top_frame_info.lineno),
+              "function" => RubyObjectNamespace.new(@top_frame_info.label),
+              "module" => RubyObjectNamespace.new(@top_frame_info.path),
               "locals" => locals(args)
             }
             ContainerNamespace.new result
@@ -43,19 +45,20 @@ module Rookout
         end
 
         def locals args
+          raise Exceptions::RookLocalsUnavailable if @frame_binding.nil?
           dump_config = nil
           unless args.nil?
             dump_config = OBJECT_DUMP_TABLE[args.downcase]
           end
 
           hash = {}
-          local_variables = @binding.local_variables
+          local_variables = @frame_binding.local_variables
           local_variables.each do |var|
-            value = @binding.local_variable_get var
+            value = @frame_binding.local_variable_get var
             hash[var.to_s] = RubyObjectNamespace.new value, dump_config
           end
 
-          hash["self"] = RubyObjectNamespace.new @binding.receiver, dump_config
+          hash["self"] = RubyObjectNamespace.new @frame_binding.receiver, dump_config
 
           ContainerNamespace.new hash
         end

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

@@ -5,15 +5,16 @@ module Rookout
       require_relative "frame_namespace"
       require_relative "traceback_namespace"
 
+
       class StackNamespace < Namespace
-        def initialize backtrace, offset = 0
+        def initialize stack_trace, offset = 0
           super()
-          @backtrace = backtrace
+          @stack_trace = stack_trace
           @offset = offset
         end
 
         def read_key key
-          FrameNamespace.new @backtrace[key + @offset]
+          FrameNamespace.new nil, @stack_trace[key + @offset]
         end
 
         def call_method name, args
@@ -23,7 +24,7 @@ module Rookout
 
         def create_traceback args
           args = 1000 if args == ""
-          TracebackNamespace.new @backtrace, @offset, args.to_i
+          TracebackNamespace.new @stack_trace, @offset, args.to_i
         end
       end
     end

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

@@ -3,23 +3,22 @@ module Rookout
     module Namespaces
       require_relative "namespace"
       require_relative "frame_namespace"
-
       require_relative "../../protobuf/variant_pb"
 
       class TracebackNamespace < Namespace
-        def initialize backtrace, offset, depth
+        def initialize stack_trace, offset, depth
           super()
-          @backtrace = backtrace
+          @stack_trace = stack_trace
           @offset = offset
           @depth = depth
         end
 
-        attr_reader :backtrace
+        attr_reader :stack_trace
         attr_reader :offset
         attr_reader :depth
 
         def read_key key
-          FrameNamespace.new @backtrace[key + @offset]
+          FrameNamespace.new nil, @stack_trace[key + @offset]
         end
 
         def dump _log_object_errors
@@ -27,12 +26,12 @@ module Rookout
 
           @depth.times do |i|
             position = i + @offset
-            break if position >= @backtrace.length
-            frame = @backtrace[position]
+            break if position >= @stack_trace.length
+            frame_info = @stack_trace[position]
 
-            code_object = Com::Rookout::Variant::CodeObject.new filename: frame.source_location[0],
-                                                                lineno: frame.source_location[1],
-                                                                name: frame.eval("__method__").to_s
+            code_object = Com::Rookout::Variant::CodeObject.new filename: frame_info.path,
+                                                                lineno: frame_info.lineno,
+                                                                name: frame_info.label
 
             traceback.locations << code_object
           end

data/lib/rookout/sanitizer.rb

@@ -14,7 +14,7 @@ module Rookout
     def self.sanitize_properties!
       ENV.each do |key, val|
         if key.start_with?("ROOKOUT_") && !@@blacklisted_properties.include?(key.to_s)
-          ENV[key] = val.strip
+          ENV[key] = val.strip.delete_suffix("/")
         end
       end
     end

data/lib/rookout/services/tracer.rb

@@ -3,9 +3,6 @@ module Rookout
     require_relative "../logger"
 
     class Tracer
-      require "binding_of_caller"
-      include BindingOfCaller::BindingExtensions
-
       def initialize
         @trace_points = {}
         @augs = {}
@@ -17,22 +14,25 @@ module Rookout
         aug_trace_points = []
         positions.each do |position|
           trace_point = create_trace_point aug
-
           begin
             trace_point.enable target: position.method, target_line: position.lineno
           rescue RuntimeError, ArgumentError => e
+            trace_point.disable # just to make sure if something was partially added to clear everything
             if e.message.include? "can not enable any hooks"
               raise Exceptions::RookInvalidPositionException.new(aug.filename, position.lineno)
             end
             raise Exceptions::RookSetTracepointFailed.new(position.lineno, e)
+          ensure
+            # We add and remove a dummy trace point to re-align the tracing mechanism as a result of some bug in adding
+            # a breakpoint https://bugs.ruby-lang.org/issues/17302
+            begin
+              dummy_trace_point = TracePoint.new(:line) {} # Dummy
+              dummy_trace_point.enable target: position.method, target_line: position.lineno
+              dummy_trace_point.disable
+            rescue
+              # IGNORE
+            end
           end
-
-          # We add and remove a dummy trace point to re-align the tracing mechanism as a result of some bug in adding
-          # a breakpoint
-          dummy_trace_point = TracePoint.new(:line) {} # Dummy
-          dummy_trace_point.enable target: position.method, target_line: position.lineno
-          dummy_trace_point.disable
-
           aug_trace_points.push trace_point
         end
 
@@ -71,11 +71,19 @@ module Rookout
       private
 
       def create_trace_point aug
-        TracePoint.new :line do
+        TracePoint.new :line do |tp|
           begin
             begin
-              # TODO: consider delaying callers (get bindings) until we actually need them in Aug.rb
-              aug.execute callers, nil
+              # tp.binding - Binding object of the frame in the location that triggered the TracePoint.
+              #              This allows us to collect locals.
+              # caller_locations - returns the stacktrace. Allows us to collect files, lines and function names.
+              # We used to also collect the Bindings up the stack (allowed us to also collect locals up the stack),
+              # but we don't actually need that. If we'll ever need this functionality again, we'll have to use the
+              # binding_of_caller gem:
+              # require "binding_of_caller"
+              # include BindingOfCaller::BindingExtensions
+              # callers_bindings = callers - The "callers" function retrieves the bindings up the stack
+              aug.execute tp.binding, caller_locations, nil
             rescue Exception => e
               Logger.instance.exception "Exception calling aug", e
             end

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.52".freeze
+  VERSION = "0.1.54".freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.52
+  version: 0.1.54
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: binding_of_caller
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement