scout_apm 0.9.7 → 0.9.8.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fbe19693982b47df3fa964a2325395e90bad24d
-  data.tar.gz: 7716bd3ba18e6d5878a96167c91a7b378aed41f9
+  metadata.gz: 762ca5628e64b9bce6fe92c2f6b8c20dc8a72a8d
+  data.tar.gz: 4d44f9031d323ed77e6bb41a0bde90dd8886d1f4
 SHA512:
-  metadata.gz: 84cc9ce20d82be3291f00e371858ffafcf09a4c40fdbd186836985b9b68ebc17bdf9a7f722ff36902bc72b0f1c5f7b92e6fee7ab063180aee59f463ae403775b
-  data.tar.gz: 0a5863f1be563fcf7c5a6e0611bf38a209968b6122034d88933417b50583572504019dc91f8bceddf893b01d03056b9b8bd3f99c42818e6f1b33e759bdd846c0
+  metadata.gz: ea5bdc27aade86543d95fe6bd542508fbf1e4ade054a245fe78e2b3b5fa7cd340d8d0d680344dc5baf3a75358a4afd23e54c55f44ba72af4ea3148e524a4db47
+  data.tar.gz: 4a1e4ffb4fa3e023e5bbdd194a3a1577c519da5ef6c3df9d4d524034443138e33373a7bbb3ebae0413897e392609f2c44c84756ddb00016372e2e77a4bafbcc1

data/lib/scout_apm/agent/logging.rb

@@ -2,7 +2,6 @@
 module ScoutApm
   class Agent
     module Logging
-
       def default_log_path
         "#{environment.root}/log"
       end
@@ -49,9 +48,10 @@ module ScoutApm
       end
 
       def wants_stdout?
-        config.value('log_file_path').to_s.upcase == 'STDOUT' || environment.heroku?
+        config.value('log_file_path').to_s.upcase == 'STDOUT' || environment.platform_integration.log_to_stdout?
       end
-    end # module Logging
+    end
     include Logging
-  end # class Agent
-end # moudle ScoutApm
+  end
+end
+

data/lib/scout_apm/agent.rb

@@ -94,7 +94,7 @@ module ScoutApm
 
       logger.info "Starting monitoring for [#{environment.application_name}]. Framework [#{environment.framework}] App Server [#{environment.app_server}]."
 
-      load_instruments if should_load_instruments?
+      load_instruments if should_load_instruments?(options)
 
       @samplers = [
         ScoutApm::Instruments::Process::ProcessCpu.new(environment.processors, logger),
@@ -177,7 +177,9 @@ module ScoutApm
       end
     end
 
-    def should_load_instruments?
+    # If we want to skip the app_server_check, then we must load it.
+    def should_load_instruments?(options={})
+      return true if options[:skip_app_server_check]
       environment.app_server_integration.found?
     end
 

data/lib/scout_apm/app_server_load.rb

@@ -37,7 +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.paas
+        :paas               => ScoutApm::Environment.instance.platform_integration.name
       }
     end
   end

data/lib/scout_apm/config.rb

@@ -7,6 +7,7 @@ require 'scout_apm/environment'
 #
 # application_root - override the detected directory of the application
 # data_file        - override the default temporary storage location. Must be a location in a writable directory
+# hostname         - override the default hostname detection. Default varies by environment - either system hostname, or PAAS hostname
 # key              - the account key with Scout APM. Found in Settings in the Web UI
 # log_file_path    - either a directory or "STDOUT".
 # log_level        - DEBUG / INFO / WARN as usual
@@ -21,7 +22,6 @@ 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

@@ -5,14 +5,14 @@ module ScoutApm
   class Environment
     include Singleton
 
-    # I've put Thin and Webrick last as they are often used in development and included in Gemfiles
-    # but less likely used in production.
     STDOUT_LOGGER = begin
                       l = Logger.new(STDOUT)
                       l.level = ENV["SCOUT_LOG_LEVEL"] || Logger::INFO
                       l
                     end
 
+    # I've put Thin and Webrick last as they are often used in development and included in Gemfiles
+    # but less likely used in production.
     SERVER_INTEGRATIONS = [
       ScoutApm::ServerIntegrations::Passenger.new(STDOUT_LOGGER),
       ScoutApm::ServerIntegrations::Unicorn.new(STDOUT_LOGGER),
@@ -30,6 +30,12 @@ module ScoutApm
       ScoutApm::FrameworkIntegrations::Ruby.new, # Fallback if none match
     ]
 
+    PLATFORM_INTEGRATIONS = [
+      ScoutApm::PlatformIntegrations::Heroku.new,
+      ScoutApm::PlatformIntegrations::CloudFoundry.new,
+      ScoutApm::PlatformIntegrations::Server.new,
+    ]
+
     DEPLOY_INTEGRATIONS = [
       ScoutApm::DeployIntegrations::Capistrano3.new(STDOUT_LOGGER),
       # ScoutApm::DeployIntegrations::Capistrano2.new(STDOUT_LOGGER),
@@ -47,6 +53,10 @@ module ScoutApm
       @framework ||= FRAMEWORK_INTEGRATIONS.detect{ |integration| integration.present? }
     end
 
+    def platform_integration
+      @platform ||= PLATFORM_INTEGRATIONS.detect{ |integration| integration.present? }
+    end
+
     def application_name
       Agent.instance.config.value("name") || framework_integration.application_name
     end
@@ -88,27 +98,10 @@ module ScoutApm
       end
     end
 
-    def heroku?
-      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'] : Agent.instance.config.value("hostname")
+      @hostname ||= Agent.instance.config.value("hostname") || platform_integration.hostname
     end
 
-
     # Returns the whole integration object
     # This needs to be improved. Frequently, multiple app servers gem are present and which
     # ever is checked first becomes the designated app server.

data/lib/scout_apm/platform_integrations/cloud_foundry.rb

@@ -0,0 +1,23 @@
+module ScoutApm
+  module PlatformIntegrations
+    class CloudFoundry
+      def present?
+        !! ENV['VCAP_APPLICATION']
+      end
+
+      def name
+        "Cloud Foundry"
+      end
+
+      # TODO: Which is easier for users by defualt? STDOUT or our log/scout_apm.log file?
+      def log_to_stdout?
+        true
+      end
+
+      # TODO: Is there a better way to get a hostname from Cloud Foundry?
+      def hostname
+        Socket.gethostname
+      end
+    end
+  end
+end

data/lib/scout_apm/platform_integrations/heroku.rb

@@ -0,0 +1,21 @@
+module ScoutApm
+  module PlatformIntegrations
+    class Heroku
+      def present?
+        !! ENV['DYNO']
+      end
+
+      def name
+        "Heroku"
+      end
+
+      def log_to_stdout?
+        true
+      end
+
+      def hostname
+        ENV['DYNO']
+      end
+    end
+  end
+end

data/lib/scout_apm/platform_integrations/server.rb

@@ -0,0 +1,24 @@
+# Classic hosting where you rent a server, then put your app on it.
+# Used as fallback
+
+module ScoutApm
+  module PlatformIntegrations
+    class Server
+      def present?
+        true
+      end
+
+      def name
+        "Server"
+      end
+
+      def log_to_stdout?
+        false
+      end
+
+      def hostname
+        Socket.gethostname
+      end
+    end
+  end
+end

data/lib/scout_apm/version.rb

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

data/lib/scout_apm.rb

@@ -40,6 +40,10 @@ require 'scout_apm/framework_integrations/rails_3_or_4'
 require 'scout_apm/framework_integrations/sinatra'
 require 'scout_apm/framework_integrations/ruby'
 
+require 'scout_apm/platform_integrations/heroku'
+require 'scout_apm/platform_integrations/cloud_foundry'
+require 'scout_apm/platform_integrations/server'
+
 require 'scout_apm/deploy_integrations/capistrano_3'
 #require 'scout_apm/deploy_integrations/capistrano_2'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8.pre1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -98,6 +98,9 @@ files:
 - lib/scout_apm/metric_meta.rb
 - lib/scout_apm/metric_stats.rb
 - lib/scout_apm/middleware.rb
+- lib/scout_apm/platform_integrations/cloud_foundry.rb
+- lib/scout_apm/platform_integrations/heroku.rb
+- lib/scout_apm/platform_integrations/server.rb
 - lib/scout_apm/reporter.rb
 - lib/scout_apm/serializers/app_server_load_serializer.rb
 - lib/scout_apm/serializers/deploy_serializer.rb
@@ -146,9 +149,9 @@ 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