raygun-apm 1.0.41-x86-linux → 1.0.42-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 819d1cf66cdd810a2f6b0d55add2589df3507768a7bf77235bddf5c1df4c204f
-  data.tar.gz: 91e704d0a1a194c8907068584ca1814ca3d28ac2e47751b0f7357af553881f62
+  metadata.gz: da0efde7ad42d2a553ad6e0bec7f0b19385df03028f0f59feae081991ad27748
+  data.tar.gz: 06b4bb7197fb413b14a73c1d6adbf3912001d4a2be65a4a4f92f2641f420dca2
 SHA512:
-  metadata.gz: 5a18c2f32cbdf5b3c18458efe6270fe9457d236a31988fee866704a5d4d3ab69c5e62a097a4d616a6434f83296fb1967ee4038d95d2f6f7700c09d7bfcae32a1
-  data.tar.gz: 7635097842d6276056eaeea8b90bc2f15b7baebbac5a9fe406feb97a80740dc43f26dcc9a6de3f275cd0f22feca504ba03a260edeb1c20115edfa68dae96d1bd
+  metadata.gz: 74a3904d2036bc43aeb2b7fb2000701513e8212fe9ebe1c8136cdbc6f3f08f293af2474317fe078f8c7cf93ff6b828f57f24eb4af667c02a6a577ad686197f19
+  data.tar.gz: c5d81c12e8cf6cdabbee175494a33fff19f5cd60e27dd340b5c395743d29f190b3d557d363e72fcab7ee3f0f11fee5f40eeb3e3a59e55b6cd81b0d2eb0228694

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