raygun-apm 1.1.6-x86-mingw32 → 1.1.10-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac3b0c17f8c6f25f3c7cff3ebdbdf152eafe2babd5f957e5c3654b9763cf063c
-  data.tar.gz: 884e99c837a303c22c90951001d8c45305b8ef378238d059c0112e043890da2f
+  metadata.gz: 7cebf18aadb7694f565252acd8b0e03062dcca556ea62572d913deecb186dc5b
+  data.tar.gz: 8692d8bd313bbbab40468116951448e39541255d177435b1192201dd1c54a512
 SHA512:
-  metadata.gz: 8ebe01a06bb6d0809c3655852d718d7b7b0f7c3e7a8bfbc974142ad5e388fcfc248252a2f815e7115c117d52c72305cf43af1cc2714779a8fe2168b0d0471357
-  data.tar.gz: 51f72e40c8fe4e1f22969813f2229d14dac2a48449cca9def48fc1c3fe6aff82e767e6ee57b7d9b314642f173717088884df081f00c9501dc204a0c5d7c467b2
+  metadata.gz: 7978f84c8623d25af49ade021464fe7774a438d877bff5ae4beeb9a46f472b1461ada8bcf7458f853382c1f75e2e2c489197a6133412d21b5538db06f6370c31
+  data.tar.gz: 6e2ec2366dd86e3a3e49bdfae16247ae980d0e8ff4a1d2f46a5bd7ee7b8adfe0cee69736809ea52f38bc1c9339e378108b07ac941fb19b8782356832d8655827

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-mingw32
 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