sqreen 1.24.0 → 1.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b43caee6a7702bfde6a56f9a3d9ad735de10b5a214ce5d097c3c26c3527f5918
-  data.tar.gz: 803451b19b5277384c9e74b186e00e0a1d0d8a8a77cb5483cf486088a1705b0d
+  metadata.gz: 5af6f04955c963eed44fee974e349c98af97865f27106d636a094f57bf2894f1
+  data.tar.gz: 88ddda4d964661c6f9dd39ad980ee3be46787eb1e9ba31656d7c6ec0d1b60047
 SHA512:
-  metadata.gz: 2d35106412544c74a99bcf5eb39b1bc33d95720efbce196e139c15f40c1259b1aaf4646cab127849b9235d3f1cf0ce421c01859eb1c4bc6076683d3f7beeef33
-  data.tar.gz: b0f5452dda0d2702397968e103313bf910bb996c09064354be78fcabb6492dbb15d898aa1caf5835307a5f21b878550fae59826fbc347382772cba1823cefea2
+  metadata.gz: fbbfc447bfb415cfed1c476907387c5d347810985f2b82a10a28c3f836c25fcc863244d164503a7220e0e6f38d598918331c0f802a2465b1f0a3f7407d895c74
+  data.tar.gz: ba08edf7f68cd16ee70a688a9d9437e41ecbb1f5504750fdd5c791ff3e993f65b80c27f443f44e97e7250d733b25605e7753023dc09367210fc67ca7bcd4e489

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.24.1
+
+* Add Datadog trace keeping through sampling
+* Improve Datadog correlation compatibility with Sinatra
+* Improve attack event correlation with Datadog spans
+
 ## 1.24.0
 
 * Add Sqreen event correlation with Datadog traces

data/lib/sqreen/dependency/sinatra.rb

@@ -61,6 +61,26 @@ module Sqreen
             u.append(p)
           end
         end
+
+        insert_datadog_middleware(builder, *args, &block)
+      end
+
+      def insert_datadog_middleware(builder, *args, &block)
+        return unless defined?(Datadog) && Datadog.respond_to?(:configuration) && Datadog.configuration.instrumented_integrations.key?(:sinatra)
+
+        Datadog.configure do |c|
+          sinatra_config = Datadog.configuration[:sinatra]
+
+          c.use(
+            :rack,
+            service_name: sinatra_config[:service_name],
+            distributed_tracing: sinatra_config[:distributed_tracing],
+          ) unless Datadog.configuration.instrumented_integrations.key?(:rack)
+        end
+
+        insert_middleware(builder, Datadog::Contrib::Rack::TraceMiddleware, args, block) do |p, u|
+          u.insert(0, p)
+        end
       end
 
       def wrap_middleware(middleware, *args, &block)

data/lib/sqreen/rules/rule_cb.rb

@@ -70,6 +70,15 @@ module Sqreen
         if payload_tpl.include?('context')
           payload[:backtrace] = Sqreen::Context.new.bt
         end
+        if framework.respond_to?(:datadog_span) && (datadog_span = framework.datadog_span)
+          Sqreen::Weave.logger.debug { "attack datadog:true span_id:#{datadog_span.span_id} parent_id:#{datadog_span.parent_id} trace_id:#{datadog_span.trace_id}" }
+          payload.merge!(
+            :datadog_trace_id => datadog_span.trace_id,
+            :datadog_span_id => datadog_span.span_id,
+          )
+          datadog_span.set_tag(Datadog::Ext::ManualTracing::TAG_KEEP, true)
+          datadog_span.set_tag('sqreen.event', true)
+        end
         framework.observe(:attacks, payload, payload_tpl)
       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.24.0'.freeze
+  VERSION = '1.24.1'.freeze
 end

data/lib/sqreen/weave/legacy/instrumentation.rb

@@ -244,8 +244,7 @@ class Sqreen::Weave::Legacy::Instrumentation
 
         # shrinkwrap_timer = Sqreen::Graft::Timer.new('weave,shrinkwrap')
         # shrinkwrap_timer.start
-        if defined?(Datadog)
-          datadog_span = Datadog.tracer.active_root_span
+        if defined?(Datadog) && Datadog.tracer && (datadog_span = Datadog.tracer.active_root_span)
           Sqreen::Weave.logger.debug { "request datadog:true span_id:#{datadog_span.span_id} parent_id:#{datadog_span.parent_id} trace_id:#{datadog_span.trace_id}" }
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.24.1
 platform: ruby
 authors:
 - Sqreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqreen-backport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: sq_mini_racer
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: Sqreen Ruby agent