newrelic_moped 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 11f781738f1a0471b0064169ea5be12b65c8a3bd
+  data.tar.gz: bc01d2c8555297998f01294b61ff5a894fe6ca14
+SHA512:
+  metadata.gz: 3e189d0dd91a1acc4eb25f5d9dc7580e6a959c6ce7017df887eb1cf4229a284fa4093d67d315c40c542ad0e19f08e4b4af073cd4a34077c3beade334dce067c5
+  data.tar.gz: 048d01ed8f931009c177c1137e3012f5df426c3df7d80bb141732d6bb8748344aee74dbe0bd65512eea767d2a01102e9d4de1c1fe32936f24448518ac964d713

data/README.md

@@ -16,6 +16,10 @@ Or install it yourself as:
 
     $ gem install newrelic_moped
 
+## News
+
+There's no official place for news & updates yet but you can follow @sbartholomew on Twitter for announcements.
+
 ## Contributing
 
 1. Fork it

data/lib/newrelic_moped/instrumentation.rb

@@ -1,3 +1,4 @@
+require 'new_relic/agent/instrumentation/active_record_helper'
 require 'new_relic/agent/method_tracer'
 
 DependencyDetection.defer do
@@ -13,7 +14,7 @@ DependencyDetection.defer do
 
   executes do
     Moped::Node.class_eval do
-      include NewRelic::Moped::Instrumentation
+      include NewRelic::Agent::Instrumentation::Moped
       alias_method :logging_without_newrelic_trace, :logging
       alias_method :logging, :logging_with_newrelic_trace
     end
@@ -21,59 +22,63 @@ DependencyDetection.defer do
 end
 
 module NewRelic
-  module Moped
+  module Agent
     module Instrumentation
-      def logging_with_newrelic_trace(operations, &blk)
-        operation_name, collection = determine_operation_and_collection(operations.first)
-        log_statement = operations.first.log_inspect.encode("UTF-8")
+      module Moped
+        def logging_with_newrelic_trace(operations, &blk)
+          operation_name, collection = determine_operation_and_collection(operations.first)
+          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
+          operation = case operation_name
+                   when 'INSERT', 'UPDATE', 'CREATE'  then 'save'
+                   when 'QUERY', 'COUNT'              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}"]
+          command = Proc.new { logging_without_newrelic_trace(operations, &blk) }
+          res = nil
 
-          self.class.trace_execution_scoped(metrics) do
-            t0 = Time.now
-            begin
-              res = command.call
-            ensure
-              elapsed_time = (Time.now - t0).to_f
+          if operation
+            metric = "ActiveRecord/#{collection}/#{operation}"
+            metrics = [metric] + ActiveRecordHelper.rollup_metrics_for(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)
+                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)
+                NewRelic::Agent.instance.stats_engine.record_metrics(metrics, elapsed_time)
+              end
             end
-          end
-        else
-          res = command.call
-        end
 
-        res
-      end
+          else
+            res = command.call
+          end
 
-      def determine_operation_and_collection(operation)
-        log_statement = operation.log_inspect.encode("UTF-8")
-        collection = "Unknown"
-        if operation.respond_to?(:collection)
-          collection = operation.collection
+          res
         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]
+
+        def determine_operation_and_collection(operation)
+          log_statement = operation.log_inspect.encode("UTF-8")
+          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
-        return operation_name, collection
       end
     end
   end

data/lib/newrelic_moped/version.rb

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

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_moped
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Stephen Bartholomew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2014-01-12 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.6.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !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
@@ -71,29 +64,29 @@ files:
 - lib/newrelic_moped.rb
 - LICENSE
 - README.md
-homepage: ''
-licenses: []
+homepage: https://github.com/stevebartholomew/newrelic_moped
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: New Relic Instrumentation for Moped & Mongoid 3
 test_files: []
 has_rdoc: