raygun-apm 1.1.7-x86-linux → 1.1.8-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 342dad88f9e3bbee968f83ace5a55a32e819043ed465af6d06ac82c8bff39e9e
-  data.tar.gz: 8712a16ab84cc4f721812078306e56833a48f035d9e1ed7b1170620523cb7e98
+  metadata.gz: 5b5e2a87a44564971610ba40808b6405550f805ea3f768028bf5fbc79f69ca27
+  data.tar.gz: 3db313b71f12365e3a4ff72de6790f73022a125dca18d67accf749b98b417449
 SHA512:
-  metadata.gz: 3eec93600c1899e8b3fe8ce6b1043932ddeb3a7a885efb85f038d04fc79986132c118bce5b8ff9e497e77101778f39b70493a4cdf940fa06e56e0aa143843100
-  data.tar.gz: fbd38469518bf38333085462adb8294bd02c0349250e068e826b8942529d912af65096ca00d378cfad802cb15ce5a3cb08dfd20191995d354cca319627d5965f
+  metadata.gz: 21ceb93e41e4247472fd282e0256436f268dc6433416223de46cf3fe91c61f7b5dc239181f8e1e06e10ab47a8bb25621d013684ef066e3b8dddfd1ddc8bad883
+  data.tar.gz: 7395b6f1f048459b5f98038120e81eba1758d3c412c4f170e85e0c48f892a6e6467291981e6490e052861413c4727b22b446c5ce1be97cb79c8e6a18ead85071

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

@@ -30,7 +30,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 +39,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.7"
+    VERSION = "1.1.8"
     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.7
+  version: 1.1.8
 platform: x86-linux
 authors:
 - Raygun Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source