sqreen 1.15.4 → 1.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b477f1130500369e463ea5be1787fbe4c5bf23f88288ab48e1df4a625cf2af9f
-  data.tar.gz: c965568a045fc2a1f928ca52ad68f842a6687124da88a154efdb082de6e551e2
+  metadata.gz: 4f460325e9377e9204840feb8c4f53d580b1f4c84fdf1d361889887d22f7bccf
+  data.tar.gz: 0a92e132141222360ef9deb652ef755e60c863aca6070e3bc2b102d9f43dfbbe
 SHA512:
-  metadata.gz: 1f6c32b6e2fec81bfe459dd42f935d094bf41d26c610e9028132e00ff7fbdd1de26673de1212acd198ef505fa452301fd11607dde91e3f77d92a70d7f68184dc
-  data.tar.gz: dc32adb2c6b3be835d198d421ae58fcb31462c333a375c229abc2a6941c655e5616ba90a42086d129518809740dea2aa6a03979c03e7d5798291ab68bee15414
+  metadata.gz: 331ef90dfd3164b75a56bbe9ee35bef1e64204feedd14b60074dc08f32dcfd8b9750f33793bf0dbc11c3063d011a8f9a824dddb1647b0cadad0b72d8d1ae9663
+  data.tar.gz: b5feb7683f00fe75714dea4fc163b5335272b05bb79dfbba59f9af93398a5ee8fda8f636dfb02b9f35b953fee6066154eeb4df5a6f95b3299224295aad8d3525

data/lib/sqreen/deliveries/batch.rb

@@ -3,6 +3,8 @@
 
 require 'sqreen/deliveries/simple'
 require 'sqreen/events/remote_exception'
+require 'sqreen/mono_time'
+
 module Sqreen
   module Deliveries
     # Simple delivery method that batch event already seen in a batch
@@ -41,22 +43,23 @@ module Sqreen
       def stale?
         min = @first_seen.values.min
         return false if min.nil?
-        (min + max_staleness) < Time.now
+        (min + max_staleness) < Sqreen.time
       end
 
       def post_batch_needed?(event)
-        now = Time.now
+        now = Sqreen.time
+        # do not use any? {} due to side effects inside block
         event_keys(event).map do |key|
           was = @first_seen[key]
           @first_seen[key] ||= now
-          was.nil? || current_batch.size > max_batch || (was + max_staleness) < now
+          was.nil? || current_batch.size > max_batch || now > (was + max_staleness)
         end.any?
       end
 
       def post_batch
         session.post_batch(current_batch)
         current_batch.clear
-        now = Time.now
+        now = Sqreen.time
         @first_seen.each_key do |key|
           @first_seen[key] = now
         end

data/lib/sqreen/frameworks/request_recorder.rb

@@ -5,6 +5,8 @@ require 'sqreen/shared_storage'
 require 'sqreen/events/request_record'
 require 'sqreen/performance_notifications/log_performance'
 require 'sqreen/performance_notifications/newrelic'
+require 'sqreen/log'
+require 'sqreen/runner'
 
 module Sqreen
   # Store event/observations that happened in this request

data/lib/sqreen/instrumentation.rb

@@ -12,6 +12,7 @@ require 'sqreen/shared_storage'
 require 'sqreen/rules_callbacks/record_request_context'
 require 'sqreen/rules_callbacks/run_req_start_actions'
 require 'sqreen/rules_callbacks/run_block_user_actions'
+require 'sqreen/mono_time'
 require 'set'
 
 # How to override a class method:
@@ -37,6 +38,11 @@ require 'set'
 module Sqreen
   class Instrumentation
     OVERTIME_METRIC = 'request_overtime'.freeze
+
+    PRE_CB = 'pre'.freeze
+    POST_CB = 'post'.freeze
+    FAILING_CB = 'failing'.freeze
+
     MGMT_COST = 0.000025
     @@override_semaphore = Mutex.new
     @@overriden_singleton_methods = false
@@ -64,7 +70,7 @@ module Sqreen
       @@overriden_methods
     end
     def self.callback_wrapper_pre(callbacks, framework, budget, _klass, method, instance, args, &block)
-      all_start = Sqreen::PerformanceNotifications.time
+      all_start = Sqreen.time
       #Instrumentation.guard_call(method, []) do
         returns = []
         callbacks.each do |cb|
@@ -76,9 +82,9 @@ module Sqreen
           end
           Sqreen.log.debug { "running pre cb #{cb}" }
           begin
-            start = Sqreen::PerformanceNotifications.time
+            start = Sqreen.time
             res = cb.pre(instance, args, budget, &block)
-            stop = Sqreen::PerformanceNotifications.time
+            stop = Sqreen.time
             # The first few pre callbacks could not have a request & hence a budget just yet so we try harder to find it
             budget = framework.remaining_perf_budget if framework && !budget && Sqreen.performance_budget
             if budget
@@ -106,21 +112,21 @@ module Sqreen
             end
             next
           end
-          Sqreen::PerformanceNotifications.notify("Callbacks/#{rule || cb.class.name}/pre", start, stop)
+          Sqreen::PerformanceNotifications.notify(rule || cb.class.name, PRE_CB, start, stop)
         end
-        all_stop = Sqreen::PerformanceNotifications.time
+        all_stop = Sqreen.time
         framework.remaining_perf_budget = budget - (all_stop - all_start) - MGMT_COST * callbacks.size if framework && budget
-        Sqreen::PerformanceNotifications.notify('Callbacks/hooks_pre/pre', all_start, all_stop)
+        Sqreen::PerformanceNotifications.notify('hooks_pre', PRE_CB, all_start, all_stop)
         returns
       #end
     rescue StandardError => e
-      Sqreen.log.warn { "we catched an exception between cbs: #{e.inspect}" }
+      Sqreen.log.warn { "we caught an exception between cbs: #{e.inspect}" }
       Sqreen::RemoteException.record(e)
       []
     end
 
     def self.callback_wrapper_post(callbacks, framework, budget, _klass, method, return_val, instance, args, &block)
-      all_start = Sqreen::PerformanceNotifications.time
+      all_start = Sqreen.time
       #Instrumentation.guard_call(method, []) do
         returns = []
         callbacks.reverse_each do |cb|
@@ -131,9 +137,9 @@ module Sqreen
           end
           Sqreen.log.debug { "running post cb #{cb}" }
           begin
-            start = Sqreen::PerformanceNotifications.time
+            start = Sqreen.time
             res = cb.post(return_val, instance, args, budget, &block)
-            stop = Sqreen::PerformanceNotifications.time
+            stop = Sqreen.time
             if budget
               budget -= (stop - start)
               cb.overtime! if budget <= 0.0
@@ -158,23 +164,23 @@ module Sqreen
             end
             next
           end
-          Sqreen::PerformanceNotifications.notify("Callbacks/#{rule || cb.class.name}/post", start, stop)
+          Sqreen::PerformanceNotifications.notify(rule || cb.class.name, POST_CB, start, stop)
         end
-        all_stop = Sqreen::PerformanceNotifications.time
+        all_stop = Sqreen.time
         if framework && budget && framework.remaining_perf_budget
           framework.remaining_perf_budget = budget - (all_stop - all_start) - MGMT_COST * callbacks.size 
         end
-        Sqreen::PerformanceNotifications.notify('Callbacks/hooks_post/post', all_start, all_stop)
+        Sqreen::PerformanceNotifications.notify('hooks_post', POST_CB, all_start, all_stop)
         returns
       #end
     rescue StandardError => e
-      Sqreen.log.warn { "we catched an exception between cbs: #{e.inspect}" }
+      Sqreen.log.warn { "we caught an exception between cbs: #{e.inspect}" }
       Sqreen::RemoteException.record(e)
       []
     end
 
     def self.callback_wrapper_failing(callbacks, framework, budget, exception, _klass, method, instance, args, &block)
-      all_start = Sqreen::PerformanceNotifications.time
+      all_start = Sqreen.time
       #Instrumentation.guard_call(method, []) do
         returns = []
         callbacks.each do |cb|
@@ -185,9 +191,9 @@ module Sqreen
           end
           Sqreen.log.debug { "running failing cb #{cb}" }
           begin
-            start = Sqreen::PerformanceNotifications.time
+            start = Sqreen.time
             res = cb.failing(exception, instance, args, budget, &block)
-            stop = Sqreen::PerformanceNotifications.time
+            stop = Sqreen.time
             if budget
               budget -= (stop - start)
               cb.overtime! if budget <= 0.0
@@ -212,17 +218,17 @@ module Sqreen
             end
             next
           end
-          Sqreen::PerformanceNotifications.notify("Callbacks/#{rule || cb.class.name}/failing", start, stop)
+          Sqreen::PerformanceNotifications.notify(rule || cb.class.name, FAILING_CB, start, stop)
         end
-        all_stop = Sqreen::PerformanceNotifications.time
+        all_stop = Sqreen.time
         if framework && budget && framework.remaining_perf_budget
           framework.remaining_perf_budget = budget - (all_stop - all_start) - MGMT_COST * callbacks.size 
         end
-        Sqreen::PerformanceNotifications.notify('Callbacks/hooks_failing/failing', all_start, all_stop)
+        Sqreen::PerformanceNotifications.notify('hooks_failing', FAILING_CB, all_start, all_stop)
         returns
      # end
     rescue StandardError => e
-      Sqreen.log.warn "we catched an exception between cbs: #{e.inspect}"
+      Sqreen.log.warn "we caught an exception between cbs: #{e.inspect}"
       Sqreen::RemoteException.record(e)
       []
     end
@@ -246,11 +252,8 @@ module Sqreen
 
     def self.define_callback_method(meth, original_meth, klass_name)
       @sqreen_multi_instr ||= nil
-      proc do |*args, &block|
-        record_req_hp = @@record_request_hookpoints.include?([klass_name, meth]) &&
-          Sqreen::PerformanceNotifications.listen_for?
-        Sqreen::PerformanceNotifications::BinnedMetrics.start_request if record_req_hp
 
+      proc do |*args, &block|
         budget = nil
         skip_call = Thread.current[:sqreen_in_use]
         begin
@@ -386,16 +389,28 @@ module Sqreen
             end
             result
           ensure
-            if record_req_hp
-              Sqreen::PerformanceNotifications.instrument('Callbacks/hooks_reporting/pre') do
-                Sqreen::PerformanceNotifications::LogPerformance.next_request
-                Sqreen::PerformanceNotifications::NewRelic.next_request
-                Sqreen::PerformanceNotifications::BinnedMetrics.finish_request
-              end
-            end
             Thread.current[:sqreen_in_use] = false
           end
         end
+      end # end of proc
+    end
+
+    def self.request_hookpoint_method(original_meth)
+      proc do |*args, &block|
+        has_notifications = Sqreen::PerformanceNotifications.listen_for?
+        Sqreen::PerformanceNotifications::BinnedMetrics.start_request if has_notifications
+
+        begin
+          send(original_meth, *args, &block)
+        ensure
+          if has_notifications
+            Sqreen::PerformanceNotifications.instrument('next_req_notifs', PRE_CB) do
+              Sqreen::PerformanceNotifications::LogPerformance.next_request
+              Sqreen::PerformanceNotifications::NewRelic.next_request
+              Sqreen::PerformanceNotifications::BinnedMetrics.finish_request
+            end
+          end
+        end
       end
     end
 
@@ -477,6 +492,12 @@ module Sqreen
 
         define_method(new_method, p)
 
+        if @@record_request_hookpoints.include?([klass_name, meth])
+          p = Instrumentation.request_hookpoint_method(new_method)
+          new_method = "#{new_method}_req_hp_wrapper"
+          define_method(new_method, p)
+        end
+
         if public_method_defined?(meth)
           method_kind = :public
         elsif protected_method_defined?(meth)
@@ -569,6 +590,8 @@ module Sqreen
         method = cb.method
         key = [klass, method]
 
+        @@record_request_hookpoints << key if cb.is_a?(Sqreen::Rules::RecordRequestContext)
+
         already_overriden = @@overriden_methods.include? key
 
         if !already_overriden
@@ -610,7 +633,6 @@ module Sqreen
 
         @@registered_callbacks.add(cb)
         @@unovertimable_hookpoints << key unless cb.overtimeable
-        @@record_request_hookpoints << key if cb.is_a?(Sqreen::Rules::RecordRequestContext)
         @@instrumented_pid = Process.pid
       end
     end

data/lib/sqreen/metrics/average.rb

@@ -9,7 +9,7 @@ module Sqreen
     class Average < Base
       # from class attr_accessor :aggregate
 
-      def update(_at, key, value)
+      def update(key, value)
         super
         @sums[key] ||= 0
         @sums[key] += value

data/lib/sqreen/metrics/base.rb

@@ -18,12 +18,12 @@ module Sqreen
       # @param _at [Time] when was the observation made
       # @param _key [String] which aggregation key was it made for
       # @param _value [Object] The observation
-      def update(_at, _key, _value)
+      def update(_key, _value)
         raise Sqreen::Exception, 'No current sample' unless @sample
       end
 
       # create a new empty sample and publish the last one
-      # @param time [Time] Time of start/finish
+      # @param time [Float] Time of start of new sample/end of the last one
       def next_sample(time)
         finalize_sample(time) unless @sample.nil?
         current_sample = @sample
@@ -33,10 +33,12 @@ module Sqreen
 
       protected
 
+      # @param time [Float]
       def new_sample(time)
         @sample = { OBSERVATION_KEY => {}, START_KEY => time }
       end
 
+      # @param time [Float]
       def finalize_sample(time)
         @sample[FINISH_KEY] = time
       end

data/lib/sqreen/metrics/binning.rb

@@ -1,6 +1,7 @@
 # Copyright (c) 2018 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
+require 'sqreen/mono_time'
 require 'sqreen/metrics/base'
 
 module Sqreen
@@ -20,10 +21,10 @@ module Sqreen
         log_factor = Math.log(@factor)
         @inv_log_base = 1 / log_base
         @add_parcel = - log_factor / log_base
-        new_sample(Time.now.utc)
+        new_sample(Sqreen.time)
       end
 
-      def update(_at, _key, x)
+      def update(_key, x)
         h = @sample[OBSERVATION_KEY]
         bin = bin_no(x)
         h[bin] += 1

data/lib/sqreen/metrics/collect.rb

@@ -11,7 +11,7 @@ module Sqreen
     class Collect < Base
       # from class attr_accessor :aggregate
 
-      def update(_at, key, value)
+      def update(key, value)
         super
         s = @sample[OBSERVATION_KEY]
         s[key] ||= []

data/lib/sqreen/metrics/sum.rb

@@ -9,7 +9,7 @@ module Sqreen
     class Sum < Base
       # from class attr_accessor :aggregate
 
-      def update(_at, key, value)
+      def update(key, value)
         super
         s = @sample[OBSERVATION_KEY]
         s[key] ||= 0

data/lib/sqreen/metrics_store.rb

@@ -3,6 +3,7 @@
 
 require 'sqreen/exception'
 require 'sqreen/metrics'
+require 'sqreen/mono_time'
 
 module Sqreen
   # This store and register metrics
@@ -17,6 +18,7 @@ module Sqreen
     class AlreadyRegisteredMetric < Sqreen::Exception
     end
 
+    # definition keys
     NAME_KEY = 'name'.freeze
     KIND_KEY = 'kind'.freeze
     PERIOD_KEY = 'period'.freeze
@@ -29,7 +31,7 @@ module Sqreen
 
     def initialize
       @store = []
-      @metrics = {}
+      @metrics = {} # name => (metric, period, start)
     end
 
     # Definition contains a name,period and aggregate at least
@@ -54,17 +56,17 @@ module Sqreen
       @metrics.key?(name)
     end
 
+    # @params at [Time] when is the store emptied
     def update(name, at, key, value)
-      at = at.utc
       metric, period, start = @metrics[name]
       raise UnregisteredMetric, "Unknown metric #{name}" unless metric
       next_sample(name, at) if start.nil? || (start + period) < at
-      metric.update(at, key, value)
+      metric.update(key, value)
     end
 
     # Drains every metrics and returns the store content
     # @params at [Time] when is the store emptied
-    def publish(flush = true, at = Time.now.utc)
+    def publish(flush = true, at = Sqreen.time)
       @metrics.each do |name, (_, period, start)|
         next_sample(name, at) if flush || !start.nil? && (start + period) < at
       end
@@ -78,10 +80,13 @@ module Sqreen
     def next_sample(name, at)
       metric = @metrics[name][0]
       r = metric.next_sample(at)
-      @metrics[name][2] = at # start
+      @metrics[name][2] = at # new start
       if r
         r[NAME_KEY] = name
         obs = r[Metric::OBSERVATION_KEY]
+        start_of_mono = Time.now.utc - Sqreen.time
+        r[Metric::START_KEY] = start_of_mono + r[Metric::START_KEY]
+        r[Metric::FINISH_KEY] = start_of_mono + r[Metric::FINISH_KEY]
         @store << r if obs && (!obs.respond_to?(:empty?) || !obs.empty?)
       end
       r

data/lib/sqreen/mono_time.rb

@@ -0,0 +1,18 @@
+module Sqreen
+  has_mono_time = begin
+    Process.clock_gettime Process::CLOCK_MONOTONIC
+    true
+  rescue StandardError
+    false
+  end
+
+  if has_mono_time
+    def self.time
+      Process.clock_gettime Process::CLOCK_MONOTONIC
+    end
+  else
+    def self.time
+      Time.now.to_f
+    end
+  end
+end

data/lib/sqreen/performance_notifications.rb

@@ -1,12 +1,7 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
-begin
-  Process.clock_gettime Process::CLOCK_MONOTONIC
-  SQREEN_MONO_TIME = Process::CLOCK_MONOTONIC
-rescue StandardError
-  SQREEN_MONO_TIME = nil
-end
+require 'sqreen/mono_time'
 
 module Sqreen
   # This module enable us to keep track of sqreen resource usage
@@ -17,39 +12,29 @@ module Sqreen
     @subscriptions_all = {}
     @subscription_id = 0
     class << self
-      # Subsribe to receive notificiations about an event
-      # returns a subscription indentitifcation
+      # Subscribe to receive notifications about an event
+      # returns a subscription identification
       def subscribe(&block)
         id = (@subscription_id += 1)
         @subscriptions_all[id] = block
         id
       end
 
-      if SQREEN_MONO_TIME
-        def time
-          Process.clock_gettime(SQREEN_MONO_TIME)
-        end
-      else
-        def time
-          Time.now
-        end
-      end
-
       # Is there a subscriber
       def listen_for?
         !@subscriptions_all.empty?
       end
 
       # Instrument a call identified by key
-      def instrument(key, meta = {}, &block)
+      def instrument(rule, cb, meta = {}, &block)
         return yield unless listen_for?
-        _instrument(key, meta, &block)
+        _instrument(rule, cb, meta, &block)
       end
 
-      def notify(key, start, stop, meta = {})
+      def notify(rule, cb, start, stop, meta = {})
         return unless listen_for?
         notifiers.each do |callable|
-          callable.call(key, start, stop, meta)
+          callable.call(rule, cb, start, stop, meta)
         end
       end
 
@@ -70,22 +55,12 @@ module Sqreen
         @subscriptions_all.values
       end
 
-      if SQREEN_MONO_TIME
-        def _instrument(key, meta)
-          start = Process.clock_gettime(SQREEN_MONO_TIME)
-          yield
-        ensure
-          stop = Process.clock_gettime(SQREEN_MONO_TIME)
-          notify(key, start, stop, meta)
-        end
-      else
-        def _instrument(key, meta)
-          start = Time.now
-          yield
-        ensure
-          stop = Time.now
-          notify(key, start, stop, meta)
-        end
+      def _instrument(rule, cb, meta)
+        start = Sqreen.time
+        yield
+      ensure
+        stop = Sqreen.time
+        notify(rule, cb, start, stop, meta)
       end
     end
   end

data/lib/sqreen/performance_notifications/binned_metrics.rb

@@ -16,8 +16,6 @@ module Sqreen
       EVENT_TOTAL_TIME = 'sq'.freeze # sqreen total overhead callback time
       EVENT_PERCENT = 'pct'.freeze # sqreen total overhead percent of time
 
-      EVT_NAME_REGEXP = %r{\ACallbacks/([^/]+)/([^/]+)\z}
-
       # @param metrics_store [Sqreen::MetricsStore]
       def initialize(metrics_store, period, perf_metric_opts, perf_metric_percent_opts)
         @metrics_store = metrics_store
@@ -49,32 +47,28 @@ module Sqreen
         @subid = nil
       end
 
-      def log(event, start, finish, _meta)
-        return unless event =~ EVT_NAME_REGEXP
-        rule, cb = Regexp.last_match.captures
-
+      def log(rule, cb, start, finish, _meta)
         metric_name = "sq.#{rule}.#{cb}"
         ensure_metric(metric_name)
 
-        finish_time = SQREEN_MONO_TIME ? Time.now.utc : finish
         time_millis = (finish - start) * 1000
         # Ensure we always have a timings if we somehow missed the request start
-        SharedStorage[:sqreen_request_time] ||= 0
-        SharedStorage[:sqreen_request_time] += time_millis
-        metrics_store.update(metric_name, finish_time, nil, time_millis)
+        SharedStorage[:sqreen_request_time] =
+          (SharedStorage[:sqreen_request_time] || 0) + time_millis
+        metrics_store.update(metric_name, finish, nil, time_millis)
       end
 
       def start_request
-        SharedStorage[:request_start_time] = PerformanceNotifications.time
+        SharedStorage[:request_start_time] = Sqreen.time
         SharedStorage[:sqreen_request_time] = 0.0
       end
 
       def finish_request
         start_time = SharedStorage[:request_start_time]
-        finish_time = PerformanceNotifications.time
+        finish_time = Sqreen.time
         duration_millis = (finish_time - start_time) * 1000
 
-        finish_time_obj = SQREEN_MONO_TIME ? Time.now.utc : finish_time
+        finish_time_obj = Time.now.utc
         # format of evt is [cat, key, value, timestamp]
         Sqreen.observations_queue.push(
           [EVENT_REQ, nil, duration_millis, finish_time_obj]
@@ -108,7 +102,11 @@ module Sqreen
       class << self
         # @return [Sqreen::PerformanceNotifications::BinnedMetrics]
         attr_reader :instance
-        def enable(metrics_store, period = 60, base = DEFAULT_PERF_BASE, factor = DEFAULT_PERF_UNIT, base_pct = DEFAULT_PERF_PCT_BASE, factor_pct = DEFAULT_PERF_PCT_UNIT)
+        def enable(metrics_store, period = 60,
+                   base = DEFAULT_PERF_BASE,
+                   factor = DEFAULT_PERF_UNIT,
+                   base_pct = DEFAULT_PERF_PCT_BASE,
+                   factor_pct = DEFAULT_PERF_PCT_UNIT)
           disable
           @instance = new(metrics_store, period,
                           {'base'=> base, 'factor' => factor},

data/lib/sqreen/performance_notifications/log.rb

@@ -10,14 +10,19 @@ module Sqreen
       @subid = nil
       @facility = nil
       class << self
-        def log(event, start, finish, meta)
+        def log(rule, cb, start, finish, meta)
           (@facility || Sqreen.log).debug do
             meta_str = nil
             meta_str = ": #{meta.inspect}" unless meta.empty?
+            event = event_name(rule, cb)
             format('%s took %.2fms%s', event, (finish - start) * 1000, meta_str)
           end
         end
 
+        def event_name(rule, cb)
+          "Callbacks/#{rule}/#{cb}"
+        end
+
         def enable(facility = nil)
           return unless @subid.nil?
           @facility = facility

data/lib/sqreen/performance_notifications/log_performance.rb

@@ -2,6 +2,7 @@
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
 require 'sqreen/performance_notifications'
+require 'sqreen/performance_notifications/log'
 
 module Sqreen
   module PerformanceNotifications
@@ -23,7 +24,8 @@ module Sqreen
           SharedStorage.set(:log_performance_timings, value)
         end
 
-        def log(event, start, finish, _meta)
+        def log(rule, cb, start, finish, _meta)
+          event = event_name(rule, cb)
           timings << [event, start, finish]
         end
 

data/lib/sqreen/performance_notifications/metrics.rb

@@ -2,17 +2,20 @@
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
 require 'sqreen/performance_notifications'
+require 'sqreen/performance_notifications/log'
+require 'sqreen/runner'
 
 module Sqreen
   module PerformanceNotifications
     # Log performances in sqreen metrics_store
-    class Metrics
+    class Metrics < Log
       @subid = nil
       @facility = nil
       class << self
         EVENT_CAT = 'sqreen_time'.freeze
-        def log(event, start, finish, _meta)
-          evt = [EVENT_CAT, event, (finish - start) * 1000, SQREEN_MONO_TIME ? Time.now.utc : finish]
+        def log(rule, cb, start, finish, _meta)
+          event = event_name(rule, cb)
+          evt = [EVENT_CAT, event, (finish - start) * 1000, Time.now.utc]
           Sqreen.observations_queue.push(evt)
         end
 

data/lib/sqreen/performance_notifications/newrelic.rb

@@ -2,11 +2,14 @@
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
 require 'sqreen/performance_notifications'
+require 'sqreen/performance_notifications/log'
+require 'sqreen/log'
+require 'sqreen/shared_storage'
 
 module Sqreen
   module PerformanceNotifications
     # Log performances on the console
-    class NewRelic
+    class NewRelic < Log
       @subid = nil
       @level = 0
 
@@ -24,7 +27,8 @@ module Sqreen
           SharedStorage.set(:log_performance_nr_timings, value)
         end
 
-        def log(event, start, finish, _meta)
+        def log(rule, cb, start, finish, _meta)
+          event = event_name(rule, cb)
           timings << [event, start, finish]
         end
 

data/lib/sqreen/rules_callbacks/binding_accessor_matcher.rb

@@ -3,6 +3,7 @@
 
 require 'sqreen/rule_callback'
 require 'sqreen/binding_accessor'
+require 'sqreen/mono_time'
 require 'sqreen/rules_callbacks/matcher_rule'
 
 module Sqreen
@@ -49,7 +50,7 @@ module Sqreen
 
       def pre(inst, args, budget = nil, &_block)
         unless budget.nil?
-          finish = budget + Sqreen::PerformanceNotifications.time.to_f
+          finish = budget + Sqreen.time
         end
         resol_cache = Hash.new do |hash, accessor|
           hash[accessor] = accessor.resolve(binding, framework, inst, args)
@@ -61,7 +62,7 @@ module Sqreen
             next unless val.respond_to?(:each)
             next if val.respond_to?(:seek)
             val.each do |v|
-              if !budget.nil? && Sqreen::PerformanceNotifications.time.to_f > finish
+              if !budget.nil? && Sqreen.time > finish
                 return nil
               end
               next if !v.is_a?(String) || (!matcher.min_size.nil? && v.size < matcher.min_size)

data/lib/sqreen/runner.rb

@@ -214,9 +214,10 @@ module Sqreen
     def config_binned_metrics(level, base, factor, base_pct, factor_pct)
       level = level.to_i
       if level <= 0
-        Sqreen.log.debug('Disabling binned metrics')
+        Sqreen.log.info('Disabling binned metrics')
         PerformanceNotifications::BinnedMetrics.disable
       else
+        Sqreen.log.info('Enabling binned metrics')
         Sqreen.log.warn("Unknown value for perf_level: #{level}. Treating as 1") unless level == 1
         PerformanceNotifications::BinnedMetrics.enable(
           metrics_engine, PERF_METRICS_PERIOD, base.to_f, factor.to_f, base_pct.to_f, factor_pct.to_f
@@ -352,9 +353,10 @@ module Sqreen
 
     def aggregate_observations
       q = Sqreen.observations_queue
+      conv = Sqreen.time - Time.now.utc.to_f
       q.size.times do
         cat, key, obs, t = q.pop
-        metrics_engine.update(cat, t, key, obs)
+        metrics_engine.update(cat, conv + t.utc.to_f, key, obs)
       end
     end
 

data/lib/sqreen/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 module Sqreen
-  VERSION = '1.15.4'.freeze
+  VERSION = '1.15.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.15.4
+  version: 1.15.5
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sq_mini_racer
@@ -75,6 +75,7 @@ files:
 - lib/sqreen/metrics/sum.rb
 - lib/sqreen/metrics_store.rb
 - lib/sqreen/middleware.rb
+- lib/sqreen/mono_time.rb
 - lib/sqreen/payload_creator.rb
 - lib/sqreen/performance_notifications.rb
 - lib/sqreen/performance_notifications/binned_metrics.rb