raygun-apm 1.0.41-universal-darwin → 1.0.42-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc879e3277fb5beaf098c4100bd651045f2307b2bb20d0c59c0bf50f8e4d80ae
-  data.tar.gz: 3b8376231692accb1e4b85a1aabca248429975631c573d330fcbf5eefe246e24
+  metadata.gz: 49b82d38eb3a2c53f2293658bef52eae27d1dc485e9757955423b74d86e11505
+  data.tar.gz: 2d1d5ac9ab1eeeb7d5efc6f015ed50bdf64ae87e833a0031d7c75eef9f0f6d06
 SHA512:
-  metadata.gz: 0a6ebe2c82418472a4c0a0d35f4fdfac67314c0dda5618d317ae46396e7ab431dfbbc52ed614e21f9af63c27e03736a03bd53400919780c0d554b7d2db2bf761
-  data.tar.gz: 39a1254a4a84ac3202b975b079fa92a9e3c183e44a25b0a2ec3cda6956a8e7b68b117d309a4e5b7f47785f348f331cb4ba5b3855e0a436fc90433a03e169424d
+  metadata.gz: b2aa86cc96978cb406d7450a0492c8b084ab170426ba505e0665ffcdfc3f291febfa678ad2cf90e1f6622fd47ee33fb146e80ceab1d6efafe879fceb76f11fbc
+  data.tar.gz: df359a268174d9ba7e49007caaef67789a89ee57f5b7939e96c504f1b270178479c6441f3eda41c27c77912ac430f717e6bacb30e8f8f7b11be9cff4710864d2

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: universal-darwin
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-30 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.bundle
@@ -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