scout_apm 0.9.2.2 → 0.9.3pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 270bf16cf2be02cef0bfc11f628da5dbae7a8efc
-  data.tar.gz: c6194a663576500dbfbc2eda60ac30ede43cb24f
+  metadata.gz: 9f2a25966bed125bef4e5af063ba90cc73512786
+  data.tar.gz: 23abb02567200410a1cc02be33306f1e3746142d
 SHA512:
-  metadata.gz: 37e428f93c79c5eac815b69f9a5d3ed8f8034abbaa0ff8aa6a2c98e7fe093a5b7a6244ce868bd46c1512e104cf55d88a4d84cb49274ca373f27bce85fa67dda0
-  data.tar.gz: 17d50f933f9a33f99b5f53055eeb39304a8e1f518546525b654b52adce62ec07ff5e687359953c80e007f9a1a2865e17cd4ce387670917dcdb0f1871dbbf7631
+  metadata.gz: 464b22471dcf5e9fa9d76d9396d590a3c9ab7343c8b99962a43c209da4e3735dfcaabda0356c5d0386c2beb752109a186479d6e01745de31f9992318df6d9230
+  data.tar.gz: 0d86312dfa978d54a527684f42726bcd803bd9c54ac7ab92014e361288d258b3cb82adc28605b1591dc4a783f9b7d478bd383091c4b0d8e9bf22d5c4fb1a0d66

data/lib/scout_apm.rb

@@ -59,6 +59,7 @@ require 'scout_apm/utils/sql_sanitizer'
 require 'scout_apm/utils/null_logger'
 require 'scout_apm/utils/installed_gems'
 require 'scout_apm/utils/time'
+require 'scout_apm/utils/unique_id'
 
 require 'scout_apm/config'
 require 'scout_apm/environment'

data/lib/scout_apm/agent/reporting.rb

@@ -33,8 +33,12 @@ module ScoutApm
 
           logger.debug("Metrics: #{metrics}")
           logger.debug("SlowTrans: #{slow_transactions}")
+          metadata = {
+            app_root: ScoutApm::Environment.instance.root,
+            unique_id: ScoutApm::Utils::UniqueId.simple
+          }
 
-          payload = ScoutApm::Serializers::PayloadSerializer.serialize(metrics, slow_transactions)
+          payload = ScoutApm::Serializers::PayloadSerializer.serialize(metadata, metrics, slow_transactions)
           slow_transactions_kb = Marshal.dump(slow_transactions).size/1024 # just for performance debugging
 
           logger.info "Delivering #{metrics.length} Metrics for #{total_request_count} requests and #{slow_transactions.length} Slow Transaction Traces"

data/lib/scout_apm/environment.rb

@@ -7,14 +7,19 @@ module ScoutApm
 
     # 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 = Agent.instance.config.value("log_level", true) || Logger::INFO
+                    end
+
     SERVER_INTEGRATIONS = [
-      ScoutApm::ServerIntegrations::Passenger.new(Logger.new(STDOUT)),
-      ScoutApm::ServerIntegrations::Unicorn.new(Logger.new(STDOUT)),
-      ScoutApm::ServerIntegrations::Rainbows.new(Logger.new(STDOUT)),
-      ScoutApm::ServerIntegrations::Puma.new(Logger.new(STDOUT)),
-      ScoutApm::ServerIntegrations::Thin.new(Logger.new(STDOUT)),
-      ScoutApm::ServerIntegrations::Webrick.new(Logger.new(STDOUT)),
-      ScoutApm::ServerIntegrations::Null.new(Logger.new(STDOUT)), # must be last
+      ScoutApm::ServerIntegrations::Passenger.new(STDOUT_LOGGER),
+      ScoutApm::ServerIntegrations::Unicorn.new(STDOUT_LOGGER),
+      ScoutApm::ServerIntegrations::Rainbows.new(STDOUT_LOGGER),
+      ScoutApm::ServerIntegrations::Puma.new(STDOUT_LOGGER),
+      ScoutApm::ServerIntegrations::Thin.new(STDOUT_LOGGER),
+      ScoutApm::ServerIntegrations::Webrick.new(STDOUT_LOGGER),
+      ScoutApm::ServerIntegrations::Null.new(STDOUT_LOGGER), # must be last
     ]
 
     FRAMEWORK_INTEGRATIONS = [
@@ -25,8 +30,8 @@ module ScoutApm
     ]
 
     DEPLOY_INTEGRATIONS = [
-      ScoutApm::DeployIntegrations::Capistrano3.new(Logger.new(STDOUT)),
-      # ScoutApm::DeployIntegrations::Capistrano2.new(Logger.new(STDOUT)),
+      ScoutApm::DeployIntegrations::Capistrano3.new(STDOUT_LOGGER),
+      # ScoutApm::DeployIntegrations::Capistrano2.new(STDOUT_LOGGER),
     ]
 
     def env

data/lib/scout_apm/framework_integrations/rails_2.rb

@@ -42,6 +42,7 @@ module ScoutApm
             case config["adapter"].to_s
             when "postgres"   then :postgres
             when "postgresql" then :postgres
+            when "postgis"    then :postgres
             when "sqlite3"    then :sqlite
             when "mysql"      then :mysql
             else default

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -38,9 +38,10 @@ module ScoutApm
         if defined?(ActiveRecord::Base)
           config = ActiveRecord::Base.connection_config
           if config && config[:adapter]
-            case config[:adapter]
+            case config[:adapter].to_s
             when "postgres"   then :postgres
             when "postgresql" then :postgres
+            when "postgis"    then :postgres
             when "sqlite3"    then :sqlite
             when "mysql"      then :mysql
             else default

data/lib/scout_apm/serializers/payload_serializer.rb

@@ -2,8 +2,8 @@
 module ScoutApm
   module Serializers
     class PayloadSerializer
-      def self.serialize(metrics, slow_transactions)
-        Marshal.dump(:metrics => metrics, :slow_transactions => slow_transactions)
+      def self.serialize(metadata, metrics, slow_transactions)
+        Marshal.dump(:metadata => metadata, :metrics => metrics, :slow_transactions => slow_transactions)
       end
 
       def self.deserialize(data)

data/lib/scout_apm/utils/unique_id.rb

@@ -0,0 +1,15 @@
+module ScoutApm
+  module Utils
+    class UniqueId
+      ALPHABET = ('a'..'z').to_a.freeze
+
+      def self.simple(length=16)
+        s = ""
+        length.times do
+            s << ALPHABET[rand(26)]
+        end
+        s
+      end
+    end
+  end
+end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "0.9.2.2"
+  VERSION = "0.9.3pre1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.2.2
+  version: 0.9.3pre1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -121,6 +121,7 @@ files:
 - lib/scout_apm/utils/sql_sanitizer_regex.rb
 - lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb
 - lib/scout_apm/utils/time.rb
+- lib/scout_apm/utils/unique_id.rb
 - lib/scout_apm/version.rb
 - scout_apm.gemspec
 - test/data/config_test_1.yml
@@ -144,9 +145,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