sqreen 1.21.0.beta3-java → 1.21.0-java

data/lib/sqreen/ecosystem/tracing/signals/tracing_producer.rb

@@ -0,0 +1,56 @@
+require 'sqreen/kit/configuration'
+require 'sqreen/kit/signals/point'
+require 'sqreen/kit/signals/dto_helper'
+
+# reference: https://github.com/sqreen/SignalsSchemas/blob/master/schemas/payload/tracing/producer-2020-04-21/schema.cue
+
+module Sqreen
+  module Ecosystem
+    module Tracing
+      module Signals
+      end
+    end
+  end
+end
+
+class Sqreen::Ecosystem::Tracing::Signals::TracingProducer < Sqreen::Kit::Signals::Point
+  readonly_attrs :payload_schema, :source, :signal_name
+
+  def initialize(values = {})
+    self.payload_schema = Payload::SCHEMA_VERSION
+    self.source = Sqreen::Kit::Configuration.default_source
+    self.signal_name = 'tracing.producer'
+    self.time = values[:time] || Time.now
+    super
+  end
+
+  def payload=(payload)
+    unless payload.is_a?(Payload)
+      raise ArgumentError, "Payload should be a #{Payload}"
+    end
+    super
+  end
+
+  class Payload
+    include Sqreen::Kit::Signals::DtoHelper
+
+    add_mandatory_attrs :message_type, :host, :tracing_identifier
+
+    SCHEMA_VERSION = 'tracing/producer-2020-04-21'.freeze
+
+    # @return [Symbol]
+    attr_accessor :message_type
+
+    # @return [String]
+    attr_accessor :host
+
+    # @return [String]
+    attr_accessor :ip
+
+    # @return [String]
+    attr_accessor :topic
+
+    # @return [String]
+    attr_accessor :tracing_identifier
+  end
+end

data/lib/sqreen/ecosystem_integration.rb

@@ -1,8 +1,6 @@
 require 'sqreen/log/loggable'
-require 'sqreen/metrics_store'
 require 'sqreen/ecosystem'
 require 'sqreen/ecosystem/dispatch_table'
-require 'sqreen/ecosystem_integration/around_callbacks'
 require 'sqreen/ecosystem_integration/instrumentation_service'
 require 'sqreen/ecosystem_integration/request_lifecycle_tracking'
 require 'sqreen/ecosystem_integration/signal_consumption'
@@ -19,12 +17,9 @@ module Sqreen
     include Sqreen::Log::Loggable
 
     # @param [Sqreen::Framework] framework
-    # @param [Proc] create_binning_metric
-    def initialize(framework, queue, create_binning_metric)
+    def initialize(framework, queue)
       @framework = framework
       @queue = queue
-      # XXX: created metrics are insulated from feature upgrades
-      @create_binning_metric = create_binning_metric
       @request_lifecycle = RequestLifecycleTracking.new
       @online = false
     end
@@ -33,7 +28,6 @@ module Sqreen
       raise 'already initialized' if @online
 
       setup_dispatch_table
-      AroundCallbacks.create_metric = @create_binning_metric
       Ecosystem.init
       logger.info 'Ecosystem successfully initialized'
       @online = true

data/lib/sqreen/ecosystem_integration/around_callbacks.rb

@@ -1,8 +1,6 @@
-require 'sqreen/metrics_store'
 require 'sqreen/log/loggable'
 require 'sqreen/events/remote_exception'
 require 'sqreen/mono_time'
-require 'sqreen/graft/call'
 
 module Sqreen
   class EcosystemIntegration
@@ -10,32 +8,27 @@ module Sqreen
       class << self
         include Log::Loggable::ClassMethods
 
-        # @return [Proc]
-        attr_accessor :create_metric
-
         # for instrumentation hooks
-        # instrumentation hooks already handle budgets/metrics
+        # instrumentation hooks already handle budgets, so nothing
+        # to do in that respect
         def wrap_instrumentation_hook(module_name, action, callable)
-          # make tag similar to that of rules
-          # TODO: move to structured tags to avoid silly string manips
-          action_for_metric = if %w[pre post failing finally].include?(action)
-                                action
-                              else
-                                'pre'
-                              end
-          metric_name = "sq.ecosystem_#{module_name}.#{action_for_metric}"
-          create_metric.call(metric_name)
+          perf_notif_name = "ecosystem_#{module_name}"
 
           Proc.new do |*args|
             begin
+              start = Sqreen.time
               callable.call(*args)
             rescue ::Exception => e # rubocop:disable Lint/RescueException
               # 2) rescue exceptions
               logger.warn { "Error in #{module_name}:#{action}: #{e.message}" }
               logger.debug { e.backtrace.map { |x| "  #{x}" }.join("\n") }
               Sqreen::RemoteException.record(e)
-            end # end begin
-          end # end proc
+            ensure
+              # 3) contribute to performance metrics
+              stop = Sqreen.time
+              Sqreen::PerformanceNotifications.notify(perf_notif_name, action, start, stop)
+            end # end proc
+          end # end begin
         end
 
         # XXX: not used yet
@@ -43,8 +36,6 @@ module Sqreen
           timer_name = "ecosystem:#{module_name}@#{action}"
           perf_notif_name = "ecosystem_#{module_name}"
 
-          # XXX: register metric
-
           Proc.new do |*args|
             begin
               req_storage = Thread.current[:sqreen_http_request]
@@ -85,7 +76,6 @@ module Sqreen
               if timer
                 req_timer.include_measurements(timer) if req_timer
 
-                # XXX: PerformanceNotifications is used no more
                 Sqreen::PerformanceNotifications.notify(
                   perf_notif_name, action, *timer.start_and_end
                 )

data/lib/sqreen/ecosystem_integration/instrumentation_service.rb

@@ -12,26 +12,22 @@ module Sqreen
           hook = Sqreen::Graft::Hook[method].add do
             if spec[:before]
               cb = AroundCallbacks.wrap_instrumentation_hook(module_name, 'pre', spec[:before])
-              tag = "weave,rule=ecosystem_#{module_name}"
-              before(tag, flow: true, &cb)
+              before(nil, flow: true, &cb)
             end
 
             if spec[:after]
               cb = AroundCallbacks.wrap_instrumentation_hook(module_name, 'post', spec[:after])
-              tag = "weave,rule=ecosystem_#{module_name}"
-              after(tag, flow: true, &cb)
+              after(nil, flow: true, &cb)
             end
 
             if spec[:raised]
               cb = AroundCallbacks.wrap_instrumentation_hook(module_name, 'failing', spec[:raised])
-              tag = "weave,rule=ecosystem_#{module_name}"
-              raised(tag, flow: true, &cb)
+              raised(nil, flow: true, &cb)
             end
 
             if spec[:ensured]
               cb = AroundCallbacks.wrap_instrumentation_hook(module_name, 'finally', spec[:ensured])
-              tag = "weave,rule=ecosystem_#{module_name}"
-              ensured(tag, flow: true, &cb)
+              ensured(nil, flow: true, &cb)
             end
           end
           hook.install

data/lib/sqreen/graft/call.rb

@@ -27,10 +27,6 @@ module Sqreen
       def raise(value)
         Flow.raise(value)
       end
-
-      def noop
-        Flow.noop
-      end
     end
 
     class Flow
@@ -50,17 +46,12 @@ module Sqreen
         def raise(value)
           new(:raise, value)
         end
-
-        def noop
-          new(:noop, nil)
-        end
       end
 
       def initialize(action, value, brk = false)
         @action = action
         @value = value
         @break = brk
-        @passed_conditions = false
       end
 
       def return?
@@ -100,16 +91,6 @@ module Sqreen
       def break?
         @break ? true : false
       end
-
-      def passed_conditions!
-        @passed_conditions = true
-
-        self
-      end
-
-      def passed_conditions?
-        @passed_conditions
-      end
     end
 
     class TimerError < StandardError; end
@@ -120,7 +101,6 @@ module Sqreen
       end
 
       attr_reader :tag, :size
-      attr_accessor :conditions_passed
 
       def initialize(tag, &block)
         @tag = tag
@@ -225,7 +205,7 @@ module Sqreen
       end
 
       def to_s
-        "#{@tag}: time=%.03fus" % (@tally * 1_000_000)
+        "#{@tag}: time=%.03fus" % (duration * 1_000_000)
       end
 
       protected

data/lib/sqreen/graft/hook.rb

@@ -7,8 +7,6 @@ require 'sqreen/graft'
 require 'sqreen/graft/call'
 require 'sqreen/graft/callback'
 require 'sqreen/graft/hook_point'
-require 'sqreen/weave'
-require 'sqreen/runner' # Sqreen.queue
 
 module Sqreen
   module Graft
@@ -138,13 +136,6 @@ module Sqreen
             request[:timed_callbacks] << t if request[:timed_level] >= 1
           end
         end
-        # very hacky, but the non-local control flow with throw-catch
-        # makes the solution non-obvious. needs to be revisited
-        conditions_passed_proc = proc do
-          if (request = Thread.current[:sqreen_http_request])
-            request[:timed_callbacks].last.conditions_passed = true
-          end
-        end
 
         Proc.new do |*args, &block|
           request = Thread.current[:sqreen_http_request]
@@ -192,15 +183,18 @@ module Sqreen
             # budget implies request
             # TODO: make budget depend on a generic context (currently "request")
             budget = request[:time_budget] if request
-            if request && (budget || request[:timed_level] >= 1)
+            if budget
+              budget_threshold = request[:time_budget_threshold]
+              budget_ratio = request[:time_budget_ratio]
               sqreen_timer = request[:sqreen_timer]
+              request_timer = request[:request_timer]
             end
 
             hooked_call = HookedCall.new(self, args)
 
             begin
               begin
-                sqreen_timer.start if sqreen_timer
+                sqreen_timer.start if budget
                 Thread.current[:sqreen_hook_entered] = true
 
                 # TODO: make Call have #ball to throw by cb
@@ -212,34 +206,34 @@ module Sqreen
                 # TODO: TimedHookCall TimedCallbackCall
                 # TODO: TimeBoundHookCall TimeBoundCallbackCall TimeBoundFlow?
 
+                request_elapsed = request_timer.elapsed if budget
+
                 hook.before.each do |c|
                   next if c.ignore && c.ignore.call
 
-                  if budget && !c.mandatory && request[:time_budget_expended]
-                    request[:skipped_callbacks] << c
-                    next
+                  if budget && !c.mandatory
+                    sqreen_elapsed = sqreen_timer.elapsed
+                    if budget_ratio && !request[:time_budget_expended]
+                      fixed_budget = budget_threshold
+                      proportional_budget = (request_elapsed - sqreen_elapsed) * budget_ratio
+                      remaining = (fixed_budget > proportional_budget ? fixed_budget : proportional_budget) - sqreen_elapsed
+                    else
+                      remaining = budget_threshold - sqreen_elapsed
+                    end
+                    unless remaining > 0
+                      request[:skipped_callbacks] << c
+                      request[:time_budget_expended] = true
+                      next
+                    end
                   end
 
-                  remaining = budget - sqreen_timer.elapsed if budget
-
-                  timer = nil
                   flow = catch(Ball.new) do |ball|
-                    timer = Timer.new(c.name, &timed_callbacks_proc)
-                    timer.measure(ignore: chrono) do
+                    Timer.new(c.name, &timed_callbacks_proc).measure(ignore: chrono) do
                       c.call(CallbackCall.new(c, remaining, hooked_call.instance, hooked_call.args_passed), ball)
                     end
                   end
 
-                  if budget && timer
-                    remaining -= timer.duration
-                    if remaining < 0.0
-                      request[:time_budget_expended]
-                      request[:overtime_cb] = c.name
-                    end
-                  end
-
                   next unless c.flow && flow.is_a?(Flow)
-                  conditions_passed_proc[] if flow.passed_conditions?
                   hooked_call.raise = flow.raise and hooked_call.raising = true if flow.raise?
                   hooked_call.args_pass = flow.args and hooked_call.args_passing = true if flow.args?
                   hooked_call.return = flow.return and hooked_call.returning = true if flow.return?
@@ -254,7 +248,7 @@ module Sqreen
               return hooked_call.return if hooked_call.returning
             ensure
               Thread.current[:sqreen_hook_entered] = false
-              sqreen_timer.stop if sqreen_timer
+              sqreen_timer.stop if budget
             end unless hook.before.empty?
 
             begin
@@ -267,41 +261,41 @@ module Sqreen
               end
             rescue ::Exception => e # rubocop:disable Lint/RescueException
               begin
-                sqreen_timer.start if sqreen_timer
+                sqreen_timer.start if budget
                 Thread.current[:sqreen_hook_entered] = true
                 hooked_call.raised = e
 
                 logger.debug { "[#{Process.pid}] Hook #{hook.point} disabled:#{hook.disabled?} exception:#{e}" } if logger_debug
                 raise if hook.raised.empty?
 
+                request_elapsed = request_timer.elapsed if budget
+
                 hook.raised.each do |c|
                   next if c.ignore && c.ignore.call
 
-                  if budget && !c.mandatory && request[:time_budget_expended]
-                    request[:skipped_callbacks] << c
-                    next
+                  if budget && !c.mandatory
+                    sqreen_elapsed = sqreen_timer.elapsed
+                    if budget_ratio && !request[:time_budget_expended]
+                      fixed_budget = budget_threshold
+                      proportional_budget = (request_elapsed - sqreen_elapsed) * budget_ratio
+                      remaining = (fixed_budget > proportional_budget ? fixed_budget : proportional_budget) - sqreen_elapsed
+                    else
+                      remaining = budget_threshold - sqreen_elapsed
+                    end
+                    unless remaining > 0
+                      request[:skipped_callbacks] << c
+                      request[:time_budget_expended] = true
+                      next
+                    end
                   end
 
-                  remaining = budget - sqreen_timer.elapsed if budget
-
-                  timer = nil
                   flow = catch(Ball.new) do |ball|
-                    timer = Timer.new(c.name, &timed_callbacks_proc)
-                    timer.measure(ignore: chrono) do
+                    Timer.new(c.name, &timed_callbacks_proc).measure(ignore: chrono) do
                       c.call(CallbackCall.new(c, remaining, hooked_call.instance, hooked_call.args_passing ? hooked_call.args_pass : hooked_call.args_passed, hooked_call.raised), ball)
                     end
                   end
 
-                  if budget && timer
-                    remaining -= timer.duration
-                    if remaining < 0.0
-                      request[:time_budget_expended]
-                      request[:overtime_cb] = c.name
-                    end
-                  end
-
                   next unless c.flow && flow.is_a?(Flow)
-                  conditions_passed_proc[] if flow.passed_conditions?
                   hooked_call.raise = flow.raise and hooked_call.raising = true if flow.raise?
                   hooked_call.return = flow.return and hooked_call.returning = true if flow.return?
                   hooked_call.retrying = true if flow.retry?
@@ -318,40 +312,40 @@ module Sqreen
               raise
             else
               begin
-                sqreen_timer.start if sqreen_timer
+                sqreen_timer.start if budget
                 Thread.current[:sqreen_hook_entered] = true
 
                 # TODO: hooked_call.returning should be always false here?
                 return hooked_call.returning ? hooked_call.return : hooked_call.returned if hook.after.empty?
 
+                request_elapsed = request_timer.elapsed if budget
+
                 hook.after.each do |c|
                   next if c.ignore && c.ignore.call
 
-                  if budget && !c.mandatory && request[:time_budget_expended]
-                    request[:skipped_callbacks] << c
-                    next
+                  if budget && !c.mandatory
+                    sqreen_elapsed = sqreen_timer.elapsed
+                    if budget_ratio && !request[:time_budget_expended]
+                      fixed_budget = budget_threshold
+                      proportional_budget = (request_elapsed - sqreen_elapsed) * budget_ratio
+                      remaining = (fixed_budget > proportional_budget ? fixed_budget : proportional_budget) - sqreen_elapsed
+                    else
+                      remaining = budget_threshold - sqreen_elapsed
+                    end
+                    unless remaining > 0
+                      request[:skipped_callbacks] << c
+                      request[:time_budget_expended] = true
+                      next
+                    end
                   end
 
-                  remaining = budget - sqreen_timer.elapsed if budget
-
-                  timer = nil
                   flow = catch(Ball.new) do |ball|
-                    timer = Timer.new(c.name, &timed_callbacks_proc)
-                    timer.measure(ignore: chrono) do
+                    Timer.new(c.name, &timed_callbacks_proc).measure(ignore: chrono) do
                       c.call(CallbackCall.new(c, remaining, hooked_call.instance, hooked_call.args_passing ? hooked_call.args_pass : hooked_call.args_passed, nil, hooked_call.returned), ball)
                     end
                   end
 
-                  if budget && timer
-                    remaining -= timer.duration
-                    if remaining < 0.0
-                      request[:time_budget_expended]
-                      request[:overtime_cb] = c.name
-                    end
-                  end
-
                   next unless c.flow && flow.is_a?(Flow)
-                  conditions_passed_proc[] if flow.passed_conditions?
                   hooked_call.raise = flow.raise and hooked_call.raising = true if flow.raise?
                   hooked_call.return = flow.return and hooked_call.returning = true if flow.return?
                   break if flow.break?
@@ -379,38 +373,36 @@ module Sqreen
                 hook.ensured.each do |c|
                   next if c.ignore && c.ignore.call
 
-                  if budget && !c.mandatory && request[:time_budget_expended]
-                    request[:skipped_callbacks] << c
-                    next
+                  if budget && !c.mandatory
+                    sqreen_elapsed = sqreen_timer.elapsed
+                    if budget_ratio && !request[:time_budget_expended]
+                      fixed_budget = budget_threshold
+                      proportional_budget = (request_elapsed - sqreen_elapsed) * budget_ratio
+                      remaining = (fixed_budget > proportional_budget ? fixed_budget : proportional_budget) - sqreen_elapsed
+                    else
+                      remaining = budget_threshold - sqreen_elapsed
+                    end
+                    unless remaining > 0
+                      request[:skipped_callbacks] << c
+                      request[:time_budget_expended] = true
+                      next
+                    end
                   end
 
-                  remaining = budget - sqreen_timer.elapsed if budget
-
-                  timer = nil
                   flow = catch(Ball.new) do |ball|
-                    timer = Timer.new(c.name, &timed_callbacks_proc)
-                    timer.measure(ignore: chrono) do
+                    Timer.new(c.name, &timed_callbacks_proc).measure(ignore: chrono) do
                       c.call(CallbackCall.new(c, remaining, hooked_call.instance, hooked_call.args_passing ? hooked_call.args_pass : hooked_call.args_passed, nil, hooked_call.returned), ball)
                     end
                   end
 
-                  if budget && timer
-                    remaining -= timer.duration
-                    if remaining < 0.0
-                      request[:time_budget_expended]
-                      request[:overtime_cb] = c.name
-                    end
-                  end
-
                   next unless c.flow && flow.is_a?(Flow)
-                  conditions_passed_proc[] if flow.passed_conditions?
                   hooked_call.raise = flow.raise and hooked_call.raising = true if flow.raise?
                   hooked_call.return = flow.return and hooked_call.returning = true if flow.return?
                   break if flow.break?
                 end unless hook.ensured.empty? || hook.disabled?
 
                 Thread.current[:sqreen_hook_entered] = false
-                sqreen_timer.stop if sqreen_timer
+                sqreen_timer.stop if budget
               rescue StandardError => e
                 Sqreen::Weave.logger.debug { "exception:#{e.class} message:'#{e.message}' location:\"#{e.backtrace[0]}\"" }
                 Sqreen::RemoteException.record(e) if Sqreen.queue