rookout 0.1.45 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 444c8c92029ebc2363f554f4fec406a1d7f6b3f90e54e846bc0768e6fbe5c996
-  data.tar.gz: 827026de861517076758522a6463e309b25ead5571a5ae46c66998aa174fba8a
+  metadata.gz: 9d494bb4243258775f4a13936da2eb7da62b67e420480d7f2996adc58f88e4ef
+  data.tar.gz: 3952626f68706316502bb672dc194e4b8d2b1c6924a5ce170accfaecb9eb7bdd
 SHA512:
-  metadata.gz: b656285e0ce9cb3ce0a02baaaa056b27e3e590b0263e899ae1be3955bbd49036fc358e09a57f9f57074fac2b14f71d4e471f6793b07b2c663fb65a7610656b73
-  data.tar.gz: 33ad61a0b53c7912f8b4529fceeb00c88bb6f38c4b85a523b05b00d8832088eb3e94647cd5b6d1960deedfb12931d162e69eb63b8ce3d45723e558f41ab17c34
+  metadata.gz: 7615d7f6acb9d2d10154b5c617d02c87fb3a64a31f0f751c0bd7ccb7abe27466cb2c3ef967daa19aea312f4b15f87054f5132a48028cc5786b88817c8aabe96f
+  data.tar.gz: e6b619c886f621ba0b3bf9e4965f61cad35a2111cf2b9946798b83931905c693da9ad9ecfbd20e166d14a145fb9760457dc6a6c0f216c82b6f5ea554152ad8d4

data/lib/rookout/augs/aug_factory.rb

@@ -67,7 +67,7 @@ module Rookout
       def create_limits_manager configuration
         limiters = []
         if global_rate_limiter.nil?
-          rate_limit = parse_rate_limit configuration["rateLimit"], configuration["rateLimitModifier"], 200, 5000, 1
+          rate_limit = parse_rate_limit configuration["rateLimit"], configuration["rateLimitModifier"], 200, 5000
           unless rate_limit.nil?
             limiters.append AugRateLimiter.new(*rate_limit)
           end
@@ -82,7 +82,7 @@ module Rookout
         if @global_rate_limiter.nil? && Rookout::Config.global_rate_limit != ""
           begin
             rate_limit = parse_rate_limit Rookout::Config.global_rate_limit,
-                                          "0", 0, 0, Rookout::Config.global_rate_limit_multiplier
+                                          "0", 0, 0
             if rate_limit.nil?
               raise Exceptions::RookInvalidRateLimitConfiguration, Rookout::Config.global_rate_limit
             end
@@ -101,7 +101,7 @@ module Rookout
         @global_rate_limiter
       end
 
-      def parse_rate_limit config, modifier_config, default_quota, default_window, multiplier
+      def parse_rate_limit config, modifier_config, default_quota, default_window
         window_quota = default_quota
         window_size = default_window
 
@@ -129,7 +129,7 @@ module Rookout
           raise Exceptions::RookInvalidRateLimitConfiguration, config
         end
 
-        [window_quota_ns * multiplier, window_size_ns, rate_limit_modifier]
+        [window_quota_ns, window_size_ns, rate_limit_modifier]
       end
     end
   end

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 = "48e26dc9369b92c454ee88b8e9f66735b4d048ce".freeze
+  COMMIT = "ffd029791f99225ff5592825141566831f73c4df".freeze
 end

data/lib/rookout/config.rb

@@ -81,13 +81,11 @@ module Rookout
       attr_accessor :global_rate_limit_quota
       attr_accessor :global_rate_limit_window_size
       attr_accessor :global_rate_limit
-      attr_accessor :global_rate_limit_multiplier
       attr_accessor :using_global_rate_limiter
 
       Rookout::Config.global_rate_limit_quota = ""
       Rookout::Config.global_rate_limit_window_size = ""
       Rookout::Config.global_rate_limit = ""
-      Rookout::Config.global_rate_limit_multiplier = 1
       Rookout::Config.using_global_rate_limiter = false
 
       def update_config configuration

data/lib/rookout/processor/namespace_serializer2.rb

@@ -44,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
@@ -64,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
@@ -84,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
@@ -145,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
@@ -173,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
@@ -186,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
@@ -203,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
@@ -219,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
@@ -229,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
@@ -255,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
@@ -266,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
@@ -281,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
 
@@ -297,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.45".freeze
+  VERSION = "0.1.47".freeze
 end

metadata

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