rack-mini-profiler 0.1.24 → 0.1.29

data/Ruby/lib/mini_profiler/config.rb

@@ -7,15 +7,15 @@ module Rack
       @attributes.concat vars
       super(*vars)
     end
-    
+
     def self.attributes
       @attributes
     end
 
     attr_accessor :auto_inject, :base_url_path, :pre_authorize_cb, :position,
-        :backtrace_remove, :backtrace_includes, :backtrace_ignores, :skip_schema_queries, 
+        :backtrace_remove, :backtrace_includes, :backtrace_ignores, :skip_schema_queries,
         :storage, :user_provider, :storage_instance, :storage_options, :skip_paths, :authorization_mode,
-        :toggle_shortcut, :start_hidden
+        :toggle_shortcut, :start_hidden, :backtrace_threshold_ms
 
     # Deprecated options
     attr_accessor :use_existing_jquery
@@ -24,10 +24,10 @@ module Rack
         new.instance_eval {
           @auto_inject = true # automatically inject on every html page
           @base_url_path = "/mini-profiler-resources/"
-          
+
           # called prior to rack chain, to ensure we are allowed to profile
-          @pre_authorize_cb = lambda {|env| true} 
-                                                  
+          @pre_authorize_cb = lambda {|env| true}
+
           # called after rack chain, to ensure we are REALLY allowed to profile
           @position = 'left'  # Where it is displayed
           @skip_schema_queries = false
@@ -36,16 +36,17 @@ module Rack
           @authorization_mode = :allow_all
           @toggle_shortcut = 'Alt+P'
           @start_hidden = false
+          @backtrace_threshold_ms = 0
           self
         }
       end
 
       def merge!(config)
         return unless config
-        if Hash === config 
+        if Hash === config
           config.each{|k,v| instance_variable_set "@#{k}",v}
-        else 
-          self.class.attributes.each{ |k|  
+        else
+          self.class.attributes.each{ |k|
             v = config.send k
             instance_variable_set "@#{k}", v if v
           }

data/Ruby/lib/mini_profiler/flame_graph.rb

@@ -6,9 +6,9 @@ class Rack::MiniProfiler::FlameGraph
   end
 
   def graph_data
-    height = 0 
+    height = 0
 
-    table = [] 
+    table = []
     prev = []
 
     # a 2d array makes collapsing easy
@@ -17,7 +17,7 @@ class Rack::MiniProfiler::FlameGraph
 
       stack.reverse.map{|r| r.to_s}.each_with_index do |frame, i|
 
-        if !prev[i].nil? 
+        if !prev[i].nil?
           last_col = prev[i]
           if last_col[0] == frame
             last_col[1] += 1
@@ -26,7 +26,7 @@ class Rack::MiniProfiler::FlameGraph
           end
         end
 
-        prev[i] = [frame, 1] 
+        prev[i] = [frame, 1]
         col << prev[i]
       end
       prev = prev[0..col.length-1].to_a

data/Ruby/lib/mini_profiler/profiler.rb

@@ -123,7 +123,7 @@ module Rack
 
         # Otherwise give the HTML back
         html = MiniProfiler.share_template.dup
-        html.gsub!(/\{path\}/, @config.base_url_path)
+        html.gsub!(/\{path\}/, "#{env['SCRIPT_NAME']}#{@config.base_url_path}")
         html.gsub!(/\{version\}/, MiniProfiler::VERSION)
         html.gsub!(/\{json\}/, result_json)
         html.gsub!(/\{includes\}/, get_profile_script(env))
@@ -224,6 +224,7 @@ module Rack
 
       MiniProfiler.create_current(env, @config)
       MiniProfiler.deauthorize_request if @config.authorization_mode == :whitelist
+
       if query_string =~ /pp=normal-backtrace/
         client_settings.backtrace_level = ClientSettings::BACKTRACE_DEFAULT
       elsif query_string =~ /pp=no-backtrace/
@@ -239,7 +240,7 @@ module Rack
       done_sampling = false
       quit_sampler = false
       backtraces = nil
-      
+
       if query_string =~ /pp=sample/ || query_string =~ /pp=flamegraph/
         current.measure = false
         skip_frames = 0
@@ -255,7 +256,7 @@ module Rack
               break if done_sampling
               i -= 1
               backtraces << (has_backtrace_locations ? t.backtrace_locations : t.backtrace)
-              
+
               # On my machine using Ruby 2.0 this give me excellent fidelity of stack trace per 1.2ms
               #   with this fidelity analysis becomes very powerful
               sleep 0.0005
@@ -266,18 +267,31 @@ module Rack
         }
       end
 
-      status, headers, body = nil
+      trace_exceptions = query_string =~ /pp=trace-exceptions/ && defined? TracePoint
+      status, headers, body, exceptions,trace = nil
+
       start = Time.now
+
+      if trace_exceptions
+        exceptions = []
+        trace = TracePoint.new(:raise) do |tp|
+          exceptions << tp.raised_exception
+        end
+        trace.enable
+      end
+
       begin
 
         # Strip all the caching headers so we don't get 304s back
         #  This solves a very annoying bug where rack mini profiler never shows up
-        env['HTTP_IF_MODIFIED_SINCE'] = nil
-        env['HTTP_IF_NONE_MATCH'] = nil
+        env['HTTP_IF_MODIFIED_SINCE'] = ''
+        env['HTTP_IF_NONE_MATCH'] = ''
 
         status,headers,body = @app.call(env)
         client_settings.write!(headers)
       ensure
+        trace.disable if trace
+
         if backtraces
           done_sampling = true
           sleep 0.001 until quit_sampler
@@ -298,6 +312,11 @@ module Rack
       return [status,headers,body] if skip_it
 
       # we must do this here, otherwise current[:discard] is not being properly treated
+      if trace_exceptions
+        body.close if body.respond_to? :close
+        return dump_exceptions exceptions
+      end
+
       if query_string =~ /pp=env/
         body.close if body.respond_to? :close
         return dump_env env
@@ -316,7 +335,7 @@ module Rack
         body.close if body.respond_to? :close
         if query_string =~ /pp=sample/
           return analyze(backtraces, page_struct)
-        else 
+        else
           return flame_graph(backtraces, page_struct)
         end
       end
@@ -327,46 +346,51 @@ module Rack
       @storage.save(page_struct)
 
       # inject headers, script
-      if status == 200
-
+      if headers['Content-Type'] && status == 200
         client_settings.write!(headers)
 
-        # 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
-        headers.delete('ETag')
-        headers.delete('Date')
-        headers['Cache-Control'] = 'must-revalidate, private, max-age=0'
-
-        # inject header
-        if headers.is_a? Hash
-          headers['X-MiniProfiler-Ids'] = ids_json(env)
-        end
-
-        # inject script
-        if current.inject_js \
-          && headers.has_key?('Content-Type') \
-          && !headers['Content-Type'].match(/text\/html/).nil? then
-
-          response = Rack::Response.new([], status, headers)
-          script = self.get_profile_script(env)
-
-          if String === body
-            response.write inject(body,script)
-          else
-            body.each { |fragment| response.write inject(fragment, script) }
-          end
-          body.close if body.respond_to? :close
-          return response.finish
-        end
+        result = inject_profiler(env,status,headers,body)
+        return result if result
       end
 
       client_settings.write!(headers)
       [status, headers, body]
+
     ensure
       # Make sure this always happens
       current = nil
     end
 
+    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']
+
+      headers.delete('ETag')
+      headers.delete('Date')
+      headers['Cache-Control'] = 'must-revalidate, private, max-age=0'
+
+      # inject header
+      if headers.is_a? Hash
+        headers['X-MiniProfiler-Ids'] = ids_json(env)
+      end
+
+      if current.inject_js && content_type =~ /text\/html/
+        response = Rack::Response.new([], status, headers)
+        script = self.get_profile_script(env)
+
+        if String === body
+          response.write inject(body,script)
+        else
+          body.each { |fragment| response.write inject(fragment, script) }
+        end
+        body.close if body.respond_to? :close
+        response.finish
+      else
+        nil
+      end
+    end
+
     def inject(fragment, script)
       if fragment.match(/<\/body>/i)
         # explicit </body>
@@ -388,9 +412,9 @@ module Rack
       index = 1
       fragment.gsub(regex) do
         # though malformed there is an edge case where /body exists earlier in the html, work around
-        if index < matches 
+        if index < matches
           index += 1
-          close_tag        
+          close_tag
         else
 
           # if for whatever crazy reason we dont get a utf string,
@@ -404,6 +428,16 @@ module Rack
       end
     end
 
+    def dump_exceptions(exceptions)
+      headers = {'Content-Type' => 'text/plain'}
+      body = "Exceptions (#{exceptions.length} raised during request)\n\n"
+      exceptions.each do |e|
+        body << "#{e.class} #{e.message}\n#{e.backtrace.join("\n")}\n\n\n\n"
+      end
+
+      [200, headers, [body]]
+    end
+
     def dump_env(env)
       headers = {'Content-Type' => 'text/plain'}
       body = "Rack Environment\n---------------\n"
@@ -440,6 +474,7 @@ module Rack
   pp=profile-gc: perform gc profiling on this request, analyzes ObjectSpace generated by request (ruby 1.9.3 only)
   pp=profile-gc-time: perform built-in gc profiling on this request (ruby 1.9.3 only)
   pp=flamegraph: works best on Ruby 2.0, a graph representing sampled activity.
+  pp=trace-exceptions: requires Ruby 2.0, will return all the spots where your application raises execptions
 "
 
       client_settings.write!(headers)
@@ -451,7 +486,7 @@ module Rack
       data = graph.graph_data
 
       headers = {'Content-Type' => 'text/html'}
-      
+
       body = IO.read(::File.expand_path('../html/flamegraph.html', ::File.dirname(__FILE__)))
       body.gsub!("/*DATA*/", ::JSON.generate(data));
 
@@ -511,7 +546,7 @@ module Rack
     # * you do not want script to be automatically appended for the current page. You can also call cancel_auto_inject
     def get_profile_script(env)
       ids = ids_comma_separated(env)
-      path = @config.base_url_path
+      path = "#{env['SCRIPT_NAME']}#{@config.base_url_path}"
       version = MiniProfiler::VERSION
       position = @config.position
       showTrivial = false

data/Ruby/lib/mini_profiler/sql_timer_struct.rb

@@ -8,7 +8,7 @@ module Rack
       def initialize(query, duration_ms, page, parent, skip_backtrace = false, full_backtrace = false)
 
         stack_trace = nil 
-        unless skip_backtrace 
+        unless skip_backtrace || duration_ms < Rack::MiniProfiler.config.backtrace_threshold_ms
           # Allow us to filter the stack trace
           stack_trace = ""
            # Clean up the stack trace if there are options to do so

data/Ruby/lib/mini_profiler/storage/abstract_store.rb

@@ -1,7 +1,7 @@
 module Rack
   class MiniProfiler
     class AbstractStore
-      
+
       def save(page_struct)
         raise NotImplementedError.new("save is not implemented")
       end
@@ -23,9 +23,10 @@ module Rack
       end
 
       def diagnostics(user)
-        raise NotImplementedError.new("diagnostics not implemented") 
+        # this is opt in, no need to explode if not implemented
+        ""
       end
-    
+
     end
   end
 end

data/Ruby/lib/mini_profiler/storage/redis_store.rb

@@ -3,7 +3,7 @@ module Rack
     class RedisStore < AbstractStore
 
       EXPIRES_IN_SECONDS = 60 * 60 * 24
-     
+
       def initialize(args = nil)
         @args = args || {}
         @prefix = @args.delete(:prefix) || 'MPRedisStore'
@@ -12,7 +12,7 @@ module Rack
       end
 
       def save(page_struct)
-        redis.setex "#{@prefix}#{page_struct['Id']}", @expires_in_seconds, Marshal::dump(page_struct) 
+        redis.setex "#{@prefix}#{page_struct['Id']}", @expires_in_seconds, Marshal::dump(page_struct)
       end
 
       def load(id)
@@ -41,7 +41,7 @@ unviewed_ids: #{get_unviewed_ids(user)}
 "
       end
 
-      private 
+      private
 
       def redis
         return @redis_connection if @redis_connection

data/Ruby/lib/mini_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MiniProfiler
-    VERSION = '843cab636fb537adf19b58eff230ff75'.freeze
+    VERSION = '8ceae04dd2abbc08ffe85a258d408292'.freeze
   end
 end

data/Ruby/lib/mini_profiler_rails/railtie.rb

@@ -1,61 +1,65 @@
 require 'fileutils'
 
-module MiniProfilerRails
+module Rack::MiniProfilerRails
 
-  class Railtie < ::Rails::Railtie
+  # call direct if needed to do a defer init
+  def self.initialize!(app)
+    c = Rack::MiniProfiler.config
 
-    initializer "rack_mini_profiler.configure_rails_initialization" do |app|
-      c = Rack::MiniProfiler.config
+    # By default, only show the MiniProfiler in development mode, in production allow profiling if post_authorize_cb is set
+    c.pre_authorize_cb = lambda { |env|
+      !Rails.env.test?
+    }
 
-      # By default, only show the MiniProfiler in development mode, in production allow profiling if post_authorize_cb is set
-      c.pre_authorize_cb = lambda { |env|
-        !Rails.env.test?
-      }
+    c.skip_paths ||= []
 
-      c.skip_paths ||= []
+    if Rails.env.development?
+      c.skip_paths << "/assets/"
+      c.skip_schema_queries = true
+    end
 
-      if Rails.env.development?
-        c.skip_paths << "/assets/"
-        c.skip_schema_queries = true
-      end
+    if Rails.env.production?
+      c.authorization_mode = :whitelist
+    end
 
-      if Rails.env.production? 
-        c.authorization_mode = :whitelist
-      end
+    # The file store is just so much less flaky
+    tmp = Rails.root.to_s + "/tmp/miniprofiler"
+    FileUtils.mkdir_p(tmp) unless File.exists?(tmp)
 
-      # The file store is just so much less flaky
-      tmp = Rails.root.to_s + "/tmp/miniprofiler"
-      FileUtils.mkdir_p(tmp) unless File.exists?(tmp)
+    c.storage_options = {:path => tmp}
+    c.storage = Rack::MiniProfiler::FileStore
 
-      c.storage_options = {:path => tmp}
-      c.storage = Rack::MiniProfiler::FileStore
+    # Quiet the SQL stack traces
+    c.backtrace_remove = Rails.root.to_s + "/"
+    c.backtrace_includes =  [/^\/?(app|config|lib|test)/]
+    c.skip_schema_queries =  Rails.env != 'production'
 
-      # Quiet the SQL stack traces
-      c.backtrace_remove = Rails.root.to_s + "/"
-      c.backtrace_includes =  [/^\/?(app|config|lib|test)/]
-      c.skip_schema_queries =  Rails.env != 'production'
+    # Install the Middleware
+    app.middleware.insert(0, Rack::MiniProfiler)
 
-      # Install the Middleware
-      app.middleware.insert(0, Rack::MiniProfiler)
+    # Attach to various Rails methods
+    ::Rack::MiniProfiler.profile_method(ActionController::Base, :process) {|action| "Executing action: #{action}"}
+    ::Rack::MiniProfiler.profile_method(ActionView::Template, :render) {|x,y| "Rendering: #{@virtual_path}"}
+  end
 
-      # Attach to various Rails methods
-      ::Rack::MiniProfiler.profile_method(ActionController::Base, :process) {|action| "Executing action: #{action}"}
-      ::Rack::MiniProfiler.profile_method(ActionView::Template, :render) {|x,y| "Rendering: #{@virtual_path}"}
+  class Railtie < ::Rails::Railtie
 
+    initializer "rack_mini_profiler.configure_rails_initialization" do |app|
+      Rack::MiniProfilerRails.initialize!(app)
     end
 
     # TODO: Implement something better here
-    # config.after_initialize do 
-    #   
-    #   class ::ActionView::Helpers::AssetTagHelper::JavascriptIncludeTag 
+    # config.after_initialize do
+    #
+    #   class ::ActionView::Helpers::AssetTagHelper::JavascriptIncludeTag
     #     alias_method :asset_tag_orig, :asset_tag
     #     def asset_tag(source,options)
-    #       current = Rack::MiniProfiler.current 
-    #       return asset_tag_orig(source,options) unless current 
+    #       current = Rack::MiniProfiler.current
+    #       return asset_tag_orig(source,options) unless current
     #       wrapped = ""
     #       unless current.mpt_init
     #         current.mpt_init = true
-    #         wrapped << Rack::MiniProfiler::ClientTimerStruct.init_instrumentation 
+    #         wrapped << Rack::MiniProfiler::ClientTimerStruct.init_instrumentation
     #       end
     #       name = source.split('/')[-1]
     #       wrapped << Rack::MiniProfiler::ClientTimerStruct.instrument(name, asset_tag_orig(source,options)).html_safe
@@ -63,15 +67,15 @@ module MiniProfilerRails
     #     end
     #   end
 
-    #   class ::ActionView::Helpers::AssetTagHelper::StylesheetIncludeTag  
+    #   class ::ActionView::Helpers::AssetTagHelper::StylesheetIncludeTag
     #     alias_method :asset_tag_orig, :asset_tag
     #     def asset_tag(source,options)
-    #       current = Rack::MiniProfiler.current 
-    #       return asset_tag_orig(source,options) unless current 
+    #       current = Rack::MiniProfiler.current
+    #       return asset_tag_orig(source,options) unless current
     #       wrapped = ""
     #       unless current.mpt_init
     #         current.mpt_init = true
-    #         wrapped << Rack::MiniProfiler::ClientTimerStruct.init_instrumentation 
+    #         wrapped << Rack::MiniProfiler::ClientTimerStruct.init_instrumentation
     #       end
     #       name = source.split('/')[-1]
     #       wrapped << Rack::MiniProfiler::ClientTimerStruct.instrument(name, asset_tag_orig(source,options)).html_safe