newrelic_moped 0.0.4.1 → 0.0.6

data/lib/newrelic_moped/instrumentation.rb

@@ -4,11 +4,11 @@ DependencyDetection.defer do
   @name = :moped
 
   depends_on do
-    defined?(::Moped) and not NewRelic::Control.instance['disable_moped']
+    defined?(::Moped) && !NewRelic::Control.instance['disable_moped']
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Moped instrumentation'
+    NewRelic::Agent.logger.info 'Installing Moped instrumentation'
   end
 
   executes do
@@ -25,20 +25,42 @@ module NewRelic
     module Instrumentation
       def logging_with_newrelic_trace(operations, &blk)
         operation_name, collection = determine_operation_and_collection(operations.first)
-        log_statement = operations.first.log_inspect
-
-        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
+        log_statement = operations.first.log_inspect.encode("UTF-8")
+
+        metric = case operation_name
+                 when 'INSERT', 'UPDATE', 'CREATE'  then 'save'
+                 when 'QUERY'                       then 'find'
+                 when 'DELETE'                      then 'destroy'
+                 else 
+                   nil 
+                 end
+
+        command = Proc.new { logging_without_newrelic_trace(operations, &blk) }
+        res = nil
+        
+        if metric
+          metrics = ["ActiveRecord/all", "ActiveRecord/#{collection}/#{metric}"]
+
+          self.class.trace_execution_scoped(metrics) do
+            t0 = Time.now
+            begin
+              res = command.call
+            ensure
+              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, metric, nil, elapsed_time)
+            end
+          end
+        else
+          res = command.call
         end
+
+        res
       end
 
       def determine_operation_and_collection(operation)
-        log_statement = operation.log_inspect
+        log_statement = operation.log_inspect.encode("UTF-8")
         collection = "Unknown"
         if operation.respond_to?(:collection)
           collection = operation.collection
@@ -55,4 +77,4 @@ module NewRelic
       end
     end
   end
-end
+end

data/lib/newrelic_moped/version.rb

@@ -1,3 +1,3 @@
 module NewrelicMoped
-  VERSION = "0.0.4.1"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_moped
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
@@ -66,17 +66,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- lib/newrelic_moped.rb
 - lib/newrelic_moped/instrumentation.rb
 - lib/newrelic_moped/version.rb
-- newrelic_moped.gemspec
-- test/instrumentation_test.rb
-- test/moped_command_fake.rb
+- lib/newrelic_moped.rb
+- LICENSE
+- README.md
 homepage: ''
 licenses: []
 post_install_message: 
@@ -101,7 +95,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: New Relic Instrumentation for Moped & Mongoid 3
-test_files:
-- test/instrumentation_test.rb
-- test/moped_command_fake.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-log

data/Gemfile

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

data/Rakefile

@@ -1,9 +0,0 @@
-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/newrelic_moped.gemspec

@@ -1,21 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/newrelic_moped/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Stephen Bartholomew"]
-  gem.email         = ["stephenbartholomew@gmail.com"]
-  gem.description   = %q{New Relic Instrumentation for Moped & Mongoid 3}
-  gem.summary   = %q{New Relic Instrumentation for Moped & Mongoid 3}
-  gem.homepage      = ""
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "newrelic_moped"
-  gem.require_paths = ["lib"]
-  gem.version       = NewrelicMoped::VERSION
-  gem.add_dependency 'newrelic_rpm', '~> 3.5.1'
-  gem.add_dependency 'moped'
-
-  gem.add_development_dependency 'rake'
-end

data/test/instrumentation_test.rb

@@ -1,86 +0,0 @@
-require 'ostruct'
-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
-
-class FakeOpWithoutCollection < Struct.new(:log_inspect)
-end
-
-class TestInstrumentation < Test::Unit::TestCase
-  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-
-  def setup
-    NewRelic::Agent.manual_start
-    @engine = NewRelic::Agent.instance.stats_engine
-    @engine.clear_stats
-
-    @sampler = NewRelic::Agent.instance.transaction_sampler
-    @sampler.reset!
-    @sampler.start_builder
-
-    Moped::Node.class_eval do
-      def logging_with_newrelic_trace(operations, &callback)
-        # do nothing
-      end
-    end
-
-    @node = Moped::Node.new("127.0.0.1:27017")
-  end
-
-  def teardown
-    @sampler.clear_builder
-  end
-
-  def test_handles_operations_with_collections
-    fake_op = FakeOpWithCollection.new([], "Fake")
-
-    assert_nothing_raised do
-      @node.logging_with_newrelic_trace(fake_op)
-    end
-  end
-
-  def test_ignores_operations_without_collection
-    fake_op = FakeOpWithoutCollection.new("Fake")
-
-    assert_nothing_raised do
-      @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

@@ -1,27 +0,0 @@
-
-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