rookout 0.1.14 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768d976e24dea5552d46df61aae43d63ca09bc620cc5ea04f2d350ce0d1fdd26
-  data.tar.gz: 9261c7aea1c3e1269129ddfe9941c4241e8ee6107be39e839c7e35be36156d80
+  metadata.gz: f0a6779a6336398a744919c44647b6d63cb1c7178c9063545f70530954750e74
+  data.tar.gz: 498661e2d876a90a3df2e91c63e4ecef923bffab7dc1a08c375c43708a85018a
 SHA512:
-  metadata.gz: b3fae0189f0f86b8e61c4ed763677882760f2d155a704e08504751f0e31aac3325660bcd089fcf5d393a9e6de3627d6e767fee5c8a3962d7d7b3d6e17b38e78c
-  data.tar.gz: 58fb6dddd9364f299d184e637ff4e28c13cad9b9f1bc098324eff01342f0d6b0a0fc35b8853553f1f6f4e8f63145e576b67cdfd2bf519509ad19ea72bab1d318
+  metadata.gz: bd968a36a0e0cdb97bc6032d2f2e916099b7bde3f01cbe78c99985cc352b98f784c02b50a9b6f07bb3259113dbbc1cc30b2d5a08bdf7f830e3486904b00f7315
+  data.tar.gz: b0a1d91c5461c758363e4e5d2a28f25f41d81592b549e8374b08580a99c0ee7c6485c66ef71644cf19aff6cfc30244ba9de55a51b3cbc9b3c3eb84a46cb4f627

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -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/pinger.rb

@@ -17,9 +17,14 @@ module Rookout
           if Time.now - @last_ping > @interval
             Logger.instance.debug "Sending Ping"
             @last_ping = Time.now
-            @connection.ping Time.now.to_s do
-              Logger.instance.debug "Got Ping reply"
-              @last_pong = Time.now
+            begin
+              @connection.ping Time.now.to_s do
+                Logger.instance.debug "Got Ping reply"
+                @last_pong = Time.now
+              end
+            rescue RuntimeError
+              Logger.instance.debug "Failed to send ping"
+              break
             end
           end
 

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,12 @@ 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 +25,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
@@ -62,7 +63,12 @@ module Rookout
       def close
         return if @driver.nil?
 
-        @driver.close
+        begin
+          @driver.close
+        rescue RuntimeError
+          # Protocol close may fail if the connection is already closed
+          nil
+        end
         @connection.close
       end
 
@@ -88,14 +94,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 +146,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 = "982cb7ee1b842b306f30a9b5bdcf5a5410528499".freeze
+  COMMIT = "d73fb2179498d7e9dd75c474b5b5aeee97db687b".freeze
 end

data/lib/rookout/exceptions.rb

@@ -144,6 +144,12 @@ module Rookout
       end
     end
 
+    class RookInvalidLabel < ToolException
+      def initialize label_name
+        super "Invalid label: must not start with the '$' character (#{label_name})"
+      end
+    end
+
     class RookCrcMismatchException < ToolException
       def initialize filepath, expected, calculated
         super "Line CRC32s do not match! path: #{filepath}, expected: #{expected}, calculated:#{calculated}",
@@ -178,10 +184,22 @@ module Rookout
       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
+
+    class RookBadProtobufPlatform < ToolException
+      def initialize platform
+        super "Bad protobuf platform: #{platform}"
+      end
+    end
   end
 end

data/lib/rookout/interface.rb

@@ -12,29 +12,31 @@ module Rookout
       @start_options = nil
     end
 
+    def print_debug_messages
+      puts "[Rookout] Running in debug mode"
+      puts "[Rookout] Rookout SDK for ruby: " + Config.rookout_version
+    end
+
     def start options = {}
       return unless @rook.nil?
       throw_errors = options[:throw_errors] == true
       Config.debug = evaluate_flag options[:debug], "ROOKOUT_DEBUG"
 
+      print_debug_messages if Config.debug
+
       begin
         verify_env
 
         require_relative "rookout_singleton"
 
-        # 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
+        configure options
 
         rook = RookoutSingleton.instance
         rook.connect(**@start_options)
+      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}"
@@ -62,12 +64,29 @@ module Rookout
 
     TRUE_VALUE = [true, "y", "Y", "yes", "Yes", "YES", "true", "True", "TRUE", "1"].freeze
 
+    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"
+      STDERR.puts RookBadProtobuf.new.message if protobuf.nil?
+      return unless protobuf.platform != "ruby"
+
+      error = RookBadProtobufPlatform.new protobuf.platform
+      STDERR.puts error.message
     end
 
     def configure_globals options
@@ -95,7 +114,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"])
@@ -107,6 +126,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/logger.rb

@@ -12,7 +12,8 @@ module Rookout
 
     def initialize
       # Detect unit tests
-      if ($PROGRAM_NAME.end_with?("minitest_runner.rb") ||
+      if (Config.debug ||
+          $PROGRAM_NAME.end_with?("minitest_runner.rb") ||
           $PROGRAM_NAME.end_with?("tunit_or_minitest_in_folder_runner.rb")) &&
          Dir.pwd.end_with?("ruby-sdk")
         Config.logger_log_level = :DEBUG

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.14".freeze
+  VERSION = "0.1.19".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.19
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: rookout is the Ruby SDK for the Rookout Debugging Platform