scout_apm 0.9.7.pre1 → 0.9.7.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5553499d4799713d432a418bc069de3d15ca85af
-  data.tar.gz: cca7067b29444e55b7d18b8e5dd2aa5cb3558c54
+  metadata.gz: 5aec62477f0a794720ae3147888ae6525f3c5fcd
+  data.tar.gz: 0348a870ef42aebc7a2ef2a5c82488d5c93e489b
 SHA512:
-  metadata.gz: 8e5d4149e7610061f72e683aad7f973e6d17a0a78d062fbd0f43d21021b040f2f48af6018d7c4e73676b5e09849021f3f53e0ba0e09461030bc5ad1f3da3623b
-  data.tar.gz: 84c8eec2f42d245e8bc19ff816c576cfb4a8cabb96a77602b90ac0c3ccabaafb098f39da7ece6205e4e3464155110202a84afd8b822fb4df25e6f789756fdc44
+  metadata.gz: f8625d4209e97a51f1411e39689887841670653546d3ad281a6d1eccbb1f5429ee74249439a0c519beb74f84feee0510772889d0bbff9f379e2bf95003716989
+  data.tar.gz: 1d3c8307e2f34b95fe13a00e77a2a22edc786efcf8a60bc5c3bfba54779ec911e20ca3ce3b59b834e379b49be619e6c92680bbc5ad87f0b4d0c5ce105d85468f

data/CHANGELOG.markdown

@@ -3,6 +3,9 @@
 * Added Cloud Foundry detection
 * Added hostname config option
 * Reporting PaaS in app server load (Heroku or Cloud Foundry).
+* Fallback to a middleware to launch the agent if we can't detect the
+  application server for any reason
+* Added agent version to checkin data
 
 # 0.9.6
 

data/lib/scout_apm/agent/reporting.rb

@@ -33,7 +33,8 @@ module ScoutApm
 
           metadata = {
             :app_root => ScoutApm::Environment.instance.root.to_s,
-            :unique_id => ScoutApm::Utils::UniqueId.simple
+            :unique_id => ScoutApm::Utils::UniqueId.simple,
+            :agent_version => ScoutApm::VERSION,
           }
 
           logger.debug("Metrics: #{metrics}")

data/lib/scout_apm/middleware.rb

@@ -1,16 +1,31 @@
 module ScoutApm
   class Middleware
+    MAX_ATTEMPTS = 5
+
     def initialize(app)
       @app = app
+      @attempts = 0
       @started = false
     end
 
     # If we get a web request in, then we know we're running in some sort of app server
     def call(env)
-      ScoutApm::Agent.instance.start(:skip_app_server_check => true) unless @started
-
-      @started = true
-      @app.call(env)
+      if @started || @attempts > MAX_ATTEMPTS
+        @app.call(env)
+      else
+        begin
+          @attempts += 1
+          ScoutApm::Agent.instance.start(:skip_app_server_check => true)
+          @started = ScoutApm::Agent.instance.started?
+        rescue => e
+          # Can't be sure of any logging here, so fall back to ENV var and STDOUT
+          if ENV["SCOUT_LOG_LEVEL"] == "debug"
+            STDOUT.puts "Failed to start via Middleware: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
+          end
+        ensure
+          @app.call(env)
+        end
+      end
     end
   end
 end

data/lib/scout_apm/reporter.rb

@@ -83,7 +83,8 @@ module ScoutApm
     # Headers passed up with all API requests.
     def default_http_headers
       { "Agent-Hostname" => ScoutApm::Environment.instance.hostname,
-        "Content-Type"   => "application/octet-stream"
+        "Content-Type"   => "application/octet-stream",
+        "Agent-Version"  => ScoutApm::VERSION,
       }
     end
 

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "0.9.7.pre1"
+  VERSION = "0.9.7.pre2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.7.pre1
+  version: 0.9.7.pre2
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring