skylight 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f303f463e38c3a4a0b657f62c56d3b5a2fdf6785
-  data.tar.gz: 0ea102881e7ee7b4ee433c3b2a6fb3108157bf6c
+  metadata.gz: 54d9a76b353b8d0a2a6fecce094a8a32802a1b9d
+  data.tar.gz: c773bed69979daa2fe511a1fef1698699aa6ba42
 SHA512:
-  metadata.gz: d0d314ceea96ff2f558b47ce7acbee8f4715c63010bb3fd8500af19882996e117c159c01d94536e904ba3a3d5fd3ec0d23b5cf3fb51f9147ce08575fee5da532
-  data.tar.gz: d11114eb4997d558bb88d9da123dff43b26e2d0ca23883c9402ad2cf466fe10c3545c46de212e75889f668d8926968bffd800b0f84c271d80f87710b29bc5db5
+  metadata.gz: ad2f6c9f9edec7ec1417a89faa026cafbb5b36b9adc6e47c35063793178b8ff4bd75d683c404463fb37e0581be526eeeb7443e9df2314be060fd78d9419a51b6
+  data.tar.gz: f4b98d9d9b50b111b7c5f33ae57343c7985be52bcaa0cced2781c322bc1231b2186dd8f1ffda1a3b9eb098afec2c98e3572ed3492e21c39b4c8693acd3399dc8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.2 (December 10, 2013)
+
+* Added support for Mongoid/Moped
+* Fix probe enabling
+* Improved error reporting
+* Fix bug with multiple subscribers to same notification
+
 ## 0.2.1 (December 4, 2013)
 
 * Fix bin/skylight

data/lib/skylight/normalizers.rb

@@ -110,7 +110,8 @@ module Skylight
       end
     end
 
-    %w( process_action
+    %w( moped
+        process_action
         render_collection
         render_partial
         render_template

data/lib/skylight/normalizers/moped.rb

@@ -0,0 +1,139 @@
+module Skylight
+  module Normalizers
+    class Moped < Normalizer
+      register "query.moped"
+
+      CAT = "db.mongo.query".freeze
+
+      def normalize(trace, name, payload)
+        # payload: { prefix: "  MOPED: #{address.resolved}", ops: operations }
+
+        # We can sometimes have multiple operations. However, it seems like this only happens when doing things
+        # like an insert, followed by a get last error, so we can probably ignore all but the first.
+        operation = payload[:ops] ? payload[:ops].first : nil
+        type = operation && operation.class.to_s =~ /^Moped::Protocol::(.+)$/ ? $1 : nil
+
+        case type
+        when "Query"       then normalize_query(operation)
+        when "GetMore"     then normalize_get_more(operation)
+        when "Insert"      then normalize_insert(operation)
+        when "Update"      then normalize_update(operation)
+        when "Delete"      then normalize_delete(operation)
+        else :skip
+        end
+      end
+
+    private
+
+      def normalize_query(operation)
+        title = normalize_title("QUERY", operation)
+
+        hash, binds = extract_binds(operation.selector)
+        description = hash.to_json
+
+        annotations = build_annotations(operation)
+        annotations[:skip] = operation.skip
+        if operation.fields
+          annotations[:fields] = operation.fields.select{|k,v| v == 1 }.keys.map(&:to_s)
+        end
+        annotations[:binds] = binds unless binds.empty?
+
+        [CAT, title, description, annotations]
+      end
+
+      def normalize_get_more(operation)
+        title = normalize_title("GET_MORE", operation)
+
+        annotations = build_annotations(operation)
+        annotations[:limit] = operation.limit
+
+        [CAT, title, nil, annotations]
+      end
+
+      def normalize_insert(operation)
+        title = normalize_title("INSERT", operation)
+
+        annotations = build_annotations(operation)
+        annotations[:count] = operation.documents.count
+
+        [CAT, title, nil, annotations]
+      end
+
+      def normalize_update(operation)
+        title = normalize_title("UPDATE", operation)
+
+        selector_hash, selector_binds = extract_binds(operation.selector)
+        update_hash, update_binds = extract_binds(operation.update)
+
+        description = { selector: selector_hash, update: update_hash }.to_json
+
+        annotations = build_annotations(operation)
+
+        binds = {}
+        binds[:selector] = selector_binds unless selector_binds.empty?
+        binds[:update]   = update_binds   unless update_binds.empty?
+        annotations[:binds] = binds unless binds.empty?
+
+        [CAT, title, description, annotations]
+      end
+
+      def normalize_delete(operation)
+        title = normalize_title("DELETE", operation)
+
+        hash, binds = extract_binds(operation.selector)
+        description = hash.to_json
+
+        annotations = build_annotations(operation)
+        annotations[:binds] = binds unless binds.empty?
+
+        [CAT, title, description, annotations]
+      end
+
+      def normalize_title(type, operation)
+        "#{type} #{operation.collection}"
+      end
+
+      def build_annotations(operation)
+        annotations = {}
+
+        if operation.respond_to?(:flags)
+          flags = operation.flags.map{|f| flag_name(f) }
+          annotations[:flags] = flags unless flags.empty?
+        end
+
+        annotations
+      end
+
+      # Some flags used by Moped don't map directly to the Mongo docs
+      # See http://docs.mongodb.org/meta-driver/latest/legacy/mongodb-wire-protocol/
+      FLAG_MAP = {
+        tailable: "TailableCursor",
+        multi:    "MultiUpdate"
+      }
+
+      def flag_name(flag)
+        FLAG_MAP[flag] || flag.to_s.sub(/^[a-z\d]*/) { $&.capitalize }.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }
+      end
+
+      def extract_binds(hash, binds=[])
+        hash = hash.dup
+
+        hash.each do |k,v|
+          if v.is_a?(Hash)
+            hash[k] = extract_binds(v, binds)[0]
+          else
+            binds << stringify(hash[k])
+            hash[k] = '?'
+          end
+        end
+
+        [hash, binds]
+      end
+
+      def stringify(value)
+        value.is_a?(Regexp) ? value.inspect : value.to_s
+      end
+
+    end
+  end
+end

data/lib/skylight/normalizers/sql.rb

@@ -17,16 +17,18 @@ module Skylight
           title = payload[:name] || "SQL"
         end
 
-        unless payload[:binds].empty?
-          payload[:binds] = payload[:binds].map { |col, val| val.inspect }
+        binds = payload[:binds]
+
+        if binds && !binds.empty?
+          binds = binds.map { |col, val| val.inspect }
         end
 
-        extracted_title, payload[:sql], binds, error = extract_binds(payload, payload[:binds])
+        extracted_title, sql, binds, error = extract_binds(payload, binds)
         title = extracted_title if extracted_title
 
-        if payload[:sql]
+        if sql
           annotations = {
-            sql:   payload[:sql],
+            sql:   sql,
             binds: binds,
           }
         else
@@ -35,7 +37,7 @@ module Skylight
           }
         end
 
-        [ name, title, payload[:sql], annotations ]
+        [ name, title, sql, annotations ]
       end
 
     private
@@ -43,7 +45,21 @@ module Skylight
         title, sql, binds = SqlLexer::Lexer.bindify(payload[:sql], precalculated)
         [ title, sql, binds, nil ]
       rescue
-        [ nil, nil, nil, ["sql_parse", payload[:sql]] ]
+        # Encode this since we may have improperly incoded strings that can't be to_json'ed
+        encoded = encode(payload: payload, precalculated: precalculated)
+        [ nil, nil, nil, ["sql_parse", encoded.to_json] ]
+      end
+
+      def encode(body)
+        if body.is_a?(Hash)
+          body.each{|k,v| body[k] = encode(v) }
+        elsif body.is_a?(Array)
+          body.each_with_index{|v,i| body[i] = encode(v) }
+        elsif body.respond_to?(:encoding) && (body.encoding == Encoding::BINARY || !body.valid_encoding?)
+          Base64.encode64(body)
+        else
+          body
+        end
       end
     end
   end

data/lib/skylight/railtie.rb

@@ -94,7 +94,7 @@ module Skylight
     def load_probes
       probes = config.skylight.probes || []
       probes.each do |p|
-        require 'skylight/probes/#{p}'
+        require "skylight/probes/#{p}"
       end
     end
   end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -55,6 +55,7 @@ files:
 - lib/skylight/middleware.rb
 - lib/skylight/normalizers.rb
 - lib/skylight/normalizers/default.rb
+- lib/skylight/normalizers/moped.rb
 - lib/skylight/normalizers/process_action.rb
 - lib/skylight/normalizers/render_collection.rb
 - lib/skylight/normalizers/render_partial.rb
@@ -160,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Skylight is a ruby application monitoring tool. Currently in closed beta.