scout_apm 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a68db2ae2d5615f89aacc3c015909ee24bc49f
-  data.tar.gz: e21486b451e768a573c10615042c9b2d183bbb47
+  metadata.gz: 63ae601480e206eabc6a2a0f9d5b4a910ff1b96b
+  data.tar.gz: 62e2cc35685a98a5ecb13432166ad0b31e5957ec
 SHA512:
-  metadata.gz: b6c77fd02eb44509a79f883e27ff4e306e6c96cf063481a617968d0e3b5bd8d6ad9125b3b39247879dfa3c0daba032a48f74c2ddce392fa87864d45aae5a35dd
-  data.tar.gz: feaf556828e488ebc3c15d951af248ede825af9b2a47b8a13428da6516e4ae377c672564e1594c42370368f784b0d68f2b4eff4d1d82d152a6ad5206d0122a0e
+  metadata.gz: 2de68e360bb022bfa74f2442f57fc84fc7914b084c3ef5c21870e79453197a7c2fb6744179f02d4ffbaabe4bbd265c586df0d9d3327f4a0628803bb11bf9de64
+  data.tar.gz: 876b496318c21489278202605167d6879636c8363247df4da87301b19625f8a9f691a1b6e71a6ed905ef3af12da2ebd103763fbbb2f3c2bc9b2fdb4a8d3bdaa3

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 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/framework_integrations/rails_2.rb

@@ -37,7 +37,6 @@ 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
@@ -45,6 +44,7 @@ module ScoutApm
             when "postgis"    then :postgres
             when "sqlite3"    then :sqlite
             when "mysql"      then :mysql
+            when "mysql2"     then :mysql
             else default
             end
           else
@@ -56,6 +56,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 = "1.6.4"
+  VERSION = "1.6.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 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-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest