sqreen 0.8.11465220943 → 1.0.0.pre1480953244

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39dacf780c2f8a4e5a3c80ed2295f31bbaa6185a
-  data.tar.gz: 0ed786d7f9437a8daff74d03112b699a0ede8aab
+  metadata.gz: 9c8f5f54c0af763465089699d22bef3c53346dc9
+  data.tar.gz: e0015e87e9c6e62f9859224e7eb47bb193ea04c4
 SHA512:
-  metadata.gz: 8c74afdd056d0c52b3d524454cb0fb25cda1cb55ec5f5696eeab53095df3673b3043535da5b1937a86f8d918094504d7cc6ff24b660a2369e481ca263a045c5a
-  data.tar.gz: 0a5fc6dd89edf3fbcbd45743b1b82f42adc3e96929f5f52df59ed9f54f4c8aff6434d1ed08046f41d99ad79a85e07d668373185d07c2a2577dc4b75f40b06b58
+  metadata.gz: 71533d2617f9a4b06d491a87b394f3da3ec0dd1c6019179d92155433799ddd19d32c3f82249c032ee208239bb252c7ca78aa1fde03bbf6b28f422cbc363400d8
+  data.tar.gz: 607a0981e332784768e172e25721c7edc6f11632f570da2cd955d18e2c5a6059037b14c959fa9a9a3a92100c85751d3325bddaf858027d133cda9aa2aeb1506d

data/lib/sqreen.rb

@@ -26,7 +26,6 @@ Sqreen.framework.on_start do |framework|
       prevent_startup = Sqreen.framework.prevent_startup
       if !prevent_startup
         runner = Sqreen::Runner.new(configuration, framework)
-        runner.do_heartbeat
         runner.run_watcher
       else
         Sqreen.log.debug("#{prevent_startup} prevented Sqreen startup")

data/lib/sqreen/binding_accessor.rb

@@ -5,7 +5,8 @@ require 'strscan'
 
 # the value located at the given binding
 class BindingAccessor
-  attr_reader :path, :expression, :convert
+  PathElem = Struct.new(:kind, :value)
+  attr_reader :path, :expression
 
   # Expression to be accessed
   # @param expression [String] expression to read
@@ -30,6 +31,18 @@ class BindingAccessor
 
   protected
 
+  STRING_KIND = 'string'.freeze
+  SYMBOL_KIND = 'symbol'.freeze
+  INTEGER_KIND = 'integer'.freeze
+  LOCAL_VAR_KIND = 'local-variable'.freeze
+  INSTANCE_VAR_KIND = 'instance-variable'.freeze
+  CLASS_VAR_KIND = 'class-variable'.freeze
+  GLOBAL_VAR_KIND = 'global-variable'.freeze
+  CONSTANT_KIND = 'constant'.freeze
+  METHOD_KIND = 'method'.freeze
+  INDEX_KIND = 'index'.freeze
+  SQREEN_VAR_KIND = 'sqreen-variable'.freeze
+
   if binding.respond_to?(:local_variable_get)
     def get_local(name, bind)
       bind.local_variable_get(name)
@@ -42,28 +55,28 @@ class BindingAccessor
 
   def resolve_component(current_value, component, binding, env)
     case component[:kind]
-    when 'string', 'symbol', 'integer'
+    when STRING_KIND, SYMBOL_KIND, INTEGER_KIND
       component[:value]
-    when 'local-variable'
-      get_local(component[:name], binding)
-    when 'instance-variable'
-      current_value.instance_variable_get("@#{component[:name]}")
-    when 'class-variable'
-      current_value.class.class_variable_get("@@#{component[:name]}")
-    when 'global-variable'
-      instance_eval("$#{component[:name]}")
-    when 'constant'
+    when LOCAL_VAR_KIND
+      get_local(component[:value], binding)
+    when INSTANCE_VAR_KIND
+      current_value.instance_variable_get("@#{component[:value]}")
+    when CLASS_VAR_KIND
+      current_value.class.class_variable_get("@@#{component[:value]}")
+    when GLOBAL_VAR_KIND
+      instance_eval("$#{component[:value]}")
+    when CONSTANT_KIND
       if current_value
-        current_value.const_get(component[:name].to_s)
+        current_value.const_get(component[:value].to_s)
       else
-        Object.const_get(component[:name].to_s)
+        Object.const_get(component[:value].to_s)
       end
-    when 'method'
-      current_value.send(component[:name])
-    when 'index'
-      current_value[component[:index]]
-    when 'sqreen-variable'
-      resolve_sqreen_variable(component[:name], *env)
+    when METHOD_KIND
+      current_value.send(component[:value])
+    when INDEX_KIND
+      current_value[component[:value]]
+    when SQREEN_VAR_KIND
+      resolve_sqreen_variable(component[:value], *env)
     else
       raise "Do not know how to handle this component #{component.inspect}"
     end
@@ -93,7 +106,7 @@ class BindingAccessor
         @path.push scalar
         return
       end
-      if @path.size == 0
+      if @path.empty?
         scan_push_variable
       else
         scan_push_method
@@ -102,16 +115,17 @@ class BindingAccessor
       scan_push_more_constant if @scan.scan(/\./).nil?
       raise error_state('Scan stuck') if @scan.pos == pos
     end
+  ensure
+    @scan = nil
   end
 
   def scan_scalar
-    case
-    when @scan.scan(/\d+/)
-      return { :value => @scan[0].to_i, :kind => 'integer' }
-    when @scan.scan(/:(\w+)/)
-      return { :value => @scan[1].to_sym, :kind => 'symbol' }
-    when @scan.scan(/'((?:\\.|[^\\'])*)'/)
-      return { :value => @scan[1], :kind => 'string' }
+    if @scan.scan(/\d+/)
+      return PathElem.new(INTEGER_KIND, @scan[0].to_i)
+    elsif @scan.scan(/:(\w+)/)
+      return PathElem.new(SYMBOL_KIND, @scan[1].to_sym)
+    elsif @scan.scan(/'((?:\\.|[^\\'])*)'/)
+      return PathElem.new(STRING_KIND, @scan[1])
     end
   end
 
@@ -119,11 +133,11 @@ class BindingAccessor
                            '[\w\u0080-\u{10ffff}]'
                          else
                            '[\w\x80-\xFF]'
-               end
+                         end
 
   def scan_push_constant
     return unless @scan.scan(/([A-Z]#{RUBY_IDENTIFIER_CHAR}+)/)
-    @path << { :name => @scan[1], :kind => 'constant' }
+    @path << PathElem.new(CONSTANT_KIND, @scan[1])
   end
 
   def scan_push_more_constant
@@ -133,30 +147,28 @@ class BindingAccessor
   end
 
   def scan_push_variable
-    case
-    when @scan.scan(/\$(#{RUBY_IDENTIFIER_CHAR}+)/)
-      return @path << { :name => @scan[1], :kind => 'global-variable' }
-    when @scan.scan(/@@(#{RUBY_IDENTIFIER_CHAR}+)/)
-      return @path << { :name => @scan[1], :kind => 'class-variable' }
-    when @scan.scan(/@(#{RUBY_IDENTIFIER_CHAR}+)/)
-      return @path << { :name => @scan[1], :kind => 'instance-variable' }
-    when @scan.scan(/#\.(\w+)/)
-      return @path << { :name => @scan[1], :kind => 'sqreen-variable' }
-    when scan_push_constant
+    if @scan.scan(/\$(#{RUBY_IDENTIFIER_CHAR}+)/)
+      return @path << PathElem.new(GLOBAL_VAR_KIND, @scan[1])
+    elsif @scan.scan(/@@(#{RUBY_IDENTIFIER_CHAR}+)/)
+      return @path << PathElem.new(CLASS_VAR_KIND, @scan[1])
+    elsif @scan.scan(/@(#{RUBY_IDENTIFIER_CHAR}+)/)
+      return @path << PathElem.new(INSTANCE_VAR_KIND, @scan[1])
+    elsif @scan.scan(/#\.(\w+)/)
+      return @path << PathElem.new(SQREEN_VAR_KIND, @scan[1])
+    elsif scan_push_constant
       return
-    when @scan.scan(/(#{RUBY_IDENTIFIER_CHAR}+)/u)
-      return @path << { :name => @scan[1], :kind => 'local-variable' }
+    elsif @scan.scan(/(#{RUBY_IDENTIFIER_CHAR}+)/u)
+      return @path << PathElem.new(LOCAL_VAR_KIND, @scan[1])
     end
   end
 
   def scan_push_method
-    case
-    when @scan.scan(/@@(#{RUBY_IDENTIFIER_CHAR}+)/)
-      return @path << { :name => @scan[1], :kind => 'class-variable' }
-    when @scan.scan(/@(#{RUBY_IDENTIFIER_CHAR}+)/)
-      return @path << { :name => @scan[1], :kind => 'instance-variable' }
-    when @scan.scan(/(#{RUBY_IDENTIFIER_CHAR}+)/)
-      return @path << { :name => @scan[1], :kind => 'method' }
+    if @scan.scan(/@@(#{RUBY_IDENTIFIER_CHAR}+)/)
+      return @path << PathElem.new(CLASS_VAR_KIND, @scan[1])
+    elsif @scan.scan(/@(#{RUBY_IDENTIFIER_CHAR}+)/)
+      return @path << PathElem.new(INSTANCE_VAR_KIND, @scan[1])
+    elsif @scan.scan(/(#{RUBY_IDENTIFIER_CHAR}+)/)
+      return @path << PathElem.new(METHOD_KIND, @scan[1])
     end
   end
 
@@ -165,7 +177,7 @@ class BindingAccessor
       scalar = scan_scalar
       raise error_state('Invalid index') unless scalar
       raise error_state('Unfinished index') unless @scan.scan(/\]/)
-      @path << { :kind => 'index', :index => scalar[:value] }
+      @path << PathElem.new(INDEX_KIND, scalar[:value])
     end
   end
 

data/lib/sqreen/condition_evaluator.rb

@@ -30,11 +30,15 @@ class ConditionEvaluator
   # @params hash [Hash] Hash to search into
   # @params min_value_size [Fixnum] to compare against
   def self.hash_val_include?(value, hash, min_value_size, rem = 10)
-    return false if rem <= 0
-    hash.any? do |_k, hval|
+    return true if rem <= 0
+    vals = hash
+    vals = hash.values if hash.is_a?(Hash)
+
+    vals.any? do |hval|
       case hval
-      when Hash
-        ConditionEvaluator.hash_val_include?(value, hval, min_value_size, rem - 1)
+      when Hash, Array
+        ConditionEvaluator.hash_val_include?(value, hval,
+                                             min_value_size, rem - 1)
       when NilClass
         false
       else
@@ -42,11 +46,11 @@ class ConditionEvaluator
           false
         else
           v = hval.to_s
-            if v.size < min_value_size
-              false
-            else
-              ConditionEvaluator.str_include?(value.to_s, v)
-            end
+          if v.size < min_value_size
+            false
+          else
+            ConditionEvaluator.str_include?(value.to_s, v)
+          end
         end
       end
     end
@@ -91,6 +95,7 @@ class ConditionEvaluator
 
   def compile_expr(exp, rem)
     return exp if exp == true || exp == false
+    return true if exp.empty?
     raise(Sqreen::Exception, 'too deep call detected') if rem <= 0
     h = {}
     exp.each do |op, values|
@@ -140,9 +145,9 @@ class ConditionEvaluator
 
   def evaluate_expr(exp, rem, *args)
     return exp if exp == true || exp == false
+    return true if exp.empty?
     raise(Sqreen::Exception, 'too deep call detected') if rem <= 0
-    bool = nil
-    exp.each do |op, values|
+    exp.all? do |op, values|
       res = values.map do |v|
         case v
         when Hash
@@ -190,7 +195,7 @@ class ConditionEvaluator
                # FIXME: this should be check in compile
                raise(Sqreen::Exception, "unknown op #{op})")
              end
+      bool
     end
-    bool
   end
 end

data/lib/sqreen/conditionable.rb

@@ -18,7 +18,8 @@ module Sqreen
         next if conds.respond_to?(:empty?) && conds.empty?
         next unless base.method_defined?(cb)
         send("#{cb}_conditions=", ConditionEvaluator.new(conds))
-        next if base.instance_variable_get("@conditional_hooked_#{cb}")
+        defd = base.instance_variable_defined?("@conditional_hooked_#{cb}")
+        next if defd && base.instance_variable_get("@conditional_hooked_#{cb}")
         base.send(:alias_method, "#{cb}_without_conditions", cb)
         base.send(:alias_method, cb, "#{cb}_with_conditions")
         base.instance_variable_set("@conditional_hooked_#{cb}", true)

data/lib/sqreen/configuration.rb

@@ -42,6 +42,8 @@ module Sqreen
       :default => nil },
     { :env => :SQREEN_REPORT_PERF_NR, :name => :report_perf_newrelic,
       :default => false },
+    { :env => :SQREEN_INITIAL_FEATURES, :name => :initial_features,
+      :default => nil },
 
   ].freeze
 

data/lib/sqreen/deliveries/batch.rb

@@ -29,11 +29,11 @@ module Sqreen
       end
 
       def drain
-        post_batch
+        post_batch unless current_batch.empty?
       end
 
       def tick
-        post_batch if current_batch.size > 0 && stale?
+        post_batch if !current_batch.empty? && stale?
       end
 
       protected

data/lib/sqreen/events/attack.rb

@@ -29,7 +29,7 @@ module Sqreen
 
     def time
       return nil unless payload['local']
-      payload['local']['time'].to_s
+      payload['local']['time']
     end
 
     def backtrace

data/lib/sqreen/frameworks/generic.rb

@@ -9,6 +9,15 @@ module Sqreen
     class GenericFramework
       attr_accessor :sqreen_configuration
 
+      def initialize
+        if defined?(Rack::Builder)
+          hook_rack_builder
+        else
+          to_app_done(Process.pid)
+        end
+      end
+
+
       # What kind of database is this
       def db_settings(_options = {})
         raise Sqreen::NotImplementedYet
@@ -97,21 +106,23 @@ module Sqreen
 
       # Instrument with our rules when the framework as finished loading
       def instrument_when_ready!(instrumentor, rules)
-        done = false
-        # FIXME: why is this called twice
-        unless defined?(Rack::Builder)
-          done = true
-          return
+        wait_for_to_app do
+          instrumentor.instrument!(rules, self)
         end
-        cb = Sqreen::RunWhenCalledCB.new(Rack::Builder, :to_app) do
-          if done
-            Sqreen.log.debug('Already instrumented to_app')
-          else
-            instrumentor.instrument!(rules, self)
-            done = true
-          end
-        end
-        instrumentor.add_callback(cb)
+      end
+
+      def to_app_done(val)
+        return if @to_app_done
+        @to_app_done = val
+        return unless @wait
+        @wait.each(&:call)
+        @wait.clear
+      end
+
+      def wait_for_to_app(&block)
+        yield && return if @to_app_done
+        @wait ||= []
+        @wait << block
       end
 
       # Does the parameters include this value
@@ -217,6 +228,33 @@ module Sqreen
 
       protected
 
+      def hook_rack_request(klass)
+        @calling_pid = Process.pid
+        klass.class_eval do
+          define_method(:call_with_sqreen) do |*args, &block|
+            rv = call_without_sqreen(*args, &block)
+            if Sqreen.framework.instance_variable_get('@calling_pid') != Process.pid
+              Sqreen.framework.instance_variable_set('@calling_pid', Process.pid)
+              yield Sqreen.framework
+            end
+            rv
+          end
+          alias_method :call_without_sqreen, :call
+          alias_method :call, :call_with_sqreen
+        end
+      end
+
+      def hook_rack_builder
+        Rack::Builder.class_eval do
+          define_method(:to_app_with_sqreen) do |*args, &block|
+            Sqreen.framework.to_app_done(Process.pid)
+            to_app_without_sqreen(*args, &block)
+          end
+          alias_method :to_app_without_sqreen, :to_app
+          alias_method :to_app, :to_app_with_sqreen
+        end
+      end
+
       # FIXME: Extract to another object (utils?)
       # FIXME: protect against cycles ?
       def each_value_for_hash(params, &block)
@@ -229,11 +267,12 @@ module Sqreen
       end
 
       def ensure_rack_loaded
+        @cannot_load_rack ||= false
         return false if @cannot_load_rack
         require 'rack' unless defined?(Rack)
         true
       rescue LoadError => e
-        # FIXME find a nice way to test this branch
+        # FIXME: find a nice way to test this branch
         Sqreen::RemoteException.record(e)
         @cannot_load_rack = true
         false

data/lib/sqreen/frameworks/rails.rb

@@ -73,30 +73,10 @@ module Sqreen
         end
       end
 
-      def hook_rack_request(app)
-        saved_meth_name = :call_without_sqreen_hooked
-        new_method = :call_with_sqreen_hooked
-
-        app.class.class_eval do
-          alias_method saved_meth_name, :call
-
-          define_method(new_method) do |*args, &cblock|
-            rv = send(saved_meth_name, *args, &cblock)
-            if Sqreen.framework.instance_variable_get('@calling_pid') != Process.pid
-              Sqreen.framework.instance_variable_set('@calling_pid', Process.pid)
-              yield Sqreen.framework
-            end
-            rv
-          end
-
-          alias_method :call, new_method
-        end
-      end
-
       def on_start(&block)
         @calling_pid = Process.pid
         Init.startup do |app|
-          hook_rack_request(app, &block)
+          hook_rack_request(app.class, &block)
           app.config.after_initialize do
             yield self
           end

data/lib/sqreen/frameworks/sinatra.rb

@@ -14,6 +14,11 @@ module Sqreen
         h
       end
 
+      def on_start(&block)
+        hook_rack_request(Sinatra::Application, &block)
+        yield self
+      end
+
       def db_settings(options = {})
         adapter = options[:connection_adapter]
         return nil unless adapter