raygun-apm 1.1.7-x86-mingw32 → 1.1.8-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29e8e377761e753e50347d53749248b14c4a539aa87ab7662386b4d3d7a3fcc9
-  data.tar.gz: b4c1c81c187ee960300f4189ca87250cf436a2687898034d2cd5a0f8ea4e5efb
+  metadata.gz: 4187c2311f7cee2b1eed395698d3ba70b1066a0995c7e69e1438b7ef1adf98b1
+  data.tar.gz: e7075d74fc3cbfa8f1be944eaaee5fd649d42dede6d339eab8f2989087a48930
 SHA512:
-  metadata.gz: 53ea73516911265d938061c9c8e6b727928ef6c23df7e32f28304b1bd15b7f8fb1b1d5b28d239f7c3a5b7fd5c335c4aea4769d52bbd819a476f0abb6b0674022
-  data.tar.gz: 823f337f7f87639d07cc8b8f37e4d0bc12e858e02c76dc381e614e38377eef8116960b258e3a431644d6d75590330c80c860f898d1ad188100eb5249f642d810
+  metadata.gz: face27f6d3ab671c8a8a1dfee07e9143672c38b7969aff2de5abc3e01f208aa530d4aa1414fc239079589370e0165e9516409286d59580f8865f350d80f70279
+  data.tar.gz: 3abc472498f1652779f80fd61ca52031368c78e086e38cca6124ff0c48fdb79e5ec0f676b71c7a688b5719a58165fa9a8f6bb3543a3f145ddb127c5bfdcd3e1e

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