scout_apm 2.0.0.pre7 → 2.0.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c342425ce84acb55c8b62c2674eb94ec618746e6
-  data.tar.gz: 64d5f991d966e16b108ab7e61737c4f6836958b2
+  metadata.gz: bdef63b6e4340550876655a7d9d8544e6667730d
+  data.tar.gz: af94bc60dd3364790210017f5615fa39b14e63ef
 SHA512:
-  metadata.gz: fe0fc8bd013cb679a6eefcae6523fd7dd61023189550f4e2dd1d865328d6bfb40d04186496b3dd9184d02937e578fb8dee74e88028d2dc68d3ccbc40ab937256
-  data.tar.gz: 6fd06f39a67c1f44549cb06c31129866cdf37a9f442225ff469667a86bab9a495252a4c6ac5c93135a54293df4e886743cad20d49cad78ccd9921b9704b73fe7
+  metadata.gz: b49b704dd2d10cc5ecc896e640f527cc0c4f740c3905ad786c4a651bf4b561f3d51585f73f9338afaaa61f05ecc979e0c8e6f375ad41c2989144bdb804ca5c5b
+  data.tar.gz: 9665d168ed2418c293c7f3fc73a0ab36919f34f5984dd38a756db30b1aa9f5383d01242c254a46603d15fabda5058b9e342ed097cc004312273d0f22f171c375

data/CHANGELOG.markdown

@@ -10,6 +10,15 @@
 * Remove unused & old references to Stackprof
 * Fixing exception on load if no config file is provided
 
+# 1.6.6
+
+* Bugfix related to DB detection
+
+# 1.6.5
+
+* Add Mongoid 5.x support
+* Fix autodetection of mysql databases
+
 # 1.6.4
 
 * Add Grape instrumentation

data/lib/scout_apm/app_server_load.rb

@@ -34,7 +34,8 @@ module ScoutApm
         :app_server         => ScoutApm::Environment.instance.app_server,
         :ruby_version       => RUBY_VERSION,
         :hostname           => ScoutApm::Environment.instance.hostname,
-        :database_engine    => ScoutApm::Environment.instance.database_engine,
+        :database_engine    => ScoutApm::Environment.instance.database_engine,      # Detected
+        :database_adapter   => ScoutApm::Environment.instance.raw_database_adapter, # Raw
         :application_name   => ScoutApm::Environment.instance.application_name,
         :libraries          => ScoutApm::Utils::InstalledGems.new.run,
         :paas               => ScoutApm::Environment.instance.platform_integration.name

data/lib/scout_apm/config.rb

@@ -40,10 +40,10 @@ module ScoutApm
     # Load up a config instance, attempting to load a yaml file.  Allows a
     # definite location if requested, or will attempt to load the default
     # configuration file: APP_ROOT/config/scout_apm.yml
-    def self.with_file(file_path=nil)
+    def self.with_file(file_path=nil, config={})
       overlays = [
         ConfigEnvironment.new,
-        ConfigFile.new(file_path),
+        ConfigFile.new(file_path, config[:file]),
         ConfigDefaults.new,
       ]
       new(overlays)
@@ -104,7 +104,8 @@ module ScoutApm
     # is not found, inaccessbile, or unparsable, log a message to that effect,
     # and move on.
     class ConfigFile
-      def initialize(file_path=nil)
+      def initialize(file_path=nil, config={})
+        @config = config || {}
         @resolved_file_path = file_path || determine_file_path
         load_file(@resolved_file_path)
       end
@@ -162,9 +163,8 @@ module ScoutApm
       end
 
       def app_environment
-        ScoutApm::Environment.instance.env
+        @config[:environment] || ScoutApm::Environment.instance.env
       end
-
       def logger
         if ScoutApm::Agent.instance.logger
           return ScoutApm::Agent.instance.logger

data/lib/scout_apm/deploy_integrations/capistrano_3.rb

@@ -58,7 +58,13 @@ module ScoutApm
       end
 
       def reporter
-        @reporter ||= ScoutApm::Reporter.new(:deploy_hook, ScoutApm::Agent.instance.config, @logger)
+        config =  if env == '' 
+                    ScoutApm::Agent.instance.config
+                  else
+                    ScoutApm::Config.with_file(nil, {:file => { :environment => env }}) # instantiate our own config, with an overridden environment for the deploy-to app name instead of deploy-from app name)
+                  end
+
+        @reporter ||= ScoutApm::Reporter.new(:deploy_hook, config, @logger)
       end
 
       def deploy_data

data/lib/scout_apm/environment.rb

@@ -70,6 +70,10 @@ module ScoutApm
       framework_integration.database_engine
     end
 
+    def raw_database_adapter
+      framework_integration.raw_database_adapter
+    end
+
     def processors
       @processors ||= begin
                         proc_file = '/proc/cpuinfo'

data/lib/scout_apm/framework_integrations/rails_2.rb

@@ -37,18 +37,14 @@ module ScoutApm
         default = :mysql
 
         if defined?(ActiveRecord::Base)
-          config = ActiveRecord::Base.configurations[env]
-          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
+          case raw_database_adapter
+          when "postgres"   then :postgres
+          when "postgresql" then :postgres
+          when "postgis"    then :postgres
+          when "sqlite3"    then :sqlite
+          when "mysql"      then :mysql
+          when "mysql2"     then :mysql
+          else default
           end
         else
           default
@@ -56,6 +52,12 @@ module ScoutApm
       rescue
         default
       end
+
+      def raw_database_adapter
+        ActiveRecord::Base.configurations[env]["adapter"]
+      rescue
+        nil
+      end
     end
   end
 end

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -37,14 +37,16 @@ module ScoutApm
         default = :postgres
 
         @database_engine = if defined?(ActiveRecord::Base)
-          adapter = get_database_adapter # can be nil
+          adapter = raw_database_adapter # can be nil
 
           case adapter.to_s
           when "postgres"   then :postgres
           when "postgresql" then :postgres
           when "postgis"    then :postgres
           when "sqlite3"    then :sqlite
+          when "sqlite"     then :sqlite
           when "mysql"      then :mysql
+          when "mysql2"     then :mysql
           else default
           end
         else
@@ -53,7 +55,7 @@ module ScoutApm
         end
       end
 
-      def get_database_adapter
+      def raw_database_adapter
         adapter = if ActiveRecord::Base.respond_to?(:connection_config)
                     ActiveRecord::Base.connection_config[:adapter].to_s
                   else

data/lib/scout_apm/framework_integrations/ruby.rb

@@ -30,6 +30,10 @@ module ScoutApm
       def database_engine
         :mysql
       end
+
+      def raw_database_adapter
+        :mysql
+      end
     end
   end
 end

data/lib/scout_apm/framework_integrations/sinatra.rb

@@ -37,6 +37,10 @@ module ScoutApm
       def database_engine
         :mysql
       end
+
+      def raw_database_adapter
+        :mysql
+      end
     end
   end
 end

data/lib/scout_apm/instruments/mongoid.rb

@@ -19,14 +19,86 @@ module ScoutApm
         if defined?(::Mongoid) and !defined?(::Moped)
           ScoutApm::Agent.instance.logger.info "Instrumenting Mongoid"
 
-          ::Mongoid::Collection.class_eval do
-            include ScoutApm::Tracer
-            (::Mongoid::Collections::Operations::ALL - [:<<, :[]]).each do |method|
-              instrument_method method, :type => "MongoDB", :name => '#{@klass}/' + method.to_s
+          ### OLD (2.x) mongoids
+          if defined?(::Mongoid::Collection)
+            ::Mongoid::Collection.class_eval do
+              include ScoutApm::Tracer
+              (::Mongoid::Collections::Operations::ALL - [:<<, :[]]).each do |method|
+                instrument_method method, :type => "MongoDB", :name => '#{@klass}/' + method.to_s
+              end
+            end
+          end
+
+          ### See moped instrument for Moped driven deploys
+
+          ### 5.x Mongoid
+          if mongoid_v5? && defined?(::Mongoid::Contextual::Mongo)
+            # All the public methods from Mongoid::Contextual::Mongo.
+            # TODO: Geo and MapReduce support (?). They are in other Contextual::* classes
+            methods = [
+              :count, :delete, :destroy, :distinct, :each,
+              :explain, :find_first, :find_one_and_delete, :find_one_and_replace,
+              :find_one_and_update, :first, :geo_near, :initialize, :last,
+              :length, :limit, :map, :map_reduce, :pluck,
+              :skip, :sort, :update, :update_all,
+            ]
+            # :exists?,
+
+            methods.each do |method|
+              if ::Mongoid::Contextual::Mongo.method_defined?(method)
+                with_scout_instruments = %Q|
+                def #{method}_with_scout_instruments(*args)
+
+                  req = ScoutApm::RequestManager.lookup
+                  *db, collection = view.collection.namespace.split(".")
+
+                  name = collection + "/#{method}"
+                  filter = ScoutApm::Instruments::Mongoid.anonymize_filter(view.filter)
+
+                  layer = ScoutApm::Layer.new("MongoDB", name)
+                  layer.desc = filter.inspect
+
+                  req.start_layer( layer )
+                  begin
+                    #{method}_without_scout_instruments
+                  ensure
+                    req.stop_layer
+                  end
+                end
+
+                alias_method :#{method}_without_scout_instruments, :#{method}
+                alias_method :#{method}, :#{method}_with_scout_instruments
+                |
+
+                ::Mongoid::Contextual::Mongo.class_eval(with_scout_instruments)
+              end
             end
           end
         end
       end
+
+      def mongoid_v5?
+        if defined?(::Mongoid::VERSION)
+          ::Mongoid::VERSION =~ /\A5/
+        else
+          false
+        end
+      end
+
+
+      # Example of what a filter looks like: => {"founded"=>{"$gte"=>"1980-1-1"}, "name"=>{"$in"=>["Tool", "Deftones", "Melvins"]}}
+      # Approach: find every leaf-node, clear it. inspect the whole thing when done.
+      def self.anonymize_filter(filter)
+        Hash[
+          filter.map do |k,v|
+            if v.is_a? Hash
+              [k, anonymize_filter(v)]
+            else
+              [k, "?"]
+            end
+          end
+        ]
+      end
     end
   end
 end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.0.0.pre7"
+  VERSION = "2.0.0.pre8"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre7
+  version: 2.0.0.pre8
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rusage