raygun-apm 1.0.45-x64-mingw32 → 1.0.51-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8eab8fae06e651ee0445a69529b643e679f258d70581199e1c33b091b033d0c
-  data.tar.gz: da7b5b376c123bf2fe73c6ff1f0724a654d9073fe7b845cefeeb353c5f3bb417
+  metadata.gz: fab20c300b6775a0d7ee6b7e21c679be442f0fab30ef932faa5d0f946e68165e
+  data.tar.gz: b6389adb233a89a67a58b7f5f09453b3705706ec59c03ac15dc14eed5ccdb962
 SHA512:
-  metadata.gz: dab160f63fed944a92f0d7844776d8490b655468fd867bfcb66bcdb7e0aa520cf5e1ea3cb390abd9e16a773ec0111029eabb02a39edf83a68013825543ea2c38
-  data.tar.gz: 8a82291195d1fde8c0667cc81ac5fa9ea10376300767b8f9eb736606d3da600f547705bc5e8dca5d12684d370295d25dd840d1eae0f14cf59422b967da214280
+  metadata.gz: 81073dbe3a95b4531d754dafa06fbb4cac78f7ac7742a3b9ac316571dcc3fd9a6f06754bf08496760583c269c92841dbceb6e2376263d1fe6ce5d2bc31794152
+  data.tar.gz: 32ffa53a071df064723f861de66366334a4e650cd9483f6ae6e621885d5aaddd0cb88dab825bb5c1b468f17e88fb85a3559bc15834161b387fcde8a7ee4ed6a5

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

@@ -12,156 +12,166 @@ module Raygun
         #<Module:
         #<Class:
         #<#<Class:
-        ARGF
-        ArgumentError
-        Array
-        Base64
-        BasicObject
-        Binding
-        Class
-        ClosedQueueError
-        Comparable
-        Complex
-        ConditionVariable
-        Continuation
-        Data
-        Dir
-        ENV
-        EOFError
-        Encoding
-        Encoding::CompatibilityError
-        Encoding::Converter
-        Encoding::ConverterNotFoundError
-        Encoding::InvalidByteSequenceError
-        Encoding::UndefinedConversionError
-        EncodingError
-        Enumerable
-        Enumerator
-        Enumerator::ArithmeticSequence
-        Enumerator::Chain
-        Enumerator::Generator
-        Enumerator::Lazy
-        Enumerator::Yielder
-        Errno
-        Exception
-        FalseClass
-        Fiber
-        FiberError
-        File
-        File::Constants
-        File::Stat
-        FileTest
-        Float
-        FloatDomainError
-        FrozenError
-        GC
-        GC::Profiler
-        Hash
-        IO
-        IO::EAGAINWaitReadable
-        IO::EAGAINWaitWritable
-        IO::EINPROGRESSWaitReadable
-        IO::EINPROGRESSWaitWritable
-        IO::EWOULDBLOCKWaitReadable
-        IO::EWOULDBLOCKWaitWritable
-        IO::WaitReadable
-        IO::WaitWritable
-        IOError
-        IndexError
-        Integer
-        Interrupt
-        JSON
-        Kernel
-        KeyError
-        LoadError
-        LocalJumpError
-        Marshal
-        MatchData
-        Math
-        Math::DomainError
+        ARGF#
+        ArgumentError#
+        Array#
+        Base64#
+        BasicObject#
+        Binding#
+        Class#
+        ClosedQueueError#
+        Comparable#
+        Complex#
+        ConditionVariable#
+        Continuation#
+        Data#
+        Dir#
+        ENV#
+        EOFError#
+        Encoding#
+        Encoding::
+        EncodingError#
+        Enumerable#
+        Enumerator#
+        Enumerator::
+        Errno#
+        Exception#
+        FalseClass#
+        Fiber#
+        FiberError#
+        File#
+        File::
+        FileTest#
+        Float#
+        FloatDomainError#
+        FrozenError#
+        GC#
+        GC::Profiler#
+        Hash#
+        IO#
+        IO::
+        IOError#
+        IndexError#
+        Integer#
+        Interrupt#
+        JSON#
+        Kernel#
+        KeyError#
+        LoadError#
+        LocalJumpError#
+        Marshal#
+        MatchData#
+        Math#
+        Math::
         Method#
-        Module
-        Mutex
-        NameError
-        NilClass
-        NoMemoryError
-        NoMethodError
-        NotImplementedError
-        Numeric
-        Object
-        ObjectSpace
-        ObjectSpace::WeakMap
-        Proc
-        Process
-        Process::GID
-        Process::Status
-        Process::Sys
-        Process::UID
-        Psych
-        Queue
-        Random
-        Random::Formatter
-        Range
-        RangeError
-        Rational
-        Regexp
-        RegexpError
-        RubyVM
-        RubyVM::AbstractSyntaxTree
-        RubyVM::AbstractSyntaxTree::Node
-        RubyVM::InstructionSequence
-        RubyVM::MJIT
-        RuntimeError
-        ScriptError
-        SecurityError
-        Set
-        SimpleDelegator
-        Signal
-        SignalException
-        SizedQueue
-        Socket
-        StandardError
-        StopIteration
-        String
-        Struct
-        Symbol
-        SyntaxError
-        SystemCallError
-        SystemExit
-        SystemStackError
-        Thread
-        Thread::Backtrace
-        Thread::Backtrace::Location
-        ThreadError
-        ThreadGroup
-        Time
-        TracePoint
-        TrueClass
-        TypeError
-        UnboundMethod
-        UncaughtThrowError
-        UnicodeNormalize
-        Warning
-        ZeroDivisionError
-        IPAddr
+        Module#
+        Mutex#
+        NameError#
+        NilClass#
+        NoMemoryError#
+        NoMethodError#
+        NotImplementedError#
+        Numeric#
+        Object#
+        ObjectSpace#
+        ObjectSpace::
+        Proc#
+        Process#
+        Process::
+        Psych#
+        Queue#
+        Random#
+        Random::
+        Range#
+        RangeError#
+        Rational#
+        Regexp#
+        RegexpError#
+        RubyVM#
+        RubyVM::
+        RuntimeError#
+        ScriptError#
+        SecurityError#
+        Set#
+        SimpleDelegator#
+        Signal#
+        SignalException#
+        SizedQueue#
+        Socket#
+        StandardError#
+        StopIteration#
+        String#
+        Struct#
+        Symbol#
+        SyntaxError#
+        SystemCallError#
+        SystemExit#
+        SystemStackError#
+        Thread#
+        Thread::
+        ThreadError#
+        ThreadGroup#
+        Timeout
+        Time#
+        TracePoint#
+        TrueClass#
+        TypeError#
+        UnboundMethod#
+        UncaughtThrowError#
+        UnicodeNormalize#
+        Warning#
+        ZeroDivisionError#
+        IPAddr#
         Net::
-        OpenSSL
-        BasicSocket
-        Forwardable
-        Gem
-        FFI
-        Addrinfo
-        Open3
-        Shellwords
-        WeakRef
-        RbConfig
-        Singleton
-        OpenStruct
-        Bundler
-        Delegator
-        PrettyPrint
-        PP
+        OpenSSL#
+        OpenSSL::
+        BasicSocket#
+        Forwardable#
+        Gem#
+        FFI#
+        Addrinfo#
+        Open3#
+        Shellwords#
+        WeakRef#
+        RbConfig#
+        Singleton#
+        OpenStruct#
+        Bundler#
+        Delegator#
+        PrettyPrint#
+        PP#
+        PP::
+        PrettyPrint#
+        PrettyPrint::
         Minitest
+        Psych
+        Mutex_m#
+        ERB#
+        ERB::
+        Gem#
+        Gem::
+        FileUtils#
+        FileUtils::
+        TempFile#
+        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{
@@ -443,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/blacklist/parser.rb

@@ -35,7 +35,7 @@ module Raygun
         end
 
         def show_filters
-          @tracer.show_filters# if @tracer.config.loglevel == Tracer::LOG_BLACKLIST
+          @tracer.show_filters if @tracer.config.loglevel == Tracer::LOG_BLACKLIST
         end
 
         def translate(filter)

data/lib/raygun/apm/diagnostics.rb

@@ -4,25 +4,34 @@ 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_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/"
 
       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 = JSON.parse(socket.gets)
-        if response['Status'] == 1
-          puts AGENT_STATE_UP_CONFIGURED
-        elsif response['Status'] == 0
-          puts AGENT_STATE_UP_MISCONFIGURED
+        if response['Version'] < Raygun::Apm::MINIMUM_AGENT_VERSION
+          puts AGENT_MINIMUM_VERSION_NOT_MET
+          tracer.noop!
+        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
+      rescue
+        puts AGENT_STATE_UNKNOWN
       end
 
       private

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.45"
+    VERSION = "1.0.51"
+    MINIMUM_AGENT_VERSION = "1.0.1186.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.45
+  version: 1.0.51
 platform: x64-mingw32
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-26 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