raygun-apm 1.0.38-x64-mingw32 → 1.0.43-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f78d4db7a85db4d8175b852ae41d979aa1fffa0ad629b29b18de88cf2dfe52c3
-  data.tar.gz: 7c2387fba2464a15576e2d2e81383761f28c00fb1564a71d6c3388e171db8836
+  metadata.gz: 3b827eea3be942b55a63f5059e58e3975abc8b4706d25d1c7fc02c3fc89929ab
+  data.tar.gz: 8e8fd810ae289d07c5ce1f4f3147b49ba135ae3348985db066851cc547e41b18
 SHA512:
-  metadata.gz: 76ea2d9f1e4c4077c743b62271294770b4944d8f8fae8cebe37253af9fb933421b379ae7150083a4ac5c74580b596922e32422908c32f1d085048b955d50601d
-  data.tar.gz: b1849883efe655299cbd4a1bbde485e4caea738aa689c7a505bf6129aef9ce3fe1b0f6bb3ce8b377a72265ba49630d20b6c386eef4950216b6658f8d8c37f162
+  metadata.gz: 6d3c55f43b4af2f45842b559c26b7e8256e70957dc415c319d1230ca4ef21f6bceccc198aad7e7dbecb0060a8786cae984859d17bdf04f673080faf23ed88bea
+  data.tar.gz: 465f69a8d3eb6783d7fc15eaf99891f09095249ae8f1446c71b502fc50c6c4c4dd2495395d5630d6eeceb8588066c6e26531ea8daa0732218da1a0680ae288ea

data/README.rdoc

@@ -84,7 +84,6 @@ For standalone scripts, context start-end needs to be marked specifically and op
   
   tracer = Raygun::Apm::Tracer.new
   tracer.udp_sink!
-  tracer.process_started
   tracer.start_trace
   Hello.new.rdoc
   tracer.end_trace

data/bin/diagnostics

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "raygun/apm"
+
+check = Raygun::Apm::Diagnostics.new
+check.verify_agent

data/lib/raygun/apm.rb

@@ -6,6 +6,7 @@ rescue LoadError
   require "raygun/raygun_ext"
 end
 require "raygun/apm/config"
+require "raygun/apm/diagnostics"
 require "raygun/apm/tracer"
 require "raygun/apm/event"
 require "raygun/apm/hooks/net_http"

data/lib/raygun/apm/blacklist.rb

@@ -228,7 +228,205 @@ module Raygun
       }
 
       QUERIES = %w{
-        +Raygun::Apm::Hooks::Redis::process
+        # redis
+        Redis
+        +Redis::auth
+        +Redis::select
+        +Redis::ping
+        +Redis::echo
+        +Redis::bgrewriteaof
+        +Redis::bgsave
+        +Redis::config
+        +Redis::dbsize
+        +Redis::debug
+        +Redis::flushall
+        +Redis::flushdb
+        +Redis::info
+        +Redis::lastsave
+        +Redis::monitor
+        +Redis::save
+        +Redis::shutdown
+        +Redis::slaveof
+        +Redis::slowlog
+        # Revisit this command as greedy matches on Redis.synchronize too
+        #+Redis::sync
+        +Redis::time
+        +Redis::persist
+        +Redis::expire
+        +Redis::expireat
+        +Redis::ttl
+        +Redis::pexpire
+        +Redis::pexpireat
+        +Redis::pttl
+        +Redis::dump
+        +Redis::restore
+        +Redis::migrate
+        +Redis::del
+        +Redis::unlink
+        +Redis::exists
+        +Redis::keys
+        +Redis::move
+        +Redis::object
+        +Redis::randomkey
+        +Redis::rename
+        +Redis::renamenx
+        +Redis::sort
+        +Redis::type
+        +Redis::decr
+        +Redis::decrby
+        +Redis::incr
+        +Redis::incrby
+        +Redis::incrbyfloat
+        +Redis::set
+        +Redis::multi
+        +Redis::client
+        +Redis::set
+        +Redis::setex
+        +Redis::psetex
+        +Redis::setnx
+        +Redis::mset
+        +Redis::mapped_mset
+        +Redis::msetnx
+        +Redis::mapped_msetnx
+        +Redis::get
+        +Redis::mget
+        +Redis::mapped_mget
+        +Redis::setrange
+        +Redis::getrange
+        +Redis::setbit
+        +Redis::getbit
+        +Redis::append
+        +Redis::bitcount
+        +Redis::bitop
+        +Redis::bitpos
+        +Redis::getset
+        +Redis::strlen
+        +Redis::llen
+        +Redis::lpush
+        +Redis::lpushx
+        +Redis::rpush
+        +Redis::rpushx
+        +Redis::lpop
+        +Redis::rpop
+        +Redis::rpoplpush
+        +Redis::blpop
+        +Redis::brpop
+        +Redis::brpoplpush
+        +Redis::lindex
+        +Redis::linsert
+        +Redis::lrange
+        +Redis::lrem
+        +Redis::lset
+        +Redis::ltrim
+        +Redis::scard
+        +Redis::sadd
+        +Redis::srem
+        +Redis::spop
+        +Redis::srandmember
+        +Redis::smove
+        +Redis::sismember
+        +Redis::smembers
+        +Redis::sdiff
+        +Redis::sdiffstore
+        +Redis::sinter
+        +Redis::sinterstore
+        +Redis::sunion
+        +Redis::sunionstore
+        +Redis::zcard
+        +Redis::zadd
+        +Redis::zincrby
+        +Redis::zrem
+        +Redis::zpopmax
+        +Redis::zpopmin
+        +Redis::bzpopmax
+        +Redis::bzpopmin
+        +Redis::zscore
+        +Redis::zrange
+        +Redis::zrevrange
+        +Redis::zrank
+        +Redis::zrevrank
+        +Redis::zremrangebyrank
+        +Redis::zlexcount
+        +Redis::zrangebylex
+        +Redis::zrevrangebylex
+        +Redis::zrangebyscore
+        +Redis::zrevrangebyscore
+        +Redis::zremrangebyscore
+        +Redis::zcount
+        +Redis::zinterstore
+        +Redis::zunionstore
+        +Redis::hlen
+        +Redis::hset
+        +Redis::hsetnx
+        +Redis::hmset
+        +Redis::mapped_hmset
+        +Redis::hget
+        +Redis::hmget
+        +Redis::mapped_hmget
+        +Redis::hdel
+        +Redis::hexists
+        +Redis::hincrby
+        +Redis::hincrbyfloat
+        +Redis::hkeys
+        +Redis::hvals
+        +Redis::hgetall
+        +Redis::publish
+        +Redis::subscribe
+        +Redis::subscribe_with_timeout
+        +Redis::unsubscribe
+        +Redis::psubscribe
+        +Redis::psubscribe_with_timeout
+        +Redis::punsubscribe
+        +Redis::pubsub
+        +Redis::watch
+        +Redis::unwatch
+        +Redis::pipelined
+        +Redis::multi
+        +Redis::exec
+        +Redis::discard
+        +Redis::script
+        +Redis::eval
+        +Redis::evalsha
+        +Redis::scan
+        +Redis::hscan
+        +Redis::zscan
+        +Redis::sscan
+        +Redis::pfadd
+        +Redis::pfcount
+        +Redis::pfmerge
+        +Redis::geoadd
+        +Redis::geohash
+        +Redis::georadiusbymember
+        +Redis::geopos
+        +Redis::geodist
+        +Redis::xinfo
+        +Redis::xadd
+        +Redis::xtrim
+        +Redis::xdel
+        +Redis::xrange
+        +Redis::xrevrange
+        +Redis::xlen
+        +Redis::xread
+        +Redis::xgroup
+        +Redis::xreadgroup
+        +Redis::xack
+        +Redis::xclaim
+        +Redis::xpending
+        +Redis::sentinel
+        +Redis::cluster
+        +Redis::asking
+        #+Raygun::Apm::Hooks::Redis::process
+      }
+
+      RAYGUN4RUBY = %w{
+        Raygun::Breadcrumbs
+        Raygun::Configuration
+        Raygun::config
+        Raygun::log
+        Raygun::should_report?
+        Raygun::Client
+        track_exception_sync
+        +Raygun::track_exception
       }
 
       def self.extend_with(list)
@@ -240,7 +438,7 @@ module Raygun
       end
 
       def self.resolve_entries
-        DEFAULT_RUBY + PROFILER + HTTP_OUT + QUERIES + self.extended_blacklist.flatten
+        DEFAULT_RUBY + PROFILER + HTTP_OUT + QUERIES + RAYGUN4RUBY + self.extended_blacklist.flatten
       end
     end
   end

data/lib/raygun/apm/config.rb

@@ -49,9 +49,10 @@ module Raygun
       end
 
       # Initial constants for ProtonAgentTail.exe
-      UDP_SINK_HOST = '127.0.0.1'
+      UDP_SINK_HOST = TCP_MANAGEMENT_HOST = '127.0.0.1'
       UDP_SINK_MULTICAST_HOST = '239.100.15.215'
       UDP_SINK_PORT = 2799
+      TCP_MANAGEMENT_PORT = 2790
 
       ## Enumerate all PROTON_ constants
       config_var 'PROTON_API_KEY', as: String, default: ''

data/lib/raygun/apm/diagnostics.rb

@@ -0,0 +1,34 @@
+require "socket"
+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!"
+
+      def initialize(host: Apm::Config::TCP_MANAGEMENT_HOST, port: Apm::Config::TCP_MANAGEMENT_PORT)
+        @host = host
+        @port = port
+      end
+
+      def verify_agent
+        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
+        end
+      rescue Errno::ECONNREFUSED
+        puts AGENT_STATE_DOWN
+      end
+
+      private
+      def socket
+        @socket ||= s = TCPSocket.new(@host, @port)
+      end
+    end
+  end
+end

data/lib/raygun/apm/event.rb

@@ -6,7 +6,7 @@ module Raygun
       end
       class ThreadStarted < Event
         def inspect
-          super + " "
+          super + " parent_tid:#{self[:parent_tid]}"
         end
       end
       class Begin < Event
@@ -29,6 +29,11 @@ module Raygun
           super + " url:#{self[:url]} verb:#{self[:verb]} status:#{self[:status]} 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]}"
+        end
+      end
     end
   end
 end

data/lib/raygun/apm/tracer.rb

@@ -1,4 +1,5 @@
 require 'raygun/apm/blacklist'
+require 'rbconfig'
 
 module Raygun
   module Apm
@@ -31,7 +32,8 @@ module Raygun
         self.log_level = config.loglevel
         self.environment = config.environment
         self.api_key = config.proton_api_key
-        self.register_libraries Bundler.load.specs.map(&:full_gem_path).sort
+        self.register_libraries Bundler.load.specs.map(&:full_gem_path).sort << RbConfig::CONFIG['rubylibdir']
+        agent_connectivity_diagnostics
         ObjectSpace.define_finalizer(self, proc{ disable_tracepoints })
       # Any fails here is kamikaze for the tracer
       rescue => e
@@ -72,6 +74,10 @@ module Raygun
         raise Raygun::Apm::FatalError, "Raygun APM UDP sink could not be initialized: #{e.message}"
       end
 
+      def agent_connectivity_diagnostics
+        check = Raygun::Apm::Diagnostics.new
+        check.verify_agent
+      end
     end
   end
 end

data/lib/raygun/apm/version.rb

@@ -1,5 +1,5 @@
 module Raygun
   module Apm
-    VERSION = "1.0.38"
+    VERSION = "1.0.43"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.38
+  version: 1.0.43
 platform: x64-mingw32
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -203,6 +203,7 @@ extra_rdoc_files: []
 files:
 - README.rdoc
 - bin/console
+- bin/diagnostics
 - bin/setup
 - ext/raygun/extconf.rb
 - lib/raygun/2.5/raygun_ext.so
@@ -211,6 +212,7 @@ files:
 - lib/raygun/apm.rb
 - lib/raygun/apm/blacklist.rb
 - lib/raygun/apm/config.rb
+- lib/raygun/apm/diagnostics.rb
 - lib/raygun/apm/event.rb
 - lib/raygun/apm/hooks/net_http.rb
 - lib/raygun/apm/hooks/redis.rb