raygun-apm 1.0.41-x86-mingw32 → 1.0.42-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24e33630059880099d0a5e46ca13bb2bb32ef9042fede417b8328af5b20094fd
-  data.tar.gz: 39835ff0b49716b4881d910b80041dcc41f24d003e051dc25463009d56f0f047
+  metadata.gz: d4806c0bbe480ae9d117e52718a84a5df256da8d7e94a11980a2de3f183568ea
+  data.tar.gz: b2163b29c7c91e1fe0dc613f7de75d900422f5b22f5ac9530414e6862169bb01
 SHA512:
-  metadata.gz: cd16c7f9716c3f2523355fa16aa4dae8ffece601a86b644ccbaa11ac34669bf0a31ee78d244cda6736fb1beff494846b9d3c4b81a23d433404d5a47783b89ae0
-  data.tar.gz: 3f5379c71bb6b0ba7450bdfed1e442a3c41e72c147c5ee665d3de4df2aa3bfa38afbb117e48f1cbd58cf64a335cf8a22c8cf0cbb5882e2d15faae96af8d76a13
+  metadata.gz: f137c1d376896c3ce5ab22d537f6eb281ea08f01cd6be8b490517cb26c8f6d3558b0e53e0d0371eaaa4658ee8e931b6e5b17f43ff70774fe537d4469d64854b4
+  data.tar.gz: 48169ad519cd4ecbdc023441ebe4cd138950fcfd45d106e77bd5883a58b20ab0801ece631008e64eb94a941b4089603d40e05e2a8013857e3e067b4a3b6557d7

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/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

data/lib/raygun/apm/tracer.rb

@@ -33,6 +33,7 @@ module Raygun
         self.environment = config.environment
         self.api_key = config.proton_api_key
         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
@@ -73,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.41"
+    VERSION = "1.0.42"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.41
+  version: 1.0.42
 platform: x86-mingw32
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-04 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