traceview 3.3.3 → 3.4.0

data/lib/traceview/inst/dalli.rb

@@ -50,7 +50,7 @@ module TraceView
       end
 
       def get_multi_with_traceview(*keys)
-        return get_multi_without_traceview(keys) unless TraceView.tracing?
+        return get_multi_without_traceview(*keys) unless TraceView.tracing?
 
         info_kvs = {}
 
@@ -60,13 +60,12 @@ module TraceView
           if @servers.is_a?(Array) && !@servers.empty?
             info_kvs[:RemoteHost] = @servers.join(", ")
           end
-        rescue
-          TraceView.logger.debug "[traceview/debug] Error collecting info keys: #{e.message}"
-          TraceView.logger.debug e.backtrace
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
         end
 
         TraceView::API.trace('memcache', { :KVOp => :get_multi }, :get_multi) do
-          values = get_multi_without_traceview(keys)
+          values = get_multi_without_traceview(*keys)
 
           info_kvs[:KVHitCount] = values.length
           info_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:dalli][:collect_backtraces]

data/lib/traceview/inst/delayed_job.rb

@@ -0,0 +1,92 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+if defined?(::Delayed)
+  module TraceView
+    module Inst
+      module DelayedJob
+        ##
+        # ForkHandler
+        #
+        # Since delayed job doesn't offer a hook into `after_fork`, we alias the method
+        # here to do our magic after a fork happens.
+        #
+        module ForkHandler
+          def self.extended(klass)
+            ::TraceView::Util.class_method_alias(klass, :after_fork, ::Delayed::Worker)
+          end
+
+          def after_fork_with_traceview
+            ::TraceView.logger.info '[traceview/delayed_job] Detected fork.  Restarting TraceView reporter.' if TraceView::Config[:verbose]
+            ::TraceView::Reporter.restart unless ENV.key?('TRACEVIEW_GEM_TEST')
+
+            after_fork_without_traceview
+          end
+        end
+
+        ##
+        # TraceView::Inst::DelayedJob::Plugin
+        #
+        # The TraceView DelayedJob plugin.  Here we wrap `enqueue` and
+        # `perform` to capture the timing of the bits we're interested
+        # in.
+        #
+        class Plugin < Delayed::Plugin
+          callbacks do |lifecycle|
+
+            # enqueue
+            if TraceView::Config[:delayed_jobclient][:enabled]
+              lifecycle.around(:enqueue) do |job, &block|
+                begin
+                  report_kvs = {}
+                  report_kvs[:Spec] = :pushq
+                  report_kvs[:Flavor] = :DelayedJob
+                  report_kvs[:JobName] = job.name
+                  report_kvs[:MsgID] = job.id
+                  report_kvs[:Queue] = job.queue if job.queue
+                  report_kvs['Backtrace'] = TV::API.backtrace if TV::Config[:delayed_jobclient][:collect_backtraces]
+
+                  TraceView::API.trace('delayed_job-client', report_kvs) do
+                    block.call(job)
+                  end
+                end
+              end
+            end
+
+            # invoke_job
+            if TraceView::Config[:delayed_jobworker][:enabled]
+              lifecycle.around(:perform) do |worker, job, &block|
+                begin
+                  report_kvs = {}
+                  report_kvs[:Spec] = :job
+                  report_kvs[:Flavor] = :DelayedJob
+                  report_kvs[:JobName] = job.name
+                  report_kvs[:MsgID] = job.id
+                  report_kvs[:Queue] = job.queue if job.queue
+                  report_kvs['Backtrace'] = TV::API.backtrace if TV::Config[:delayed_jobworker][:collect_backtraces]
+
+                  # DelayedJob Specific KVs
+                  report_kvs[:priority] = job.priority
+                  report_kvs[:attempts] = job.attempts
+                  report_kvs[:WorkerName] = job.locked_by
+                rescue => e
+                  TV.logger.warn "[traceview/warning] inst/delayed_job.rb: #{e.message}"
+                end
+
+                result = TraceView::API.start_trace('delayed_job-worker', nil, report_kvs) do
+                  block.call(worker, job)
+                  TV::API.log_exception(nil, job.error) if job.error
+                end
+                result[0]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  ::TraceView.logger.info '[traceview/loading] Instrumenting delayed_job' if TraceView::Config[:verbose]
+  ::TraceView::Util.send_extend(::Delayed::Worker, ::TraceView::Inst::DelayedJob::ForkHandler)
+  ::Delayed::Worker.plugins << ::TraceView::Inst::DelayedJob::Plugin
+end

data/lib/traceview/inst/em-http-request.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2013 AppNeta, Inc.
+# All rights reserved.
+
 module TraceView
   module Inst
     module EventMachine

data/lib/traceview/inst/excon.rb

@@ -64,7 +64,7 @@ module TraceView
           # Avoid cross host tracing for blacklisted domains
           blacklisted = TraceView::API.blacklisted?(@data[:hostname])
 
-          req_context = TraceView::Context.toString()
+          req_context = TraceView::Context.toString
           @data[:headers]['X-Trace'] = req_context unless blacklisted
 
           kvs = traceview_collect(params)
@@ -84,8 +84,8 @@ module TraceView
             kvs['HTTPStatus'] = response.status
 
             # If we get a redirect, report the location header
-            if ((300..308).to_a.include? response.status.to_i) && response.headers.key?("Location")
-              kvs["Location"] = response.headers["Location"]
+            if ((300..308).to_a.include? response.status.to_i) && response.headers.key?('Location')
+              kvs['Location'] = response.headers['Location']
             end
 
             if response_context && !blacklisted

data/lib/traceview/inst/faraday.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2014 AppNeta, Inc.
+# All rights reserved.
+
 module TraceView
   module Inst
     module FaradayConnection
@@ -9,7 +12,7 @@ module TraceView
         # Only send service KVs if we're not using the Net::HTTP adapter
         # Otherwise, the Net::HTTP instrumentation will send the service KVs
         handle_service = !@builder.handlers.include?(Faraday::Adapter::NetHttp) &&
-                          !@builder.handlers.include?(Faraday::Adapter::Excon)
+                         !@builder.handlers.include?(Faraday::Adapter::Excon)
         TraceView::API.log_entry('faraday')
 
         result = run_request_without_traceview(method, url, body, headers, &block)

data/lib/traceview/inst/mongo.rb

@@ -56,7 +56,8 @@ if defined?(::Mongo) && TraceView::Config[:mongo][:enabled]
               report_kvs[:Collection] = args[0]          if m == :drop_collection
 
               report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:mongo][:collect_backtraces]
-            rescue
+            rescue => e
+              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
             TraceView::API.trace('mongo', report_kvs) do
@@ -97,7 +98,8 @@ if defined?(::Mongo) && TraceView::Config[:mongo][:enabled]
                 end
                 report_kvs[:Limit] = @limit if @limit != 0
               end
-            rescue
+            rescue => e
+              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
             TraceView::API.trace('mongo', report_kvs) do
@@ -162,7 +164,8 @@ if defined?(::Mongo) && TraceView::Config[:mongo][:enabled]
                   report_kvs[:Multi] = args[2][:multi] if args[2] && args[2].key?(:multi)
                 end
               end
-            rescue
+            rescue => e
+              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
             TraceView::API.trace('mongo', report_kvs) do
@@ -200,7 +203,8 @@ if defined?(::Mongo) && TraceView::Config[:mongo][:enabled]
                   end
                 end
               end
-            rescue
+            rescue => e
+              TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
             TraceView::API.trace('mongo', report_kvs) do
@@ -221,7 +225,8 @@ if defined?(::Mongo) && TraceView::Config[:mongo][:enabled]
               if [:create_index, :ensure_index, :drop_index].include?(m) && !args.empty?
                 report_kvs[:Index] = args[0].to_json
               end
-            rescue
+            rescue => e
+              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/inst/moped.rb

@@ -58,7 +58,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
               report_kvs = extract_trace_details(:map_reduce)
               report_kvs[:Map_Function] = command[:map]
               report_kvs[:Reduce_Function] = command[:reduce]
-            rescue StandardError => e
+            rescue => e
               TraceView.logger.debug "[traceview/debug] Moped KV collection error: #{e.inspect}"
             end
 
@@ -117,7 +117,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
         end
 
         def create_with_traceview(key, options = {})
-          return create_without_traceview(key, options = {}) unless TraceView.tracing?
+          return create_without_traceview(key, options) unless TraceView.tracing?
 
           begin
             # We report :create_index here to be consistent
@@ -135,7 +135,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
         end
 
         def drop_with_traceview(key = nil)
-          return drop_without_traceview(key = nil) unless TraceView.tracing?
+          return drop_without_traceview(key) unless TraceView.tracing?
 
           begin
             # We report :drop_indexes here to be consistent
@@ -451,7 +451,7 @@ if defined?(::Moped) && TraceView::Config[:moped][:enabled]
         end
 
         def aggregate_with_traceview(*pipeline)
-          return aggregate_without_traceview(pipeline) unless TraceView.tracing?
+          return aggregate_without_traceview(*pipeline) unless TraceView.tracing?
 
           report_kvs = extract_trace_details(:aggregate)
           report_kvs[:Query] = pipeline

data/lib/traceview/inst/redis.rb

@@ -88,9 +88,7 @@ module TraceView
 
             if KV_COLLECT_MAP[op]
               # Extract KVs from command for this op
-              KV_COLLECT_MAP[op].each { |k, v|
-                kvs[k] = command[v]
-              }
+              KV_COLLECT_MAP[op].each { |k, v| kvs[k] = command[v] }
             else
               # This case statement handle special cases not handled
               # by KV_COLLECT_MAP
@@ -107,10 +105,10 @@ module TraceView
                     options = command[3..-1]
                     until (opts = options.shift(2)).empty?
                       case opts[0]
-                      when "EX"; kvs[:ex] = opts[1]
-                      when "PX"; kvs[:px] = opts[1]
-                      when "NX"; kvs[:nx] = opts[1]
-                      when "XX"; kvs[:xx] = opts[1]
+                      when 'EX' then; kvs[:ex] = opts[1]
+                      when 'PX' then; kvs[:px] = opts[1]
+                      when 'NX' then; kvs[:nx] = opts[1]
+                      when 'XX' then; kvs[:xx] = opts[1]
                       end
                     end
                   end

data/lib/traceview/inst/resque.rb

@@ -32,11 +32,10 @@ module TraceView
               report_kvs[:Args] = kv_args
             end
           end
-
           report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:resqueclient][:collect_backtraces]
           report_kvs[:Queue] = klass.instance_variable_get(:@queue)
         rescue => e
-          TraceView.logger.debug "[traceview/resque] Error collecting resqueclient KVs: #{e.message}"
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
         end
 
         report_kvs
@@ -114,7 +113,8 @@ module TraceView
           end
 
           report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:resqueworker][:collect_backtraces]
-        rescue
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
         end
 
         TraceView::API.start_trace('resque-worker', nil, report_kvs) do

data/lib/traceview/inst/rest-client.rb

@@ -16,7 +16,7 @@ module TraceView
       def execute_with_traceview & block
         kvs = {}
         kvs['Backtrace'] = TraceView::API.backtrace if TraceView::Config[:rest_client][:collect_backtraces]
-        TraceView::API.log_entry("rest-client", kvs)
+        TraceView::API.log_entry('rest-client', kvs)
 
         # The core rest-client call
         execute_without_traceview(&block)
@@ -24,7 +24,7 @@ module TraceView
         TraceView::API.log_exception('rest-client', e)
         raise e
       ensure
-        TraceView::API.log_exit("rest-client")
+        TraceView::API.log_exit('rest-client')
       end
     end
   end

data/lib/traceview/inst/sidekiq-client.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 module TraceView
   class SidekiqClient
     def collect_kvs(args)

data/lib/traceview/inst/sidekiq-worker.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 module TraceView
   class SidekiqWorker
     def collect_kvs(args)

data/lib/traceview/inst/twitter-cassandra.rb

@@ -36,7 +36,8 @@ module TraceView
               end
             end
           end
-        rescue
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
         end
 
         report_kvs
@@ -178,7 +179,8 @@ module TraceView
           report_kvs[:Keyspace] = keyspace.to_s
           report_kvs[:Column_name] = column_name.to_s
           report_kvs[:Validation_class] = validation_class.to_s
-        rescue
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
         end
 
         TraceView::API.trace('cassandra', report_kvs) do
@@ -193,7 +195,8 @@ module TraceView
         begin
           report_kvs[:Keyspace] = keyspace.to_s
           report_kvs[:Column_name] = column_name.to_s
-        rescue
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
         end
 
         TraceView::API.trace('cassandra', report_kvs) do
@@ -207,7 +210,8 @@ module TraceView
         report_kvs = extract_trace_details(:add_column_family, nil, nil, nil)
         begin
           report_kvs[:Cf] = cf_def[:name] if cf_def.is_a?(Hash) && cf_def.key?(:name)
-        rescue
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
         end
 
         TraceView::API.trace('cassandra', report_kvs) do

data/lib/traceview/test.rb

@@ -4,9 +4,15 @@
 module TraceView
   module Test
     class << self
+      ##
+      # load_extras
+      #
+      # This method simply loads all the extras needed to run
+      # tests such as models, jobs etc...
+      #
       def load_extras
         # If we're using the libraries gemfile (with sidekiq and resque)
-        if File.basename(ENV['BUNDLE_GEMFILE']) =~ /libraries/
+        if TV::Test.gemfile?(:libraries)
           # Load all of the test workers
           pattern = File.join(File.dirname(__FILE__), '../../test/jobs/**/', '*.rb')
           Dir.glob(pattern) do |f|
@@ -15,6 +21,29 @@ module TraceView
           end
         end
       end
+
+      ##
+      # gemfile?
+      #
+      # Method used to determine under which gemfile we're running.
+      # Pass <tt>name</tt> as the gemfile name only (without the
+      # .gemfile extension)
+      #
+      # returns true or fase depending on result
+      #
+      def gemfile?(name)
+        File.basename(ENV['BUNDLE_GEMFILE']) == (name.to_s + '.gemfile')
+      end
+
+      ##
+      # gemfile
+      #
+      # Used to determine under which gemfile we are running.  This
+      # method will return the name of the active gemfile
+      #
+      def gemfile
+        File.basename(ENV['BUNDLE_GEMFILE']).split('.').first
+      end
     end
   end
 end

data/lib/traceview/util.rb

@@ -218,6 +218,13 @@ module TraceView
           platform_info['Ruby.Sidekiq.Version']    = "Sidekiq-#{::Sidekiq::VERSION}"       if defined?(::Sidekiq::VERSION)
           platform_info['Ruby.Typhoeus.Version']   = "Typhoeus-#{::Typhoeus::VERSION}"     if defined?(::Typhoeus::VERSION)
 
+          if Gem.loaded_specs.key?('delayed_job')
+            # Oddly, DelayedJob doesn't have an embedded version number so we get it from the loaded
+            # gem specs.
+            version = Gem.loaded_specs['delayed_job'].version.to_s
+            platform_info['Ruby.DelayedJob.Version']       = "DelayedJob-#{version}"
+          end
+
           # Special case since the Mongo 1.x driver doesn't embed the version number in the gem directly
           if ::Gem.loaded_specs.key?('mongo')
             platform_info['Ruby.Mongo.Version']     = "Mongo-#{::Gem.loaded_specs['mongo'].version}"

data/lib/traceview/version.rb

@@ -7,8 +7,8 @@ module TraceView
   # traceview.gemspec during gem build process
   module Version
     MAJOR = 3
-    MINOR = 3
-    PATCH = 3
+    MINOR = 4
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')