rookout 0.1.44 → 0.1.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0233712f50c0fe5e94c8288b73ee96a07da9bb1692cc553ac83692a10655c131
-  data.tar.gz: b273a8cc02ed25508400b58758c5706f6073a979c7d323316c9957dd4f186d30
+  metadata.gz: b59aefa8a8063910a6a7ec3446c7f709a9781468e786993f2b7ae84b47c284cc
+  data.tar.gz: 91fc89ae75510ab8a81de5da86a3619c2f17d6a2920aa72d9f718436ac1b7056
 SHA512:
-  metadata.gz: afbacca6a3828ebb0e2bda728c072a9515fa6f3003945a9ab5bf972bde564a77dc950224d14bbc58b90aebdef3f505c90b89baf8d916beaca9c3bac3215fdb98
-  data.tar.gz: bf5c468000ed3dd7e2def2d628acab6540226ade8364a77036a12421ade338ed0106123f4c19cbc9e81c988e624bf50e9e84aa3dec090a17e68c41014390dc06
+  metadata.gz: 0b9a998c2f766b42e115e103e92883807c813d9bdb583d6f9eaf148ead19de00d8fd71dae6a98a88dcfdbcd028634ff5de865410911b7ffcae92ff84bf224c20
+  data.tar.gz: b5ee7cf8ff1af74a6718d5abfd5d87e56ca7a521d470449abab7d07c525e32fa5f979e7b97553340dfd5a2b35618573ec10f4c2855cfc7ed24ccf5d2495abd07

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -114,8 +114,8 @@ module Rookout
 
             if @print_on_initial_connection
               @print_on_initial_connection = false
-              Utils.quiet_puts "[Rookout] Successfully connected to controller"
-              Utils.quiet_puts "[Rookout] Rook's ID is #{@agent_id}"
+              Utils.quiet_puts "[Rookout] Successfully connected to controller."
+              Logger.instance.debug "[Rookout] Agent ID is #{@agent_id}"
             end
             Logger.instance.debug "WebSocket connected successfully"
             Logger.instance.info "Finished initialization"

data/lib/rookout/com_ws/envelope_wrapper.rb

@@ -29,19 +29,26 @@ class Variant2EnvelopeWrapper < EnvelopeWrapperBase
                                                              report_id: report_id
     @serializer = Rookout::Processor::NamespaceSerializer2.new
     @aug_report_message.arguments2 = @serializer.dump arguments, true
-    @serializer.string_cache.each do |key, value|
-      @aug_report_message.strings_cache[key.encode "UTF-8", invalid: :replace, undef: :replace, replace: "?"] = value
-    end
-    @envelope = wrap_in_envelope @aug_report_message
-    @aug_report_message = nil
+
+    @estimated_length = @serializer.estimated_pending_bytes
+    @envelope = nil
   end
 
   def envelope
+    if @envelope.nil?
+      @serializer.string_cache.each do |key, value|
+        @aug_report_message.strings_cache[key.encode "UTF-8", invalid: :replace, undef: :replace, replace: "?"] = value
+      end
+      @envelope = wrap_in_envelope @aug_report_message
+
+      @serializer = nil
+      @aug_report_message = nil
+    end
     @envelope
   end
 
   def calculate_size
-    @envelope.length
+    @estimated_length
   end
 end
 

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "426414a386441285302fbe4424892b2a98989af5".freeze
+  COMMIT = "ec556ada7fc1b5196406db4ed39b386974440d91".freeze
 end

data/lib/rookout/processor/namespace_serializer2.rb

@@ -16,6 +16,13 @@ module Rookout
         MASH = nil
       end
 
+      begin
+        require "active_support/core_ext/hash/indifferent_access"
+        HASH_WITH_INDIFFERENT_ACCESS = ActiveSupport::HashWithIndifferentAccess
+      rescue LoadError
+        HASH_WITH_INDIFFERENT_ACCESS = nil
+      end
+
       def initialize
         @string_cache = {}
         @estimated_pending_bytes = 0
@@ -37,10 +44,12 @@ module Rookout
 
       def dump_variant_type variant, type
         variant.variant_type_max_depth = type << 1
+        @estimated_pending_bytes += 2 # Field header + short number
       end
 
       def dump_variant_type_max_depth variant, type
         variant.variant_type_max_depth = (type << 1) | 1
+        @estimated_pending_bytes += 2 # Field header + short number
       end
 
       def dump namespace, log_errors
@@ -57,6 +66,7 @@ module Rookout
       rescue StandardError => e
         message = "Failed to serialize namespace"
         variant = Com::Rookout::Variant2.new
+        @estimated_pending_bytes = 0
         dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_ERROR
 
         if log_errors
@@ -77,6 +87,7 @@ module Rookout
       rescue StandardError => e
         message = "Failed to serialize object"
         variant = Com::Rookout::Variant2.new
+        @estimated_pending_bytes = 0
         dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_ERROR
 
         if log_object_errors
@@ -105,7 +116,8 @@ module Rookout
           dump_time obj, variant
         elsif obj.class == Array
           dump_array obj, variant, current_depth, config, log_object_errors
-        elsif obj.class == Hash || (!MASH.nil? && obj.is_a?(MASH))
+        elsif obj.class == Hash || (!MASH.nil? && obj.is_a?(MASH)) ||
+              (!HASH_WITH_INDIFFERENT_ACCESS.nil? && obj.is_a?(HASH_WITH_INDIFFERENT_ACCESS))
           dump_hash obj, variant, current_depth, config, log_object_errors
         elsif obj.is_a? Exception
           dump_exception obj, variant, current_depth, config, log_object_errors
@@ -137,20 +149,24 @@ module Rookout
         when true
           dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_LONG
           variant.long_value = 1
+          @estimated_pending_bytes += 2 # Header + short number
         when false
           dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_LONG
           variant.long_value = 0
+          @estimated_pending_bytes += 2 # Header + short number
         when Integer
           dump_integer obj, variant
         when Float
           dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_DOUBLE
           variant.double_value = obj.to_f
+          @estimated_pending_bytes += 7 # Header + 64 bit float
         when BigDecimal
           dump_string obj.to_s, variant, config # TODO: NS: This might cut the decimal value, is that ok?
         when Complex
           dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_COMPLEX
           variant.complex_value = Com::Rookout::Variant::Complex.new real: obj.real.to_f,
                                                                      imaginary: obj.imaginary.to_f
+          @estimated_pending_bytes += 8 # Large header + size + (header + 64 bit float) * 2
         else
           raise Exceptions::RookClassCannotBeSerialized.new(obj.class, "Unknown Numeric Type")
         end
@@ -165,6 +181,7 @@ module Rookout
           dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_LARGE_INT
           variant.bytes_index_in_cache = get_string_index_in_cache obj.to_s
         end
+        @estimated_pending_bytes += 3 # Header + number
       end
 
       def dump_string obj, variant, config
@@ -178,16 +195,20 @@ module Rookout
         variant.original_size = obj.length
         dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_STRING
         variant.bytes_index_in_cache = get_string_index_in_cache final_obj
+        @estimated_pending_bytes += 6 # Header + number + header + number
       end
 
       def dump_time obj, variant
         dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_TIME
         variant.time_value = Google::Protobuf::Timestamp.new
         variant.time_value.from_time obj
+
+        @estimated_pending_bytes += 16 # Header + size + (header + 32 bit number + header + 64 bit number)
       end
 
       def dump_array obj, variant, current_depth, config, log_object_errors
         variant.original_size = obj.length
+        @estimated_pending_bytes += 3 # Header + number
 
         weighted_children_depth = current_depth + 1
         if weighted_children_depth <= config.max_collection_depth
@@ -195,6 +216,7 @@ module Rookout
           obj.each_with_index do |value, index|
             break if index >= config.max_width
             variant.collection_values << dump_raw_object(value, weighted_children_depth, config, log_object_errors)
+            @estimated_pending_bytes += 3 # Header + size
           end
         else
           dump_variant_type_max_depth variant, Com::Rookout::Variant::Type::VARIANT_LIST
@@ -211,6 +233,7 @@ module Rookout
             break if index >= config.max_width
             variant.collection_keys << dump_raw_object(key, weighted_children_depth, config, log_object_errors)
             variant.collection_values << dump_raw_object(value, weighted_children_depth, config, log_object_errors)
+            @estimated_pending_bytes += 6 # Header + size + header + size
           end
         else
           dump_variant_type_max_depth variant, Com::Rookout::Variant::Type::VARIANT_MAP
@@ -221,12 +244,15 @@ module Rookout
         dump_variant_type variant, Com::Rookout::Variant::Type::VARIANT_OBJECT
         variant.attribute_names_in_cache << get_string_index_in_cache("message")
         variant.attribute_values << dump_raw_object(obj.message, current_depth + 1, config, log_object_errors)
+        @estimated_pending_bytes += 6 # Header + number + header + size
 
         variant.attribute_names_in_cache << get_string_index_in_cache("cause")
         variant.attribute_values << dump_raw_object(obj.cause, current_depth + 1, config, log_object_errors)
+        @estimated_pending_bytes += 6 # Header + number + header + size
 
         variant.attribute_names_in_cache << get_string_index_in_cache("backtrace")
         variant.attribute_values << dump_raw_object(obj.backtrace, current_depth + 1, config, log_object_errors)
+        @estimated_pending_bytes += 6 # Header + number + header + size
       end
 
       def dump_code_object obj, variant
@@ -247,6 +273,9 @@ module Rookout
         variant.code_values << Com::Rookout::Variant::CodeObject.new(name: name,
                                                                      filename: source_location[0],
                                                                      lineno: source_location[1])
+        # NOTE: This size is probably less, in Python we use the optional fields of CodeObject and in Ruby we don't,
+        # but it is better to estimate more
+        @estimated_pending_bytes += 14 # Header + size + (header + number) * 4
       end
 
       def dump_user_class variant, obj, current_depth, config, log_object_errors
@@ -258,6 +287,7 @@ module Rookout
             raw_value = obj.instance_variable_get name
             variant.attribute_names_in_cache << get_string_index_in_cache(name.to_s)
             variant.attribute_values << dump_raw_object(raw_value, weighted_children_depth, config, log_object_errors)
+            @estimated_pending_bytes += 6 # Header + number + header + number
           end
         else
           dump_variant_type_max_depth variant, Com::Rookout::Variant::Type::VARIANT_OBJECT
@@ -273,6 +303,8 @@ module Rookout
           variant.attribute_values << dump(value, log_errors)
         end
 
+        @estimated_pending_bytes += 4 # One number (packed field), One header + length
+
         variant
       end
 
@@ -289,6 +321,8 @@ module Rookout
                                                               lineno: frame.source_location[1],
                                                               name: frame.eval("__method__").to_s
           variant.code_values << code_object
+          # See dump_code_object
+          @estimated_pending_bytes += 14 # Header + size + (header + number) * 4
         end
         variant
       end

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.44".freeze
+  VERSION = "0.1.46".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.44
+  version: 0.1.46
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller