sqreen 1.18.2-java → 1.19.0-java

data/lib/sqreen/{callback_tree.rb → cb_tree.rb}

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -31,7 +33,7 @@ module Sqreen
         methods[1] ||= []
         add_to_array(methods[1], cb)
       end
-      if cb.failing?
+      if cb.failing? # rubocop:disable Style/GuardClause
         methods[2] ||= []
         add_to_array(methods[2], cb)
       end
@@ -50,7 +52,7 @@ module Sqreen
         types[1].delete(cb)
         types[1] = nil if types[1].empty?
       end
-      if cb.failing? && types[2]
+      if cb.failing? && types[2] # rubocop:disable Style/GuardClause
         types[2].delete(cb)
         types[2] = nil if types[2].empty?
       end

data/lib/sqreen/condition_evaluator.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -179,7 +181,7 @@ module Sqreen
       return true if exp.empty?
       raise(Sqreen::Exception, 'too deep call detected') if rem <= 0
       exp.all? do |op, values|
-        res = values.map do |v|
+        val_to_res = lambda do |v|
           case v
           when Hash
             evaluate_expr(v, rem - 1, *args)
@@ -191,27 +193,42 @@ module Sqreen
         end
 
         arity = OPERATORS_ARITY[op]
-        if !arity.nil? && res.size != arity
-          raise(Sqreen::Exception, "bad res #{res} (op #{op} wanted #{arity})")
+        if !arity.nil? && values.size != arity
+          raise(Sqreen::Exception, "bad arg count #{values.inspect} (op #{op} wanted #{arity})")
         end
         bool = case op
                when OR_OPERATOR
-                 res.any?
+                 values.reduce(false) do |_, v|
+                   r = val_to_res.call(v)
+                   break r if r
+                   r
+                 end
                when AND_OPERATOR
-                 res.all?
+                 values.reduce(true) do |_, v|
+                   r = val_to_res.call(v)
+                   break r unless r
+                   r
+                 end
                when EQ_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] == res[1]
                when NEQ_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] != res[1]
                when GT_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] > res[1]
                when GTE_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] >= res[1]
                when LT_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] < res[1]
                when LTE_OPERATOR
+                 res = values.map(&val_to_res)
                  res[0] <= res[1]
                when INC_OPERATOR
+                 res = values.map(&val_to_res)
                  unless res[0].respond_to?(:include?)
                    raise(Sqreen::Exception, "no include on res #{res[0].inspect}")
                  end
@@ -221,8 +238,10 @@ module Sqreen
                    res[0].include?(res[1])
                  end
                when HASH_INC_OPERATOR
+                 res = values.map(&val_to_res)
                  ConditionEvaluator.hash_val_include?(res[0], res[1], res[2])
                when HASH_KEY_OPERATOR
+                 res = values.map(&val_to_res)
                  ConditionEvaluator.hash_key_include?(res[0], res[1], res[2])
                else
                  # FIXME: this should be check in compile

data/lib/sqreen/conditionable.rb

@@ -1,3 +1,5 @@
+# typed: false
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/configuration.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -6,6 +8,9 @@ require 'erb'
 require 'sqreen/performance_notifications/newrelic'
 
 module Sqreen
+  # TODO: remove all referecnes to global such as config_get
+  # TODO: move within Sqreen::Configuration
+
   @config = nil
 
   def self.config_init(framework = nil)
@@ -31,6 +36,12 @@ module Sqreen
   CONFIG_DESCRIPTION = [
     { :env => :SQREEN_DISABLE, :name => :disable,
       :default => false, :convert => :to_bool },
+    { :env => :SQREEN_LIBSQREEN, :name => :libsqreen,
+      :default => true, :convert => :to_bool },
+    { :env => :SQREEN_WEAVE, :name => :weave,
+      :default => false, :convert => :to_bool },
+    { :env => :SQREEN_WEAVE_STRATEGY, :name => :weave_strategy,
+      :default => :chain, :convert => :to_sym },
     { :env => :SQREEN_URL,       :name => :url,
       :default => 'https://back.sqreen.io' },
     { :env => :SQREEN_TOKEN,     :name => :token,
@@ -78,6 +89,10 @@ module Sqreen
     str.to_i
   end
 
+  def self.to_sym(value)
+    value.to_sym
+  end
+
   # Class to access configurations variables
   # This try to load environment by different ways.
   # 1. By file:
@@ -201,5 +216,9 @@ module Sqreen
     def to_int(value)
       Sqreen::to_int(value)
     end
+
+    def to_sym(value)
+      Sqreen::to_sym(value)
+    end
   end
 end

data/lib/sqreen/context.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/default_cb.rb

@@ -0,0 +1,22 @@
+# typed: true
+
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'sqreen/cb'
+require 'sqreen/log'
+
+module Sqreen
+  class DefaultCB < CB
+    def pre(_inst, args, _budget = nil, &_block)
+      Sqreen.log.debug "<< #{@klass} #{@method} #{Thread.current}"
+      Sqreen.log.debug args.join ' '
+      # log params
+    end
+
+    def post(_rv, _inst, _args, _budget = nil, &_block)
+      # log "#{rv}"
+      Sqreen.log.debug ">> #{@klass} #{@method} #{Thread.current}"
+    end
+  end
+end

data/lib/sqreen/deferred_logger.rb

@@ -0,0 +1,65 @@
+# typed: false
+
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'singleton'
+require 'logger'
+require 'sqreen/logger'
+
+module Sqreen
+  class DeferredLogger
+    include Singleton
+
+    def initialize
+      @buffer = StringIO.new
+      @logger = ::Logger.new(@buffer)
+    end
+
+    def debug(msg = nil, &block)
+      @logger.debug(msg, &block)
+    end
+
+    def info(msg = nil, &block)
+      @logger.info(msg, &block)
+    end
+
+    def warn(msg = nil, &block)
+      @logger.warn(msg, &block)
+    end
+
+    def error(msg = nil, &block)
+      @logger.error(msg, &block)
+    end
+
+    def fatal(msg = nil, &block)
+      @logger.error(msg, &block)
+    end
+
+    def add(severity, msg = nil, &block)
+      send(Sqreen::Logger::SEVERITY_TO_METHOD[severity], msg, &block)
+    end
+
+    def formatter=(value)
+      @logger.formatter = value
+    end
+
+    def flush_to(logger)
+      logger.instance_eval { @logdev }.write(read).tap { reset }
+    end
+
+    private
+
+    def read
+      @buffer.rewind
+      @buffer.read
+    end
+
+    def reset
+      buffer = StringIO.new
+      logger = ::Logger.new(buffer)
+      logger.formatter = @logger.formatter
+      @buffer, @logger = buffer, logger
+    end
+  end
+end

data/lib/sqreen/deliveries.rb

@@ -0,0 +1,12 @@
+# typed: strong
+
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'sqreen/deliveries/simple'
+require 'sqreen/deliveries/batch'
+
+module Sqreen
+  module Deliveries
+  end
+end

data/lib/sqreen/deliveries/batch.rb

@@ -1,9 +1,17 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
-require 'sqreen/deliveries/simple'
+# TODO: Sqreen::Attack => sqreen/events
+# TODO: Sqreen::RemoteException  => sqreen/events
+# TODO: Sqreen::RequestRecord => sqreen/events
+# TODO: Sqreen.time
+
+require 'sqreen/events/attack'
 require 'sqreen/events/remote_exception'
 require 'sqreen/mono_time'
+require 'sqreen/deliveries/simple'
 
 module Sqreen
   module Deliveries

data/lib/sqreen/deliveries/simple.rb

@@ -1,6 +1,13 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
+# TODO: Sqreen::Attack => sqreen/events
+# TODO: Sqreen::RemoteException  => sqreen/events
+# TODO: Sqreen::RequestRecord => sqreen/events
+
+require 'sqreen/events/attack'
 require 'sqreen/events/remote_exception'
 require 'sqreen/events/request_record'
 

data/lib/sqreen/dependency.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -12,7 +14,7 @@ module Sqreen
     def self.resolve_const(name)
       raise ArgumentError if name.nil? || name.empty?
 
-      name.to_s.split('::').inject(Object) { |a, e| a.const_get(e) }
+      name.to_s.split('::').inject(Object) { |a, e| a.const_get(e, false) }
     end
   end
 end

data/lib/sqreen/dependency/detector.rb

@@ -1,7 +1,9 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
-require 'sqreen/dependency/hook'
+require 'sqreen/graft/hook'
 require 'sqreen/dependency/rails'
 require 'sqreen/dependency/sinatra'
 require 'sqreen/dependency/rack'
@@ -32,28 +34,34 @@ module Sqreen
           Sqreen::Dependency::Rails.insert_sqreen_middlewares
         end if Sqreen::Dependency::Rails.required?
 
-        Sqreen::Dependency::Hook.add('Rack::Builder#to_app') do
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
           after do
             Sqreen::Dependency::Rails.inspect_middlewares
           end
         end if Sqreen::Dependency::Rails.required?
 
-        Sqreen::Dependency::Hook.add('Sinatra::Base.setup_default_middleware') do
-          after do |_, _, _, args|
+        Sqreen::Graft::Hook.add('Sinatra::Base.setup_middleware') do
+          after do |call|
+            args = call.args
+
             Sqreen::Dependency::Sinatra.insert_sqreen_middlewares(args.first)
           end
         end.install if Sqreen::Dependency::Sinatra.required?
 
-        Sqreen::Dependency::Hook.add('Rack::Builder#to_app') do
-          after do |_, builder|
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
+          after do |call|
+            builder = call.instance
+
             Sqreen::Dependency::Sinatra.inspect_middlewares(builder)
           end
         end if Sqreen::Dependency::Sinatra.required?
 
         # ensure startup of thread in request handling processes
 
-        Sqreen::Dependency::Hook.add('Rack::Builder#to_app') do
-          after do |callback, *|
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
+          after do |call|
+            callback = call.callback
+
             Sqreen.log.debug "[#{Process.pid}] Start mode #{Sqreen::Dependency::Detector.start_mode}"
             if Sqreen::Dependency::Detector.start_mode == :rails || Sqreen::Dependency::Detector.start_mode == :rackup
 
@@ -61,7 +69,7 @@ module Sqreen
                 Sqreen::Dependency::Rack.on_run(handler) do
                   case handler.name
                   when 'Rack::Handler::Puma'
-                    Sqreen::Dependency::Hook.add('Puma::Launcher#run') do
+                    Sqreen::Graft::Hook.add('Puma::Launcher#run') do
                       before do
                         # HACK: Puma master? hack falls apart when not preloading
                         # it would think master is not, triggering startup
@@ -73,12 +81,12 @@ module Sqreen
                         end
                       end
                     end
-                    Sqreen::Dependency::Hook['Puma::Launcher#run'].install
+                    Sqreen::Graft::Hook['Puma::Launcher#run'].install
                   when 'Rack::Handler::PhusionPassenger'
                     # noop, passenger will start his own separate process
                     Sqreen.log.debug "[#{Process.pid}] Passenger will start in standalone process"
                   when 'Rack::Handler::Unicorn' # unicorn-rails
-                    Sqreen::Dependency::Hook.add('Unicorn::HttpServer.new') do
+                    Sqreen::Graft::Hook.add('Unicorn::HttpServer.new') do
                       before do
                         # BUG: detects single process...
                       end
@@ -97,12 +105,12 @@ module Sqreen
           end
         end
 
-        Sqreen::Dependency::Hook['Rack::Builder#to_app'].install
+        Sqreen::Graft::Hook['Rack::Builder#to_app'].install
 
-        # Sqreen::Dependency::Hook.add('Rails::Server#start') do
+        # Sqreen::Graft::Hook.add('Rails::Server#start') do
         #   before { }
         # end
-        # Sqreen::Dependency::Hook['Rails::Server#start'].install
+        # Sqreen::Graft::Hook['Rails::Server#start'].install
         # /!\ double instrument Rails < Rack => Rails.start_with -> Rails.start_without -> super -> Rack.start_with -> Rails.start_without
       end
     end

data/lib/sqreen/dependency/libsqreen.rb

@@ -0,0 +1,32 @@
+# typed: ignore
+
+# Copyright (c) 2015 Sqreen. All Rights Reserved.
+# Please refer to our terms for more information: https://www.sqreen.com/terms.html
+
+require 'sqreen/dependency'
+
+module Sqreen
+  module Dependency
+    module LibSqreen
+      module_function
+
+      def require_libsqreen
+        raise LoadError, 'libsqreen forcefully disabled by configuration' unless Sqreen.config_get('libsqreen')
+        require 'libsqreen'
+        @libsqreen = true
+      rescue LoadError => e
+        Sqreen.log.warn("libsqreen gem not required: #{e.message}")
+        @libsqreen = false
+      end
+
+      def required?
+        require_libsqreen if @libsqreen.nil?
+        Sqreen::Dependency.const_exist?('LibSqreen')
+      end
+
+      def stub?
+        !::LibSqreen.respond_to?(:version)
+      end
+    end
+  end
+end

data/lib/sqreen/dependency/new_relic.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 

data/lib/sqreen/dependency/rack.rb

@@ -1,3 +1,5 @@
+# typed: ignore
+
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
@@ -7,23 +9,26 @@ module Sqreen
       module_function
 
       def find_handler(&block)
-        Sqreen::Dependency::Hook.add('Rack::Server#server') do
-          after do |callback, _, server, _|
+        Sqreen::Graft::Hook.add('Rack::Server#server') do
+          after do |call|
+            callback = call.callback
+            server = call.returned
+
             block.call(server)
             callback.disable # do this once, :server is a lazy init accessor
           end
         end
-        Sqreen::Dependency::Hook['Rack::Server#server'].install
+        Sqreen::Graft::Hook['Rack::Server#server'].install
       end
 
       def on_run(handler, &block)
         Sqreen.log.debug "[#{Process.pid}] #{handler.inspect}"
         hookpoint_name = "#{handler.name}.run"
 
-        Sqreen::Dependency::Hook.add(hookpoint_name) do
+        Sqreen::Graft::Hook.add(hookpoint_name) do
           before { block.call(handler) }
         end
-        Sqreen::Dependency::Hook[hookpoint_name].install
+        Sqreen::Graft::Hook[hookpoint_name].install
       end
 
       def rackup?