newrelic_mongodb 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a17754978a3401c8f1cf852100f50cda3d33cc
-  data.tar.gz: ce7ee16b780d502fe686ad012a046f655a9b588d
+  metadata.gz: 0265cccf0bf07d2e3643690dc529f817d3f9a10e
+  data.tar.gz: 6e6ec0df1e0c1a2bbfc49dd92e097e59ef623602
 SHA512:
-  metadata.gz: f781e2dad3973c5d6f3c28a641616db6cc36a6a1833d6e6d671aeb05cf34e7e457a38e3d11e9f550e84f5cfc7cc08a81190096f64cff05cb6ffa5912dddb2c1a
-  data.tar.gz: 6ced51cfaedfd998a46d4defe0f4125d1f04d245e7c69f416e6c85515a4392792ae874cdcde0874da0290e9b4624cce5c5d7c3d02cffa5be1b2a6170dc8402e6
+  metadata.gz: 885f137fdf365cab9dcd0fc2c7fd4ec6bd38ae00456371ad3ff8a36b83e67cfe9e4ca0a2e60371ddd72f1acabfc4436004afe75d60ca9e5f13a5875b4487178f
+  data.tar.gz: 47a8c7754407f8e884afda65d8a9d465e33745398ff97b1f5ae0364a4c41d9433e09534815dad7ff6376e9c16978c0e3609937a7bed023bff075f588a15e8fa3

data/lib/newrelic_mongodb/instrumentation.rb

@@ -27,35 +27,41 @@ module NewRelic
     module Instrumentation
       module Mongodb
         def logging_with_newrelic_trace(messages, operation_id = nil)
-          log_statement, operation_name, collection_name = determine_operation_and_collection(messages.first)
+          operation_name, collection_name = determine_operation_and_collection(messages.first)
           command = Proc.new { logging_without_newrelic_trace(messages, operation_id) }
-          res = nil
 
-          op = case operation_name.to_s
-          when *%w(delete) then 'destroy'
-          when *%w(find get_more query) then 'find'
-          when *%w(insert update) then 'save'
-          end
+          operation_type = case operation_name.to_s
+            when *%w(delete) then 'destroy'
+            when *%w(find get_more query) then 'find'
+            when *%w(insert update) then 'save'
+            else
+              nil
+            end
 
-          if op
+          if operation_type
             callback = Proc.new do |result, metric, elapsed|
-              NewRelic::Agent::Datastores.notice_statement(log_statement, elapsed)
+              NewRelic::Agent::Datastores.notice_statement(operation_name, elapsed)
             end
 
-            # TODO add use of collection name here once it is figured out
-            NewRelic::Agent::Datastores.wrap('MongoDB', op, nil, callback) do
-              res = command.call
+            NewRelic::Agent::Datastores.wrap('MongoDB', operation_type, collection_name, callback) do
+              command.call
             end
           else
-            res = command.call
+            command.call
           end
-
-          res
         end
 
+        private
         def determine_operation_and_collection(message)
-          # TODO figure out how to get the collection name correct
-          [message.namespace, message.payload[:command_name], message.namespace.split('.').last]
+          operation_name = message.payload[:command_name]
+
+          collection_name = if (namespace_name = message.namespace.split('.').last) == '$cmd'
+            message.selector[operation_name]
+          else
+            namespace_name
+          end
+
+          [operation_name, collection_name]
         end
       end
     end

data/lib/newrelic_mongodb/version.rb

@@ -1,3 +1,3 @@
 module NewrelicMongodb
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_mongodb
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - William Li