traceview 3.7.0-java → 3.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552de0d2129dc5b8bf9ab4444fa86f1a5330b16b
-  data.tar.gz: 93f8062358917531a2d86c5133400517cab44c76
+  metadata.gz: 2764ec8660cc08edd31bca1a668aac0d715a154d
+  data.tar.gz: 21ab2ecfac3fed66c9bf4676f64fa604428095ff
 SHA512:
-  metadata.gz: 9e4bb7f59286be06b5ecb7d08767642ac840392b49697ade510f0d365a54f943b7473dbbd1a461e577126558110f9c88437feeca84f85922a84f1d0465a31706
-  data.tar.gz: ca841ea2247b7c1d5b8bc40fe12b3e89191d3a11cf3d4a33892b17e9ae2a751af22e87f9ec1a52ee48f348c46ae2bf8cd6df02f6156ad741b4bca561f06eef85
+  metadata.gz: f9bae84566bf7c44ce85898db7acf37551822723f8b1a6db70a4dd2cb15867e8d763d68d818017ef473b318cfc35656bd26718ce7ba55d4e137a8d08a500c88e
+  data.tar.gz: 426cb37b7a29178ccad0464aa8460a3b9215ba8ba3e22f3c7e0e2ad114115ff088a70a92a827c6eec08077faaa80e7466390dd518e86aff361e6efcbcf70a999

data/CHANGELOG.md

@@ -4,6 +4,17 @@ https://github.com/appneta/oboe-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# traceview 3.7.1
+
+This patch release includes the following fixes:
+
+* Updated Mongo instrumentation to support v2+: #164
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/traceview/versions/3.7.1
+https://rubygems.org/gems/traceview/versions/3.7.1-java
+
 # traceview 3.7.0
 
 This minor release includes the following new feature:

data/gemfiles/delayed_job.gemfile

@@ -10,6 +10,11 @@ group :development, :test do
   gem 'bson', '< 4.0'
 end
 
+# New mime-types/mime-types-data requires ruby 2.0
+if RUBY_VERSION < '2.0'
+  gem 'mime-types', '< 3.0'
+end
+
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/gemfiles/frameworks.gemfile

@@ -14,6 +14,11 @@ group :development, :test do
   end
 end
 
+# New mime-types/mime-types-data requires ruby 2.0
+if RUBY_VERSION < '2.0'
+  gem 'mime-types', '< 3.0'
+end
+
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
 else

data/gemfiles/libraries.gemfile

@@ -17,11 +17,11 @@ group :development, :test do
   gem 'rack-test'
   if RUBY_VERSION < '1.9.3'
     gem 'rake', '< 11.0'
-    gem 'bson', '<= 1.12.3'
+    gem 'bson', '<= 1.12.5'
     gem 'puma', '< 3.0'
   else
     gem 'rake'
-    gem 'bson', '< 4.0'
+    gem 'bson', '~> 3.0'
     gem 'puma', '< 3.1.0'
   end
 end
@@ -38,6 +38,12 @@ else
   gem 'bunny'
 end
 
+if RUBY_VERSION < '1.9.3'
+  gem 'mongo', '1.12.5'
+else
+  gem 'mongo', '2.0.6'
+end
+
 gem 'cassandra'
 gem 'curb' unless defined?(JRUBY_VERSION)
 gem 'dalli' if RUBY_VERSION > '1.8.7'
@@ -45,14 +51,12 @@ gem 'excon'
 gem 'faraday'
 gem 'httpclient'
 gem 'memcache-client'
-gem 'mongo'
 gem 'redis'
 gem 'resque' unless defined?(JRUBY_VERSION) && RUBY_VERSION > '1.9.3'
 gem 'sequel'
 gem "sidekiq" if RUBY_VERSION >= '2.0'
 gem 'typhoeus'
 
-
 # Database adapter gems needed by sequel
 if defined?(JRUBY_VERSION)
   gem 'jdbc-postgresql'
@@ -69,7 +73,6 @@ end
 
 unless defined?(JRUBY_VERSION)
   gem 'memcached', '1.7.2' if RUBY_VERSION < '2.0.0'
-  gem 'bson_ext' # For Mongo, Yours Truly
 end
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')

data/gemfiles/rails32.gemfile

@@ -20,7 +20,7 @@ group :development, :test do
   gem 'rack-test'
   if RUBY_VERSION < '1.9.3'
     gem 'rake', '< 11.0'
-    gem 'bson', '<= 1.12.3'
+    gem 'bson', '<= 1.12.5'
     gem 'puma', '< 3.0'
   else
     gem 'rake'

data/gemfiles/rails42.gemfile

@@ -10,6 +10,11 @@ group :development, :test do
   gem 'bson', '< 4.0'
 end
 
+# New mime-types/mime-types-data requires ruby 2.0
+if RUBY_VERSION < '2.0'
+  gem 'mime-types', '< 3.0'
+end
+
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/lib/oboe_metal.rb

@@ -72,15 +72,28 @@ module TraceView
 
         return contents if contents.empty?
 
-        s = StringIO.new(contents[0])
-
         traces = []
 
-        until s.eof?
-          if ::BSON.respond_to? :read_bson_document
-            traces << BSON.read_bson_document(s)
-          else
-            traces << BSON::Document.from_bson(s)
+        #
+        # We use Gem.loaded_spec because older versions of the bson
+        # gem didn't even have a version embedded in the gem.  If the
+        # gem isn't in the bundle, it should rightfully error out
+        # anyways.
+        #
+        if Gem.loaded_specs['bson'].version.to_s < '4.0'
+          s = StringIO.new(contents[0])
+
+          until s.eof?
+            if ::BSON.respond_to? :read_bson_document
+              traces << BSON.read_bson_document(s)
+            else
+              traces << BSON::Document.from_bson(s)
+            end
+          end
+        else
+          bbb = BSON::ByteBuffer.new(contents[0])
+          until bbb.length == 0
+            traces << Hash.from_bson(bbb)
           end
         end
 

data/lib/traceview/inst/mongo.rb

@@ -22,7 +22,7 @@ module TraceView
   end
 end
 
-if defined?(::Mongo) && TraceView::Config[:mongo][:enabled]
+if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && TraceView::Config[:mongo][:enabled]
   TraceView.logger.info '[traceview/loading] Instrumenting mongo' if TraceView::Config[:verbose]
 
   if defined?(::Mongo::DB)

data/lib/traceview/inst/mongo2.rb

@@ -0,0 +1,226 @@
+# Copyright (c) 2013 AppNeta, Inc.
+# All rights reserved.
+
+require 'json'
+
+if RUBY_VERSION >= '1.9' && TraceView::Config[:mongo][:enabled]
+  if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s >= '2.0.0')
+    ::TraceView.logger.info '[traceview/loading] Instrumenting mongo' if TraceView::Config[:verbose]
+
+
+    # Collection Related Operations
+    COLL_OTHER_OPS = [:create, :drop, :insert_one, :insert_many, :bulk_write, :map_reduce]
+
+    # Mongo 2.2 only ops
+    if Mongo::VERSION >= '2.1'
+      COLL_QUERY_OPS = [ :find, :find_one_and_delete, :find_one_and_update, :find_one_and_replace, :update_one, :update_many, :delete_one, :delete_many, :replace_one ]
+    else
+      COLL_QUERY_OPS = [ :find, :update_many, :delete_one ]
+    end
+
+    COLL_OPS = COLL_QUERY_OPS + COLL_OTHER_OPS
+
+    module Mongo
+      class Collection
+        ##
+        # collect_kvs
+        #
+        # Used to collect up information to report and build a hash
+        # with the Keys/Values to report.
+        #
+        def collect_kvs(op, args)
+          kvs = { :Flavor => :mongodb, :Database => @database.name }
+
+          kvs[:QueryOp] = op
+
+          if op == :create
+            kvs[:New_Collection_Name] = @name
+          else
+            kvs[:Collection] = @name
+          end
+
+          if op == :map_reduce
+            kvs[:Map_Function] = args[0]
+            kvs[:Reduce_Function] = args[1]
+            kvs[:Limit] = args[2][:limit] if args[2].is_a?(Hash) && args[2].key?(:limit)
+          end
+
+          if TraceView::Config[:mongo][:log_args]
+            if COLL_QUERY_OPS.include?(op)
+              kvs[:Query] = args.first.to_json
+            end
+          end
+
+          kvs[:RemoteHost] = @database.client.cluster.addresses.first.to_s
+          kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:mongo][:collect_backtraces]
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
+        ensure
+          return kvs
+        end
+
+        ##
+        # Here we dynamically define wrapper methods for the operations
+        # we want to instrument in mongo
+        #
+        COLL_OPS.reject { |m| !method_defined?(m) }.each do |m|
+          define_method("#{m}_with_traceview") do |*args|
+            begin
+              if !TraceView.tracing? || TraceView.tracing_layer?(:mongo)
+                mongo_skipped = true
+                return send("#{m}_without_traceview", *args)
+              end
+
+              kvs = collect_kvs(m, args)
+              TraceView::API.log_entry(:mongo, kvs)
+
+              send("#{m}_without_traceview", *args)
+            rescue => e
+              TraceView::API.log_exception(:mongo, e)
+              raise e
+            ensure
+              TraceView::API.log_exit(:mongo) unless mongo_skipped
+            end
+          end
+          ::TraceView::Util.method_alias(Mongo::Collection, m)
+        end
+      end
+    end
+
+    ##
+    # Mongo Collection View Instrumentation
+    #
+
+    # Collection View Related Operations
+    VIEW_QUERY_OPS = [ :delete_one, :delete_many, :count, :distinct, :find_one_and_delete, :find_one_and_update,
+                       :replace_one, :update_one, :update_many ]
+    VIEW_OTHER_OPS = [ :aggregate, :map_reduce ]
+    VIEW_OPS = VIEW_QUERY_OPS + VIEW_OTHER_OPS
+
+    module Mongo
+      class Collection
+        class View
+          ##
+          # collect_kvs
+          #
+          # Used to collect up information to report and build a hash
+          # with the Keys/Values to report.
+          #
+          def collect_kvs(op, args)
+            kvs = { :Flavor => :mongodb, :Database => @collection.database.name }
+
+            kvs[:QueryOp] = op
+            kvs[:Collection] = @collection.name
+
+            if op == :map_reduce
+              kvs[:Map_Function] = args[0]
+              kvs[:Reduce_Function] = args[1]
+              kvs[:Limit] = args[2][:limit] if args[2].is_a?(Hash) && args[2].key?(:limit)
+            end
+
+            if TraceView::Config[:mongo][:log_args]
+              if VIEW_QUERY_OPS.include?(op)
+                if defined?(filter)
+                  kvs[:Query] = filter.to_json
+                elsif defined?(selector)
+                  kvs[:Query] = selector.to_json
+                end
+              end
+            end
+
+            kvs[:RemoteHost] = @collection.database.client.cluster.addresses.first.to_s
+            kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:mongo][:collect_backtraces]
+          rescue => e
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
+          ensure
+            return kvs
+          end
+
+          ##
+          # Here we dynamically define wrapper methods for the operations
+          # we want to instrument in mongo
+          #
+          VIEW_OPS.reject { |m| !method_defined?(m) }.each do |m|
+            define_method("#{m}_with_traceview") do |*args|
+              begin
+                if !TraceView.tracing? || TraceView.tracing_layer?(:mongo)
+                  mongo_skipped = true
+                  return send("#{m}_without_traceview", *args)
+                end
+
+                kvs = collect_kvs(m, args)
+                TraceView::API.log_entry(:mongo, kvs)
+
+                send("#{m}_without_traceview", *args)
+              rescue => e
+                TraceView::API.log_exception(:mongo, e)
+                raise e
+              ensure
+                TraceView::API.log_exit(:mongo) unless mongo_skipped
+              end
+            end
+            ::TraceView::Util.method_alias(Mongo::Collection::View, m)
+          end
+        end
+      end
+    end
+
+    ##
+    # Mongo Collection Index View Instrumentation
+    #
+
+    # Collection Index View Related Operations
+    INDEX_OPS = [ :create_one, :create_many, :drop_one, :drop_all ]
+
+    module Mongo
+      module Index
+        class View
+          ##
+          # collect_kvs
+          #
+          # Used to collect up information to report and build a hash
+          # with the Keys/Values to report.
+          #
+          def collect_index_kvs(op, args)
+            kvs = { :Flavor => :mongodb, :Database => @collection.database.name }
+
+            kvs[:QueryOp] = op
+            kvs[:Collection] = @collection.name
+            kvs[:RemoteHost] = @collection.database.client.cluster.addresses.first.to_s
+            kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:mongo][:collect_backtraces]
+          rescue => e
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
+          ensure
+            return kvs
+          end
+
+          ##
+          # Here we dynamically define wrapper methods for the operations
+          # we want to instrument in mongo
+          #
+          INDEX_OPS.reject { |m| !method_defined?(m) }.each do |m|
+            define_method("#{m}_with_traceview") do |*args|
+              begin
+                if !TraceView.tracing? || TraceView.tracing_layer?(:mongo)
+                  mongo_skipped = true
+                  return send("#{m}_without_traceview", *args)
+                end
+
+                kvs = collect_index_kvs(m, args)
+                TraceView::API.log_entry(:mongo, kvs)
+
+                send("#{m}_without_traceview", *args)
+              rescue => e
+                TraceView::API.log_exception(:mongo, e)
+                raise e
+              ensure
+                TraceView::API.log_exit(:mongo) unless mongo_skipped
+              end
+            end
+            ::TraceView::Util.method_alias(Mongo::Index::View, m)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/traceview/inst/moped.rb

@@ -37,17 +37,17 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
           begin
             report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
             # FIXME: We're only grabbing the first of potentially multiple servers here
+            first = session.cluster.seeds.first
             if ::Moped::VERSION < '2.0.0'
-              report_kvs[:RemoteHost], report_kvs[:RemotePort] = session.cluster.seeds.first.split(':')
+              report_kvs[:RemoteHost] = first
             else
-              report_kvs[:RemoteHost] = session.cluster.seeds.first.address.host
-              report_kvs[:RemotePort] = session.cluster.seeds.first.address.port
+              report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
             end
             report_kvs[:Database] = name
             report_kvs[:QueryOp] = op.to_s
             report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
           report_kvs
         end
@@ -59,7 +59,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
               report_kvs[:Map_Function] = command[:map]
               report_kvs[:Reduce_Function] = command[:reduce]
             rescue => e
-              TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
             TraceView::API.trace('mongo', report_kvs) do
@@ -100,18 +100,19 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
           report_kvs = {}
           begin
             report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
+
             # FIXME: We're only grabbing the first of potentially multiple servers here
+            first = database.session.cluster.seeds.first
             if ::Moped::VERSION < '2.0.0'
-              report_kvs[:RemoteHost], report_kvs[:RemotePort] = database.session.cluster.seeds.first.split(':')
+              report_kvs[:RemoteHost] = first
             else
-              report_kvs[:RemoteHost] = database.session.cluster.seeds.first.address.host
-              report_kvs[:RemotePort] = database.session.cluster.seeds.first.address.port
+              report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
             end
             report_kvs[:Database] = database.name
             report_kvs[:QueryOp] = op.to_s
             report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
           report_kvs
         end
@@ -126,7 +127,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs[:Key] = key.to_json
             report_kvs[:Options] = options.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs, :create_index) do
@@ -143,7 +144,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs = extract_trace_details(:drop_indexes)
             report_kvs[:Key] = key.nil? ? 'all' : key.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs) do
@@ -172,18 +173,18 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
           begin
             report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
             # FIXME: We're only grabbing the first of potentially multiple servers here
+            first = collection.database.session.cluster.seeds.first
             if ::Moped::VERSION < '2.0.0'
-              report_kvs[:RemoteHost], report_kvs[:RemotePort] = collection.database.session.cluster.seeds.first.split(':')
+              report_kvs[:RemoteHost] = first
             else
-              report_kvs[:RemoteHost] = collection.database.session.cluster.seeds.first.address.host
-              report_kvs[:RemotePort] = collection.database.session.cluster.seeds.first.address.port
+              report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
             end
             report_kvs[:Database] = collection.database.name
             report_kvs[:Collection] = collection.name
             report_kvs[:QueryOp] = op.to_s
             report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
           report_kvs
         end
@@ -195,7 +196,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs = extract_trace_details(:count)
             report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs) do
@@ -211,7 +212,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
             report_kvs[:Order] = sort.to_s
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs) do
@@ -226,7 +227,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
               report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
               report_kvs[:Limit] = limit.to_s
             rescue StandardError => e
-              TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
             TraceView::API.trace('mongo', report_kvs) do
@@ -245,7 +246,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
             report_kvs[:Key] = key.to_s
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs) do
@@ -260,7 +261,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
               report_kvs[:Flags] = flags.to_s if flags
               report_kvs[:Update_Document] = change.to_json
             rescue StandardError => e
-              TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
             TraceView::API.trace('mongo', report_kvs) do
@@ -278,7 +279,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs = extract_trace_details(:update_all)
             report_kvs[:Update_Document] = change.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs, :update_all) do
@@ -294,7 +295,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs[:Query] = selector.to_json
             report_kvs[:Update_Document] = change.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs, :upsert) do
@@ -309,7 +310,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs = extract_trace_details(:explain)
             report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs, :explain) do
@@ -326,7 +327,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs[:Change] = change.to_json
             report_kvs[:Options] = options.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs) do
@@ -341,7 +342,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs = extract_trace_details(:remove)
             report_kvs[:Query] = selector.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs) do
@@ -356,7 +357,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs = extract_trace_details(:remove_all)
             report_kvs[:Query] = selector.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs) do
@@ -385,18 +386,18 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
           begin
             report_kvs[:Flavor] = TraceView::Inst::Moped::FLAVOR
             # FIXME: We're only grabbing the first of potentially multiple servers here
+            first = database.session.cluster.seeds.first
             if ::Moped::VERSION < '2.0.0'
-              report_kvs[:RemoteHost], report_kvs[:RemotePort] = database.session.cluster.seeds.first.split(':')
+              report_kvs[:RemoteHost] = first
             else
-              report_kvs[:RemoteHost] = database.session.cluster.seeds.first.address.host
-              report_kvs[:RemotePort] = database.session.cluster.seeds.first.address.port
+              report_kvs[:RemoteHost] = "#{first.address.host}:#{first.address.port}"
             end
             report_kvs[:Database] = database.name
             report_kvs[:Collection] = name
             report_kvs[:QueryOp] = op.to_s
             report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:moped][:collect_backtraces]
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
           report_kvs
         end
@@ -420,7 +421,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
             report_kvs = extract_trace_details(:find)
             report_kvs[:Query] = selector.empty? ? 'all' : selector.to_json
           rescue StandardError => e
-            TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
+            TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
           end
 
           TraceView::API.trace('mongo', report_kvs) do

data/lib/traceview/version.rb

@@ -8,7 +8,7 @@ module TraceView
   module Version
     MAJOR = 3
     MINOR = 7
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/frameworks/rails3x_test.rb

@@ -8,6 +8,7 @@ if defined?(::Rails)
   describe "Rails3x" do
     before do
       clear_all_traces
+      ENV['DBTYPE'] = "postgresql" unless ENV['DBTYPE']
     end
 
     it "should trace a request to a rails stack" do