sqreen 1.20.1 → 1.21.0.beta1

data/lib/sqreen/legacy/old_event_submission_strategy.rb

@@ -55,6 +55,12 @@ module Sqreen
               when AggregatedMetric
                 logger.warn "Aggregated metric event in non-signal mode. Signals disabled at runtime?"
                 next
+              when Sqreen::Kit::Signals::Signal
+                logger.warn "Signal event in non-signal mode"
+                next
+              when Sqreen::Kit::Signals::Trace
+                logger.warn "Trace event in non-signal mode"
+                next
               when Attack # in practice only found inside req rec
                 EventToHash.convert_attack event
               when RemoteException
@@ -72,7 +78,7 @@ module Sqreen
           tally = Hash[events.group_by(&:class).map { |k, v| [k, v.count] }]
           "Doing batch with the following tally of event types: #{tally}"
         end
-        post('batch', { batch: batch }, {}, RETRY_MANY)
+        post('batch', { batch: batch.compact }, {}, RETRY_MANY)
       end
 
       private

data/lib/sqreen/remote_command.rb

@@ -22,6 +22,7 @@ module Sqreen
       :ips_whitelist => :change_whitelisted_ips,
       :get_bundle => :upload_bundle,
       :performance_budget => :change_performance_budget,
+      :tracing_enable => :tracing_enable,
     }.freeze
 
     attr_reader :uuid
@@ -39,6 +40,8 @@ module Sqreen
       begin
         output = runner.send(KNOWN_COMMANDS[@name], *@params, context_infos)
       rescue => e
+        Sqreen.log.warn { "Command failed with #{e}" }
+        Sqreen.log.debug { e.backtrace.map { |x| "  #{x}" }.join("\n") }
         Sqreen::RemoteException.record(e)
         return { :status => false, :reason => "error: #{e.inspect}" }
       end

data/lib/sqreen/runner.rb

@@ -14,6 +14,7 @@ require 'sqreen/log'
 require 'sqreen/agent_message'
 require 'sqreen/rules'
 require 'sqreen/session'
+require 'sqreen/version'
 require 'sqreen/remote_command'
 require 'sqreen/capped_queue'
 require 'sqreen/metrics_store'
@@ -26,6 +27,7 @@ require 'sqreen/legacy/instrumentation'
 require 'sqreen/call_countable'
 require 'sqreen/weave/legacy/instrumentation'
 require 'sqreen/kit/configuration'
+require 'sqreen/ecosystem_integration'
 
 module Sqreen
   @features = {}
@@ -52,10 +54,6 @@ module Sqreen
       @queue ||= CappedQueue.new(MAX_QUEUE_LENGTH)
     end
 
-    def update_queue(queue)
-      @queue = queue
-    end
-
     def observations_queue
       @observations_queue ||= CappedQueue.new(MAX_OBS_QUEUE_LENGTH)
     end
@@ -104,8 +102,8 @@ module Sqreen
     # we may want to do that in a thread in order to prevent delaying app
     # startup
     # set_at_exit do not place a global at_exit (used for testing)
+    # @param [Sqreen::Frameworks::GenericFramework] framework
     def initialize(configuration, framework, set_at_exit = true, session_class = Sqreen::Session)
-      Sqreen.update_queue(CappedQueue.new(MAX_QUEUE_LENGTH))
       @logged_out_tried = false
       @configuration = configuration
       @framework = framework
@@ -132,6 +130,7 @@ module Sqreen
       Sqreen::Kit::Configuration.ingestion_url = chosen_endpoints.ingestion.url
       Sqreen::Kit::Configuration.certificate_store = chosen_endpoints.ingestion.ca_store
       Sqreen::Kit::Configuration.proxy_url = @proxy_url
+      Sqreen::Kit::Configuration.default_source = "sqreen:agent:ruby:#{Sqreen::VERSION}"
 
       register_exit_cb if set_at_exit
 
@@ -168,6 +167,10 @@ module Sqreen
       end
       self.features = wanted_features
 
+      @ecosystem_integration = EcosystemIntegration.new(framework, Sqreen.queue)
+      framework.req_start_cb = @ecosystem_integration.method(:request_start)
+      framework.req_end_cb = @ecosystem_integration.method(:request_end)
+
       # Ensure a deliverer is there unless features have set it first
       self.deliverer ||= Deliveries::Simple.new(session)
       context_infos = {}
@@ -268,6 +271,10 @@ module Sqreen
       rulespack_id, rules = load_rules(context_infos)
       @framework.instrument_when_ready!(instrumenter, rules)
       Sqreen.log.info 'Instrumentation set up'
+
+      # XXX: ecosystem instrumentation should likely be deferred
+      #      the same way the rest might be
+      @ecosystem_integration.init
       rulespack_id.to_s
     end
 
@@ -392,6 +399,13 @@ module Sqreen
       { :was => prev }
     end
 
+    # @param [String] tracing_id_prefix
+    # @param [Array<Hash{String=>Object}>] sampling_config
+    def tracing_enable(tracing_id_prefix, sampling_config, _context_infos = {})
+      @ecosystem_integration.handle_tracing_command(tracing_id_prefix, sampling_config)
+      { status: true }
+    end
+
     def upload_bundle(_context_infos = {})
       t = Time.now
       session.post_bundle(RuntimeInfos.dependencies_signature, RuntimeInfos.dependencies)

data/lib/sqreen/session.rb

@@ -249,8 +249,10 @@ module Sqreen
       end
       Sqreen.log.info 'Login success.'
       @session_id = res['session_id']
+
       Kit::Configuration.session_key = @session_id
       Kit.reset
+
       Sqreen.log.debug { "received session_id #{@session_id}" }
       Sqreen.logged_in = true
       res

data/lib/sqreen/signals/conversions.rb

@@ -118,6 +118,7 @@ module Sqreen
           signals += req_rec.processed_sdk_calls
                             .select { |h| h[:name] == :track }
                             .map { |h| convert_track(h) }
+          signals += (observed[:signals] || [])
 
           trace = Kit::Signals::Specialized::HttpTrace.new(
             actor: Kit::Signals::Actor.new(
@@ -137,7 +138,7 @@ module Sqreen
           trace
         end
 
-        # @param [Array<Sqreen::Kit::Signals::Signal|Sqreen::Kit::Signals::Trace>] batch
+        # @return [Array<Sqreen::Kit::Signals::Signal|Sqreen::Kit::Signals::Trace>]
         def convert_batch(batch)
           batch.map do |evt|
             case evt
@@ -147,6 +148,10 @@ module Sqreen
               convert_metric_sample(evt)
             when RequestRecord
               convert_req_record(evt)
+            when Sqreen::Kit::Signals::Signal
+              evt
+            when Sqreen::Kit::Signals::Trace
+              evt
             else
               raise NotImplementedError, "Unknown type of event in batch: #{evt}"
             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.20.1'.freeze
+  VERSION = '1.21.0.beta1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.20.1
+  version: 1.21.0.beta1
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqreen-backport
@@ -122,6 +122,30 @@ files:
 - lib/sqreen/dependency/rails.rb
 - lib/sqreen/dependency/sentry.rb
 - lib/sqreen/dependency/sinatra.rb
+- lib/sqreen/ecosystem.rb
+- lib/sqreen/ecosystem/dispatch_table.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/signal_producer.rb
+- lib/sqreen/ecosystem/module_api/tracing_push_down.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/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_id_setup.rb
+- lib/sqreen/ecosystem/transaction_storage.rb
+- lib/sqreen/ecosystem_integration.rb
+- lib/sqreen/ecosystem_integration/around_callbacks.rb
+- lib/sqreen/ecosystem_integration/instrumentation_service.rb
+- lib/sqreen/ecosystem_integration/request_lifecycle_tracking.rb
+- lib/sqreen/ecosystem_integration/signal_consumption.rb
 - lib/sqreen/encoding_sanitizer.rb
 - lib/sqreen/endpoint_testing.rb
 - lib/sqreen/error_handling_middleware.rb
@@ -277,7 +301,9 @@ metadata:
   changelog_uri: https://docs.sqreen.com/ruby/release-notes/
   source_code_uri: https://github.com/sqreen/ruby-agent
   bug_tracker_uri: https://github.com/sqreen/ruby-agent/issues
-post_install_message: 
+post_install_message: |2
+      This is a Sqreen beta release and may not work in all situations.
+      Make sure to review CHANGELOG.md for important details.
 rdoc_options: []
 require_paths:
 - lib
@@ -288,12 +314,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Sqreen Ruby agent