newrelic_moped 0.0.2 → 0.0.3

data/lib/newrelic_moped/instrumentation.rb

@@ -1,3 +1,5 @@
+require 'new_relic/agent/method_tracer'
+
 DependencyDetection.defer do
   @name = :moped
 
@@ -12,19 +14,21 @@ DependencyDetection.defer do
   executes do
     Moped::Node.class_eval do
       def process_with_newrelic_trace(operation, &callback)
-        collection = operation.collection
+        if operation.respond_to?(:collection)
+          collection = operation.collection
 
-        self.class.trace_execution_scoped(["Moped::process[#{collection}]"]) do
-          t0 = Time.now
+          self.class.trace_execution_scoped(["Moped::process[#{collection}]"]) do
+            t0 = Time.now
 
-          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)
+            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
         end
       end

data/lib/newrelic_moped/version.rb

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

data/test/instrumentation_test.rb

@@ -0,0 +1,55 @@
+require 'ostruct'
+require 'test/unit'
+require 'moped'
+
+require File.expand_path(File.dirname(__FILE__) + '/../lib/newrelic_moped/instrumentation')
+
+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
+    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)
+        # 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.process_with_newrelic_trace(fake_op)
+    end
+  end
+
+  def test_ignores_operations_without_collection
+    fake_op = FakeOpWithoutCollection.new("Fake")
+
+    assert_nothing_raised do
+      @node.process_with_newrelic_trace(fake_op) 
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_moped
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies: []
 description: New Relic Instrumentation for Moped & Mongoid 3
 email:
@@ -19,7 +19,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -27,6 +26,7 @@ files:
 - lib/newrelic_moped/instrumentation.rb
 - lib/newrelic_moped/version.rb
 - newrelic_moped.gemspec
+- test/instrumentation_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -51,4 +51,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: New Relic Instrumentation for Moped & Mongoid 3
-test_files: []
+test_files:
+- test/instrumentation_test.rb

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in newrelic-moped.gemspec
-gemspec