oneapm_rpm 1.2.4 → 1.2.5.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTM0MmJhZDViNjUyNjEzMjk2ODkzZDYzYjVhODIyODliODE5ODA1YQ==
+    ZWM0MDc1ZWYwM2M5ODg2ZGQzOTMzZTc2MDg5NWFjOWMxMzNjNTY5Zg==
   data.tar.gz: !binary |-
-    YmY4OTNmMzE0N2YwNjViMjk0ZjA3NmQ2MmVjMWUxYTU0ODM5ZDFiOQ==
+    Yzk4MzAzMWVmOWU1MDM3YWU5ZTE0ZjViMmM5NzY5N2JmY2Q5ZjQyNw==
 SHA512:
   metadata.gz: !binary |-
-    NzliYjUxODQzZjkzMTI4ZDY3OWE5ZDhmMTRlMTMwOTQ1NmMzZjQ5NjU3NzRi
-    ZmIyMTRmODI2NWFhOWViNzEwMjgwNTkzNzlmMmI2ZjczOWI5ZGU0OGY1NzQw
-    N2NlODIzNWE2YmRhNDIxMjE0NTQ5YWNhYjVmZTYyNTU1Yjg5MDY=
+    ZDI2OWM3YjlkY2JhODcxNDA1OGE1MzYzODcwNzMwOTYyY2FiZDA2ZTBhNDdm
+    OTgwMjdhZjI2OThiN2MyYzQ1M2QyZTY4NzIwNDg4NjFjOTRlNTE3MTJiNDQ4
+    ZTliYTk1ZTEyODMxZGU2MzNkOGIxNDhjN2E5MTYxM2I2Zjg3ZTM=
   data.tar.gz: !binary |-
-    MzVmNGI5ZWVmNzEzNzlkMTg5ZjkzZGU5MTEzNmRkZTViOTlhOGI2NDhmYzIz
-    NDUxZWY3MGQ4ZmIxYmRlZmY2OTJkODhjNWNiZGE1NGI5OTk2ZmU2ZjAxOTMz
-    NDM5NTVkMzA1MWFjYzk2NTUyNGE2ZjUyZWJlYzA2ZDFiN2FlMGI=
+    ZmJkMDM3MGIyZTBlNTJiYjU2ODA4M2NlMDI0NWY2YWM1NTE2OWEyNzY3YzQ2
+    ZjEyYjkyNWIyN2JiN2FlZDZlZTVkZjhjMThjNmFkZTBmODQ0MDYxZjUwMThh
+    MDE4OGUyNGI5MTViNTRhYzkzNzA4M2EzOWE3ZWUyZmMxODI3NGI=

data/lib/one_apm/inst/nosql/mongo2.rb

@@ -0,0 +1,87 @@
+# encoding: utf-8
+
+LibraryDetection.defer do
+  named :mongo2
+
+  depends_on do
+    require 'one_apm/agent/datastore/mongo'
+    defined?(::Mongo) &&  OneApm::Agent::Datastore::Mongo.is_version2? && !OneApm::Manager.config[:disable_mongo]
+  end
+
+  executes do
+    OneApm::Manager.logger.info 'Installing Mongo2 instrumentation'
+    install_mongo_instrumentation
+  end
+
+  def install_mongo_instrumentation
+    require 'one_apm/agent/datastore/mongo/metric_translator'
+    require 'one_apm/agent/datastore/mongo/statement_formatter'
+    hook_instrument_method_for_collection
+    hook_instrument_method_for_view
+  end
+
+  def hook_instrument_method_for_collection
+    methods = [:create,:drop, :find, :indexes, :insert_one, :insert_many, :bulk_write, :parallel_scan]
+    instrument_methods_with_oneapm(::Mongo::Collection, methods)
+  end
+
+
+  def hook_instrument_method_for_view
+    methods = [:count, :distinct, :map_reduce,:find_one_and_delete, :find_one_and_replace, :find_one_and_update, 
+      :delete_many, :delete_one, :replace_one, :update_many, :update_one]
+    instrument_methods_with_oneapm(::Mongo::Collection::View, methods)
+  end
+
+
+  def instrument_methods_with_oneapm klass, methods
+    klass.class_eval do 
+      include OneApm::Support::MethodTracer
+
+      def payload_for_oneapm
+        collection = self.name rescue self.collection.name
+        @payload_for_oneapm ||= { :collection => collection, :database => self.database.name }
+      end
+
+      def one_apm_notice_statement(t0, name)
+        statement = OneApm::Agent::Datastore::Mongo::StatementFormatter.format(payload_for_oneapm, name)
+        if statement
+          OneApm::Manager.agent.transaction_sampler.notice_nosql_statement(statement, (Time.now - t0).to_f)
+        end
+      rescue => e
+        OneApm::Manager.logger.debug("Exception during Mongo statement gathering", e)
+      end
+
+      def one_apm_generate_metrics(operation)
+        OneApm::Agent::Datastore::Mongo::MetricTranslator.metrics_for(operation, payload_for_oneapm)
+      end
+    end
+
+    methods.each do |method_name|
+      next unless klass.method_defined?(method_name)
+
+      klass.class_eval do 
+
+        method_name_without_oneapm = :"#{method_name}_without_oneapm"
+        method_name_with_oneapm = :"#{method_name}_with_oneapm"
+
+        define_method method_name_with_oneapm do |*args, &block|
+          metrics = one_apm_generate_metrics(method_name)
+
+          trace_execution_scoped(metrics) do
+            t0 = Time.now
+            result = OneApm::Manager.disable_all_tracing do
+              send method_name_without_oneapm, *args, &block
+            end
+            one_apm_notice_statement(t0, method_name)
+            result
+          end
+         
+        end
+        alias_method method_name_without_oneapm, method_name.to_sym
+        alias_method method_name.to_sym, method_name_with_oneapm
+      end
+    end
+
+  end
+ 
+end

data/lib/one_apm/version.rb

@@ -5,9 +5,10 @@ module OneApm
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
+    TAG   = 'rc1'
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -338,6 +338,7 @@ files:
 - lib/one_apm/inst/http_clients/typhoeus.rb
 - lib/one_apm/inst/nosql/memcache.rb
 - lib/one_apm/inst/nosql/mongo.rb
+- lib/one_apm/inst/nosql/mongo2.rb
 - lib/one_apm/inst/nosql/mongo_moped.rb
 - lib/one_apm/inst/nosql/redis.rb
 - lib/one_apm/inst/orm/active_record.rb