raygun-apm 1.0.64-x86-mingw32 → 1.0.72-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ef267bb0b137da1d83bac5d9b16f3f96ec66c44289e0c8b655315192dc424c8
-  data.tar.gz: 9c0e1ab2380a6abf4731ca591b5678d2ed71e89ff2d4f85a53665558df005910
+  metadata.gz: d0eb46634a2515d6d73291997494024e5cab8baa433c332b4f26662e5666646e
+  data.tar.gz: 01d74285ab240faf370c44835800bccffe344589b7a0368230955889f663388c
 SHA512:
-  metadata.gz: 0dcabeaa592e4cf00d4a58c491dd49e11a251b14e0bf861a919daf7e99df7e2e923a1cb5bf1e2c034bbaa58734be46e1574fa8bc8be82d69f2228c27dc8df1f3
-  data.tar.gz: 2af729913ad07d7a5c546b69464bb52fe9c31365b9ea372db485a08c867e9639c9fda3f4f139aed300faeb2d321452ccbe17cccb81239f72ef5d0532a5228911
+  metadata.gz: e6d67e2cf6cef1d1b18267a289962b7c68ae10daa9ff267379bbcc7f7a531bf05fa60edc772f0841b87e9d36c7c54d868ffb9014241c13e49606485bcb40a217
+  data.tar.gz: bf67a4052680109501b102966af917d4f94ec924048d87d69cc6812367a8aed80fc8908ac0c6aef1cd2dd872a52c139074b8315cadc0d0b61c398fd7dfc1e0fd

data/bin/{diagnostics → raygun-diagnostics}

@@ -3,5 +3,4 @@
 require "bundler/setup"
 require "raygun/apm"
 
-check = Raygun::Apm::Diagnostics.new
-check.verify_agent
+tracer = Raygun::Apm::Tracer.new

data/lib/raygun/apm.rb

@@ -18,8 +18,10 @@ 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
+conditional_hooks = %w(httpclient excon mongodb)
+conditional_hooks.each do |hook|
+  begin
+    require "raygun/apm/hooks/#{hook}"
+  rescue LoadError
+  end
 end

data/lib/raygun/apm/blacklist.rb

@@ -66,6 +66,10 @@ module Raygun
         Method#
         Module#
         Mutex#
+        +Thread::Mutex#synchronize
+        +Thread::Mutex#lock
+        +Thread::Mutex#unlock
+        +Thread::Mutex#sleep
         NameError#
         NilClass#
         NoMemoryError#
@@ -154,6 +158,8 @@ module Raygun
         FileUtils::
         TempFile#
         TempFile::
+        Logger#
+        Logger::
       }
 
       INTERNALS = %w{
@@ -246,6 +252,10 @@ module Raygun
       }
 
       QUERIES = %w{
+        #mongodb
+        Mongo
+        BSON
+        +Mongo::Operation::Executable#do_execute
         #redis
         Redis
         +Redis#auth

data/lib/raygun/apm/config.rb

@@ -18,6 +18,9 @@ module Raygun
         "production" => Tracer::ENV_PRODUCTION
       }
 
+      DEFAULT_BLACKLIST_PATH_UNIX = "/usr/share/Raygun/Blacklist"
+      DEFAULT_BLACKLIST_PATH_WINDOWS = "C:\\ProgramData\\Raygun\\Blacklist"
+
       attr_accessor :env
       def initialize(env=ENV)
         @env = env
@@ -62,19 +65,18 @@ module Raygun
       config_var 'PROTON_FILE_IPC_FOLDER', as: String
       config_var 'PROTON_USE_MULTICAST', as: String, default: 'False'
       config_var 'PROTON_BATCH_IDLE_COUNTER', as: Integer, default: 500
+      ## 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
 
-      def udp_host
+      def proton_udp_host
         if proton_use_multicast == 'True'
           UDP_SINK_MULTICAST_HOST
         else
-          UDP_SINK_HOST
+          env['PROTON_UDP_HOST'] ? env['PROTON_UDP_HOST'].to_s : UDP_SINK_HOST
         end
       end
 
-      def udp_port
-        UDP_SINK_PORT
-      end
-
       def loglevel
         LOGLEVELS[proton_debug_loglevel] || raise(ArgumentError, "invalid log level")
       end
@@ -83,6 +85,13 @@ module Raygun
         environment = env['RACK_ENV'] || env['RAILS_ENV'] || 'production'
         ENVIRONMENTS[environment] || Tracer::ENV_PRODUCTION
       end
+
+      # Prefer what is set by PROTON_USER_OVERRIDES_FILE env
+      def blacklist_file
+        return proton_user_overrides_file if proton_user_overrides_file
+        path = Gem.win_platform? ? DEFAULT_BLACKLIST_PATH_WINDOWS : DEFAULT_BLACKLIST_PATH_UNIX
+        "#{File.join(path, proton_api_key)}.txt"
+      end
     end
   end
 end

data/lib/raygun/apm/diagnostics.rb

@@ -5,7 +5,7 @@ module Raygun
   module Apm
     class Diagnostics
       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_UNKNOWN = "\nThe Raygun APM Agent is reachable, but Unable to determine the state of the Agent at the moment."
       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/"

data/lib/raygun/apm/event.rb

@@ -4,6 +4,11 @@ module Raygun
       def inspect
         "#<#{self.class.name}:#{self.object_id}> length:#{self.length} pid:#{self[:pid]} tid:#{self[:tid]} timestamp:#{self[:timestamp]}"
       end
+      class ExceptionThrown < Event
+        def inspect
+          super + " class:#{self[:class_name]}"
+        end
+      end
       class ThreadStarted < Event
         def inspect
           super + " parent_tid:#{self[:parent_tid]}"
@@ -29,6 +34,11 @@ module Raygun
           super + " url:#{self[:url]} verb:#{self[:verb]} status:#{self[:status]} duration:#{self[:duration]}"
         end
       end
+      class Sql < Event
+        def inspect
+          super + " provider:#{self[:provider]} host:#{self[:host]} query:#{self[:query]} database:#{self[:database]} duration:#{self[:duration]}"
+        end
+      end
       class BeginTransaction < Event
         def inspect
           super + " api_key:#{self[:api_key]} technology_type:#{self[:technology_type]} process_type:#{self[:process_type]}"

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

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Raygun
   module Apm
     module Hooks
@@ -64,6 +66,24 @@ module Raygun
           super
         end
       end
+
+      module Mutex
+        def synchronize(*args)
+          super
+        end
+
+        def lock(*args)
+          super
+        end
+
+        def unlock(*args)
+          super
+        end
+
+        def sleep(*args)
+          super
+        end
+      end
     end
   end
 end
@@ -71,4 +91,5 @@ 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
+Signal.prepend Raygun::Apm::Hooks::Signal
+Thread::Mutex.prepend Raygun::Apm::Hooks::Mutex

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

@@ -0,0 +1,45 @@
+require 'mongo'
+
+module Raygun
+  module Apm
+    module Hooks
+      module MongoDB
+        def do_execute(connection, client, options = {})
+          result = nil
+          if tracer = Raygun::Apm::Tracer.instance
+            started = tracer.now
+            result = super
+            ended = tracer.now
+            event = raygun_apm_sql_event
+            event[:pid] = Process.pid
+            event[:query] = raygun_format_query(connection)
+            event[:provider] = "mongodb"
+            event[:host] = connection.address.to_s
+            event[:database] = client.database.name
+            event[:duration] = ended - started
+            event[:timestamp] = started
+            event[:tid] = tracer.get_thread_id(Thread.current)
+            tracer.emit(event)
+            result
+          else
+            super
+          end
+        end
+
+        private
+        def raygun_format_query(connection)
+          payload = message(connection).payload
+          return "#{payload["database_name"]}.#{payload["command_name"]} #{payload["command"]}}"
+        end
+
+        def raygun_apm_sql_event
+          @_raygun_apm_sql_event ||= Raygun::Apm::Event::Sql.new
+        end
+      end
+    end
+  end
+end
+
+Mongo::Operation.constants.each do |operation|
+  Mongo::Operation.const_get(operation).prepend(Raygun::Apm::Hooks::MongoDB) rescue nil
+end

data/lib/raygun/apm/tracer.rb

@@ -36,8 +36,8 @@ module Raygun
         sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, Tracer::BATCH_PACKET_SIZE)
         self.udp_sink(
           socket: sock,
-          host: config.udp_host,
-          port: config.udp_port,
+          host: config.proton_udp_host,
+          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
@@ -57,20 +57,23 @@ module Raygun
 
       def initialize_blacklist
         @blacklist_parser = Raygun::Apm::Blacklist::Parser.new(self)
-        @blacklist = if @config.proton_user_overrides_file && File.exists?(@config.proton_user_overrides_file)
-          File.readlines(@config.proton_user_overrides_file)
+        file = @config.blacklist_file
+        @blacklist = if file && File.exist?(file)
+          File.readlines(file)
         else
           []
         end
-        # From file
-        @blacklist_parser.add_filters @blacklist
         # Defaults
         @blacklist_parser.add_filters Raygun::Apm::Blacklist.resolve_entries
+        # From file
+        @blacklist_parser.add_filters @blacklist
       end
 
       def register_known_library_paths
         if defined?(Bundler)
-          self.register_libraries Bundler.load.specs.map(&:full_gem_path).sort << RbConfig::CONFIG['rubylibdir']
+          libs = Bundler.load.specs.map(&:full_gem_path).sort << RbConfig::CONFIG['rubylibdir']
+          libs.delete(Dir.getwd)
+          self.register_libraries libs
         else
           self.register_libraries [RbConfig::CONFIG['rubylibdir']]
         end

data/lib/raygun/apm/version.rb

@@ -1,6 +1,6 @@
 module Raygun
   module Apm
-    VERSION = "1.0.64"
+    VERSION = "1.0.72"
     MINIMUM_AGENT_VERSION = "1.0.1190.0"
   end
 end

data/raygun-apm.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
 
   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.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib", "ext"]
 
@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "excon", "~> 0.73.0"
   spec.add_development_dependency "httparty", "~> 0.18.0"
   spec.add_development_dependency "httpclient", "~> 2.8.3"
+  spec.add_development_dependency "mongoid", "~> 7.1.2"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.64
+  version: 1.0.72
 platform: x86-mingw32
 authors:
 - Raygun
 - Erkki Eilonen
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -193,6 +193,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.3
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.1.2
 description: 
 email:
 - support@raygun.com
@@ -203,7 +217,7 @@ extra_rdoc_files: []
 files:
 - README.rdoc
 - bin/console
-- bin/diagnostics
+- bin/raygun-diagnostics
 - bin/setup
 - ext/raygun/extconf.rb
 - lib/raygun/2.5/raygun_ext.so
@@ -219,6 +233,7 @@ files:
 - lib/raygun/apm/hooks/excon.rb
 - lib/raygun/apm/hooks/httpclient.rb
 - lib/raygun/apm/hooks/internals.rb
+- lib/raygun/apm/hooks/mongodb.rb
 - lib/raygun/apm/hooks/net_http.rb
 - lib/raygun/apm/hooks/redis.rb
 - lib/raygun/apm/tracer.rb