sqreen 1.21.0-java → 1.21.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d55430d1415f21ee90558cf45a461137b79b06a4
-  data.tar.gz: 159b44e8ec7cd0c1409033a51121fa53166bbf4e
+  metadata.gz: 7da0143942d8b7ab1904204694ff425b28063c4a
+  data.tar.gz: 9c18ce7181ba9e6d059f7265108fa1abbc8d9c99
 SHA512:
-  metadata.gz: b1927c86d04f84f532666a40d785d4ad8cdb7c411b17d3bd07e98e3423f9bae2ed7fe83a713ef9a6b9866021067016336d7550324006ddd59800c38939f5967c
-  data.tar.gz: 997507ff2042ffebf01b1820d08f3d6fb8458ef3a63c086e66a3f46d009a901537cd0e26a974c01365213bef26a22138d624b79e2d573cd12e0168ad3fcea885
+  metadata.gz: 54eba17e83cb41dd546c16caa7543da24b72b7c2768e782a667278a0ce7d07c18cbd6477fa72f71530e0fe34cf64e1a691ed179a6c07c9d883030560791f7659
+  data.tar.gz: 3e716230761babffbe1abe97d18062887ea371800d98c5a6a85a92970c61b59cf7d2ca2d99f3947be54b1e6ef99ed19e557b8c39a662bdaeefaebec8e148f937

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: java
 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
   requirement: !ruby/object:Gem::Requirement