raygun-apm 1.1.10-x86-linux → 1.1.11-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb341d6c0e333f3cadabaf7f77fbd66e0c111b9b300ffa76c063176708ec7c1
-  data.tar.gz: 47b8ce5da9f3c6784a3f3b5d027a91eefd2f02a2c3dbc8a50ab5c64fa29fd379
+  metadata.gz: d3d5f9f7b12dafd2b155ca52cb715c942c7c45c45cc1f4c3122143beda64bbd4
+  data.tar.gz: a3605d41f39c80f155ff2428a552c47d0478c62083633bc9537186939a3977d5
 SHA512:
-  metadata.gz: a5b6160edb04fd77a82a634bbaf3b61f53def91743ca0f1d4a6ba6a731a4610fb9d469bad9e85a2c7d4329df77d3cf8e21fd5634660621f21aad3e5af92427ff
-  data.tar.gz: 4e390838bf1fdeba79bdde6193be302a333d4f3882663a54177af6f2e1608ad82d02877d67e7b8cf9adb435f3c761703fea91a7ecad78e111c1d707b1b55719c
+  metadata.gz: a21d4fe4204886f327ae29bc311492a7b07c1b5f5e537c052f72fafa5b573b023e1c42ad4d49e71616d07eb1d6d9cde0f630b999e21b9b10995e27000982d958
+  data.tar.gz: 2b93b030de7b3c29a259df61cb3c71d4f5699b92a813fd22d8aaec89ca75f190c5cdba92dc405d48bfeeb1e28613a23293a91ab588e8486bbcec1b83bb341068

data/lib/raygun/apm/config.rb

@@ -70,6 +70,9 @@ module Raygun
       config_var 'PROTON_UDP_PORT', as: Integer, default: UDP_SINK_PORT
       config_var 'PROTON_TCP_HOST', as: String, default: TCP_SINK_HOST
       config_var 'PROTON_TCP_PORT', as: Integer, default: TCP_SINK_PORT
+      ## Conditional hooks
+      config_var 'PROTON_HOOK_REDIS', as: :boolean, default: 'True'
+      config_var 'PROTON_HOOK_INTERNALS', as: :boolean, default: 'True'
 
       def proton_udp_host
         if proton_use_multicast == 'True'

data/lib/raygun/apm/hooks/excon.rb

@@ -33,4 +33,4 @@ module Raygun
   end
 end
 
-Excon::Connection.prepend(Raygun::Apm::Hooks::Excon)
+Raygun::Apm::Tracer.patch(Excon::Connection, Raygun::Apm::Hooks::Excon)

data/lib/raygun/apm/hooks/httpclient.rb

@@ -40,4 +40,4 @@ module Raygun
   end
 end
 
-HTTPClient.prepend(Raygun::Apm::Hooks::HTTPClient)
+Raygun::Apm::Tracer.patch(HTTPClient, Raygun::Apm::Hooks::HTTPClient)

data/lib/raygun/apm/hooks/internals.rb

@@ -88,8 +88,8 @@ module Raygun
   end
 end
 
-Object.prepend Raygun::Apm::Hooks::Object
-IO.prepend Raygun::Apm::Hooks::IO
-Random.prepend Raygun::Apm::Hooks::Random
-Signal.prepend Raygun::Apm::Hooks::Signal
-Thread::Mutex.prepend Raygun::Apm::Hooks::Mutex
+Raygun::Apm::Tracer.patch(Object, Raygun::Apm::Hooks::Object)
+Raygun::Apm::Tracer.patch(IO, Raygun::Apm::Hooks::IO)
+Raygun::Apm::Tracer.patch(Random, Raygun::Apm::Hooks::Random)
+Raygun::Apm::Tracer.patch(Signal, Raygun::Apm::Hooks::Signal)
+Raygun::Apm::Tracer.patch(Thread::Mutex, Raygun::Apm::Hooks::Mutex)

data/lib/raygun/apm/hooks/mongodb.rb

@@ -41,5 +41,5 @@ module Raygun
 end
 
 Mongo::Operation.constants.each do |operation|
-  Mongo::Operation.const_get(operation).prepend(Raygun::Apm::Hooks::MongoDB) rescue nil
+  Raygun::Apm::Tracer.patch(Mongo::Operation.const_get(operation), Raygun::Apm::Hooks::MongoDB) rescue nil
 end

data/lib/raygun/apm/hooks/net_http.rb

@@ -41,4 +41,4 @@ module Raygun
   end
 end
 
-::Net::HTTP.prepend(Raygun::Apm::Hooks::Net::HTTP)
+Raygun::Apm::Tracer.patch(::Net::HTTP, Raygun::Apm::Hooks::Net::HTTP)

data/lib/raygun/apm/hooks/redis.rb

@@ -43,4 +43,4 @@ module Raygun
   end
 end
 
-::Redis::Client.prepend(Raygun::Apm::Hooks::Redis)
+Raygun::Apm::Tracer.patch(::Redis::Client, Raygun::Apm::Hooks::Redis)

data/lib/raygun/apm/tracer.rb

@@ -19,6 +19,10 @@ module Raygun
         def instance=(tracer)
           @__pids[Process.pid] = tracer
         end
+
+        def patch(concern, hook)
+          concern.prepend(hook) unless concern.ancestors.include?(hook)
+        end
       end
 
       attr_accessor :config
@@ -28,6 +32,7 @@ module Raygun
         initialize_blacklist
         register_known_library_paths
         run_agent_connectivity_diagnostics
+        require_hooks
         ObjectSpace.define_finalizer(self, proc{ disable_tracepoints })
       # Any fails here is kamikaze for the tracer
       rescue => e
@@ -105,6 +110,22 @@ module Raygun
         check = Raygun::Apm::Diagnostics.new
         check.verify_agent(self)
       end
+
+      def require_hooks
+        require "raygun/apm/hooks/internals" if @config.proton_hook_internals
+        require "raygun/apm/hooks/net_http"
+        # conditionally required - may not be bundled
+        conditional_hooks = %w(httpclient excon mongodb)
+        conditional_hooks.each do |hook|
+          begin
+            require "raygun/apm/hooks/#{hook}"
+          rescue LoadError
+          end
+        end
+        if @config.proton_hook_redis
+          require "raygun/apm/hooks/redis" if defined?(Redis::Client)
+        end
+      end
     end
   end
 end

data/lib/raygun/apm/version.rb

@@ -1,6 +1,6 @@
 module Raygun
   module Apm
-    VERSION = "1.1.10"
+    VERSION = "1.1.11"
     MINIMUM_AGENT_VERSION = "1.0.1190.0"
   end
 end

data/lib/raygun/apm.rb

@@ -16,13 +16,3 @@ require "raygun/apm/blacklist/parser"
 require "raygun/apm/blacklist/translator"
 require "raygun/apm/tracer"
 require "raygun/apm/event"
-require "raygun/apm/hooks/internals"
-require "raygun/apm/hooks/net_http"
-# conditionally required - may not be bundled
-conditional_hooks = %w(httpclient excon mongodb)
-conditional_hooks.each do |hook|
-  begin
-    require "raygun/apm/hooks/#{hook}"
-  rescue LoadError
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: x86-linux
 authors:
 - Raygun Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source