peek-mongo 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 48895e9d990e1d81676d587e2db0fb0ffd8c6361
+  data.tar.gz: 7201cbea459ce896e9b0973820588f7ca1e688a8
+SHA512:
+  metadata.gz: 715ea029257f778a2babe33153ca986d36fd604cc0f6d0a733f1014ce5f9f236c04a651ad7e39fbf96f1fae6ecd8259b0af7d03f1c13e2324edc3e654f822a55
+  data.tar.gz: a9a0d0460cafd74a504bbfaba3d590ec3de3b7451019dc8df96a26c1594ec1a35698436605c80d4a0a5fe1ea516fccd783ba242ab0b1091f9e043e5fff19113d

data/CHANGELOG.md

@@ -9,3 +9,7 @@
 # 1.1.0
 
 - Query count and Query time are now threadsafe.
+
+# 1.2.0
+
+- Use `Module#prepend` over `alias_method_chain` - #4 @NJ-Scioly

data/lib/peek-mongo/version.rb

@@ -1,5 +1,5 @@
 module Peek
   module Mongo
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/peek/views/mongo.rb

@@ -1,57 +1,83 @@
 require 'mongo'
-require 'atomic'
+require 'concurrent'
 
-# At the deepest of all commands in mongo go to Mongo::Connection
-# and the following methods:
-#
-# - :send_message
-# - :send_message_with_gle
-# - :receive_message
+module Peek
+  # Query times are logged by timing the Socket class of the Mongo Ruby Driver
+  module MongoSocketInstrumented
+    def read(*args, &block)
+      start = Time.now
+      super(*args, &block)
+    ensure
+      duration = (Time.now - start)
+      ::Mongo::Socket.query_time.update { |value| value + duration }
+    end
 
-# Instrument Mongo time
-class Mongo::Connection
-  class << self
-    attr_accessor :command_time, :command_count
+    def write(*args, &block)
+      start = Time.now
+      super(*args, &block)
+    ensure
+      duration = (Time.now - start)
+      ::Mongo::Socket.query_time.update { |value| value + duration }
+    end
   end
-  self.command_count = Atomic.new(0)
-  self.command_time = Atomic.new(0)
-
-  def send_message_with_timing(*args)
-    start = Time.now
-    send_message_without_timing(*args)
-  ensure
-    duration = (Time.now - start)
-    Mongo::Connection.command_time.update { |value| value + duration }
-    Mongo::Connection.command_count.update { |value| value + 1 }
+
+  # Query counts are logged to the Socket class by monitoring payload generation
+  module MongoProtocolInstrumented
+    def payload
+      super
+    ensure
+      ::Mongo::Protocol::Message.query_count.update { |value| value + 1 }
+    end
   end
-  alias_method_chain :send_message, :timing
-
-  def send_message_with_gle_with_timing(*args)
-    start = Time.now
-    send_message_with_gle_without_timing(*args)
-  ensure
-    duration = (Time.now - start)
-    Mongo::Connection.command_time.update { |value| value + duration }
-    Mongo::Connection.command_count.update { |value| value + 1 }
+end
+
+# The Socket class will keep track of timing
+# The MongoSocketInstrumented class overrides the read and write methods, rerporting the total count as the attribute :query_count
+class Mongo::Socket
+  prepend Peek::MongoSocketInstrumented
+  class << self
+    attr_accessor :query_time
   end
-  alias_method_chain :send_message_with_gle, :timing
-
-  def receive_message_with_timing(*args)
-    start = Time.now
-    receive_message_without_timing(*args)
-  ensure
-    duration = (Time.now - start)
-    Mongo::Connection.command_time.update { |value| value + duration }
-    Mongo::Connection.command_count.update { |value| value + 1 }
+  self.query_time = Concurrent::AtomicFixnum.new(0)
+end
+
+# The Message class will keep track of count
+# Nothing is overridden here, only an attribute for counting is added
+class Mongo::Protocol::Message
+  class << self
+    attr_accessor :query_count
   end
-  alias_method_chain :receive_message, :timing
+  self.query_count = Concurrent::AtomicFixnum.new(0)
+end
+
+## Following classes all override the various Mongo command classes in Protocol to add counting
+# The actual counting for each class is stored in Mongo::Protocol::Message
+
+class Mongo::Protocol::Query
+  prepend Peek::MongoProtocolInstrumented
+end
+
+class Mongo::Protocol::Insert
+  prepend Peek::MongoProtocolInstrumented
+end
+
+class Mongo::Protocol::Update
+  prepend Peek::MongoProtocolInstrumented
+end
+
+class Mongo::Protocol::GetMore
+  prepend Peek::MongoProtocolInstrumented
+end
+
+class Mongo::Protocol::Delete
+  prepend Peek::MongoProtocolInstrumented
 end
 
 module Peek
   module Views
     class Mongo < View
       def duration
-        ::Mongo::Connection.command_time.value
+        ::Mongo::Socket.query_time.value
       end
 
       def formatted_duration
@@ -64,7 +90,7 @@ module Peek
       end
 
       def calls
-        ::Mongo::Connection.command_count.value
+        ::Mongo::Protocol::Message.query_count.value
       end
 
       def results
@@ -75,9 +101,9 @@ module Peek
 
       def setup_subscribers
         # Reset each counter when a new request starts
-        before_request do
-          ::Mongo::Connection.command_time.value = 0
-          ::Mongo::Connection.command_count.value = 0
+        subscribe 'start_processing.action_controller' do
+          ::Mongo::Socket.query_time.value = 0
+          ::Mongo::Protocol::Message.query_count.value = 0
         end
       end
     end

data/peek-mongo.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'peek'
-  gem.add_dependency 'mongo', '>= 1.8'
-  gem.add_dependency 'atomic', '>= 1.0.0'
+  gem.add_dependency 'mongo', '>= 2.4.1'
+  gem.add_dependency 'concurrent-ruby', '>= 1.0.4'
 end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: peek-mongo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Garrett Bjerkhoel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peek
   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: mongo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
-  name: atomic
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.4
 description: Take a peek into the Mongo commands made within your Rails application.
 email:
 - me@garrettbjerkhoel.com
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -80,26 +73,26 @@ files:
 - peek-mongo.gemspec
 homepage: https://github.com/peek/peek-mongo
 licenses: []
+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.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Take a peek into the Mongo commands made within your Rails application.
 test_files: []
+has_rdoc: