oneapm_rpm 1.3.6 → 1.3.7.rc1

data/lib/one_apm/rack/developer_mode.rb

@@ -19,7 +19,7 @@ module OneApm
   module Rack
     class DeveloperMode < MiddlewareBase
 
-      VIEW_PATH = File.expand_path('../developer_mode/views/', __FILE__)
+      OA_VIEW_PATH = File.expand_path('../developer_mode/views/', __FILE__)
 
       include OneApm::DeveloperModeHelper
 
@@ -33,7 +33,7 @@ module OneApm
           result = inject_profiler(env, status, headers, body)
           return result if result
         end
-        return [status,headers,body]
+        return [status, headers, body]
       end
 
       def self.profiled?
@@ -52,7 +52,7 @@ module OneApm
         @rendered = false
         case @req.path_info
         when /assets/
-          ::Rack::File.new(VIEW_PATH).call(env)
+          ::Rack::File.new(OA_VIEW_PATH).call(env)
         when /index/
           index
         when /threads/
@@ -93,33 +93,26 @@ module OneApm
       def inject_profiler(env, status, headers, body)
         # mini profiler is meddling with stuff, we can not cache cause we will get incorrect data
         # Rack::ETag has already inserted some nonesense in the chain
-        content_type = headers['Content-Type']
-        if content_type =~ /text\/html/
-          body = get_and_inject_profile(body)
-          response = ::Rack::Response.new([], status, headers)
-          if String === body
-            response.write body
-          else
-            body.each { |fragment| response.write fragment }
-          end
-          body.close if body.respond_to? :close
-          response.finish
-        else
-          nil
-        end
+        source = gather_source(body)
+        close_old_response(body)
+        return nil unless source
+        response_string = get_and_inject_profile(source)
+        return nil unless response_string
+        response = ::Rack::Response.new(response_string, status, headers)
+        response.finish
       end
 
-      def get_and_inject_profile body
-        inject_page!(body, stylesheets, :postion => :head)
-        inject_page!(body, javascripts(body))
-        inject_page!(body, slide_templates)
-        body
+      def get_and_inject_profile source
+        inject_page!(source, stylesheets, :postion => :head)
+        inject_page!(source, javascripts(source))
+        inject_page!(source, slide_templates)
+        source
       end
 
       def javascripts body
         script = ""
         script_files = ["javascript/jquery.min.js", "javascript/layer.js", "javascript/functions.js" ]
-        script_files.shift if body.body[0] =~ /jquery(.min)?/ rescue false
+        script_files.shift if body =~ /jquery(.min)?/ rescue false
         script_files.each do |sf|
           script << "<script src=\"/oneapm/assets/#{sf}\"></script>\r\n"
         end
@@ -134,7 +127,7 @@ module OneApm
       end
 
       def slide_templates
-        template = read_script_file "#{VIEW_PATH}/oneapm/slide.tmpl"
+        template = read_script_file "#{OA_VIEW_PATH}/oneapm/slide.tmpl"
         samples  = ""
 
         duration = current_duration
@@ -163,11 +156,7 @@ module OneApm
       end
 
       def inject_page! body, script, options = {:postion => :body}
-        if String === body
-          inject!(body, script, options)
-        else
-          body.each { |fragment| inject!(fragment, script, options) }
-        end
+        inject!(body, script, options)
       end
 
       def read_script_file file_path
@@ -229,10 +218,10 @@ module OneApm
         if explanations
           @explanation = explanations
           if !@explanation.blank?
-            if @explanation.first.length < OneApm::MYSQL_EXPLAIN_COLUMNS.length
+            if @explanation.first.length < OneApm::OA_MYSQL_EXPLAIN_COLUMNS.length
               @row_headers = nil
             else
-              @row_headers = OneApm::MYSQL_EXPLAIN_COLUMNS
+              @row_headers = OneApm::OA_MYSQL_EXPLAIN_COLUMNS
             end
           end
         end
@@ -282,14 +271,14 @@ module OneApm
       # You have to call this with a block - the contents returned from
       # that block are interpolated into the layout
       def render_with_layout(view)
-        body = ERB.new(File.read(File.join(VIEW_PATH, 'oneapm/layout.html.erb')))
+        body = ERB.new(File.read(File.join(OA_VIEW_PATH, 'oneapm/layout.html.erb')))
         body.result(Proc.new {}.binding)
       end
 
       # you have to pass a binding to this (a proc) so that ERB can have
       # access to helper functions and local variables
       def render_without_layout(view, binding)
-        ERB.new(File.read(File.join(VIEW_PATH, 'oneapm', view.to_s + '.html.erb')), nil, nil, 'frobnitz').result(binding)
+        ERB.new(File.read(File.join(OA_VIEW_PATH, 'oneapm', view.to_s + '.html.erb')), nil, nil, 'frobnitz').result(binding)
       end
 
       def content_tag(tag, contents, opts={}) 

data/lib/one_apm/rack/developer_mode/helper.rb

@@ -275,7 +275,7 @@ module OneApm::DeveloperModeHelper
     parts.join '.'
   end
 
-  SORT_REPLACEMENTS = {
+  OA_SORT_REPLACEMENTS = {
       "Total" => :total_time,
       "Self" => :self_time,
       "Child" => :children_time,

data/lib/one_apm/rack/middleware_base.rb

@@ -1,11 +1,13 @@
 # encoding: utf-8
 
 require 'one_apm/rack/middleware_tracing'
+require 'one_apm/rack/middleware_helper'
 
 module OneApm
   module Rack
     class MiddlewareBase
       include MiddlewareTracing
+      include OneApm::Rack::MiddlewareHelper
 
       attr_reader :transaction_options, :category, :target
 

data/lib/one_apm/rack/middleware_helper.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module OneApm
+  module Rack
+    module MiddlewareHelper
+
+      def gather_source(response)
+        source = nil
+        response.each {|fragment| source ? (source << fragment.to_s) : (source = fragment.to_s)}
+        source
+      end
+
+      def close_old_response(response)
+        response.close if response.respond_to?(:close)
+      end
+
+      def middleware_ignore?
+        OneApm::Manager.config[:disable_rails_middleware]
+      end
+    end
+  end
+end

data/lib/one_apm/rack/middleware_hooks.rb

@@ -2,16 +2,18 @@
 
 require 'one_apm/rack/middleware_base'
 
-module OneApm::Rack
-  class MiddlewareHooks < MiddlewareBase
+module OneApm
+  module Rack
+    class MiddlewareHooks < MiddlewareBase
 
-    def self.needed?
-      !OneApm::Manager.config[:disable_rack_middleware]
-    end
+      def self.needed?
+        !OneApm::Manager.config[:disable_rack_middleware]
+      end
 
-    def traced_call(env)
-      @app.call(env)
-    end
+      def traced_call(env)
+        @app.call(env)
+      end
 
+    end
   end
 end

data/lib/one_apm/rack/middleware_tracing.rb

@@ -20,64 +20,67 @@ require 'one_apm/inst/transaction_base'
 # The target may be self, in which case the host class should define a
 # #traced_call method, instead of the usual #call.
 
-module OneApm::Rack
-  module MiddlewareTracing
-    TXN_STARTED_KEY = 'oneapm.transaction_started'.freeze unless defined?(TXN_STARTED_KEY)
+module OneApm
+  module Rack
+    module MiddlewareTracing
+      OA_TXN_STARTED_KEY = 'oneapm.transaction_started'.freeze unless defined?(TXN_STARTED_KEY)
 
-    def _oa_has_middleware_tracing
-      true
-    end
+      def _oa_has_middleware_tracing
+        true
+      end
 
-    def build_transaction_options(env, first_middleware)
-      opts = transaction_options
-      opts = merge_first_middleware_options(opts, env) if first_middleware
-      opts
-    end
+      def build_transaction_options(env, first_middleware)
+        opts = transaction_options
+        opts = merge_first_middleware_options(opts, env) if first_middleware
+        opts
+      end
 
-    def merge_first_middleware_options(opts, env)
-      opts.merge(
-        :request          => ::Rack::Request.new(env),
-        :apdex_start_time => OneApm::Agent::Instrumentation::QueueTime.parse_frontend_timestamp(env)
-      )
-    end
+      def merge_first_middleware_options(opts, env)
+        opts.merge(
+          :request          => ::Rack::Request.new(env),
+          :apdex_start_time => OneApm::Agent::Instrumentation::QueueTime.parse_frontend_timestamp(env)
+        )
+      end
+
+      def note_transaction_started(env)
+        env[OA_TXN_STARTED_KEY] = true unless env[OA_TXN_STARTED_KEY]
+      end
 
-    def note_transaction_started(env)
-      env[TXN_STARTED_KEY] = true unless env[TXN_STARTED_KEY]
-    end
 
-    def capture_http_response_code(state, result)
-      if result.is_a?(Array) && state.current_transaction
-        state.current_transaction.http_response_code = result[0]
+      def capture_http_response_code(state, result)
+        if result.is_a?(Array) && state.current_transaction
+          state.current_transaction.http_response_code = result[0]
+        end
       end
-    end
 
-    def call(env)
-      first_middleware = note_transaction_started(env)
+      def call(env)
+        first_middleware = note_transaction_started(env)
 
-      state = OneApm::TransactionState.tl_get
-      begin
-        options = build_transaction_options(env, first_middleware)
+        state = OneApm::TransactionState.tl_get
+        begin
+          options = build_transaction_options(env, first_middleware)
 
-        current_transaction = OneApm::Transaction.start(state, category, options)
-        current_transaction.ignore_frames << options[:transaction_name] if respond_to?(:middleware_ignore?) && middleware_ignore?
+          current_transaction = OneApm::Transaction.start(state, category, options)
+          current_transaction.ignore_frames << options[:transaction_name] if respond_to?(:middleware_ignore?) && middleware_ignore?
 
-        events.notify(:before_call, env) if first_middleware
-        result = (target == self) ? traced_call(env) : target.call(env)
+          events.notify(:before_call, env) if first_middleware
+          result = (target == self) ? traced_call(env) : target.call(env)
 
-        capture_http_response_code(state, result)
-        events.notify(:after_call, env, result) if first_middleware
+          capture_http_response_code(state, result)
+          events.notify(:after_call, env, result) if first_middleware
 
-        result
-      rescue Exception => e
-        OneApm::Manager.notice_error(e)
-        raise e
-      ensure
-        OneApm::Transaction.stop(state)
+          result
+        rescue Exception => e
+          OneApm::Manager.notice_error(e)
+          raise e
+        ensure
+          OneApm::Transaction.stop(state)
+        end
       end
-    end
 
-    def events
-      OneApm::Manager.agent.events
+      def events
+        OneApm::Manager.agent.events
+      end
     end
   end
 end

data/lib/one_apm/rack/middleware_wrapper.rb

@@ -7,79 +7,85 @@ require 'one_apm/inst/support/queue_time'
 require 'one_apm/inst/transaction_base'
 require 'one_apm/rack/middleware_tracing'
 
-module OneApm::Rack
-  class MiddlewareWrapper
-    include MiddlewareTracing
+module OneApm
+  module Rack
+    class MiddlewareWrapper
+      include MiddlewareTracing
 
-    class MiddlewareClassWrapper
+      class MiddlewareClassWrapper
 
-      def initialize(middleware_class)
-        @middleware_class = middleware_class
-      end
+        def initialize(middleware_class)
+          @middleware_class = middleware_class
+        end
 
-      def new(*args, &blk)
-        middleware_instance = @middleware_class.new(*args, &blk)
-        MiddlewareWrapper.wrap(middleware_instance)
-      end
+        def new(*args, &blk)
+          middleware_instance = @middleware_class.new(*args, &blk)
+          MiddlewareWrapper.wrap(middleware_instance)
+        end
 
-    end
+      end
 
-    class << self
+      class << self
 
-      def is_sinatra_app?(target)
-        defined?(::Sinatra::Base) && target.kind_of?(::Sinatra::Base)
-      end
+        def is_sinatra_app?(target)
+          defined?(::Sinatra::Base) && target.kind_of?(::Sinatra::Base)
+        end
 
-      def wrap_class(target_class)
-        MiddlewareClassWrapper.new(target_class)
-      end
+        def wrap_class(target_class)
+          MiddlewareClassWrapper.new(target_class)
+        end
 
-      def needs_wrapping?(target)
-        !target.respond_to?(:_oa_has_middleware_tracing) &&
-        !is_sinatra_app?(target)
-      end
+        def needs_wrapping?(target)
+          !target.respond_to?(:_oa_has_middleware_tracing) &&
+          !is_sinatra_app?(target)
+        end
 
-      def wrap(target, is_app = false)
-        if needs_wrapping?(target)
-          self.new(target, is_app)
-        else
-          target
+        def wrap(target, is_app = false)
+          if needs_wrapping?(target)
+            self.new(target, is_app)
+          else
+            target
+          end
         end
+
       end
 
-    end
+      attr_reader :target, :category, :transaction_options
+
+      def initialize(target, is_app = false)
+        @target               = target
+        @is_app               = is_app
+        @category             = determine_category
+        @target_class_name    = determine_class_name
+        @transaction_name     = "#{determine_prefix}#{@target_class_name}/call"
+        @transaction_options  = {
+          :transaction_name => @transaction_name
+        }
+      end
 
-    attr_reader :target, :category, :transaction_options
-
-    def initialize(target, is_app = false)
-      @target               = target
-      @is_app               = is_app
-      @category             = determine_category
-      @target_class_name    = determine_class_name
-      @transaction_name     = "#{determine_prefix}#{@target_class_name}/call"
-      @transaction_options  = {
-        :transaction_name => @transaction_name
-      }
-    end
+      def determine_category
+        @is_app ? :rack : :middleware
+      end
 
-    def determine_category
-      @is_app ? :rack : :middleware
-    end
+      def determine_prefix
+        OneApm::TransactionNamer.prefix_for_category(nil, @category)
+      end
 
-    def determine_prefix
-      OneApm::TransactionNamer.prefix_for_category(nil, @category)
-    end
+      def middleware_ignore?
+        defined?(::Rails) && OneApm::Manager.config[:disable_rails_middleware] && @transaction_name =~ /Middleware/
+      end
 
-    # In 'normal' usage, the target will be an application instance that
-    # responds to #call. With Rails, however, the target may be a subclass
-    # of Rails::Application that defines a method_missing that proxies #call
-    # to a singleton instance of the the subclass. We need to ensure that we
-    # capture the correct name in both cases.
-    def determine_class_name
-      if @target.is_a?(Class)
-        @target.name
-      else
-        @target.class.name
+      # In 'normal' usage, the target will be an application instance that
+      # responds to #call. With Rails, however, the target may be a subclass
+      # of Rails::Application that defines a method_missing that proxies #call
+      # to a singleton instance of the the subclass. We need to ensure that we
+      # capture the correct name in both cases.
+      def determine_class_name
+        if @target.is_a?(Class)
+          @target.name
+        else
+          @target.class.name
+        end
       end
     end
   end