raygun-apm 1.0.48-x86-linux → 1.0.54-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185e83d51208f563c0f0dd4384de7fb1123e9e8e52531da7abc3bdd22f5a43bd
-  data.tar.gz: cb4327777a8fcba886cc0c1417682393c2a26e229d4517b76a742ea84dd28b2a
+  metadata.gz: 7093c9a95637788fc2a9a3bc43b035f3bfa1ac4b1d5d41e14f6a8eeee8a30f4d
+  data.tar.gz: f66d0986945b8c0c25265879639ca151ea88bec70bd2e5fa8787cf2e26e7329e
 SHA512:
-  metadata.gz: 6f9d8243e2d21823d5cac6243e46c5e22f3bcc38dda39a507e87abb83b8d32dbf06c8e80f7fa676acb41a1f4475fad5787a3c423a28222dca4d7995acb1d19c6
-  data.tar.gz: 351236e8f8a5da7c1583ef179906e944d848638489e12611edd2e9d98b92b2f258cd34037c7c5f5ab82702bc4620fb3399d387cacb6a4b6852c3ce9944864a1d
+  metadata.gz: b943885a686bee15fd8d6b84a6d5ab961b36acfe8495d8d9940ed7754a97fcde601798ff1855113cf99389ff2e1b1d0b64624bfbdf7420a42d197735e5a86495
+  data.tar.gz: 04ba507e8b3f83d374b61bd5279f9b20a2817dbac2d580cf779861e9bd2bf91bc8f0fa7e9bc57b2ab22a110d230fef4f39d59370eae414ac0c02cd2ec5e18165

data/README.rdoc

@@ -49,7 +49,7 @@ The Linux version can be installed either using {systemd}[https://raygun.com/doc
 
 On windows the agent can be installed either via {MSI installer}[https://raygun.com/documentation/product-guides/apm/agent/installation/#installing-on-linux-using-terminal] or on {.NET core}[https://raygun.com/documentation/product-guides/apm/agent/installation/#installing-on-windows-net-core]
 
-== Ruby on Rails
+== Ruby on Rails 
 
 For Rails support see {documentation}[https://www.rubydoc.info/gems/raygun-apm-rails/0.1.0] of the railgun-apm-rails gem.
 

data/ext/raygun/extconf.rb

@@ -10,6 +10,9 @@ headers = proc do
 end
 
 dir_config('raygun')
+
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+
 append_cflags '-pedantic'
 append_cflags '-Wall'
 append_cflags '-Werror=switch'
@@ -27,7 +30,6 @@ if ENV['DEBUG']
   append_cflags '-fstack-protector-all'
   append_cflags '-DRB_RG_DEBUG'
 else
-  #append_cflags '-DRAX_DEBUG_MSG'
   append_cflags '-O3'
 end
 

data/lib/raygun/apm.rb

@@ -1,14 +1,25 @@
 require "raygun/apm/version"
+
 begin
+  # Attempt to load a precompiled shared object (released gem)
   RUBY_VERSION =~ /(\d+\.\d+)/
   require "raygun/#{$1}/raygun_ext"
 rescue LoadError
+  # Attempt to load the development specific extension (non-released gem, local dev)
   require "raygun/raygun_ext"
 end
+
 require "raygun/apm/config"
 require "raygun/apm/diagnostics"
 require "raygun/apm/blacklist/parser"
 require "raygun/apm/blacklist/translator"
 require "raygun/apm/tracer"
 require "raygun/apm/event"
+require "raygun/apm/hooks/internals"
 require "raygun/apm/hooks/net_http"
+# conditionally required - may not be bundled
+begin
+  require "raygun/apm/hooks/httpclient"
+  require "raygun/apm/hooks/excon"
+rescue LoadError
+end

data/lib/raygun/apm/blacklist.rb

@@ -140,6 +140,9 @@ module Raygun
         Delegator#
         PrettyPrint#
         PP#
+        PP::
+        PrettyPrint#
+        PrettyPrint::
         Minitest
         Psych
         Mutex_m#
@@ -153,6 +156,24 @@ module Raygun
         TempFile::
       }
 
+      INTERNALS = %w{
+        +Object#sleep
+        +Object#exec
+        +Object#fork
+        +Object#system
+        +Object#spawn
+        +Continuation#callcc
+        +IO#syscall
+        +IO#open
+        +IO#puts
+        +IO#gets
+        +IO#readline
+        +IO#readlines
+        +Random#srand
+        +Random#rand
+        +Signal#trap
+      }
+
       HTTP_OUT = %w{
         #Faraday
         URI
@@ -432,7 +453,7 @@ module Raygun
       end
 
       def self.resolve_entries
-        DEFAULT_RUBY + PROFILER + HTTP_OUT + QUERIES + RAYGUN4RUBY + self.extended_blacklist.flatten
+        DEFAULT_RUBY + PROFILER + INTERNALS + HTTP_OUT + QUERIES + RAYGUN4RUBY + self.extended_blacklist.flatten
       end
     end
   end

data/lib/raygun/apm/diagnostics.rb

@@ -4,23 +4,31 @@ require "json"
 module Raygun
   module Apm
     class Diagnostics
-      AGENT_STATE_DOWN = "The Raygun APM Agent appears to not be running on the current host.\nIf not already installed, please consult https://raygun.com/documentation/product-guides/apm/agent/downloads/\nOtherwise refer to https://raygun.com/documentation/product-guides/apm/agent/installation/ for starting the Agent."
-      AGENT_STATE_UNKNOWN = "Unable to determine the state of the Raygun APM Agent."
-      AGENT_STATE_UP_MISCONFIGURED = "The Raygun APM Agent is running, but misconfigured.\nThe API Key needs to be set through the Raygun_ApiKey environment variable.\nThe API key can be found under 'Application Settings' in the Raygun UI"
-      AGENT_STATE_UP_CONFIGURED = "The Raygun APM Agent is configured properly!"
+      AGENT_STATE_DOWN = "\nThe Raygun APM Agent appears to not be running on the current host.\nIf not already installed, please consult https://raygun.com/documentation/product-guides/apm/agent/downloads/\nOtherwise refer to https://raygun.com/documentation/product-guides/apm/agent/installation/ for starting the Agent."
+      AGENT_STATE_UNKNOWN = "\nUnable to determine the state of the Raygun APM Agent."
+      AGENT_STATE_UP_MISCONFIGURED = "\nThe Raygun APM Agent is running, but misconfigured.\nThe API Key needs to be set through the Raygun_ApiKey environment variable.\nThe API key can be found under 'Application Settings' in the Raygun UI"
+      AGENT_STATE_UP_CONFIGURED = "\nThe Raygun APM Agent is configured properly!"
+      AGENT_MINIMUM_VERSION_NOT_MET = "\nVersion #{Raygun::Apm::VERSION} of the Raygun APM Profiler requires a minimum Agent version #{Raygun::Apm::MINIMUM_AGENT_VERSION}\nPlease download the latest Agent from https://raygun.com/documentation/product-guides/apm/agent/downloads/"
+      PROFILER_NOOPED = "Profiler loaded in noop mode and will be disabled due to the minimum Agent version not met"
 
       def initialize(host: Apm::Config::TCP_MANAGEMENT_HOST, port: Apm::Config::TCP_MANAGEMENT_PORT)
         @host = host
         @port = port
       end
 
-      def verify_agent
+      def verify_agent(tracer)
         socket.write "GetAgentInfo"
-        response = rJSON.parse(socket.gets)
-        if response['Status'] == 1
-          puts AGENT_STATE_UP_CONFIGURED
-        elsif response['Status'] == 0
-          puts AGENT_STATE_UP_MISCONFIGURED
+        response = JSON.parse(socket.gets)
+        if minimum_agent_version_not_met?(response['Version'])
+          puts AGENT_MINIMUM_VERSION_NOT_MET
+          tracer.noop!
+          puts PROFILER_NOOPED
+        else
+          if response['Status'] == 1
+            puts AGENT_STATE_UP_CONFIGURED
+          elsif response['Status'] == 0
+            puts AGENT_STATE_UP_MISCONFIGURED
+          end
         end
       rescue Errno::ECONNREFUSED
         puts AGENT_STATE_DOWN
@@ -32,6 +40,15 @@ module Raygun
       def socket
         @socket ||= s = TCPSocket.new(@host, @port)
       end
+
+      def minimum_agent_version_not_met?(version)
+        # Legacy path
+        if String === version
+          version < Raygun::Apm::MINIMUM_AGENT_VERSION
+        else
+          "#{version['Major']}.#{version['Minor']}.#{version['Build']}.#{version['Revision']}" < Raygun::Apm::MINIMUM_AGENT_VERSION
+        end
+      end
     end
   end
 end

data/lib/raygun/apm/hooks/excon.rb

@@ -0,0 +1,36 @@
+require 'excon'
+
+module Raygun
+  module Apm
+    module Hooks
+      module Excon
+        def request(params={}, &block)
+          if tracer = Raygun::Apm::Tracer.instance
+            started = tracer.now
+            response = super
+            ended = tracer.now
+            event = raygun_apm_http_out_event
+            event[:pid] = Process.pid
+            event[:url] = "#{@data[:scheme]}://#{@data[:host]}/#{params[:path]}"
+            event[:verb] = params[:method].to_s.upcase
+            event[:status] = response.status
+            event[:duration] = ended - started
+            event[:timestamp] = started
+            event[:tid] = tracer.get_thread_id(Thread.current)
+            tracer.emit(event)
+            response
+          else
+            super
+          end
+        end
+
+        private
+        def raygun_apm_http_out_event
+          @_raygun_apm_http_out_event ||= Raygun::Apm::Event::HttpOut.new
+        end
+      end
+    end
+  end
+end
+
+Excon::Connection.prepend(Raygun::Apm::Hooks::Excon)

data/lib/raygun/apm/hooks/httpclient.rb

@@ -0,0 +1,36 @@
+require 'httpclient'
+
+module Raygun
+  module Apm
+    module Hooks
+      module HTTPClient
+        def do_request(method, uri, query, body, header, &filtered_block)
+          if tracer = Raygun::Apm::Tracer.instance
+            started = tracer.now
+            response = super
+            ended = tracer.now
+            event = raygun_apm_http_out_event
+            event[:pid] = Process.pid
+            event[:url] = query ? URI.join(uri, query).to_s : uri.to_s
+            event[:verb] = method.to_s.upcase
+            event[:status] = response.code.to_i
+            event[:duration] = ended - started
+            event[:timestamp] = started
+            event[:tid] = tracer.get_thread_id(Thread.current)
+            tracer.emit(event)
+            response
+          else
+            super
+          end
+        end
+
+        private
+        def raygun_apm_http_out_event
+          @_raygun_apm_http_out_event ||= Raygun::Apm::Event::HttpOut.new
+        end
+      end
+    end
+  end
+end
+
+HTTPClient.prepend(Raygun::Apm::Hooks::HTTPClient)

data/lib/raygun/apm/hooks/internals.rb

@@ -0,0 +1,74 @@
+module Raygun
+  module Apm
+    module Hooks
+      module Object
+        def system(*args)
+          super
+        end
+
+        def sleep(*args)
+          super
+        end
+
+        def exec(*args)
+          super
+        end
+
+        def spawn(*args)
+          super
+        end
+
+        def fork(*args)
+          super
+        end
+      end
+
+      module IO
+        def sycall(*args)
+          super
+        end
+
+        def open(*args)
+          super
+        end
+
+        def puts(*args)
+          super
+        end
+
+        def gets(*args)
+          super
+        end
+
+        def readline(*args)
+          super
+        end
+
+        def readlines(*args)
+          super
+        end
+      end
+
+      module Random
+        def srand(*args)
+          super
+        end
+
+        def rand(*args)
+          super
+        end
+      end
+
+      module Signal
+        def trap(*args)
+          super
+        end
+      end
+    end
+  end
+end
+
+Object.prepend Raygun::Apm::Hooks::Object
+IO.prepend Raygun::Apm::Hooks::IO
+Random.prepend Raygun::Apm::Hooks::Random
+Signal.prepend Raygun::Apm::Hooks::Signal

data/lib/raygun/apm/tracer.rb

@@ -69,12 +69,16 @@ module Raygun
       end
 
       def register_known_library_paths
-        self.register_libraries Bundler.load.specs.map(&:full_gem_path).sort << RbConfig::CONFIG['rubylibdir']
+        if defined?(Bundler)
+          self.register_libraries Bundler.load.specs.map(&:full_gem_path).sort << RbConfig::CONFIG['rubylibdir']
+        else
+          self.register_libraries [RbConfig::CONFIG['rubylibdir']]
+        end
       end
 
       def run_agent_connectivity_diagnostics
         check = Raygun::Apm::Diagnostics.new
-        check.verify_agent
+        check.verify_agent(self)
       end
     end
   end

data/lib/raygun/apm/version.rb

@@ -1,5 +1,6 @@
 module Raygun
   module Apm
-    VERSION = "1.0.48"
+    VERSION = "1.0.54"
+    MINIMUM_AGENT_VERSION = "1.0.1190.0"
   end
 end

data/raygun-apm.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://raygun.com/platform/apm"
   #spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|vendor|tools|ext)/}) || f.match(%r{Rakefile|Gemfile|CHANGELOG|.git}) }
+  spec.files         = Dir['README.rdoc', 'raygun-apm.gemspec', 'lib/**/*', 'bin/**/*'].reject { |f| f.match(/raygun_ext\./) }
   spec.files         += Dir['lib/raygun/**/{2}*/raygun_ext.*']
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.48
+  version: 1.0.54
 platform: x86-linux
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -216,6 +216,9 @@ files:
 - lib/raygun/apm/config.rb
 - lib/raygun/apm/diagnostics.rb
 - lib/raygun/apm/event.rb
+- lib/raygun/apm/hooks/excon.rb
+- lib/raygun/apm/hooks/httpclient.rb
+- lib/raygun/apm/hooks/internals.rb
 - lib/raygun/apm/hooks/net_http.rb
 - lib/raygun/apm/hooks/redis.rb
 - lib/raygun/apm/tracer.rb