rookout 0.1.11 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60302a56b6a812ebcbffa6f737d09c489451469d81faf3dc7dd40c2e8d00d47f
-  data.tar.gz: ffc57878db1619dacd3b3e9d742f319aa9ddd95644b0aae70cd7dd9d554b12c8
+  metadata.gz: e08815efb5a89029e091fe5cd252dce182407411e6025de9db8e5ae2659d77d7
+  data.tar.gz: 60bba85497d1f9253e3447283fa1adb97096cb21213b5911ba90371323f1de26
 SHA512:
-  metadata.gz: 72955273e9f425aa5f21ed5bb6325e5806550b466eea822383d81df7adf3374f8c436036be04aed4bddb117465fd577c9ecf5f0c7f7a35449d11c6d5916d601f
-  data.tar.gz: 2ab2e8e7478a46bd06b42b9e346afa30bb9f4a405caa6342d4fd0bbe95dc601d37e0af5e3c9f8d58fca08125cc1e78cc12a5166c7f9da52c5c6697ef0765d7d4
+  metadata.gz: 3d4744c8a0eda6615c1c9b503503d67a1ee647ac7dbf4607fe75b1d9aeff90f8ad98dd497df23eab4488f692f26266d5fd048db566a88a8713272ad072843200
+  data.tar.gz: 7aec7fcff6e9637319f5867b19f2a5eb15d1a0c560a7e1ed212f21b730ed67253db853eff0d3aeacb89a66a6b558f06fbb9049c68d2a8d052cc6787630859247

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -51,11 +51,11 @@ module Rookout
       def add message
         buffer = wrap_in_envelope message
         if buffer.length > Config.agent_com_max_message_limit
-          exc = Exceptions::RookMessageSizeExceeded.new buffer.length, Coonfig.agent_com_max_message_limit
-          warning = RookError.new exc, message
+          exc = Exceptions::RookMessageSizeExceeded.new buffer.length, Config.agent_com_max_message_limit
+          warning = Processor::RookError.new exc
           UserWarnings.notify_warning warning
 
-          Logger.instance.warn "Dropping message, size was #{buffer.length} which is over the message size limit"
+          Logger.instance.warning "Dropping message, size was #{buffer.length} which is over the message size limit"
           return
         end
 
@@ -100,10 +100,11 @@ module Rookout
 
         while @running
           begin
-            backoff.before_connection_attempt
             client = open_new_connection
 
             Logger.instance.debug "WebSocket connected successfully"
+            Logger.instance.info "Finished initialization"
+
             @token_valid = true
             backoff.after_connect
 

data/lib/rookout/com_ws/backoff.rb

@@ -4,25 +4,20 @@ module Rookout
 
     class Backoff
       def initialize
-        @connected = false
-        @last_successful_connection = Time.mktime 1970
-        reset_backoff
-      end
-
-      def before_connection_attempt
-        return unless Time.new > @last_successful_connection + Config.backoff_reset_time
+        @connect_time = nil
         reset_backoff
       end
 
       def after_disconnect
-        @connected = false
+        reset_backoff if @connect_time && Time.new > @connect_time + Config.backoff_reset_time
+        @connect_time = nil
+
         sleep @next_backoff
         @next_backoff = [@next_backoff * 2, Config.backoff_max_time].min
       end
 
       def after_connect
-        @connected = true
-        @last_successful_connection = Time.now
+        @connect_time = Time.now
       end
 
       private

data/lib/rookout/com_ws/information.rb

@@ -66,7 +66,7 @@ module Rookout
       # rubocop:enable Style/ParallelAssignment
 
       def create_scm_information
-        user_git_origin = Config.user_git_origin || ENV["ROOKOUT_ORIGIN"]
+        user_git_origin = Config.user_git_origin || ENV["ROOKOUT_REMOTE_ORIGIN"]
         user_git_commit = Config.user_git_commit || ENV["ROOKOUT_COMMIT"]
 
         if user_git_origin.nil? && user_git_commit.nil?

data/lib/rookout/com_ws/websocket_client.rb

@@ -2,6 +2,7 @@ module Rookout
   module ComWs
     require "openssl"
     require "websocket/driver"
+    require "uri"
 
     require_relative "../config"
     require_relative "../logger"
@@ -11,14 +12,13 @@ module Rookout
       def initialize url, proxy, token
         @token = token
         @connection = WebsocketConnection.new url, proxy
+        @proxy = proxy
         @driver = nil
-        @error = nil
         @last_ping = nil
       end
 
       def connect
-        # TODO: add proxy support
-        @connection.connect
+        connection_error = nil
         @driver = WebSocket::Driver.client @connection
 
         headers.each do |key, value|
@@ -26,18 +26,20 @@ module Rookout
         end
 
         @driver.on :error do |error|
-          @error = error
+          connection_error = error
         end
 
         # Connect to the remote server
-        @driver.start
         # TODO: ADD CONNECT TIMEOUT
+        @connection.connect @driver
+        @driver.start
+
         while @driver.state == :connecting
           recv_data = @connection.read_char
           @driver.parse recv_data
         end
 
-        raise Exceptions::RookWebsocketException, @error if @driver.state != :open
+        raise Exceptions::RookWebsocketException, connection_error if @driver.state != :open
       end
 
       def connection_pump message_handler
@@ -88,14 +90,36 @@ module Rookout
         @secure = %w[https wss].include? @uri.scheme
 
         @socket = nil
+
+        @proxy_connected = false
       end
 
-      def connect
-        if @secure
-          @socket = ssl_connect
-        else
-          @socket = tcp_connect
+      def connect driver
+        @socket = tcp_connect
+
+        proxy_connect driver if @proxy
+
+        @socket = ssl_connect @socket if @secure
+      end
+
+      def proxy_connect driver
+        connection_error = nil
+        @proxy_connected = false
+        proxy = driver.proxy @proxy
+
+        proxy.on :connect do
+          @proxy_connected = true
         end
+
+        proxy.on :error do |error|
+          connection_error = error
+        end
+
+        proxy.start
+
+        proxy.parse read_char until @proxy_connected == true || !connection_error.nil?
+
+        raise Exceptions::RookProxyException, connection_error unless connection_error.nil?
       end
 
       attr_reader :url
@@ -118,13 +142,16 @@ module Rookout
       private
 
       def tcp_connect
-        TCPSocket.new @uri.host,
-                      @uri.port || (@secure ? 443 : 80)
+        if @proxy
+          uri = URI(@proxy)
+          TCPSocket.new uri.host, uri.port
+        else
+          TCPSocket.new @uri.host,
+                        @uri.port || (@secure ? 443 : 80)
+        end
       end
 
-      def ssl_connect
-        tcp_socket = tcp_connect
-
+      def ssl_connect tcp_socket
         ctx = ::OpenSSL::SSL::SSLContext.new
         ctx.min_version = ::OpenSSL::SSL::TLS1_2_VERSION
         cert_store = ::OpenSSL::X509::Store.new

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "abb2cf931a9859b4fd334a6b11940cd4819cd41d".freeze
+  COMMIT = "809b0c180b1861b5f90a7ed0a14ccdd356e7edcf".freeze
 end

data/lib/rookout/exceptions.rb

@@ -94,7 +94,7 @@ module Rookout
         super "Message size of #{message_size} exceeds max size limit of #{max_message_size}. " \
                   "Change the depth of collection or change the default by setting ROOKOUT_MAX_MESSAGE_SIZE " \
                   "as environment variable or system property",
-              { message_size: message_size, max_message_size: max_message_size }
+              { "message_size" => message_size, "max_message_size" => max_message_size }
       end
     end
 
@@ -177,5 +177,17 @@ module Rookout
         super "Error from Websocket #{error}", { "error" => error }
       end
     end
+
+    class RookProxyException < ToolException
+      def initialize error
+        super "Error from proxy #{error}", { "error" => error }
+      end
+    end
+
+    class RookBadProtobuf < ToolException
+      def initialize
+        super 'Bad protobuf version. Please execute "bundle config force_ruby_platform true" before "bundler install".'
+      end
+    end
   end
 end

data/lib/rookout/interface.rb

@@ -17,24 +17,22 @@ module Rookout
       throw_errors = options[:throw_errors] == true
       Config.debug = evaluate_flag options[:debug], "ROOKOUT_DEBUG"
 
+      puts "[Rookout] Running in debug mode" if Config.debug
+
       begin
-        require_relative "rookout_singleton"
+        verify_env
 
-        # 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
+        require_relative "rookout_singleton"
 
-          @start_options = configure_start_options options
-          print_config @start_options
-        end
+        configure options
 
         rook = RookoutSingleton.instance
         rook.connect(**@start_options)
-      rescue RookMissingToken, RookInvalidToken, RookInvalidOptions, RookVersionNotSupported => e
+      rescue LoadError
+        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
         raise if throw_errors
         STDERR.puts "[Rookout] Failed to start Rookout: #{e.message}"
       rescue RookCommunicationException => e
@@ -61,7 +59,28 @@ module Rookout
 
     TRUE_VALUE = [true, "y", "Y", "yes", "Yes", "YES", "true", "True", "TRUE", "1"].freeze
 
-    def configure_logging options
+    def configure 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_globals options
+
+        @start_options = configure_start_options options
+        print_config @start_options
+      end
+    end
+
+    def verify_env
+      # Only test alpine
+      return unless File.exist? "/etc/alpine-release"
+
+      protobuf = Gem::Specification.find_by_path "google/protobuf"
+      raise RookBadProtobuf if protobuf.nil? || protobuf.platform != "ruby"
+    end
+
+    def configure_globals options
       if Config.debug
         log_to_stderr = true
         log_level = :DEBUG
@@ -75,9 +94,7 @@ module Rookout
       Config.logger_log_to_stderr = log_to_stderr unless log_to_stderr.nil?
       Config.logger_filename = log_file unless log_file.nil?
       Config.logger_log_level = log_level unless log_level.nil?
-    end
 
-    def configure_git options
       Config.user_git_origin = options[:git_origin] if options[:git_origin]
       Config.user_git_commit = options[:git_commit] if options[:git_commit]
     end
@@ -88,7 +105,7 @@ module Rookout
       proxy = evaluate_config options[:proxy], "ROOKOUT_PROXY"
       token = evaluate_config options[:token], "ROOKOUT_TOKEN"
 
-      raise RookMissingToken if token.nil? && host == "wss://control.rookout.com"
+      raise RookMissingToken if token.nil? && !(host_specified options)
       verify_token token if token
 
       labels = stringify_labels(options[:labels]) || parse_labels(ENV["ROOKOUT_LABELS"])
@@ -100,6 +117,10 @@ module Rookout
       { host: host, port: port, proxy: proxy, token: token, labels: labels, async_start: async_start, fork: fork }
     end
 
+    def host_specified options
+      !options[:host].nil? || !ENV["ROOKOUT_CONTROLLER_HOST"].nil? || !ENV["ROOKOUT_AGENT_HOST"].nil?
+    end
+
     def evaluate_flag argument, env_var_name
       return true? argument unless argument.nil?
       true? ENV[env_var_name]

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

@@ -12,15 +12,15 @@ module Rookout
         end
 
         def call_method _name, _args
-          RubyObjectNamespace nil
+          Rookout::Processor::Namespaces::RubyObjectNamespace.new nil
         end
 
         def read_attribute _name
-          RubyObjectNamespace nil
+          Rookout::Processor::Namespaces::RubyObjectNamespace.new nil
         end
 
         def read_key _key
-          RubyObjectNamespace nil
+          Rookout::Processor::Namespaces::RubyObjectNamespace.new nil
         end
 
         def dump _log_object_errors

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.11".freeze
+  VERSION = "0.1.16".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.16
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller