traceview 3.8.0 → 3.8.1

data/lib/traceview/frameworks/rails/inst/action_controller4.rb

@@ -20,12 +20,14 @@ module TraceView
       end
 
       def process_action_with_traceview(method_name, *args)
-        report_kvs = {
+        kvs = {
           :Controller   => self.class.name,
           :Action       => self.action_name,
         }
+        kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:action_controller][:collect_backtraces]
+
+        TraceView::API.log_entry('rails', kvs)
 
-        TraceView::API.log_entry('rails', report_kvs)
         process_action_without_traceview(method_name, *args)
 
       rescue Exception => e

data/lib/traceview/frameworks/rails/inst/action_controller5.rb

@@ -12,21 +12,15 @@ module TraceView
     module ActionController
       include ::TraceView::Inst::RailsBase
 
-      def self.included(base)
-        base.class_eval do
-          alias_method_chain :process_action, :traceview
-          alias_method_chain :render, :traceview
-        end
-      end
-
-      def process_action_with_traceview(method_name, *args)
-        report_kvs = {
+      def process_action(method_name, *args)
+        kvs = {
           :Controller   => self.class.name,
           :Action       => self.action_name,
         }
+        kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:action_controller][:collect_backtraces]
 
-        TraceView::API.log_entry('rails', report_kvs)
-        process_action_without_traceview(method_name, *args)
+        TraceView::API.log_entry('rails', kvs)
+        super(method_name, *args)
 
       rescue Exception => e
         TraceView::API.log_exception(nil, e) if log_rails_error?(e)
@@ -34,6 +28,23 @@ module TraceView
       ensure
         TraceView::API.log_exit('rails')
       end
+
+      #
+      # render_with_traceview
+      #
+      # Our render wrapper that just times and conditionally
+      # reports raised exceptions
+      #
+      def render(*args, &blk)
+        TraceView::API.log_entry('actionview')
+        super(*args, &blk)
+
+      rescue Exception => e
+        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
+        raise
+      ensure
+        TraceView::API.log_exit('actionview')
+      end
     end
   end
 end

data/lib/traceview/frameworks/rails/inst/action_controller5_api.rb

@@ -7,26 +7,20 @@ module TraceView
     # ActionController
     #
     # This modules contains the instrumentation code specific
-    # to Rails v5
+    # to Rails v5.
     #
     module ActionControllerAPI
       include ::TraceView::Inst::RailsBase
 
-      def self.included(base)
-        base.class_eval do
-          alias_method_chain :process_action, :traceview
-          alias_method_chain :render, :traceview
-        end
-      end
-
-      def process_action_with_traceview(method_name, *args)
-        report_kvs = {
+      def process_action(method_name, *args)
+        kvs = {
           :Controller   => self.class.name,
           :Action       => self.action_name,
         }
+        kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:action_controller_api][:collect_backtraces]
 
-        TraceView::API.log_entry('rails-api', report_kvs)
-        process_action_without_traceview(method_name, *args)
+        TraceView::API.log_entry('rails-api', kvs)
+        super(method_name, *args)
 
       rescue Exception => e
         TraceView::API.log_exception(nil, e) if log_rails_error?(e)
@@ -34,6 +28,23 @@ module TraceView
       ensure
         TraceView::API.log_exit('rails-api')
       end
+
+      #
+      # render
+      #
+      # Our render wrapper that just times and conditionally
+      # reports raised exceptions
+      #
+      def render(*args, &blk)
+        TraceView::API.log_entry('actionview')
+        super(*args, &blk)
+
+      rescue Exception => e
+        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
+        raise
+      ensure
+        TraceView::API.log_exit('actionview')
+      end
     end
   end
 end

data/lib/traceview/frameworks/sinatra/templates.rb

@@ -15,14 +15,14 @@ module TraceView
           report_kvs[:engine] = engine
           report_kvs[:template] = data
 
-          if TraceView.tracing_layer_op?('render')
+          if TraceView.tracing_layer_op?(:render)
             # For recursive calls to :render (for sub-partials and layouts),
             # use method profiling.
             begin
               name = data
               report_kvs[:FunctionName] = :render
               report_kvs[:Class]        = :Templates
-              report_kvs[:Module]       = 'Sinatra::Templates'
+              report_kvs[:Module]       = :'Sinatra::Templates'
               report_kvs[:File]         = __FILE__
               report_kvs[:LineNumber]   = __LINE__
             rescue StandardError => e
@@ -39,12 +39,12 @@ module TraceView
             # back on exit (a limitation of the TraceView::API.trace
             # block method) This removes the need for an info
             # event to send additonal KVs
-            ::TraceView::API.log_entry('render', {}, 'render')
+            ::TraceView::API.log_entry(:render, {}, :render)
 
             begin
               render_without_traceview(engine, data, options, locals, &block)
             ensure
-              ::TraceView::API.log_exit('render', report_kvs)
+              ::TraceView::API.log_exit(:render, report_kvs)
             end
           end
         else

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

@@ -28,14 +28,14 @@ module TraceView
             kvs[:ExchangeName] = :default
           end
 
-          TraceView::API.log_entry('rabbitmq-client')
+          TraceView::API.log_entry(:'rabbitmq-client')
 
           delete_without_traceview(opts)
         rescue => e
           TraceView::API.log_exception(nil, e)
           raise e
         ensure
-          TraceView::API.log_exit('rabbitmq-client', kvs)
+          TraceView::API.log_exit(:'rabbitmq-client', kvs)
         end
       end
     end
@@ -83,7 +83,7 @@ module TraceView
           kvs[:RoutingKey]  = routing_key if routing_key
           kvs[:Op]          = :publish
 
-          TraceView::API.log_entry('rabbitmq-client')
+          TraceView::API.log_entry(:'rabbitmq-client')
 
           # Pass the tracing context as a header
           opts[:headers] ||= {}
@@ -94,7 +94,7 @@ module TraceView
           TraceView::API.log_exception(nil, e)
           raise e
         ensure
-          TraceView::API.log_exit('rabbitmq-client', kvs)
+          TraceView::API.log_exit(:'rabbitmq-client', kvs)
         end
       end
 
@@ -106,7 +106,7 @@ module TraceView
           kvs = collect_channel_kvs
           kvs[:Op] = :queue
 
-          TraceView::API.log_entry('rabbitmq-client')
+          TraceView::API.log_entry(:'rabbitmq-client')
 
           result = queue_without_traceview(name, opts)
           kvs[:Queue] = result.name
@@ -115,7 +115,7 @@ module TraceView
           TraceView::API.log_exception(nil, e)
           raise e
         ensure
-          TraceView::API.log_exit('rabbitmq-client', kvs)
+          TraceView::API.log_exit(:'rabbitmq-client', kvs)
         end
       end
 
@@ -127,14 +127,14 @@ module TraceView
           kvs = collect_channel_kvs
           kvs[:Op] = :wait_for_confirms
 
-          TraceView::API.log_entry('rabbitmq-client')
+          TraceView::API.log_entry(:'rabbitmq-client')
 
           wait_for_confirms_without_traceview
         rescue => e
           TraceView::API.log_exception(nil, e)
           raise e
         ensure
-          TraceView::API.log_exit('rabbitmq-client', kvs)
+          TraceView::API.log_exit(:'rabbitmq-client', kvs)
         end
       end
     end

data/lib/traceview/inst/bunny-consumer.rb

@@ -77,7 +77,7 @@ module TraceView
           headers.delete('SourceTrace')
         end
 
-        result = TraceView::API.start_trace('rabbitmq-consumer', nil, report_kvs) do
+        result = TraceView::API.start_trace(:'rabbitmq-consumer', nil, report_kvs) do
           call_without_traceview(*args)
         end
         result[0]

data/lib/traceview/inst/curb.rb

@@ -19,7 +19,7 @@ module TraceView
         kvs = {}
 
         if TraceView::Config[:curb][:cross_host]
-          kvs['IsService'] = 1
+          kvs[:IsService] = 1
 
           # Conditionally log query args
           if TraceView::Config[:curb][:log_args]
@@ -33,7 +33,7 @@ module TraceView
 
         # Avoid cross host tracing for blacklisted domains
         kvs[:blacklisted] = TraceView::API.blacklisted?(URI(url).hostname)
-        kvs['Backtrace'] = TraceView::API.backtrace if TraceView::Config[:curb][:collect_backtraces]
+        kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:curb][:collect_backtraces]
 
         kvs
       rescue => e
@@ -59,7 +59,7 @@ module TraceView
           handle_cross_host = TraceView::Config[:curb][:cross_host]
           kvs.merge! traceview_collect
 
-          TraceView::API.log_entry('curb', kvs)
+          TraceView::API.log_entry(:curb, kvs)
           kvs.clear
 
           if handle_cross_host && !kvs[:blacklisted]
@@ -71,11 +71,11 @@ module TraceView
           response = self.send(method, *args, &block)
 
           if handle_cross_host
-            kvs['HTTPStatus'] = response_code
+            kvs[:HTTPStatus] = response_code
 
             # If we get a redirect, report the location header
             if ((300..308).to_a.include? response_code) && headers.key?("Location")
-              kvs["Location"] = headers["Location"]
+              kvs[:Location] = headers["Location"]
             end
 
             # Curb only provides a single long string of all response headers (yuck!).  So we are forced
@@ -92,10 +92,10 @@ module TraceView
 
           response
         rescue => e
-          TraceView::API.log_exception('curb', e)
+          TraceView::API.log_exception(:curb, e)
           raise e
         ensure
-          TraceView::API.log_exit('curb', kvs)
+          TraceView::API.log_exit(:curb, kvs)
         end
 
       end
@@ -120,7 +120,7 @@ module TraceView
       #
       def http_post_with_traceview(*args, &block)
         # If we're not tracing, just do a fast return.
-        if !TraceView.tracing? || TraceView.tracing_layer?('curb')
+        if !TraceView.tracing? || TraceView.tracing_layer?(:curb)
           return http_post_without_traceview(*args)
         end
 
@@ -139,7 +139,7 @@ module TraceView
       #
       def http_put_with_traceview(*args, &block)
         # If we're not tracing, just do a fast return.
-        if !TraceView.tracing? || TraceView.tracing_layer?('curb')
+        if !TraceView.tracing? || TraceView.tracing_layer?(:curb)
           return http_put_without_traceview(data)
         end
 
@@ -158,7 +158,7 @@ module TraceView
       #
       def perform_with_traceview(&block)
         # If we're not tracing, just do a fast return.
-        if !TraceView.tracing? || TraceView.tracing_layer?('curb')
+        if !TraceView.tracing? || TraceView.tracing_layer?(:curb)
           return perform_without_traceview(&block)
         end
 
@@ -219,17 +219,17 @@ module TraceView
 
         begin
           kvs = {}
-          kvs['Backtrace'] = TraceView::API.backtrace if TraceView::Config[:curb][:collect_backtraces]
+          kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:curb][:collect_backtraces]
 
-          TraceView::API.log_entry('curb_multi', kvs)
+          TraceView::API.log_entry(:curb_multi, kvs)
 
           # The core curb call
           http_without_traceview(urls_with_config, multi_options, &block)
         rescue => e
-          TraceView::API.log_exception('curb_multi', e)
+          TraceView::API.log_exception(:curb_multi, e)
           raise e
         ensure
-          TraceView::API.log_exit('curb_multi')
+          TraceView::API.log_exit(:curb_multi)
         end
       end
     end
@@ -252,23 +252,23 @@ module TraceView
       #
       def perform_with_traceview(&block)
         # If we're not tracing or we're not already tracing curb, just do a fast return.
-        if !TraceView.tracing? || ['curb', 'curb_multi'].include?(TraceView.layer)
+        if !TraceView.tracing? || [:curb, :curb_multi].include?(TraceView.layer)
           return perform_without_traceview(&block)
         end
 
         begin
           kvs = {}
-          kvs['Backtrace'] = TraceView::API.backtrace if TraceView::Config[:curb][:collect_backtraces]
+          kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:curb][:collect_backtraces]
 
-          TraceView::API.log_entry('curb_multi', kvs)
+          TraceView::API.log_entry(:curb_multi, kvs)
 
           # The core curb call
           perform_without_traceview(&block)
         rescue => e
-          TraceView::API.log_exception('curb_multi', e)
+          TraceView::API.log_exception(:curb_multi, e)
           raise e
         ensure
-          TraceView::API.log_exit('curb_multi')
+          TraceView::API.log_exit(:curb_multi)
         end
       end
     end

data/lib/traceview/inst/dalli.rb

@@ -33,7 +33,7 @@ module TraceView
         end
 
         if TraceView.tracing? && !TraceView.tracing_layer_op?(:get_multi)
-          TraceView::API.trace('memcache', report_kvs) do
+          TraceView::API.trace(:memcache, report_kvs) do
             result = perform_without_traceview(*all_args, &blk)
 
             # Clear the hash for a potential info event
@@ -41,7 +41,7 @@ module TraceView
             report_kvs[:KVHit] = memcache_hit?(result) if op == :get && key.class == String
             report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:dalli][:collect_backtraces]
 
-            TraceView::API.log('memcache', 'info', report_kvs) unless report_kvs.empty?
+            TraceView::API.log(:memcache, :info, report_kvs) unless report_kvs.empty?
             result
           end
         else
@@ -64,12 +64,12 @@ module TraceView
           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
+        TraceView::API.trace(:memcache, { :KVOp => :get_multi }, :get_multi) do
           values = get_multi_without_traceview(*keys)
 
           info_kvs[:KVHitCount] = values.length
           info_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:dalli][:collect_backtraces]
-          TraceView::API.log('memcache', 'info', info_kvs)
+          TraceView::API.log(:memcache, :info, info_kvs)
 
           values
         end

data/lib/traceview/inst/delayed_job.rb

@@ -44,9 +44,9 @@ if defined?(::Delayed)
                   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]
+                  report_kvs[:Backtrace] = TV::API.backtrace if TV::Config[:delayed_jobclient][:collect_backtraces]
 
-                  TraceView::API.trace('delayed_job-client', report_kvs) do
+                  TraceView::API.trace(:'delayed_job-client', report_kvs) do
                     block.call(job)
                   end
                 end
@@ -63,7 +63,7 @@ if defined?(::Delayed)
                   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]
+                  report_kvs[:Backtrace] = TV::API.backtrace if TV::Config[:delayed_jobworker][:collect_backtraces]
 
                   # DelayedJob Specific KVs
                   report_kvs[:priority] = job.priority
@@ -73,7 +73,7 @@ if defined?(::Delayed)
                   TV.logger.warn "[traceview/warning] inst/delayed_job.rb: #{e.message}"
                 end
 
-                result = TraceView::API.start_trace('delayed_job-worker', nil, report_kvs) do
+                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

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

@@ -11,10 +11,10 @@ module TraceView
           blacklisted = TraceView::API.blacklisted?(@uri)
 
           begin
-            report_kvs['IsService'] = 1
-            report_kvs['RemoteURL'] = @uri
-            report_kvs['HTTPMethod'] = args[0]
-            report_kvs['Blacklisted'] = true if blacklisted
+            report_kvs[:IsService] = 1
+            report_kvs[:RemoteURL] = @uri
+            report_kvs[:HTTPMethod] = args[0]
+            report_kvs[:Blacklisted] = true if blacklisted
 
             if TraceView::Config[:em_http_request][:collect_backtraces]
               report_kvs[:Backtrace] = TraceView::API.backtrace
@@ -23,7 +23,7 @@ module TraceView
             TraceView.logger.debug "[traceview/debug] em-http-request KV error: #{e.inspect}"
           end
 
-          ::TraceView::API.log_entry('em-http-request', report_kvs)
+          ::TraceView::API.log_entry(:'em-http-request', report_kvs)
           client = setup_request_without_traceview(*args, &block)
           client.req.headers['X-Trace'] = context unless blacklisted
           client
@@ -66,7 +66,7 @@ module TraceView
 
           end
 
-          ::TraceView::API.log_exit('em-http-request', report_kvs)
+          ::TraceView::API.log_exit(:'em-http-request', report_kvs)
         end
       end
     end