newrelic_moped 0.0.3 → 0.0.4

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+log

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec
+

data/Rakefile

@@ -1,2 +1,9 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+ t.libs = ['test']
+ t.test_files = FileList['test/*_test.rb']
+end
+
+desc "Run tests"
+task :default => :test

data/lib/newrelic_moped/instrumentation.rb

@@ -13,28 +13,46 @@ DependencyDetection.defer do
 
   executes do
     Moped::Node.class_eval do
-      def process_with_newrelic_trace(operation, &callback)
-        if operation.respond_to?(:collection)
-          collection = operation.collection
+      include NewRelic::Moped::Instrumentation
+      alias_method :logging_without_newrelic_trace, :logging
+      alias_method :logging, :logging_with_newrelic_trace
+    end
+  end
+end
 
-          self.class.trace_execution_scoped(["Moped::process[#{collection}]"]) do
-            t0 = Time.now
+module NewRelic
+  module Moped
+    module Instrumentation
+      def logging_with_newrelic_trace(operations, &blk)
+        operation_name, collection = determine_operation_and_collection(operations.first)
+        log_statement = operations.first.log_inspect
 
-            begin
-              process_without_newrelic_trace(operation, &callback)
-            ensure
-              elapsed_time = (Time.now - t0).to_f
-              NewRelic::Agent.instance.transaction_sampler.notice_sql(operation.log_inspect,
-                                                       nil, elapsed_time)
-              NewRelic::Agent.instance.sql_sampler.notice_sql(operation.log_inspect, nil,
-                                                       nil, elapsed_time)
-            end
-          end
+        self.class.trace_execution_scoped("Database/#{collection}/#{operation_name}") do
+          t0 = Time.now
+          res = logging_without_newrelic_trace(operations, &blk)
+          elapsed_time = (Time.now - t0).to_f
+          NewRelic::Agent.instance.transaction_sampler.notice_sql(log_statement, nil, elapsed_time)
+          NewRelic::Agent.instance.sql_sampler.notice_sql(log_statement, nil, nil, elapsed_time)
+          res
         end
       end
 
-      alias_method :process_without_newrelic_trace, :process
-      alias_method :process, :process_with_newrelic_trace
+      def determine_operation_and_collection(operation)
+        log_statement = operation.log_inspect
+        collection = "Unknown"
+        if operation.respond_to?(:collection)
+          collection = operation.collection
+        end
+        operation_name = log_statement.split[0]
+        if operation_name == 'COMMAND' && log_statement.include?(":mapreduce")
+          operation_name = 'MAPREDUCE'
+          collection = log_statement[/:mapreduce=>"([^"]+)/,1]
+        elsif operation_name == 'COMMAND' && log_statement.include?(":count")
+          operation_name = 'COUNT'
+          collection = log_statement[/:count=>"([^"]+)/,1]
+        end
+        return operation_name, collection
+      end
     end
   end
-end
+end

data/lib/newrelic_moped/version.rb

@@ -1,3 +1,3 @@
 module NewrelicMoped
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/newrelic_moped.gemspec

@@ -14,4 +14,8 @@ Gem::Specification.new do |gem|
   gem.name          = "newrelic_moped"
   gem.require_paths = ["lib"]
   gem.version       = NewrelicMoped::VERSION
+  gem.add_dependency 'newrelic_rpm', '~> 3.5.3.25'
+  gem.add_dependency 'moped'
+
+  gem.add_development_dependency 'rake'
 end

data/test/instrumentation_test.rb

@@ -3,6 +3,7 @@ require 'test/unit'
 require 'moped'
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/newrelic_moped/instrumentation')
+require File.expand_path(File.dirname(__FILE__) + '/moped_command_fake')
 
 class FakeOpWithCollection < Struct.new(:collection, :log_inspect)
 end
@@ -14,18 +15,16 @@ class TestInstrumentation < Test::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
   def setup
-    DependencyDetection.detect!
     NewRelic::Agent.manual_start
     @engine = NewRelic::Agent.instance.stats_engine
     @engine.clear_stats
 
     @sampler = NewRelic::Agent.instance.transaction_sampler
-    @sampler.enable
     @sampler.reset!
     @sampler.start_builder
 
     Moped::Node.class_eval do
-      def process_without_newrelic_trace(operation, &callback)
+      def logging_with_newrelic_trace(operations, &callback)
         # do nothing
       end
     end
@@ -41,7 +40,7 @@ class TestInstrumentation < Test::Unit::TestCase
     fake_op = FakeOpWithCollection.new([], "Fake")
 
     assert_nothing_raised do
-      @node.process_with_newrelic_trace(fake_op)
+      @node.logging_with_newrelic_trace(fake_op)
     end
   end
 
@@ -49,7 +48,39 @@ class TestInstrumentation < Test::Unit::TestCase
     fake_op = FakeOpWithoutCollection.new("Fake")
 
     assert_nothing_raised do
-      @node.process_with_newrelic_trace(fake_op) 
+      @node.logging_with_newrelic_trace(fake_op)
     end
   end
 end
+
+class NewRelicMopedInstrumentationTest < Test::Unit::TestCase
+  include NewRelic::Moped::Instrumentation
+
+  def test_when_command_is_mapreduce
+    command = MopedCommandWithCollectionFake.new("COMMAND database=my_database command={:mapreduce=>\"users\", :query=>{}}", "other_collection")
+    operation, collection = determine_operation_and_collection(command)
+    assert_equal("MAPREDUCE", operation)
+    assert_equal("users", collection, "it should parse collection from statement")
+  end
+
+  def test_query_when_operation_responds_to_collection
+    command = MopedCommandWithCollectionFake.new("QUERY database=my_database collection=xyz", "users")
+    operation, collection = determine_operation_and_collection(command)
+    assert_equal("QUERY", operation)
+    assert_equal("users", collection, "it should use collection from operation")
+  end
+
+  def test_when_command_is_count
+    command = MopedCommandWithCollectionFake.new("COMMAND database=my_database command={:count=>\"users\", query=>{}}", "other_collection")
+    operation, collection = determine_operation_and_collection(command)
+    assert_equal("COUNT", operation)
+    assert_equal("users", collection, "it should parse collection from statement")
+  end
+
+  def test_command_when_operation_does_not_respond_to_collection
+    command = MopedCommandFake.new("COMMAND database=admin command={:ismaster=>1}")
+    operation, collection = determine_operation_and_collection(command)
+    assert_equal("COMMAND", operation)
+    assert_equal("Unknown", collection, "it should set collection name to Unknown")
+  end
+end

data/test/moped_command_fake.rb

@@ -0,0 +1,27 @@
+
+class MopedCommandFake
+
+  def initialize(log_statement)
+    @log_statement = log_statement
+  end
+
+  def log_inspect
+    @log_statement
+  end
+end
+
+class MopedCommandWithCollectionFake
+
+  def initialize(log_statement, collection)
+    @log_statement = log_statement
+    @collection = collection
+  end
+
+  def log_inspect
+    @log_statement
+  end
+
+  def collection
+    @collection
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_moped
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
-dependencies: []
+date: 2012-12-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: newrelic_rpm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.3.25
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.3.25
+- !ruby/object:Gem::Dependency
+  name: moped
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: New Relic Instrumentation for Moped & Mongoid 3
 email:
 - stephenbartholomew@gmail.com
@@ -19,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -27,6 +76,7 @@ files:
 - lib/newrelic_moped/version.rb
 - newrelic_moped.gemspec
 - test/instrumentation_test.rb
+- test/moped_command_fake.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -53,3 +103,5 @@ specification_version: 3
 summary: New Relic Instrumentation for Moped & Mongoid 3
 test_files:
 - test/instrumentation_test.rb
+- test/moped_command_fake.rb
+has_rdoc: