raygun-apm 1.1.4-x86_64-linux → 1.1.8-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6a1c0f5db533c8fe668f70791e6c1beb5ff44d1178dd641150b9b56ba1f1b9
-  data.tar.gz: 20bd5bfdbbd1c5a47cdab845cd9bdf57ceccefbb4bef9d9e9354b53de640ba39
+  metadata.gz: 130e8cfd5c981f68d938fb3f076d87efbb19e8971321df7e2ec2eec7348b3fa8
+  data.tar.gz: '0609912e61ac488a6db735be0f7093bd7c8daf8994024ae99e20400472f0b84d'
 SHA512:
-  metadata.gz: 2c5ac69f7e3ba4a0eb7666f572cdf16450d45ef8140703d9f67ce72110a03c44f441b4ceb7622c900f13b7ff899be9d977ae836f58464d0f56b9cb8828a3f63b
-  data.tar.gz: f850767513c16a8cf5526859b6a6fb5bb3ff82e6ed42e824bdffb2c699807c6534ad771719d11f6265dfcfc41ce3765dfa4755b5a6a54919ca84feefa2a4864b
+  metadata.gz: 7ae826500993d9472699178007c23ee2980fb45067c5a49ea7ca0dfd44a9cdc66908432c31cefda9dc6809cf27caaeca58fff5ce09d27a7f87cf3fed782f2b77
+  data.tar.gz: 0ddbf6dc4177e23d6a267d594091b7721198ffed33aa184464f98eb19d373a83b9eba6eb6b92f788a2600b0062d26938c63f11382aed461cb7c15146bb03d964

data/lib/raygun/apm/blacklist/parser.rb

@@ -27,6 +27,8 @@ module Raygun
             @tracer.add_whitelist *translate(filter[1..-1])
           elsif filter.start_with?('-')
             @tracer.add_blacklist *translate(filter[1..-1])
+          elsif filter.start_with?('L-')
+            @tracer.add_blacklist *translate(filter[2..-1])
           elsif filter.size > 0
             @tracer.add_blacklist *translate(filter)
           end

data/lib/raygun/apm/blacklist/translator.rb

@@ -5,12 +5,14 @@ module Raygun
         class RubyTranslator
           # Foo::Bar#baz
           # Foo::Bar.baz
+          # Foo::Bar::baz
           COMMENT = /^#.*/
           ANONYMOUS = /^#<.*>?/
           NAMESPACE = /::/
           NAMESPACE_ONLY = /::$/
           METHOD = /#|\./
           LETTER_CASE = /^[A-Z]/
+          LOWER_CASE = /^[a-z]/
 
           def translate(filter)
             path, method = nil, nil
@@ -29,6 +31,10 @@ module Raygun
 
               # .NET fallback
               return if method =~ NAMESPACE
+              if path && (_method = path.split(NAMESPACE).last) =~ LOWER_CASE
+                method = _method
+                path.gsub!(Regexp.compile("::#{method}$"), "")
+              end
               [path, method]
             elsif filter =~ ANONYMOUS
               _, klass, method = filter.split(METHOD)

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.4"
+    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.4
+  version: 1.1.8
 platform: x86_64-linux
 authors:
 - Raygun Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source