scout_apm 0.9.4.pre1 → 0.9.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7965070352dba0abdf13aaa1087cbc1b29335ebb
+  data.tar.gz: c0344b576001fb07bdbc52808bb889dc295e6360
+SHA512:
+  metadata.gz: 51b1343c212b9261615ec66ef6ca20f1da2dbb978f15bf7d56ba164c945b1d5194fcd4cefc99e736c44b06ad53495ddbffb8255904f6f89452fcd967662b911b
+  data.tar.gz: 970d9858a92a5929f66288561e209ad997ffc4b0afff2b2d11256cae4836e50571f1539337f15ed4fa33cf348f0bf25e753a7ce1b4d65c29ae480feffe170729

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 0.9.4
+
+* Detect database connection correctly on Rails 3.0.x
+* Detect and warn if the old ScoutRails plugin is installed, since it causes an
+  conflict.
+
 # 0.9.3
 
 * Parse SQL correctly when using PostGIS

data/lib/scout_apm/agent.rb

@@ -68,6 +68,11 @@ module ScoutApm
         return false
       end
 
+      if defined?(::ScoutRails)
+        logger.warn "ScoutAPM is incompatible with the old Scout Rails plugin. Please remove scout_rails from your Gemfile"
+        return false
+      end
+
       true
     end
 

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -36,24 +36,31 @@ module ScoutApm
         default = :mysql
 
         if defined?(ActiveRecord::Base)
-          config = ActiveRecord::Base.connection_config
-          if config && 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
-            end
-          else
-            default
+          adapter = getDatabaseAdapter # can be nil
+
+          case 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
           end
         else
           # TODO: Figure out how to detect outside of Rails context. (sequel, ROM, etc)
           default
         end
       end
+
+      def getDatabaseAdapter
+        if ActiveRecord::Base.respond_to?(:connection_config)
+          ActiveRecord::Base.connection_config[:adapter]
+        elsif ActiveRecord::Base.respond_to?(:configurations)
+          ActiveRecord::Base.configurations[env]["adapter"]
+        end
+      rescue
+        nil
+      end
     end
   end
 end

data/lib/scout_apm/instruments/net_http.rb

@@ -25,8 +25,6 @@ module ScoutApm
               self.class.instrument("HTTP/request", :desc => "#{(@address+args.first.path.split('?').first)[0..99]}") do
                 request_without_scout_instruments(*args,&block)
               end
-              rescue SystemStackError => e
-                ScoutApm::Agent.instance.logger.error "Exception in Net::HTTP (#{self.class.to_s}): #{e.message}\nBacktrace: #{e.backtrace}\n\nCaller: #{caller.join("\n")}"
             end
             alias request_without_scout_instruments request
             alias request request_with_scout_instruments

data/lib/scout_apm/reporter.rb

@@ -75,7 +75,7 @@ module ScoutApm
         logger.debug "/#{type} FAILED: #{response.inspect}"
       end
     rescue Exception
-      logger.debug "Exception sending request to server: #{$!.message}\nBacktrace: #{$!.backtrace}\nCaller: #{caller.join("\n")}"
+      logger.debug "Exception sending request to server: \n#{$!.message}\n\t#{$!.backtrace.join("\n\t")}"
     ensure
       response
     end

data/lib/scout_apm/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.4.pre1
-  prerelease: 6
+  version: 0.9.4
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,54 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Monitors Ruby apps and reports detailed metrics on performance to Scout.
@@ -67,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.markdown
 - Gemfile
 - README.markdown
@@ -139,28 +132,27 @@ files:
 - test/unit/sql_sanitizer_test.rb
 homepage: https://github.com/scoutapp/scout_apm_ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - data
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby application performance monitoring
 test_files:
 - test/data/config_test_1.yml