appsignal-mongo 0.1.2 → 0.1.3.beta.0

data/lib/appsignal/middleware/mongo_event_sanitizer.rb

@@ -0,0 +1,37 @@
+module Appsignal
+  module Middleware
+    class MongoEventSanitizer
+      WHITELISTED_TOP_LEVEL_KEYS = [:fields, :order]
+
+      def call(event)
+        if target?(event)
+          event.payload.each_value do |parameters|
+            selected(parameters).each_value do |value|
+              scrub!(value)
+            end
+          end
+        end
+        yield
+      end
+
+      protected
+
+      def target?(event)
+        event.name == Appsignal::Mongo::Instrumentation::EVENT_NAME
+      end
+
+      def selected(parameters)
+        parameters.reject do |key, value|
+          WHITELISTED_TOP_LEVEL_KEYS.include?(key)
+        end
+      end
+
+      def scrub!(value)
+        if value.is_a?(Hash) || value.is_a?(Array)
+          Appsignal::ParamsSanitizer.scrub!(value)
+        end
+      end
+
+    end
+  end
+end

data/lib/appsignal/middleware/mongo_event_sanitizer.rb~

@@ -0,0 +1,35 @@
+module Appsignal
+  module Middleware
+    class MongoEventSanitizer
+      WHITELISTED_KEYS = [:fields, :order]
+
+      def call(event)
+        if target?(event)
+          event.payload.each_value do |parameters|
+            selected(parameters).each_value do |value|
+              scrub!(value)
+            end
+          end
+        end
+        yield
+      end
+
+      protected
+
+      def target?(event)
+        event.name == Appsignal::Mongo::Instrumentation::EVENT_NAME
+      end
+
+      def selected(parameters)
+        parameters.reject { |key, value| WHITELISTED_KEYS.include?(key) }
+      end
+
+      def scrub!(value)
+        if value.is_a?(Hash) || value.is_a?(Array)
+          Appsignal::ParamsSanitizer.scrub!(value)
+        end
+      end
+
+    end
+  end
+end

data/lib/appsignal/mongo/instrumentation.rb

@@ -0,0 +1,17 @@
+module Appsignal
+  module Mongo
+    module Instrumentation
+      EVENT_NAME = 'query.mongodb'
+
+      private
+
+      def instrument_with_appsignal_instrumentation(name, payload={}, &block)
+        ActiveSupport::Notifications.instrument(
+          EVENT_NAME, name => payload) do
+            instrument_without_appsignal_instrumentation(name, payload, &block)
+          end
+      end
+
+    end
+  end
+end

data/lib/appsignal/mongo/instrumentation.rb~

@@ -0,0 +1,16 @@
+module Appsignal
+  module Mongo
+    module Instrumentation
+
+      private
+
+      def instrument_with_appsignal_instrumentation(name, payload={}, &block)
+        ActiveSupport::Notifications.instrument(
+          'query.mongodb', name => payload) do
+            instrument_without_appsignal_instrumentation(name, payload, &block)
+          end
+      end
+
+    end
+  end
+end

data/lib/appsignal/mongo/version.rb

@@ -0,0 +1,5 @@
+module Appsignal
+  module Mongo
+    VERSION = '0.1.3.beta.0'
+  end
+end

data/lib/appsignal-mongo.rb

@@ -0,0 +1,14 @@
+require 'mongo'
+require 'rails'
+require 'appsignal'
+require 'appsignal/mongo/instrumentation'
+require 'appsignal/middleware/mongo_event_sanitizer'
+
+::Mongo::Logging.module_eval do
+  include Appsignal::Mongo::Instrumentation
+
+  alias_method :instrument_without_appsignal_instrumentation, :instrument
+  alias_method :instrument, :instrument_with_appsignal_instrumentation
+end
+
+Appsignal.post_processing_middleware.add Appsignal::Middleware::MongoEventSanitizer

data/lib/appsignal-mongo.rb~

@@ -0,0 +1,12 @@
+require 'mongo'
+require 'rails'
+require 'appsignal'
+require 'appsignal/mongo/instrumentation'
+require 'appsignal/middleware/mongo_event_sanitizer'
+
+::Mongo::Logging.module_eval do
+  include Appsignal::Mongo::Instrumentation
+
+  alias_method :instrument_without_appsignal_instrumentation, :instrument
+  alias_method :instrument, :instrument_with_appsignal_instrumentation
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: appsignal-mongo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  prerelease: 6
+  version: 0.1.3.beta.0
 platform: ruby
 authors:
 - Thijs Cadier
@@ -10,142 +10,161 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '1.5'
+    none: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+    none: false
+  prerelease: false
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
+        version: 0.5.0.beta1
+    none: false
+  prerelease: false
+  name: appsignal
   requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0.beta1
     none: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Wrap all mongo queries withActiveSupport::Notifications.instrument calls.For
-  use with Appsignal.
+    none: false
+  type: :development
+description: Wrap all mongo queries withActiveSupport::Notifications.instrument calls.
+  For use with Appsignal.
 email:
 - contact@appsignal.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/appsignal_mongo/version.rb
-- lib/appsignal_mongo.rb
+- lib/appsignal/middleware/mongo_event_sanitizer.rb
+- lib/appsignal/middleware/mongo_event_sanitizer.rb~
+- lib/appsignal/mongo/instrumentation.rb
+- lib/appsignal/mongo/instrumentation.rb~
+- lib/appsignal/mongo/version.rb
+- lib/appsignal/mongo/version.rb~
+- lib/appsignal-mongo.rb
+- lib/appsignal-mongo.rb~
 - README.md
-homepage: https://github.com/80beans/appsignal-mongo
+homepage: https://github.com/appsignal/appsignal-mongo
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -1981725142118150093
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -4000561256811814464
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1981725142118150093
+      version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Add instrument calls to mongodb queries made with mongo. For use with Appsignal.

data/lib/appsignal_mongo.rb

@@ -1,26 +0,0 @@
-require 'mongo'
-require 'active_support'
-
-module Appsignal
-  module Mongo
-    module Instrumentation
-
-      private
-
-      def instrument_with_appsignal_instrumentation(name, payload={}, &block)
-        ActiveSupport::Notifications.instrument(
-          'query.mongodb', :query => payload.merge(:method => name)) do
-            instrument_without_appsignal_instrumentation(name, payload, &block)
-          end
-      end
-
-    end
-  end
-end
-
-::Mongo::Logging.module_eval do
-  include Appsignal::Mongo::Instrumentation
-
-  alias_method :instrument_without_appsignal_instrumentation, :instrument
-  alias_method :instrument, :instrument_with_appsignal_instrumentation
-end