sqreen 1.25.0 → 1.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91d799812d8133a1915b8174bc71b1986028bbea556ed445cc8bd8c240176d96
-  data.tar.gz: d7f9e221109affd64736c772f030ba618dba20cdbaac1b5369772e2d151b12ff
+  metadata.gz: 6328da058ba9dbd5f216152de2a9751d3d967a2f4d65304032137849a8b10d25
+  data.tar.gz: 7835057ef1b3c18d6995136c6d7c10ed6168bb9f42be32d91959518bcbe287cf
 SHA512:
-  metadata.gz: 996a203e716bb890c32c00d75b89e534e78e7fad75dc1ec05acf1089cfc2865ab1d907ea5f364dacd377cbf3e102f3a1ca14ac246a1960a3986334cb5f3de698
-  data.tar.gz: 8af17107b023e921b9a660126cc368eb43893724b35c7af76afb6461c623e8d80c9d35f5537af9078b51df8d8f84d6a44b361595249e6db514e64c5e24594bd7
+  metadata.gz: d2a151b0bdc36e3ff4872c533e3e701cce5a70c9dbf9758b2ee53cf7026317f6dc49e85741a92c61c38cd0128575741e27b7b6995cd5d0fd66289ee883300975
+  data.tar.gz: 28c72b896a9cf0b5a7bd49cb1ebb5ef0fe2cb99a349f91f70f02b667ffc8346c1d47e940bac3ec6823240c95935204bb96aedd8d666ae13d01a5017d082a00f7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.25.1
+
+* Add compatibility with ddtrace 1.0
+* Fix issue on WAF garbage collection
+
 ## 1.25.0
 
 * Switch from old sq_mini_racer to upstream mini_racer

data/lib/sqreen/dependency/sinatra.rb

@@ -66,6 +66,7 @@ module Sqreen
       end
 
       def insert_datadog_middleware(builder, *args, &block)
+        return unless defined?(Datadog) && defined?(Datadog::Tracing)
         return unless defined?(Datadog) && Datadog.respond_to?(:configuration) && Datadog.configuration.instrumented_integrations.key?(:sinatra)
 
         Datadog.configure do |c|

data/lib/sqreen/frameworks/generic.rb

@@ -182,9 +182,21 @@ module Sqreen
       end
 
       def datadog_span
-        return unless defined?(Datadog) && (tracer = Datadog.tracer)
+        return unless defined?(Datadog)
 
-        tracer.active_span
+        if defined?(Datadog::Tracing) && Datadog::Tracing.respond_to?(:active_span)
+          Datadog::Tracing.active_span
+        elsif Datadog.respond_to?(:tracer) && Datadog.tracer
+          Datadog.tracer.active_span
+        end
+      end
+
+      def datadog_trace
+        return unless defined?(Datadog)
+
+        if defined?(Datadog::Tracing) && Datadog::Tracing.respond_to?(:active_trace)
+          Datadog::Tracing.active_trace
+        end
       end
 
       def response_infos

data/lib/sqreen/rules/rule_cb.rb

@@ -76,7 +76,11 @@ module Sqreen
             :datadog_trace_id => datadog_span.trace_id,
             :datadog_span_id => datadog_span.span_id,
           )
-          datadog_span.set_tag(Datadog::Ext::ManualTracing::TAG_KEEP, true)
+          if (datadog_trace = framework.datadog_trace)
+            datadog_trace.keep!
+          else
+            datadog_span.set_tag(Datadog::Ext::ManualTracing::TAG_KEEP, true)
+          end
           datadog_span.set_tag('sqreen.event', true)
         end
         framework.observe(:attacks, payload, payload_tpl)

data/lib/sqreen/rules/waf_cb.rb

@@ -126,7 +126,7 @@ module Sqreen
         lambda do |object_id|
           return unless WAFCB.libsqreen?
 
-          ::LibSqreen::WAF.delete(waf_rule_name)
+          ::LibSqreen::WAF.delete(rule_name)
           Sqreen.log.debug("WAF rule #{rule_name} deleted, from #<#{name}:0x#{object_id.to_s(16).rjust(16, '0')}>")
         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.25.0'.freeze
+  VERSION = '1.25.1'.freeze
 end

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

@@ -244,8 +244,17 @@ class Sqreen::Weave::Legacy::Instrumentation
 
         # shrinkwrap_timer = Sqreen::Graft::Timer.new('weave,shrinkwrap')
         # shrinkwrap_timer.start
-        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}" }
+        if defined?(Datadog)
+          if defined?(Datadog::Tracing) && Datadog::Tracing.respond_to?(:active_trace)
+            datadog_active_trace = Datadog::Tracing.active_trace
+            datadog_span = datadog_active_trace.send(:root_span) if datadog_active_trace
+          elsif Datadog.respond_to?(:tracer) && Datadog.tracer
+            datadog_span = Datadog.tracer.active_root_span
+          end
+
+          if datadog_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
         end
 
         request_timer = Sqreen::Graft::Timer.new("request")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.25.1
 platform: ruby
 authors:
 - Sqreen