raygun-apm 1.1.9-x86-linux → 1.1.12-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21376f894941372f7d984ca02014cbea884c2d92bd0b6b214c6fb24ab3ff692
-  data.tar.gz: 98efb1181914b4a8b362ac1b1536da29698030ef55c0df5a33c5c7e83583d96b
+  metadata.gz: 87a5b0425e6bdb871cfbc38195afcd0e42472a8ac378c7f90c399fa5b0ff839f
+  data.tar.gz: 5de0dd0244137e04b213becb27ec7977a36c547df076d7ad54103ab9712814e8
 SHA512:
-  metadata.gz: c936f3de42c6fa6d0acc4be2122e739d87367850809786fd13527ff5e8d61c25a51b2b7cb947f9386a6218cc524ccb048efd917f94d3cfbaec7efab498b950ae
-  data.tar.gz: afed042d6772e3b2ac3784efee6cdef77fafd8284911ac25153f75bce04b22f7c839140567549e252732fef9c9882ebf15ed2fcc7be6f503a1dbf84a660c3d4b
+  metadata.gz: 6cd7dfba2d6213821f8073396ea0f883b6b138be261cb8d5269f693948d13d7c3506fc6b985519cea2cdef716d4c0f3468f5a268594b91c38332ed5d30f75b03
+  data.tar.gz: eca1c0d2d66af06cb4224668d9f7ddd47bca820502e824df40b17133549766e776f727216dcf761b38c64eb8923a207646a02f9cb51a7ccb0cee3f6bcf7b1908

data/ext/raygun/extconf.rb

@@ -23,6 +23,7 @@ append_cflags '-Werror=switch'
 append_cflags '-std=c99'
 append_cflags '-fdeclspec'
 append_cflags '-fms-extensions'
+append_cflags '-ggdb3'
 # Enables additional flags, stack protection and debug symbols
 if ENV['DEBUG']
   have_library 'ssp'

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

@@ -4,8 +4,14 @@ require 'rbconfig'
 module Raygun
   module Apm
     class Tracer
+      @__mutex = Mutex.new
+
       @__pids ||= {}
       class << self
+        def synchronize(&block)
+          @__mutex.synchronize { block.call }
+        end
+
         def instance
           @__pids[Process.pid]
         end
@@ -13,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
@@ -22,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
@@ -99,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.9"
+    VERSION = "1.1.12"
     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.9
+  version: 1.1.12
 platform: x86-linux
 authors:
 - Raygun Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source