raygun-apm 1.1.7-x64-mingw32 → 1.1.11-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4925303d64e67f4aaefc7008ae99d5389ce4637b3e330c838259b95ede94786a
-  data.tar.gz: da48428cccfb5ab23db5cc8e58935aa8d5354de627d16638c4d6892698e550db
+  metadata.gz: 3bd2d096c5fa13b26433ff6a9feafdccd62b940f8f4b39c7ab583eef5089c744
+  data.tar.gz: c46b4a864c7f9fcdc497e0f300d2b3b1832d1baaab57cf3f70ed82497f56b740
 SHA512:
-  metadata.gz: 152ac16b082aa5306e8f0d4e71e3572a02f89e003b82c48587dec75eeccc711d8b528102267999278a607127307891ce629c59d361efb8bd963229429ad67e5c
-  data.tar.gz: 83c6f8edc3e67ac3a41e4acbf1a90e14ffe5da320e281709274608fe3939838684fc3602a0d2c0e08958f22f877530d218667f83a4fd8b602fdc3778d68451d0
+  metadata.gz: 0bd100a884528259307cfeb30297099c1117de1381ae0cb6b0d1e27377576281a4e00db63118f4c1be4e4ad4550a303efd92fd84b2b74cc4424ce7fc110e24f2
+  data.tar.gz: 24e9f74b499d71dea4e41bcf9f1882920e334d1484c265e53ce0275dc875b86be798b6ca0f0bcc176407885c2c38cfa85e929d297954fde0c581a807978542ce

data/lib/raygun/apm/config.rb

@@ -52,9 +52,9 @@ module Raygun
       end
 
       # Initial constants for ProtonAgentTail.exe
-      UDP_SINK_HOST = TCP_MANAGEMENT_HOST = '127.0.0.1'
+      UDP_SINK_HOST = TCP_SINK_HOST = TCP_MANAGEMENT_HOST = '127.0.0.1'
       UDP_SINK_MULTICAST_HOST = '239.100.15.215'
-      UDP_SINK_PORT = 2799
+      UDP_SINK_PORT = TCP_SINK_PORT = 2799
       TCP_MANAGEMENT_PORT = 2790
 
       ## Enumerate all PROTON_ constants
@@ -68,6 +68,11 @@ module Raygun
       ## New - Ruby profiler
       config_var 'PROTON_UDP_HOST', as: String, default: UDP_SINK_HOST
       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'
@@ -77,6 +82,10 @@ module Raygun
         end
       end
 
+      def proton_tcp_host
+        env['PROTON_TCP_HOST'] ? env['PROTON_TCP_HOST'].to_s : TCP_SINK_HOST
+      end
+
       def loglevel
         LOGLEVELS[proton_debug_loglevel] || raise(ArgumentError, "invalid log level")
       end

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
@@ -30,7 +41,6 @@ module Raygun
       end
 
       def udp_sink!
-        require "socket"
         sock = UDPSocket.new
         # For UDP sockets, SO_SNDBUF is the max packet size and NOT send buffer as with a connection oriented transport
         sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, Tracer::BATCH_PACKET_SIZE)
@@ -40,12 +50,29 @@ module Raygun
           port: config.proton_udp_port,
           receive_buffer_size: sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF).int
         )
-      # Any fails here is kamikaze for the tracer
       rescue => e
         # XXX works for the middleware wrapped case, not for standalone - revisit
         raise Raygun::Apm::FatalError, "Raygun APM UDP sink could not be initialized: #{e.message} #{e.backtrace.join("\n")}"
       end
 
+      def tcp_sink!
+        self.tcp_sink(
+          host: config.proton_tcp_host,
+          port: config.proton_tcp_port
+        )
+      rescue => e
+        # XXX works for the middleware wrapped case, not for standalone - revisit
+        raise Raygun::Apm::FatalError, "Raygun APM TCP sink could not be initialized: #{e.message} #{e.backtrace.join("\n")}"
+      end
+
+      def enable_sink!
+        if config.proton_network_mode == "Udp"
+          udp_sink!
+        elsif config.proton_network_mode == "Tcp"
+          tcp_sink!
+        end
+      end
+
       private
       def configure(env)
         @config = Config.new(env)
@@ -83,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.7"
+    VERSION = "1.1.11"
     MINIMUM_AGENT_VERSION = "1.0.1190.0"
   end
 end

data/lib/raygun/apm.rb

@@ -1,4 +1,5 @@
 require "raygun/apm/version"
+require "socket"
 
 begin
   # Attempt to load a precompiled shared object (released gem)
@@ -15,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.7
+  version: 1.1.11
 platform: x64-mingw32
 authors:
 - Raygun Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source