sqreen 1.21.0.beta1 → 1.21.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a6c95ab34d19ae0f769e475ae67c2c3e4d19b17582ee09d8a6d231ac3d9150
-  data.tar.gz: ad1ea7a80f3582ba90ffc6aa1cef7040459c56f65ea4712a023923b8bc7801e3
+  metadata.gz: e5b3d6fc37fd5d2431e622d302fd3f58d35dd64a3fc7abca741a84b213688025
+  data.tar.gz: a3443a3f1c95841af9deb7eb5f4a5ab8c47aabf6c6f42eeb902d828edd3ad91d
 SHA512:
-  metadata.gz: 0da6438f20a00a84914db2bb06c24feab53e164feae1cb7d2af0b53afe24c5d5ea54a0cb68a8872a49aadedae4450de57e63da6a4f4a2ec21ac85eaa84c13acf
-  data.tar.gz: 3e75918e810529674e10d693fd2a62c0eeeeecb18bac06a25fdd686d29c45d55333abb0feea790ec1d89e29ce71097bd1de16c2d31d98a6219e985d806793008
+  metadata.gz: 487d63ea8f4bc8c5d3da55dced0c8d458c6a6c7f218689027925d8f6ca2808fc4eda478e57ca67764edb8a049fb8fae60b552974ffa39dfaa0dcd15d31f34071
+  data.tar.gz: 23cf04763b76e95d421a36593c2b96d91aad0f40bc206fe8608606fad803a464d03518ac92b40e4c1bb667dbd163ba79c6380f605b1133270f65d66fb8314173

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.21.0.beta2
+
+* Improve transport and tracing internals
+
+## 1.21.0.beta1
+
+* Add transport and tracing internals
+
 ## 1.20.1
 
 * Add fallback mechanisms when connecting to new Sqreen backend API domains

data/lib/sqreen/ecosystem.rb

@@ -2,8 +2,11 @@ require 'securerandom'
 require 'sqreen/ecosystem/module_registry'
 require 'sqreen/ecosystem/tracing/sampling_configuration'
 require 'sqreen/ecosystem/transaction_storage'
+require 'sqreen/ecosystem/tracing_broker'
 require 'sqreen/ecosystem/tracing_id_setup'
-require 'sqreen/ecosystem/module_api/tracing_push_down'
+require 'sqreen/ecosystem/module_api/message_producer'
+require 'sqreen/ecosystem/module_api/tracing_id_generation'
+require 'sqreen/ecosystem/module_api/tracing'
 
 module Sqreen
   # The API for the ecosystem client (together with the dispatch table)
@@ -14,8 +17,22 @@ module Sqreen
         register_modules(opts[:modules])
         @registry.init_all
 
-        @tracing_id_setup = TracingIdSetup.new(@registry)
+        # setup tracing generation
+        tracing_id_mods = @registry.module_subset(ModuleApi::TracingIdGeneration)
+        @tracing_id_setup = TracingIdSetup.new(tracing_id_mods)
         @tracing_id_setup.setup_modules
+
+        # configure tracing broker with the consumers (tracing modules)
+        tracing_modules = @registry.module_subset(ModuleApi::Tracing)
+        @tracing_broker = TracingBroker.new(tracing_modules)
+
+        # inject tracing broker in message producers
+        @registry.each_module(ModuleApi::MessageProducer) do |mod|
+          mod.tracing_broker = @tracing_broker
+        end
+      rescue ::Exception # rubocop:disable Lint/RescueException
+        # TODO: modules must be disabled at this point
+        raise
       end
 
       def reset
@@ -42,7 +59,7 @@ module Sqreen
       def configure_sampling(tracing_id_prefix, sampling_config)
         @tracing_id_setup.tracing_id_prefix = tracing_id_prefix
         built_samp_cfg = Tracing::SamplingConfiguration.new(sampling_config)
-        inject_sampling_config(built_samp_cfg)
+        @tracing_broker.sampling_configuration = built_samp_cfg
       end
 
       private
@@ -63,18 +80,17 @@ module Sqreen
 
         require_relative 'ecosystem/redis/redis_connection'
         register Redis::RedisConnection.new
+
+        require_relative 'ecosystem/tracing/modules/client'
+        register Tracing::Modules::Client.new
+
+        require_relative 'ecosystem/tracing/modules/server'
+        register Tracing::Modules::Server.new
       end
 
       def register(mod)
         @registry.register mod
       end
-
-      # @param [Sqreen::Ecosystem::SamplingConfiguration] config
-      def inject_sampling_config(config)
-        @registry.each_module(Sqreen::Ecosystem::ModuleApi::TracingPushDown) do |mod|
-          mod.sampling_config = config
-        end
-      end
     end
   end
 end

data/lib/sqreen/ecosystem/exception_reporting.rb

@@ -0,0 +1,26 @@
+require 'sqreen/ecosystem/dispatch_table'
+require 'sqreen/ecosystem/loggable'
+require 'sqreen/kit/signals/specialized/sqreen_exception'
+
+module Sqreen
+  module Ecosystem
+    module ExceptionReporting
+      include Loggable
+
+      private
+
+      # @param [String] message
+      # @param [Exception] e
+      def report_exception(message, e)
+        logger.warn { "#{message}: #{e.message}" }
+        logger.debug { e.backtrace.map { |x| "  #{x}" }.join("\n") }
+
+        signal = Sqreen::Kit::Signals::Specialized::SqreenException.new(
+          ruby_exception: e
+        )
+
+        DispatchTable.consume_signal signal
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/http/net_http.rb

@@ -1,20 +1,24 @@
 require 'sqreen/ecosystem/module_api'
 require 'sqreen/ecosystem/module_api/instrumentation'
-require 'sqreen/ecosystem/module_api/tracing_push_down'
-require 'sqreen/ecosystem/module_api/signal_producer'
-require 'sqreen/ecosystem/module_api/transaction_storage'
-require 'sqreen/ecosystem/tracing/signals/tracing_client'
+require 'sqreen/ecosystem/module_api/message_producer'
+require 'sqreen/ecosystem/module_api/tracing_id_generation'
+require 'sqreen/ecosystem/module_api/tracing/client_data'
 
 module Sqreen
   module Ecosystem
     module Http
       class NetHttp
+        class HttpConnectionData
+          include ModuleApi::Tracing::ClientData
+        end
+
         include ModuleApi::Instrumentation
-        include ModuleApi::SignalProducer
-        include ModuleApi::TracingPushDown
+        include ModuleApi::MessageProducer
+        include ModuleApi::TracingIdGeneration
 
         def setup
-          instrument 'Net::HTTP#request', before: method(:before_advice)
+          advice = wrap_for_interest(HttpConnectionData, &method(:before_advice))
+          instrument 'Net::HTTP#request', before: advice
         end
 
         private
@@ -22,28 +26,23 @@ module Sqreen
         # instr. def request(req, body = nil, &block)  # :yield: +response+
         # req is of type +Net::HTTPGenericRequest+
         def before_advice(call, _ball)
-          return unless should_sample?('client')
-
           tracing_id = create_tracing_id
 
           # build & submit signal
           host = call.instance.address
           port = call.instance.port
 
+          # add tracing header
+          req = call.args[0]
+          req[ModuleApi::TRACE_ID_HEADER] = tracing_id
+
           host += ':' + port.to_s if port != 80 && port != 443
 
-          signal = Tracing::Signals::TracingClient.new
-          signal.payload = Tracing::Signals::TracingClient::Payload.new(
+          HttpConnectionData.new(
             transport: 'http',
             host: host,
             tracing_identifier: tracing_id
           )
-
-          submit_signal signal
-
-          # add tracing header, if available
-          req = call.args[0]
-          req[ModuleApi::TRACE_ID_HEADER] = tracing_id
         end
       end
     end

data/lib/sqreen/ecosystem/http/rack_request.rb

@@ -1,36 +1,37 @@
 require 'sqreen/ecosystem/module_api'
 require 'sqreen/ecosystem/module_api/event_listener'
-require 'sqreen/ecosystem/module_api/signal_producer'
-require 'sqreen/ecosystem/module_api/tracing_push_down'
-require 'sqreen/ecosystem/tracing/signals/tracing_server'
+require 'sqreen/ecosystem/module_api/message_producer'
+require 'sqreen/ecosystem/module_api/tracing/server_data'
 
 module Sqreen
   module Ecosystem
     module Http
       class RackRequest
+        class HttpServerData
+          include ModuleApi::Tracing::ServerData
+        end
+
         include ModuleApi::EventListener
-        include ModuleApi::TracingPushDown
-        include ModuleApi::SignalProducer
+        include ModuleApi::MessageProducer
 
         def setup
-          on_request_start(&method(:handle_request))
+          advice = wrap_for_interest(
+            ModuleApi::Tracing::ServerData,
+            &method(:handle_request)
+          )
+          on_request_start(&advice)
         end
 
         private
 
         def handle_request(rack_request)
-          return unless should_sample?('server')
-
           trace_id = rack_request.env[ModuleApi::TRACE_ID_ENV_KEY]
 
-          signal = Tracing::Signals::TracingServer.new
-          signal.payload = Tracing::Signals::TracingServer::Payload.new(
+          HttpServerData.new(
             transport: 'http',
             client_ip: rack_request.ip,
             tracing_identifier: trace_id
           )
-
-          submit_signal signal
         end
       end
     end

data/lib/sqreen/ecosystem/module_api/message_producer.rb

@@ -0,0 +1,51 @@
+require 'sqreen/ecosystem/loggable'
+
+module Sqreen
+  module Ecosystem
+    module ModuleApi
+      module MessageProducer
+        include Loggable
+
+        # method for ecosystem to inject the config
+        # @param [Sqreen::Ecosystem::TracingBroker]
+        attr_writer :tracing_broker
+
+        private
+
+        def determine_interest(type, hints = {})
+          @tracing_broker.interested_consumers(type, hints)
+        end
+
+        def publish(data, interested)
+          @tracing_broker.publish(data, interested)
+        end
+
+        # Convenience wrapper.
+        # Wraps a callback, skipping it if there is no interest in the type
+        # produced and submitting the return value as a message to the
+        # tracing broker
+        def wrap_for_interest(type, gen_hints = nil, &block)
+          raise ArgumentError, 'no block passed' if block.nil?
+
+          proc do |*args|
+            hints = gen_hints[*args] if gen_hints
+            interested = determine_interest(type, hints || {})
+
+            unless interested
+              logger.debug { "No interested consumers in #{type}" }
+              next
+            end
+
+            res = block[*args]
+
+            next if res.nil?
+
+            raise 'unexpected return type' unless res.is_a?(type)
+
+            @tracing_broker.publish(res, interested)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/module_api/signal_producer.rb

@@ -1,13 +1,11 @@
 require 'sqreen/ecosystem/dispatch_table'
-require 'sqreen/ecosystem/module_api/transaction_storage'
 
 module Sqreen
   module Ecosystem
     module ModuleApi
       module SignalProducer
-        include TransactionStorage
-
         # for injection
+        # callable taking no arguments and generating a tracing id
         attr_writer :tracing_id_producer
 
         private

data/lib/sqreen/ecosystem/module_api/tracing.rb

@@ -0,0 +1,45 @@
+require 'sqreen/ecosystem/module_api/signal_producer'
+
+module Sqreen
+  module Ecosystem
+    module ModuleApi
+      module Tracing
+        include SignalProducer
+
+        def self.included(mod)
+          mod.extend(ClassMethods)
+        end
+
+        module ClassMethods
+          private
+
+          # @param [Module] type The type the including module is interested in
+          def consumes(type)
+            @consumes = type
+          end
+
+          # A fixed (non-virtual) scope for this tracing module
+          # @param [String] scope
+          def fixed_scope(scope)
+            @fixed_scope = scope
+          end
+        end
+
+        def consumed_type
+          self.class.instance_variable_get(:@consumes) \
+            || raise('@consumes not specified')
+        end
+
+        def scope(_hints = {})
+          self.class.instance_variable_get(:@fixed_scope) \
+            || raise('@fixed_scope not set')
+        end
+
+        # including class must implement it
+        def receive(_data)
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/module_api/tracing/client_data.rb

@@ -0,0 +1,31 @@
+require 'sqreen/ecosystem/util/call_writers_from_init'
+
+module Sqreen
+  module Ecosystem
+    module ModuleApi
+      module Tracing
+        # The data the tracing module needs in order to populate
+        # +Sqreen::Ecosystem::Tracing::Signals::TracingClient::Payload+
+        #
+        # Signals are not produced by the data producers (transport)
+        # because of superior orders, as the only current use of this
+        # data is to generate signals.
+        module ClientData
+          include Util::CallWritersFromInit
+
+          # @return [Symbol]
+          attr_accessor :transport
+
+          # @return [String]
+          attr_accessor :host
+
+          # @return [String]
+          attr_accessor :ip
+
+          # @return [String]
+          attr_accessor :tracing_identifier
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/module_api/tracing/server_data.rb

@@ -0,0 +1,27 @@
+require 'sqreen/ecosystem/util/call_writers_from_init'
+
+module Sqreen
+  module Ecosystem
+    module ModuleApi
+      module Tracing
+        # The data the tracing module needs in order to populate
+        # +Sqreen::Ecosystem::Tracing::Signals::TracingServer::Payload+
+        module ServerData
+          include Util::CallWritersFromInit
+
+          # @return [Symbol]
+          attr_accessor :transport
+
+          # @return [String]
+          attr_accessor :client_ip
+
+          # @return [Array<String>]
+          attr_accessor :previous_hops
+
+          # @return [String]
+          attr_accessor :tracing_identifier
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/module_api/tracing_id_generation.rb

@@ -0,0 +1,16 @@
+module Sqreen
+  module Ecosystem
+    module ModuleApi
+      module TracingIdGeneration
+        # for injection
+        attr_writer :tracing_id_producer
+
+        private
+
+        def create_tracing_id
+          @tracing_id_producer.call
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/module_registry.rb

@@ -16,6 +16,7 @@ module Sqreen
       def init_all
         logger.info { "Initializing #{@mods.size} ecosystem modules" }
         each_module do |mod|
+          next unless mod.respond_to? :setup
           logger.debug { "Initializing module with type #{mod.class}" }
           mod.setup
         end
@@ -34,6 +35,10 @@ module Sqreen
           selected_mods.each
         end
       end
+
+      def module_subset(type)
+        each_module(type).to_a
+      end
     end
   end
 end

data/lib/sqreen/ecosystem/redis/redis_connection.rb

@@ -1,33 +1,41 @@
-require 'sqreen/ecosystem/tracing/signals/tracing_client'
-require 'sqreen/ecosystem/module_api/signal_producer'
+require 'sqreen/ecosystem/module_api'
+require 'sqreen/ecosystem/module_api/instrumentation'
+require 'sqreen/ecosystem/module_api/message_producer'
+require 'sqreen/ecosystem/module_api/tracing_id_generation'
+require 'sqreen/ecosystem/module_api/tracing/client_data'
 
 module Sqreen
   module Ecosystem
     module Redis
       class RedisConnection
-        include ModuleApi::SignalProducer
-        include ModuleApi::TracingPushDown
+        class RedisConnectionData
+          include ModuleApi::Tracing::ClientData
+
+          attr_accessor :port
+        end
+
         include ModuleApi::Instrumentation
+        include ModuleApi::MessageProducer
+        include ModuleApi::TracingIdGeneration
 
         def setup
+          advice = wrap_for_interest(ModuleApi::Tracing::ClientData, &method(:before_advice))
           instrument 'Redis::Connection::TCPSocket#connect',
-                     before: method(:before_advice)
+                     before: advice
         end
 
         private
 
         def before_advice
-          return unless should_sample?('client')
-
           host = call.args[0]
           port = call.args[1]
 
-          signal = Sqreen::Kit::Signals::Specialized::TracingClient.new
-          signal.payload = Sqreen::Kit::Signals::Specialized::TracingClient::Payload.new(
+          RedisConnectionData.new(
             transport: 'redis',
-            host: host, port: port
+            host: host,
+            port: port,
+            tracing_identifier: create_tracing_id
           )
-          submit_signal signal
         end
       end
     end

data/lib/sqreen/ecosystem/tracing/modules/client.rb

@@ -0,0 +1,31 @@
+require 'sqreen/ecosystem/tracing/signals/tracing_client'
+require 'sqreen/ecosystem/module_api/tracing'
+require 'sqreen/ecosystem/module_api/tracing/client_data'
+
+module Sqreen
+  module Ecosystem
+    module Tracing
+      module Modules
+        class Client
+          include ModuleApi::Tracing
+
+          consumes    ModuleApi::Tracing::ClientData
+          fixed_scope 'client'
+
+          # @param [Sqreen::Ecosystem::ModuleApi::Tracing::ClientData] data
+          def receive(data)
+            signal = Tracing::Signals::TracingClient.new
+            signal.payload = Tracing::Signals::TracingClient::Payload.new(
+              transport: data.transport,
+              host: data.host,
+              ip: data.ip,
+              tracing_identifier: data.tracing_identifier
+            )
+
+            submit_signal signal
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/tracing/modules/server.rb

@@ -0,0 +1,30 @@
+require 'sqreen/ecosystem/tracing/signals/tracing_server'
+require 'sqreen/ecosystem/module_api/tracing'
+require 'sqreen/ecosystem/module_api/tracing/server_data'
+
+module Sqreen
+  module Ecosystem
+    module Tracing
+      module Modules
+        class Server
+          include ModuleApi::Tracing
+
+          consumes    ModuleApi::Tracing::ServerData
+          fixed_scope 'server'
+
+          # @param [Sqreen::Ecosystem::ModuleApi::Tracing::ServerData] data
+          def receive(data)
+            signal = Tracing::Signals::TracingServer.new
+            signal.payload = Tracing::Signals::TracingServer::Payload.new(
+              transport: data.transport,
+              client_ip: data.client_ip,
+              tracing_identifier: data.tracing_identifier
+            )
+
+            submit_signal signal
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/tracing_broker.rb

@@ -0,0 +1,101 @@
+require 'sqreen/ecosystem/loggable'
+require 'sqreen/ecosystem/exception_reporting'
+
+module Sqreen
+  module Ecosystem
+    class TracingBroker
+      include Loggable
+      include ExceptionReporting
+
+      # Stores a lookup resolution so that lookup (incl. sampling) is done
+      # only once, not in the beginning of the producer code (when it asks
+      # whether it should proceed) and again once it delivers the data
+      ObserverLookup = Struct.new(:modules)
+
+      # @return [Sqreen::Ecosystem::Tracing::SamplingConfiguration]
+      attr_writer :sampling_configuration
+
+      # @param [Array<Sqreen::Ecosystem::ModuleApi::Tracing>] tracing_modules
+      def initialize(tracing_modules)
+        @sampling_configuration = nil
+        @type_to_subscribers = {}
+        tracing_modules.each do |mod|
+          consumed_type = mod.consumed_type
+          @type_to_subscribers[consumed_type] ||= []
+          @type_to_subscribers[consumed_type] << mod
+        end
+      end
+
+      # @param [Object] data
+      # @param [Sqreen::Ecosystem::TracingBroker::ObserverLookup] prev_lookup
+      def publish(data, prev_lookup)
+        prev_lookup.modules.each do |mod|
+          mod_process_data mod, data
+        end
+      end
+
+      # @param [Module] data_type
+      # @param [Hash] _hints reserved for future use, e.g. virtual scopes
+      # @return [Sqreen::Ecosystem::TracingBroker::ObserverLookup]
+      def interested_consumers(data_type, _hints = {})
+        unless @sampling_configuration
+          logger.debug do
+            "Declaring no one is interested in #{data_type} " \
+            "because tracing hasn't been enabled yet"
+          end
+          return false
+        end
+
+        # if we have several modules with the same scope, we
+        # should ask whether we should sample only once
+        scope_to_should_sample = Hash.new do |hash, scope|
+          result = @sampling_configuration.should_sample?(scope)
+          if result
+            logger.debug { "Will sample scope #{scope}. Sampling line: #{result}" }
+          else
+            logger.debug { "Will NOT sample scope #{scope}" }
+          end
+
+          hash[scope] = result
+        end
+
+        res = subscribers(data_type).select do |mod|
+          scope_to_should_sample[mod.scope]
+        end
+
+        res.empty? ? false : ObserverLookup.new(res)
+      end
+
+      private
+
+      # @param [Sqreen::Ecosystem::ModuleApi::Tracing] mod
+      def mod_process_data(mod, data)
+        mod.receive(data)
+      rescue ::Exception => e # rubocop:disable Lint/RescueException
+        report_exception("Error invoking tracing module #{mod}", e)
+      end
+
+      # @param [Module] data_type
+      # @return Array<Sqreen::Ecosystem::ModuleApi::Tracing>
+      def subscribers(data_type)
+        subscribers = @type_to_subscribers[data_type]
+
+        # None of the modules subscribes to data_type directly,
+        # but maybe they subscribe to one of the ancestors
+        # Cache this lookup
+        unless subscribers
+          subscribers = parents(data_type).inject([]) do |accum, type|
+            accum + (@type_to_subscribers[type] || [])
+          end
+          @type_to_subscribers[data_type] = subscribers
+        end
+
+        subscribers
+      end
+
+      def parents(type)
+        type.ancestors - Object.ancestors - [type]
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem/tracing_id_setup.rb

@@ -5,9 +5,9 @@ require 'sqreen/ecosystem/module_api/signal_producer'
 module Sqreen
   module Ecosystem
     class TracingIdSetup
-      # @param [Sqreen::Ecosystem::ModuleRegistry] registry
-      def initialize(registry)
-        @registry = registry
+      # @param [Array<Sqreen::Ecosystem::ModuleApi::SignalProducer>] signal_producer_modules
+      def initialize(signal_producer_modules)
+        @modules = signal_producer_modules
         @tracing_id_prefix = nil
       end
 
@@ -20,7 +20,7 @@ module Sqreen
       private
 
       def inject_out_of_tx_tracing_id_gen
-        @registry.each_module(Sqreen::Ecosystem::ModuleApi::SignalProducer) do |mod|
+        @modules.each do |mod|
           mod.tracing_id_producer = method(:generate_tracing_id)
         end
       end

data/lib/sqreen/ecosystem/util/call_writers_from_init.rb

@@ -0,0 +1,13 @@
+module Sqreen
+  module Ecosystem
+    module Util
+      module CallWritersFromInit
+        def initialize(values = {})
+          values.each do |attr, val|
+            public_send("#{attr}=", val)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sqreen/ecosystem_integration.rb

@@ -21,15 +21,20 @@ module Sqreen
       @framework = framework
       @queue = queue
       @request_lifecycle = RequestLifecycleTracking.new
+      @online = false
     end
 
     def init
+      raise 'already initialized' if @online
+
       setup_dispatch_table
       Ecosystem.init
       logger.info 'Ecosystem successfully initialized'
+      @online = true
     rescue ::Exception => e # rubocop:disable Lint/RescueException
       logger.warn { "Error initializing Ecosystem: #{e.message}" }
       logger.debug { e.backtrace.map { |x| "  #{x}" }.join("\n") }
+      Sqreen::RemoteException.record(e)
     end
 
     def disable
@@ -37,15 +42,21 @@ module Sqreen
     end
 
     def request_start(rack_request)
+      return unless @online
+
       Ecosystem.start_transaction
       @request_lifecycle.notify_request_start(rack_request)
     end
 
     def request_end
+      return unless @online
+
       Ecosystem.end_transaction
     end
 
     def handle_tracing_command(trace_id_prefix, scopes_config)
+      return unless @online
+
       Ecosystem.configure_sampling(trace_id_prefix, scopes_config)
     end
 

data/lib/sqreen/ecosystem_integration/request_lifecycle_tracking.rb

@@ -1,3 +1,4 @@
+require 'sqreen/events/remote_exception'
 require 'sqreen/log/loggable'
 
 module Sqreen
@@ -44,6 +45,7 @@ module Sqreen
             cb.call(rack_req)
           rescue ::Exception => e # rubocop:disable Lint/RescueException
             logger.warn { "Error calling #{cb} on request start: #{e.message}" }
+            Sqreen::RemoteException.record(e)
           end
         end
       end

data/lib/sqreen/version.rb

@@ -4,5 +4,5 @@
 # Please refer to our terms for more information: https://www.sqreen.com/terms.html
 
 module Sqreen
-  VERSION = '1.21.0.beta1'.freeze
+  VERSION = '1.21.0.beta2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.21.0.beta1
+  version: 1.21.0.beta2
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqreen-backport
@@ -124,23 +124,32 @@ files:
 - lib/sqreen/dependency/sinatra.rb
 - lib/sqreen/ecosystem.rb
 - lib/sqreen/ecosystem/dispatch_table.rb
+- lib/sqreen/ecosystem/exception_reporting.rb
 - lib/sqreen/ecosystem/http/net_http.rb
 - lib/sqreen/ecosystem/http/rack_request.rb
 - lib/sqreen/ecosystem/loggable.rb
 - lib/sqreen/ecosystem/module_api.rb
 - lib/sqreen/ecosystem/module_api/event_listener.rb
 - lib/sqreen/ecosystem/module_api/instrumentation.rb
+- lib/sqreen/ecosystem/module_api/message_producer.rb
 - lib/sqreen/ecosystem/module_api/signal_producer.rb
-- lib/sqreen/ecosystem/module_api/tracing_push_down.rb
+- lib/sqreen/ecosystem/module_api/tracing.rb
+- lib/sqreen/ecosystem/module_api/tracing/client_data.rb
+- lib/sqreen/ecosystem/module_api/tracing/server_data.rb
+- lib/sqreen/ecosystem/module_api/tracing_id_generation.rb
 - lib/sqreen/ecosystem/module_api/transaction_storage.rb
 - lib/sqreen/ecosystem/module_registry.rb
 - lib/sqreen/ecosystem/redis/redis_connection.rb
+- lib/sqreen/ecosystem/tracing/modules/client.rb
+- lib/sqreen/ecosystem/tracing/modules/server.rb
 - lib/sqreen/ecosystem/tracing/sampler.rb
 - lib/sqreen/ecosystem/tracing/sampling_configuration.rb
 - lib/sqreen/ecosystem/tracing/signals/tracing_client.rb
 - lib/sqreen/ecosystem/tracing/signals/tracing_server.rb
+- lib/sqreen/ecosystem/tracing_broker.rb
 - lib/sqreen/ecosystem/tracing_id_setup.rb
 - lib/sqreen/ecosystem/transaction_storage.rb
+- lib/sqreen/ecosystem/util/call_writers_from_init.rb
 - lib/sqreen/ecosystem_integration.rb
 - lib/sqreen/ecosystem_integration/around_callbacks.rb
 - lib/sqreen/ecosystem_integration/instrumentation_service.rb

data/lib/sqreen/ecosystem/module_api/tracing_push_down.rb

@@ -1,34 +0,0 @@
-require 'sqreen/ecosystem/loggable'
-require 'sqreen/ecosystem/tracing/sampling_configuration'
-
-module Sqreen
-  module Ecosystem
-    module ModuleApi
-      module TracingPushDown
-        include Loggable
-
-        # method for ecosystem to inject the config
-        # @param [Sqreen::Ecosystem::SamplingConfiguration]
-        attr_writer :sampling_config
-
-        private
-
-        def should_sample?(scope)
-          unless @sampling_config
-            logger.debug { "Scope #{scope} is disabled because tracing hasn't been enabled yet" }
-            return
-          end
-
-          result = @sampling_config.should_sample?(scope)
-          if result
-            logger.debug { "Will sample scope #{scope}. Sampling line: #{result}" }
-          else
-            logger.debug { "Will NOT sample scope #{scope}" }
-          end
-
-          result
-        end
-      end
-    end
-  end
-end