oboe 1.3.0 → 1.3.1

data/lib/oboe/api/layerinit.rb

@@ -8,7 +8,7 @@ module Oboe
       def report_init(layer)
         platform_info                  = { '__Init' => 1 }
         platform_info['RubyVersion']   = RUBY_VERSION
-        platform_info['RailsVersion']  = Rails.version if defined?(Rails)
+        platform_info['RailsVersion']  = ::Rails.version if defined?(Rails)
         platform_info['OboeVersion']   = Gem.loaded_specs['oboe'].try(:version).to_s
 
         force_trace do

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

@@ -28,6 +28,7 @@ module Oboe
       rescue Exception => exception
         opts[:Status] = 500
         Oboe::API.log('rails', 'info', opts)
+        raise
       end
 
       def render(*args)

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

@@ -1,55 +1,116 @@
-
 module Oboe
-  module Inst
-    module Rails
-      def self.load_initializer
-        # Force load the tracelytics Rails initializer if there is one
-        # Prefer oboe.rb but give priority to tracelytics.rb if it exists
-        if ::Rails::VERSION::MAJOR > 2
-          rails_root = "#{::Rails.root.to_s}"
-        else
-          rails_root = "#{RAILS_ROOT}"
-        end
+  module Rails
+    module Helpers
+      extend ActiveSupport::Concern if ::Rails::VERSION::MAJOR > 2
 
-        if File.exists?("#{rails_root}/config/initializers/tracelytics.rb")
-          tr_initializer = "#{rails_root}/config/initializers/tracelytics.rb"
-        else 
-          tr_initializer = "#{rails_root}/config/initializers/oboe.rb"
+      def oboe_rum_header
+        begin
+          return unless Oboe::Config.has_key?(:rum_id)
+          if Oboe::Config.tracing?
+            if request.xhr?
+              header_tmpl = File.dirname(__FILE__) + '/helpers/rum/rum_ajax_header'
+            else
+              header_tmpl = File.dirname(__FILE__) + '/helpers/rum/rum_header'
+            end
+            if ::Rails::VERSION::MAJOR > 2
+              render :file => header_tmpl, :formats => [:js]
+            else
+              render :file => header_tmpl + '.js.erb'
+            end
+          end
+        rescue Exception => e  
+          logger.debug "oboe_rum_header: #{e.message}."
         end
-        require tr_initializer if File.exists?(tr_initializer)
       end
-
-      def self.load_instrumentation
-        pattern = File.join(File.dirname(__FILE__), 'inst', '*.rb')
-        Dir.glob(pattern) do |f|
-          begin
-            require f
-          rescue => e
-            $stderr.puts "[oboe/loading] Error loading rails insrumentation file '#{f}' : #{e}"
+      
+      def oboe_rum_footer
+        begin
+          return unless Oboe::Config.has_key?(:rum_id)
+          if Oboe::Config.tracing?
+            footer_tmpl = File.dirname(__FILE__) + '/helpers/rum/rum_footer'
+            if ::Rails::VERSION::MAJOR > 2
+              render :file => footer_tmpl, :formats => [:js]
+            else
+              render :file => footer_tmpl + '.js.erb'
+            end
           end
+        rescue Exception => e
+          logger.debug "oboe_rum_footer: #{e.message}."
         end
-        if ::Rails::VERSION::MAJOR > 2
-          puts "Tracelytics oboe gem #{Gem.loaded_specs['oboe'].version.to_s} successfully loaded."
-        else
-          puts "Tracelytics oboe gem #{Oboe::Version::STRING} successfully loaded." 
+      end
+    end # Helpers
+      
+    def self.load_initializer
+      # Force load the tracelytics Rails initializer if there is one
+      # Prefer oboe.rb but give priority to tracelytics.rb if it exists
+      if ::Rails::VERSION::MAJOR > 2
+        rails_root = "#{::Rails.root.to_s}"
+      else
+        rails_root = "#{RAILS_ROOT}"
+      end
+
+      if File.exists?("#{rails_root}/config/initializers/tracelytics.rb")
+        tr_initializer = "#{rails_root}/config/initializers/tracelytics.rb"
+      else 
+        tr_initializer = "#{rails_root}/config/initializers/oboe.rb"
+      end
+      require tr_initializer if File.exists?(tr_initializer)
+    end
+
+
+    def self.load_instrumentation
+      pattern = File.join(File.dirname(__FILE__), 'inst', '*.rb')
+      Dir.glob(pattern) do |f|
+        begin
+          require f
+        rescue => e
+          $stderr.puts "[oboe/loading] Error loading rails insrumentation file '#{f}' : #{e}"
         end
       end
+      if ::Rails::VERSION::MAJOR > 2
+        puts "Tracelytics oboe gem #{Gem.loaded_specs['oboe'].version.to_s} successfully loaded."
+      else
+        puts "Tracelytics oboe gem #{Oboe::Version::STRING} successfully loaded." 
+      end
     end
-  end
-end
+
+    def self.include_helpers
+      # TBD: This would make the helpers available to controllers which is occasionally desired.
+      # ActiveSupport.on_load(:action_controller) do
+      #   include Oboe::Rails::Helpers
+      # end
+      if ::Rails::VERSION::MAJOR > 2
+        ActiveSupport.on_load(:action_view) do
+          include Oboe::Rails::Helpers
+        end
+      else
+        ActionView::Base.send :include, Oboe::Rails::Helpers
+      end
+    end
+
+  end # Rails
+end # Oboe
 
 if defined?(::Rails)
   if ::Rails::VERSION::MAJOR > 2
     module Oboe
       class Railtie < ::Rails::Railtie
+        
+        initializer 'oboe.helpers' do
+          Oboe::Rails.include_helpers        
+        end
+
         config.after_initialize do
-          Oboe::Inst::Rails.load_instrumentation
+          Oboe::Loading.load_access_key
+          Oboe::Rails.load_instrumentation
         end
       end
     end
   else
-    Oboe::Inst::Rails.load_initializer
-    Oboe::Inst::Rails.load_instrumentation
+    Oboe::Rails.load_initializer
+    Oboe::Loading.load_access_key
+    Oboe::Rails.load_instrumentation
+    Oboe::Rails.include_helpers        
   end
 end
 

data/lib/oboe/loading.rb

@@ -1,9 +1,50 @@
 # Copyright (c) 2012 by Tracelytics, Inc.
 # All rights reserved.
 
+require 'digest/sha1'
+
 module Oboe
+  module Util
+    module Base64URL
+      module_function
+
+      def encode(bin)
+        c = [bin].pack('m0').gsub(/\=+\Z/, '').tr('+/', '-_').rstrip
+        m = c.size % 4
+        c += '=' * (4 - m) if m != 0
+        c
+      end
+
+      def decode(bin)
+        m = bin.size % 4
+        bin += '=' * (4 - m) if m != 0
+        bin.tr('-_', '+/').unpack('m0').first
+      end
+    end
+  end
+
   module Loading
 
+    def self.load_access_key
+      unless Oboe::Config.has_key?(:access_key)  
+        config_file = '/etc/tracelytics.conf'
+        return unless File.exists?(config_file)
+        
+        begin
+          File.open(config_file).each do |line|
+            if line =~ /^tracelyzer.access_key=/ or line =~ /^access_key/
+              bits = line.split(/=/)
+              Oboe::Config[:access_key] = bits[1].strip
+              Oboe::Config[:rum_id] = Oboe::Util::Base64URL.encode(Digest::SHA1.digest("RUM" + Oboe::Config[:access_key]))
+              break
+            end
+          end
+        rescue
+          puts "Having trouble parsing #{config_file}..."
+        end
+      end
+    end
+
     def self.require_api
       require 'oboe/version'
 

data/lib/oboe/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oboe
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Tracelytics, Inc.