oboe 1.4.0.2 → 1.4.1.2

data/lib/oboe/api/logging.rb

@@ -113,7 +113,9 @@ module Oboe
       #
       # Returns nothing.
       def log_event(layer, label, event, opts={})
-        event.addInfo('Layer', layer.to_s)
+        if layer
+            event.addInfo('Layer', layer.to_s)
+        end
         event.addInfo('Label', label.to_s)
   
         opts.each do |k, v|

data/lib/oboe/frameworks/rails.rb

@@ -3,16 +3,19 @@ module Oboe
     module Helpers
       extend ActiveSupport::Concern if ::Rails::VERSION::MAJOR > 2
 
+      @@rum_xhr_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_ajax_header.js.erb')
+      @@rum_hdr_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_header.js.erb')
+      @@rum_ftr_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_footer.js.erb')
+
       def oboe_rum_header
         begin
           return unless Oboe::Config.rum_id
           if Oboe.tracing?
             if request.xhr?
-              header_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_ajax_header.js.erb')
+              return raw(ERB.new(@@rum_xhr_tmpl).result)
             else
-              header_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_header.js.erb')
+              return raw(ERB.new(@@rum_hdr_tmpl).result)
             end
-            return raw(ERB.new(header_tmpl).result)
           end
         rescue Exception => e  
           logger.warn "oboe_rum_header: #{e.message}." if defined?(logger)
@@ -26,8 +29,7 @@ module Oboe
           if Oboe.tracing?
             # Even though the footer template is named xxxx.erb, there are no ERB tags in it so we'll
             # skip that step for now
-            footer_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_footer.js.erb')
-            return raw(footer_tmpl)
+            return raw(@@rum_ftr_tmpl)
           end
         rescue Exception => e
           logger.warn "oboe_rum_footer: #{e.message}." if defined?(logger)

data/lib/oboe/frameworks/rails/inst/action_controller.rb

@@ -20,21 +20,15 @@ module Oboe
 
       def process_action_with_oboe(*args)
         report_kvs = {
-          'HTTP-Host'   => @_request.headers['HTTP_HOST'],
-          :URL          => @_request.headers['REQUEST_URI'],
-          :Method       => @_request.headers['REQUEST_METHOD'],
           :Controller   => self.class.name,
           :Action       => self.action_name,
         }
-        result = process_action_without_oboe *args
+        Oboe::API.log(nil, 'info', report_kvs)
 
-        report_kvs[:Status] = @_response.status
-        Oboe::API.log('rails', 'info', report_kvs)
-     
-        result
+        process_action_without_oboe *args
       rescue Exception => exception
         report_kvs[:Status] = 500
-        Oboe::API.log('rails', 'info', report_kvs)
+        Oboe::API.log(nil, 'info', report_kvs)
         raise
       end
 
@@ -71,23 +65,15 @@ if defined?(ActionController::Base) and Oboe::Config[:action_controller][:enable
 
       def perform_action(*arguments)
         report_kvs = {
-            'HTTP-Host'   => @_request.headers['HTTP_HOST'],
-            :URL          => @_request.headers['REQUEST_URI'],
-            :Method       => @_request.headers['REQUEST_METHOD'],
             :Controller  => @_request.path_parameters['controller'],
             :Action      => @_request.path_parameters['action']
         }
-
+        Oboe::API.log(nil, 'info', report_kvs)
         perform_action_without_oboe(*arguments)
-        begin
-          report_kvs[:Status] = @_response.status.to_i
-        rescue
-        end
-        Oboe::API.log('rails', 'info', report_kvs)
       end
 
       def rescue_action(exn)
-        Oboe::API.log_exception('rails', exn)
+        Oboe::API.log_exception(nil, exn)
         rescue_action_without_oboe(exn)
       end
 
@@ -101,3 +87,4 @@ if defined?(ActionController::Base) and Oboe::Config[:action_controller][:enable
   puts "[oboe/loading] Instrumenting actioncontroler" if Oboe::Config[:verbose]
 end
 # vim:set expandtab:tabstop=2
+

data/lib/oboe/inst/rack.rb

@@ -1,8 +1,6 @@
 # Copyright (c) 2012 by Tracelytics, Inc.
 # All rights reserved.
 
-require 'rack'
-
 module Oboe
   class Rack
     attr_reader :app
@@ -12,20 +10,35 @@ module Oboe
     end
 
     def call(env)
+      report_kvs = {}
       xtrace = env['HTTP_X_TRACE']
 
-      report_kvs = {}
-      report_kvs[:SampleRate] = Oboe::Config[:sample_rate]
+      begin
+        req = ::Rack::Request.new(env)
+        report_kvs[:SampleRate]      = Oboe::Config[:sample_rate]
+        report_kvs['HTTP-Host']      = req.host
+        report_kvs['HTTP-Port']      = req.port
+        report_kvs['Query-String']   = req.query_string unless req.query_string.blank?
+        report_kvs[:URL]             = req.path
+        report_kvs[:Method]          = req.request_method
+        report_kvs['AJAX']           = true if req.xhr?
+      rescue
+        # Discard any potential exceptions. Report whatever we can.
+      end
+
+      result, xtrace = Oboe::API.start_trace('rack', xtrace, report_kvs) do
+
+        status, headers, response = @app.call(env)
+        Oboe::API.log(nil, 'info', { :Status => status })
 
-      response, xtrace = Oboe::API.start_trace('rack', xtrace, report_kvs) do
-        @app.call(env)
+        [status, headers, response]
       end
     rescue Exception => e
       xtrace = e.instance_variable_get(:@xtrace)
       raise
     ensure
-      response[1].merge!({'X-Trace' => xtrace}) if xtrace
-      return response
+      result[1]['X-Trace'] = xtrace if xtrace
+      return result
     end
   end
 end

data/lib/oboe/version.rb

@@ -2,7 +2,7 @@ module Oboe
   module Version
     MAJOR = 1
     MINOR = 4
-    PATCH = 0
+    PATCH = 1
     BUILD = 2
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: oboe
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 127
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
+  - 1
   - 2
-  version: 1.4.0.2
+  version: 1.4.1.2
 platform: ruby
 authors: 
 - Tracelytics, Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-08 00:00:00 Z
+date: 2013-04-19 00:00:00 Z
 dependencies: []
 
 description: The oboe gem provides AppNeta instrumentation for Ruby and Ruby frameworks.