raygun-apm 1.1.10-universal-darwin → 1.1.11-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c4f92187ae4a59765047ee0baec944266977c4c9c16a8ba9a7aff4abde35a1f
-  data.tar.gz: 465a0be5ed7e32bca19d726d1258c04f0bd83c1da2c7b6819db1d8dcb5b89187
+  metadata.gz: baf629d9ee033c6ea1ef9828274a2e4ca14f90cdfbbf9a5d7b7c189368298ea7
+  data.tar.gz: f5f2c325f04ba68735a632fc512e6156be2a9037a699ce264f9ab59ee6fdb742
 SHA512:
-  metadata.gz: 46d66ab088834897fbccc502baeb6935f779cbb130e799cafd6a848bb8405477a98a8fe6e89c38b50748572deeecbc96bf393764fa5c651cc84a9c6d6fa6058c
-  data.tar.gz: e30dc539cd0f8cec4e07bfe9287179b55ff245f986234b04c5fa9c17d358f41b1212af16abefdf0a65b77942cdb5a2204bfee3e4b33668a375f27b55e49f52ed
+  metadata.gz: b38a703a2050546705655b9ec734ac832cba69bd646aac3df0595ad3c16fcce24c5275aa4a96d93409bf78290872b943cb5a3425f4b1ac89ff0fdfa8b03f2134
+  data.tar.gz: 57032094b9643733c4e12196b0727fc146d2ee094c4ae09db10bc6008555f90380ffae24193345b0464a8ebe11167ce12ce5423ba8eb515dc2f3190abd27e4ad

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: universal-darwin
 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