scout_apm 0.9.6 → 0.9.7.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45b445e6890d21e6a92c1e35684b89a8104f06c
-  data.tar.gz: 86e98c9d8f952de077c7b35d372b21f2f217be4c
+  metadata.gz: 98536a2a26a3dcd0f508a214ff53710d434787ac
+  data.tar.gz: fd7667d714f25b323c5e05d76ef358f8cbcebf01
 SHA512:
-  metadata.gz: 69453628027b2cf8d95828342ee27eefc82fc5f17ad2c5f2fba9d1c0fd67f0f2bde3067cc95117086bd338e842b35ae28b09d1e924227b9ded5aa5e88309ca37
-  data.tar.gz: 31ad198f6b219fcef29085a15a8f7feeb9ba814f350d214f29ce468a9854c6a423f3896b8318f4608e34fe90f3d7b41d7ac91291d5cd3b020779d2172bacdd81
+  metadata.gz: e27f3d446948abc9683e773ae753d0bc22e84035f5e23edf3b934e68e46eb0c3864f8b90359d226ccd4c2600f0b935333d388f78f3963463ceb204179e19661d
+  data.tar.gz: 4d6f0bee9eb790d984e1a54dbbfc395120b12c4fb0a8e1dae339bd39a6f8d44790024828cdc7d23462a2b9d1cae154f4779608ecc9ddf1631aff8c0ba4b33f30

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 0.9.7
+
+* Added Cloud Foundry detection
+* Added hostname config option
+* Reporting PaaS in app server load (Heroku or Cloud Foundry).
+
 # 0.9.6
 
 * Fix more 1.8.7 syntax errors

data/lib/scout_apm.rb

@@ -85,11 +85,19 @@ require 'scout_apm/serializers/directive_serializer'
 require 'scout_apm/serializers/app_server_load_serializer'
 require 'scout_apm/serializers/deploy_serializer'
 
-if defined?(Rails) and Rails.respond_to?(:version) and Rails.version >= '3'
+require 'scout_apm/middleware'
+
+if defined?(Rails) && defined?(Rails::VERSION) && defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR >= 3
   module ScoutApm
     class Railtie < Rails::Railtie
       initializer "scout_apm.start" do |app|
+        # Attempt to start right away, this will work best for preloading apps, Unicorn & Puma & similar
         ScoutApm::Agent.instance.start
+
+        # And attempt to start on first-request, which is a good catch-all for
+        # Webrick, and Passenger and similar, where we can't detect the running app server
+        # until actual requests come in.
+        app.middleware.use ScoutApm::Middleware
       end
     end
   end

data/lib/scout_apm/agent.rb

@@ -47,7 +47,7 @@ module ScoutApm
       config.value('monitor') and !@options[:force]
     end
 
-    def preconditions_met?
+    def preconditions_met?(options={})
       if !apm_enabled?
         logger.warn "Monitoring isn't enabled for the [#{environment.env}] environment."
         return false
@@ -58,7 +58,7 @@ module ScoutApm
         return false
       end
 
-      if !environment.app_server_integration.found?
+      if !environment.app_server_integration(true).found? && !options[:skip_app_server_check]
         logger.warn "Couldn't find a supported app server. Not starting agent."
         return false
       end
@@ -88,7 +88,7 @@ module ScoutApm
         return environment.deploy_integration.install
       end
 
-      return false unless preconditions_met?
+      return false unless preconditions_met?(options)
 
       @started = true
 

data/lib/scout_apm/app_server_load.rb

@@ -37,6 +37,7 @@ module ScoutApm
         :database_engine    => ScoutApm::Environment.instance.database_engine,
         :application_name   => ScoutApm::Environment.instance.application_name,
         :libraries          => ScoutApm::Utils::InstalledGems.new.run,
+        :paas               => ScoutApm::Environment.instance.pass
       }
     end
   end

data/lib/scout_apm/config.rb

@@ -21,6 +21,7 @@ module ScoutApm
     DEFAULTS =  {
         'host'      => 'https://checkin.scoutapp.com',
         'log_level' => 'info',
+        'hostname' => Socket.gethostname,
         'stackprof_interval' => 20000 # microseconds, 1000 = 1 millisecond, so 20k == 20 milliseconds
     }.freeze
 

data/lib/scout_apm/environment.rb

@@ -92,8 +92,20 @@ module ScoutApm
       ENV['DYNO']
     end
 
+    def cloud_foundry?
+      ENV['VCAP_APPLICATION']
+    end
+
+    def paas
+      if heroku?
+        'Heroku'
+      elsif cloud_foundry?
+        'Cloud Foundry'
+      end
+    end
+
     def hostname
-      @hostname ||= heroku? ? ENV['DYNO'] : Socket.gethostname
+      @hostname ||= heroku? ? ENV['DYNO'] : Agent.instance.config.value("hostname")
     end
 
 
@@ -102,8 +114,9 @@ module ScoutApm
     # ever is checked first becomes the designated app server.
     #
     # Next step: (1) list out all detected app servers (2) install hooks for those that need it (passenger, rainbows, unicorn).
-    def app_server_integration
-      @app_server = SERVER_INTEGRATIONS.detect{ |integration| integration.present? }
+    def app_server_integration(force=false)
+      @app_server = nil if force
+      @app_server ||= SERVER_INTEGRATIONS.detect{ |integration| integration.present? }
     end
 
     # App server's name (symbol)

data/lib/scout_apm/middleware.rb

@@ -0,0 +1,16 @@
+module ScoutApm
+  class Middleware
+    def initialize(app)
+      @app = app
+      @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)
+    end
+  end
+end

data/lib/scout_apm/server_integrations/webrick.rb

@@ -27,3 +27,5 @@ module ScoutApm
     end
   end
 end
+
+

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "0.9.6"
+  VERSION = "0.9.7.pre"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7.pre
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -97,6 +97,7 @@ files:
 - lib/scout_apm/layaway_file.rb
 - lib/scout_apm/metric_meta.rb
 - lib/scout_apm/metric_stats.rb
+- lib/scout_apm/middleware.rb
 - lib/scout_apm/reporter.rb
 - lib/scout_apm/serializers/app_server_load_serializer.rb
 - lib/scout_apm/serializers/deploy_serializer.rb
@@ -145,14 +146,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
-test_files: []
-has_rdoc: 
+test_files:
+- test/data/config_test_1.yml
+- test/test_helper.rb
+- test/unit/config_test.rb
+- test/unit/environment_test.rb
+- test/unit/instruments/active_record_instruments_test.rb
+- test/unit/sql_sanitizer_test.rb