sqreen 1.21.0 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acfd752e97a36e2f1f2d0cb224e72a409334d379a6e8c3e05b002bade311e097
-  data.tar.gz: cb15f77dbc7e21faa5136a3cfc2493dd576164f2e49c532573c9f8adfa331e77
+  metadata.gz: 6611caf7add24e05a248fce4026be48a4c47612335c5fc9a26c64c33cd0409e9
+  data.tar.gz: 8381eba611e37df32a8744848661bcf144eaffe00c818e306355508fe0267394
 SHA512:
-  metadata.gz: a4025d0a2500ff46db50b33eb7f3340065ae687f3e8d218a14ca3f2690ccecee4412b4901a4dcd93fd67a7fc0036ee025f4f4cf08a6d254101741ddaf4bbcf07
-  data.tar.gz: 54755c74c6211c7aad3ae75aa8f2a5c307a074acef5ebf182ee31a5f50580a3115bd499be80d24cd5566ce16ef82c169f50ee9bed18531e7d0944e6864e7f610
+  metadata.gz: 65c820c306961ed812360c2c73a1f37396433238cff8fd79e2676132d7842eaa86d3555bf860d7c2f6fd465783f8c1aeb59100c94349b8c53588d83513265d2e
+  data.tar.gz: 38cda532df6f1037ac243c8cd5ccaecd708b880ff377d3fcbcecad329be184d40ec9f27deb61b69124be3d37ff74a16f88a7ab1032a6e6a0f6b5387645181027

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.21.1
+
+* Work around NewRelic initialisation (see https://github.com/newrelic/newrelic-ruby-agent/issues/461)
+
 ## 1.21.0
 
 * Add support for transport and tracing facilities

data/lib/sqreen/dependency/detector.rb

@@ -25,6 +25,14 @@ module Sqreen
         end
       end
 
+      def to_app_hook_strategy
+        if Sqreen::Dependency::NewRelic.bundled? || Sqreen::Dependency::NewRelic.required?
+          :chain
+        else
+          :prepend
+        end
+      end
+
       def hook(&block)
         Sqreen.log.debug "[#{Process.pid}] Startup command: #{$0}"
 
@@ -34,7 +42,7 @@ module Sqreen
           Sqreen::Dependency::Rails.insert_sqreen_middlewares
         end if Sqreen::Dependency::Rails.required?
 
-        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app', to_app_hook_strategy) do
           after do
             Sqreen::Dependency::Rails.inspect_middlewares
           end
@@ -48,7 +56,7 @@ module Sqreen
           end
         end.install if Sqreen::Dependency::Sinatra.required?
 
-        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app', to_app_hook_strategy) do
           after do |call|
             builder = call.instance
 
@@ -58,7 +66,7 @@ module Sqreen
 
         # ensure startup of thread in request handling processes
 
-        Sqreen::Graft::Hook.add('Rack::Builder#to_app') do
+        Sqreen::Graft::Hook.add('Rack::Builder#to_app', to_app_hook_strategy) do
           after do |call|
             callback = call.callback
 

data/lib/sqreen/dependency/new_relic.rb

@@ -8,8 +8,17 @@ module Sqreen
     module NewRelic
       module_function
 
+      def bundled?
+        defined?(Gem) && Gem.respond_to?(:loaded_specs) && !Gem.loaded_specs['newrelic_rpm'].nil?
+      end
+
+      def required?
+        Sqreen::Dependency.const_exist?('NewRelic::Agent::Agent')
+      end
+
       def ignore_sqreen_exceptions
-        return unless defined?(NewRelic::Agent::Agent)
+        return unless required?
+
         NewRelic::Agent::Agent.instance.error_collector.ignore(['Sqreen::AttackBlocked'])
       rescue ::Exception => e # rubocop:disable Lint/RescueException
         Sqreen.log.warn "Failed ignoring AttackBlocked on NewRelic: #{e.inspect}"

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'.freeze
+  VERSION = '1.21.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.21.1
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqreen-backport