oneapm_rpm 1.2.9 → 1.3.0.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNkNTY0Y2FhZjMxMWRmZDI4YWNjYjZlNmI0ODgwMjc3ODA3YWI4ZA==
+    NzJkZmRlMGY5MmE5ZWM1MzBiMWQzOGI4OTU2MzM5OTEzYmU2OTE2NQ==
   data.tar.gz: !binary |-
-    ZDE0MmRlZGZhNjY1ZTE0ZWRkM2QzOWZhNGFlNGVjMjM1ZDk4NjY0ZQ==
+    ZTE2ZWUwMGRhZDg5ZjdhZjNjNzlkY2UzYmUxYjBkNjQyODEwOTY0OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDk5NzdiOTA5NWY5OWUwODAzNGY4OTA0NjZiNjlmMDVhYjFiMDg4ZDgwMmNl
-    Y2RlZjJkMWRmODkxYmM0ZmFmMGNhZTUyMDQzOTkyZjYxZjk5NjRhNGY1NGNl
-    ZDEzNTI3N2FhZmVkMDBhNGU3YzkyYzMzOGJjMDE3YzZiZDc1NGU=
+    NzMyNDAzNDliNmYwZTdhNDI4OTNmMDUxN2UyNWRmOWMxZWU5OTUwOWFjMWJk
+    N2IxYTIzN2ZiNDg4ODU5OGJkZjIyMmY4NzdkYWNmZjVkMDRkMzBiNzgwMGVk
+    YjQ0MDA1NDVmY2U1ZTIyZDUyNmQ4YWQ1NGQ4YTc0Mjc5Y2Q0ZDU=
   data.tar.gz: !binary |-
-    ZDAwOThmMjM3ZjhmZmI3OTIyOWNhOTdkM2E3N2VlOWQ5NWRlMTFhZDc3M2Zm
-    NWE2NjA1YWFjZTMwYjdkNTRlMDA0NzdmYzU1ZDJkYTNjYTVkNzBkNGFiOGIx
-    YzgzOTk4M2RhNzc1MWVhYzdkYjQ0ODEyYTY3OWU4M2MxMmY3NDA=
+    ZmYwZGJhZTQxODk0Yzc1ZDUzZWE1NDM5Y2I2YTI3MzBjOTU1ZjE4OTc5NDFh
+    YzVjYzMwZmVkODgyMGE4NWU2MWM2ZjU2M2U5YjBkMjVjNjYzZTQ1ZTY4YmI3
+    YjJlMzQ0ZTNmZTgxZWUyNGM0MDc2OGJjNjg1OTY3NTBmZjI1YzY=

data/lib/one_apm/agent/datastore/mongo/command_formatter.rb

@@ -0,0 +1,69 @@
+# encoding: utf-8
+
+require 'one_apm/agent/datastore/mongo/obfuscator'
+
+module OneApm
+  module Agent
+    module Datastore
+      module Mongo
+        module CommandFormatter
+
+          OBFUSCATE_KEYS   = [ 'filter', 'query',  ].freeze
+          BLACKLISTED_KEYS = [ 'deletes', 'documents', 'updates' ].freeze
+          OBFUSCATE_NOSQL_KEYS = [ 'filter', 'query', 'deletes', 'documents', 'updates' ].freeze
+
+
+          def self.format(event, status)
+            return nil unless OneApm::Manager.config[:'mongo.capture_queries']
+            result = {
+              :operation  => event.command_name,
+              :database   => event.database_name,
+              :collection => event.command.values.first,
+              :command    => event.command,
+              :status     => status
+            }
+
+            event.command.each do |key, value|
+              next if BLACKLISTED_KEYS.include?(key)
+              if OBFUSCATE_KEYS.include?(key)
+                obfuscated = obfuscate(value)
+                result[key] = obfuscated if obfuscated
+              else
+                result[key] = value
+              end
+            end
+            result
+          end
+
+          def self.format_sql(event, status)
+            return nil unless OneApm::Manager.config[:'mongo.capture_queries']
+            header = "db.#{event.command.values.first}.#{event.command_name}"
+            obfuscate_sql = []
+            event.command.each do |key, value|
+              if OBFUSCATE_NOSQL_KEYS.include?(key)
+                if value.is_a?(Array)
+                  value.each do |val|
+                    obfuscate_sql << "(#{obfuscate_json(val)})"
+                  end 
+                else 
+                  obfuscate_sql << "(#{obfuscate_json(value)})"
+                end
+              end
+            end
+            header.concat(obfuscate_sql.join(", "))
+          end
+
+          def self.obfuscate_json value
+            obfuscate_value = obfuscate(value)
+            obfuscate_value.to_s.gsub('=>', ':').gsub('"', '') if obfuscate_value
+          end
+
+          def self.obfuscate(statement)
+            statement = Obfuscator.obfuscate_statement(statement) if OneApm::Manager.config[:'mongo.obfuscate_queries']
+            statement
+          end
+        end
+      end
+    end
+  end
+end

data/lib/one_apm/agent/datastore/mongo.rb

@@ -11,6 +11,10 @@ module OneApm
             !is_version2?
         end
 
+        def self.is_support_version2?
+          defined?(::Mongo::Monitoring) && is_version2?
+        end
+
         # At present we explicitly don't support version 2.x of the driver yet
         def self.is_version2?
           defined?(::Mongo::VERSION) &&

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

@@ -1,87 +1,116 @@
 # 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 Mongo 2 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
+module OneApm
+  module Agent
+    module Instrumentation
+      class MongoCommandSubscriber
+
+        MONGODB = 'MongoDB'.freeze
+        STARTED = 'STARTED'.freeze
+        SUCCEEDED = 'SUCCEEDED'.freeze
+        FAILED = 'FAILED'.freeze
+
+        def started(event)
+          begin
+            return unless OneApm::Manager.tl_is_execution_traced?
+            operations[event.operation_id] = event
+          rescue Exception => e
+            log_operations_error(STARTED, e)
+          end
+        end
 
+        def succeeded(event)
+          operator SUCCEEDED, event
+        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 failed(event)
+          operator FAILED, event
+        end
 
+        private
 
-  def instrument_methods_with_oneapm klass, methods
-    klass.class_eval do 
-      include OneApm::Support::MethodTracer
+        def operations
+          @operations ||= {}
+        end
 
-      def payload_for_oneapm
-        collection = self.name rescue self.collection.name
-        @payload_for_oneapm ||= { :collection => collection, :database => self.database.name }
-      end
+        def mertircs(event)
+          OneApm::Agent::Datastore::MetricHelper.metrics_for(
+            MONGODB, event.command_name, event.command.values.first
+          )
+        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)
+        def operator(operator_type, event)
+          begin
+            state = OneApm::TransactionState.tl_get
+            return unless state.is_execution_traced?
+            stared_event = operations.delete(event.operation_id)
+            one_apm_generate_metrics(stared_event, event.duration)
+            one_apm_notice_statement(stared_event, operator_type, event.duration)
+            one_apm_notice_sql(state, stared_event, operator_type, event.duration)
+          rescue => e
+            log_operations_error(operator_type, e)
+          end
         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
+        def one_apm_generate_metrics(event, duration)         
+          base, *other_metrics = mertircs(event)
+          OneApm::Manager.agent.stats_engine.tl_record_scoped_and_unscoped_metrics(
+            base, other_metrics, duration
+          )
+        end
 
-    methods.each do |method_name|
-      next unless klass.method_defined?(method_name)
+        def one_apm_notice_sql(state, event, status, duration)
+          stack = state.traced_method_stack
+          base, *other_metrics = mertircs(event)
 
-      klass.class_eval do 
+          started_time = Time.now.to_f
+          frame = stack.push_frame(state, :mongo_tracer, started_time)
 
-        method_name_without_oneapm = :"#{method_name}_without_oneapm"
-        method_name_with_oneapm = :"#{method_name}_with_oneapm"
+          builder = state.transaction_sample_builder
+          format_sql = OneApm::Agent::Datastore::Mongo::CommandFormatter.format_sql(event, status)
+          OneApm::Manager.agent.transaction_sampler.send(:notice_extra_data, builder, format_sql, duration, :sql)
 
-        define_method method_name_with_oneapm do |*args, &block|
-          metrics = one_apm_generate_metrics(method_name)
+          stack.pop_frame(state, frame, base, started_time + duration)
+        end
 
-          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
+        def one_apm_notice_statement(event, status, duration)
+          statement = OneApm::Agent::Datastore::Mongo::CommandFormatter.format(event, status)
+          if statement
+             OneApm::Manager.agent.transaction_sampler.notice_nosql_statement(statement, duration)
           end
-         
+          rescue => e
+            OneApm::Manager.logger.debug("Exception during Mongo statement gathering", e)
         end
-        alias_method method_name_without_oneapm, method_name.to_sym
-        alias_method method_name.to_sym, method_name_with_oneapm
+
+        def log_operations_error(event_type, error)
+          OneApm::Manager.logger.error("Error during MongoDB #{event_type} event:")
+          OneApm::Manager.logger.log_exception(:error, error)
+        end
+  
       end
     end
-
   end
- 
 end
+
+LibraryDetection.defer do
+  named :mongo2
+
+  depends_on do
+    require 'one_apm/agent/datastore/mongo'
+    defined?(::Mongo) && OneApm::Agent::Datastore::Mongo.is_support_version2? && !OneApm::Manager.config[:disable_mongo]
+  end
+
+  executes do
+    OneApm::Manager.logger.info 'Installing Mongo 2 instrumentation'
+    install_mongo_command_subscriber
+  end
+
+  def install_mongo_command_subscriber
+    require 'one_apm/agent/datastore/metric_helper'
+    require 'one_apm/agent/datastore/mongo/command_formatter'
+    ::Mongo::Monitoring::Global.subscribe(
+      ::Mongo::Monitoring::COMMAND,
+      OneApm::Agent::Instrumentation::MongoCommandSubscriber.new
+    )
+  end
+end

data/lib/one_apm/version.rb

@@ -4,12 +4,13 @@ module OneApm
   module VERSION
 
     MAJOR = 1
-    MINOR = 2
-    TINY  = 9
+    MINOR = 3
+    TINY  = 0
+    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.9
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -258,6 +258,7 @@ files:
 - lib/one_apm/agent/datastore.rb
 - lib/one_apm/agent/datastore/metric_helper.rb
 - lib/one_apm/agent/datastore/mongo.rb
+- lib/one_apm/agent/datastore/mongo/command_formatter.rb
 - lib/one_apm/agent/datastore/mongo/metric_translator.rb
 - lib/one_apm/agent/datastore/mongo/obfuscator.rb
 - lib/one_apm/agent/datastore/mongo/statement_formatter.rb