sqreen 1.14.0-java → 1.14.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb56629cb030a8c8ae7e1d3438fe241bbaa0c9f425dc95073498551ee84e53cd
-  data.tar.gz: dc28f65a8de23fead674554aaa7c1e076482a009407224e3d9e2b972417fdadc
+  metadata.gz: 625e0b54a85e128be8a54aa94d91ff58d2dd99556fb6cfc79e22511731082fd3
+  data.tar.gz: 19ef99856cdc8269acf7888c424f2f80fdea4643b3c7deef4fa963f1de127923
 SHA512:
-  metadata.gz: c494d1f9a2add8ab06cf4db09de8be8c6b8bc36278e4a3c2796c60ad6ebd0419bb3974d32cf872bc3b73942e47861a856111db8b1530b5a36990e1abe5d3448f
-  data.tar.gz: 56ee9cc964987ff4c343b84f758c222d6aa7a9971b11e0ebb5342bc0ffc5e31bd9ce86a244f77c21fb671acbe2057ca103f395bf3e4f6184d155696c1bc28f91
+  metadata.gz: bbe599eea8b8f74ced0183e8ec6a2de5bc5cfd9506618fb21e5b526cca2611ed77cf94765abd39c8f136584c9f88fd7747f3ac29bd0729b57c9f5e647a7dfba1
+  data.tar.gz: 510eaa669c74a5989023b4b08da5158dd97e0e65e847301510e0c2e457e674b4b360c80a2996708aef37b05dd04fc5a56013278cc1003ed9c6f4e6fcf6acba5f

data/lib/sqreen/metrics/base.rb

@@ -10,7 +10,7 @@ module Sqreen
     FINISH_KEY = 'finish'.freeze
     # Base interface for a metric
     class Base
-      def initialize
+      def initialize(_opts={})
         @sample = nil
       end
 

data/lib/sqreen/metrics/binning.rb

@@ -6,14 +6,18 @@ require 'sqreen/metrics/base'
 module Sqreen
   module Metric
     # Takes numbers as samples and bins them (effectively, rounds them).
+    # Also collect max values
     class Binning < Base
+      BASE_KEY = 'base'.freeze
+      FACTOR_KEY = 'factor'.freeze
       # upper bound of i-th bin is factor * base^(i-1)
-      def initialize(base, factor)
-        super()
-        @base = base
-        @factor = factor
-        log_base = Math.log(base)
-        log_factor = Math.log(factor)
+      def initialize(opts={})
+        options = opts.dup
+        @base = options.delete(BASE_KEY)
+        @factor = options.delete(FACTOR_KEY)
+        super(options)
+        log_base = Math.log(@base)
+        log_factor = Math.log(@factor)
         @inv_log_base = 1 / log_base
         @add_parcel = - log_factor / log_base
         new_sample(Time.now.utc)
@@ -23,6 +27,7 @@ module Sqreen
         h = @sample[OBSERVATION_KEY]
         bin = bin_no(x)
         h[bin] += 1
+        h['max'] = x if x > h['max']
       end
 
       def next_sample(time)
@@ -54,21 +59,5 @@ module Sqreen
         res < 1 ? 1 : res
       end
     end
-
-    # overrides the constructor
-    class ParameterizedBinning < Binning
-      def initialize
-        raise 'Not configured' unless self.class.base && self.class.factor
-        super(self.class.base, self.class.factor)
-      end
-
-      class << self
-        attr_reader :base, :factor
-        def parameters(opts)
-          @base = opts[:base]
-          @factor = opts[:factor]
-        end
-      end
-    end
   end
 end

data/lib/sqreen/metrics_store.rb

@@ -20,6 +20,7 @@ module Sqreen
     NAME_KEY = 'name'.freeze
     KIND_KEY = 'kind'.freeze
     PERIOD_KEY = 'period'.freeze
+    OPTIONS_KEY = 'options'.freeze
 
     # Currently ready samples
     attr_reader :store
@@ -38,7 +39,9 @@ module Sqreen
       name = definition[NAME_KEY]
       kind = definition[KIND_KEY]
       klass = valid_metric(kind, name)
-      metric = mklass || klass.new
+
+      opts = definition[OPTIONS_KEY]
+      metric = mklass || klass.new(opts)
       @metrics[name] = [
         metric,
         definition[PERIOD_KEY],

data/lib/sqreen/performance_notifications/binned_metrics.rb

@@ -8,26 +8,36 @@ module Sqreen
   module PerformanceNotifications
     # Logs callback performance
     class BinnedMetrics
+      DEFAULT_PERF_BASE = 2.0
+      DEFAULT_PERF_UNIT = 0.1 # ms
+      DEFAULT_PERF_PCT_BASE = 1.3
+      DEFAULT_PERF_PCT_UNIT = 1.0 # %
       EVENT_REQ = 'req'.freeze # request total time
       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)
+      def initialize(metrics_store, period, perf_metric_opts, perf_metric_percent_opts)
         @metrics_store = metrics_store
         @period = period
         @subid = nil
+        @perf_metric_opts = perf_metric_opts
+        @perf_metric_percent_opts = perf_metric_percent_opts
       end
 
       def enable
         return unless @subid.nil?
 
         metrics_store.create_metric(
-          'name' => EVENT_REQ, 'period' => period, 'kind' => 'ParameterizedBinning'
+          'name' => EVENT_REQ, 'period' => period, 'kind' => 'Binning', 'options' => @perf_metric_opts
         )
         metrics_store.create_metric(
-          'name' => EVENT_TOTAL_TIME, 'period' => period, 'kind' => 'ParameterizedBinning'
+          'name' => EVENT_TOTAL_TIME, 'period' => period, 'kind' => 'Binning', 'options' => @perf_metric_opts
+        )
+        metrics_store.create_metric(
+          'name' => EVENT_PERCENT, 'period' => period, 'kind' => 'Binning', 'options' => @perf_metric_percent_opts
         )
 
         @subid = Sqreen::PerformanceNotifications.subscribe(&method(:log))
@@ -67,9 +77,15 @@ module Sqreen
         Sqreen.observations_queue.push(
           [EVENT_REQ, nil, duration_millis, finish_time_obj]
         )
+        total_t = SharedStorage[:sqreen_request_time]
         Sqreen.observations_queue.push(
           [EVENT_TOTAL_TIME, nil,
-           SharedStorage[:sqreen_request_time], finish_time_obj]
+           total_t, finish_time_obj]
+        )
+        return if !duration_millis or total_t >= duration_millis
+        Sqreen.observations_queue.push(
+          [EVENT_PERCENT, nil,
+           (total_t*100.0)/(duration_millis-total_t), finish_time_obj]
         )
       end
 
@@ -82,7 +98,7 @@ module Sqreen
       def ensure_metric(metric_name)
         return if metrics_store.metric?(metric_name)
         metrics_store.create_metric(
-          'name' => metric_name, 'period' => period, 'kind' => 'ParameterizedBinning'
+          'name' => metric_name, 'period' => period, 'kind' => 'Binning', 'options' => @perf_metric_opts
         )
       end
 
@@ -90,12 +106,12 @@ module Sqreen
       class << self
         # @return [Sqreen::PerformanceNotifications::BinnedMetrics]
         attr_reader :instance
-        def enable(metrics_store, period = 60, base = 2.0, factor = 0.1)
+        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
-          Sqreen::Metric::ParameterizedBinning.parameters(
-            :base => base, :factor => factor
-          )
-          @instance = new(metrics_store, period).tap(&:enable)
+          @instance = new(metrics_store, period,
+                          {'base'=> base, 'factor' => factor},
+                          {'base' => base_pct, 'factor' => factor_pct}
+                      ).tap(&:enable)
         end
 
         def disable

data/lib/sqreen/runner.rb

@@ -33,8 +33,6 @@ module Sqreen
 
   PERF_METRICS_PERIOD = 60 # 1 min
   DEFAULT_PERF_LEVEL = 0 # disabled
-  DEFAULT_PERF_UNIT = 0.1 # ms
-  DEFAULT_PERF_BASE = 2.0
 
   class << self
     attr_reader :features
@@ -213,7 +211,7 @@ module Sqreen
       end
     end
 
-    def config_binned_metrics(level, base, factor)
+    def config_binned_metrics(level, base, factor, base_pct, factor_pct)
       level = level.to_i
       if level <= 0
         Sqreen.log.debug('Disabling binned metrics')
@@ -221,7 +219,7 @@ module Sqreen
       else
         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
+          metrics_engine, PERF_METRICS_PERIOD, base.to_f, factor.to_f, base_pct.to_f, factor_pct.to_f
         )
       end
     end
@@ -306,8 +304,11 @@ module Sqreen
       session.request_compression = features['request_compression'] if session
       self.performance_metrics_period = features['performance_metrics_period']
       config_binned_metrics(features['perf_level'] || DEFAULT_PERF_LEVEL,
-                            features['perf_base'] || DEFAULT_PERF_BASE,
-                            features['perf_unit'] || DEFAULT_PERF_UNIT)
+                            features['perf_base'] || PerformanceNotifications::BinnedMetrics::DEFAULT_PERF_BASE,
+                            features['perf_unit'] || PerformanceNotifications::BinnedMetrics::DEFAULT_PERF_UNIT,
+                            features['perf_pct_base'] || PerformanceNotifications::BinnedMetrics::DEFAULT_PERF_PCT_BASE,
+                            features['perf_pct_unit'] || PerformanceNotifications::BinnedMetrics::DEFAULT_PERF_PCT_UNIT,
+                           )
       self.call_counts_metrics_period = features['call_counts_metrics_period']
       hd = features['heartbeat_delay'].to_i
       self.heartbeat_delay = hd if hd > 0

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.14.0'.freeze
+  VERSION = '1.14.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: java
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement