rookout 0.1.33 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44bfee39e23252d8f32aec49169aef41a7a5bc75aa1b297546d41a8c4c1043ce
-  data.tar.gz: 6d4208c55a9e45c96a2a59e2d3bbf50ecd468f2a18f7d4b832fe60888e53e36b
+  metadata.gz: 40c3d2b4b3e7cf49a817115416ff9ac23fb2078c036744f31cbba5a187dd933f
+  data.tar.gz: fc57b64eb454574b754dcbfc6ea4f0fdc7579794f073f4290f4a11b336f76c10
 SHA512:
-  metadata.gz: d0fcb676742f9dab45aaabe1da3db6d20e8bc17892b6b63917db99fe8c6563d44cff49f58c8fe0c650a05a4b67eaeb7b346a979987b1bb4001c2ca9a76651544
-  data.tar.gz: 0ee2ab75597be3d32d37bb8eec698a0ecb196cc0c3eeaf14e7fe868b9c4a807b6db25ecc5c34f9c8adb6f2dc2aae1e0870d8d9042431a5dfa7bec8a42391ee54
+  metadata.gz: cfb0aca8f7fb82ccb39adb8c8f03f5b5242c22bb43dc23bf68f80b18d300e06e11eec8a4885edc3d8eddba58d792db254bbcb6070c030ca2d9f675557ad8a98d
+  data.tar.gz: fdc04d582ee9a9bc76a7b9e12ffeaa0a04be2e70a6fdfd7a3841d65ae9a088d947f97df3aaf9f65e1cdd26e0f3a4ef111ea992417eb50581dcbddc682c5716bc

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -68,6 +68,7 @@ module Rookout
         end
 
         @pending_messages.push envelope_wrapper
+        @pending_messages_length += msg_size
       end
 
       def queue_full?

data/lib/rookout/com_ws/envelope_wrapper.rb

@@ -28,17 +28,17 @@ class Variant2EnvelopeWrapper < EnvelopeWrapperBase
                                        report_id: report_id
     @serializer = Rookout::Processor::NamespaceSerializer2.new
     @aug_report_message.arguments2 = @serializer.dump arguments
-  end
-
-  def envelope
-    return @envelope unless @envelope.nil?
     @serializer.string_cache.each { |key, value| @aug_report_message.strings_cache[key] = value }
     @envelope = wrap_in_envelope @aug_report_message
     @aug_report_message = nil
   end
 
+  def envelope
+    @envelope
+  end
+
   def calculate_size
-    @envelope.length + @serializer.estimated_pending_bytes
+    @envelope.length
   end
 end
 

data/lib/rookout/com_ws/information.rb

@@ -21,6 +21,8 @@ module Rookout
           @labels["k8s_namespace"] = k8_namespace
         end
 
+        collect_serverless_labels
+
         @ip_addr = local_ip
 
         @scm_info = create_scm_information
@@ -97,6 +99,47 @@ module Rookout
 
         Com::Rookout::SCMInformation.new origin: user_git_origin, commit: user_git_commit
       end
+
+      def aws_lambda?
+        !ENV["AWS_LAMBDA_FUNCTION_NAME"].nil?
+      end
+
+      def google_cloud_function?
+        !ENV["FUNCTION_TARGET"].nil? && !ENV["FUNCTION_SIGNATURE_TYPE"].nil?
+      end
+
+      def cloud_run_or_fire_base?
+        !ENV["K_SERVICE"].nil? &&
+          !ENV["K_REVISION"].nil? &&
+          !ENV["K_CONFIGURATION"].nil? &&
+          !ENV["PORT"].nil?
+      end
+
+      def azure_function?
+        !ENV["FUNCTIONS_WORKER_RUNTIME"].nil? && !ENV["WEBSITE_SITE_NAME"].nil?
+      end
+
+      def collect_serverless_labels
+        if aws_lambda?
+          @labels["function_name"] = ENV["AWS_LAMBDA_FUNCTION_NAME"]
+          @labels["aws_region"] = ENV["AWS_REGION"]
+
+        elsif google_cloud_function? || cloud_run_or_fire_base?
+          function_name = ENV["FUNCTION_NAME"]
+          if function_name.nil?
+            function_name = ENV["K_SERVICE"]
+          end
+          @labels["function_name"] = function_name
+
+        elsif azure_function?
+          @labels["function_name"] = ENV["WEBSITE_SITE_NAME"]
+          @labels["azure_region"] = ENV["REGION_NAME"]
+        end
+
+        return unless @labels.key? "function_name"
+
+        @labels["rookout_serverless"] = "true"
+      end
     end
   end
 end

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "e26a0d04bfa2d0e1bd62c7b84cba85f353c98760".freeze
+  COMMIT = "2c51b13711b7b94b1a58728d299d8981dc76e18f".freeze
 end

data/lib/rookout/config.rb

@@ -64,10 +64,10 @@ module Rookout
       def update_config configuration
         is_config_proto2 = configuration["RUBY_PROTOBUF_VERSION_2"]
         return if is_config_proto2.nil?
-        is_env_proto2 = ENV[env_var_name]
+        is_env_proto2 = ENV["PROTOBUF_VERSION_2"]
         if is_env_proto2.nil?
-          @protobuf_version2 = true if @true_values.includes? is_config_proto2
-        elsif @true_values.includes? is_env_proto2
+          @protobuf_version2 = true if @true_values.include? is_config_proto2
+        elsif @true_values.include? is_env_proto2
           @protobuf_version2 = true
         end
       end

data/lib/rookout/rookout_singleton.rb

@@ -40,7 +40,7 @@ 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?
 

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.33".freeze
+  VERSION = "0.1.36".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.36
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller