raygun-apm 1.1.6-x86_64-linux → 1.1.10-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeeab423c5b80245ef2dc64bc0baba78aef3603beab57e73bc950d90631d6656
-  data.tar.gz: a6ec9352f246604bae73a9d9cad7ceff89a6daa0ab8f5725a0c15d2d627b66ef
+  metadata.gz: 9899c704b83082a4464e08beef065cf11bc3af3cbdce1bbcf9baee6f458cc50f
+  data.tar.gz: c5ffeeaca7ae073a268fea1215d5dc25b7f6d8fc9b0167f1dd1f2626a4feb2fe
 SHA512:
-  metadata.gz: 2c2e1ebc0d7aae3e3b019481e09224960f8cd1c5b6a7b57b0658003223f39c061b871fd780fb009fad7a92d23b7f8de8d245f27946902bc240f5d8d61012d42a
-  data.tar.gz: 1905f78d20f28111d12e4f7cb58283d3887b2ac318629e08cb184168847b11c7b7bf9b606f9ee845f8f0c80fa6f1577e0ee6f5ddcfddb94dc2bc67304e00a762
+  metadata.gz: 31d8d894e0451b798494ec0eaee57a59b7b967188b4ca9994566e066715b6e29c2da2e9636e29defd53f86a79a49ff42c5cd29e5060ce9e2d3701b7541ccbbc1
+  data.tar.gz: ecea89b76da510c2001e14a36a5ff535976270a38ec68049cca7ff755d01f3b7f745d1275f8f735b743ac355e5322f262dde21e0b156adb68177f316191859ab

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,8 @@ 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
 
       def proton_udp_host
         if proton_use_multicast == 'True'
@@ -77,6 +79,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/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
@@ -30,7 +36,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 +45,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)

data/lib/raygun/apm/version.rb

@@ -1,6 +1,6 @@
 module Raygun
   module Apm
-    VERSION = "1.1.6"
+    VERSION = "1.1.10"
     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)

metadata

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