rack-mini-profiler 0.10.6 → 2.3.0

data/lib/patches/db/riak.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # riak-client 2.2.2 patches
 class Riak::Multiget
   class <<self
@@ -5,7 +7,7 @@ class Riak::Multiget
     def get_all(client, fetch_list)
       return get_all_without_profiling(client, fetch_list) unless SqlPatches.should_measure?
 
-      start        = Time.now
+      start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       result       = get_all_without_profiling(client, fetch_list)
       elapsed_time = SqlPatches.elapsed_time(start)
       record       = ::Rack::MiniProfiler.record_sql("get_all size=#{fetch_list.size}", elapsed_time)
@@ -18,7 +20,7 @@ end
 class Riak::Client
 
   alias_method :buckets_without_profiling, :buckets
-  def buckets(options={}, &blk)
+  def buckets(options = {}, &blk)
     profile("buckets #{options}") { buckets_without_profiling(options, &blk) }
   end
 
@@ -28,32 +30,32 @@ class Riak::Client
   end
 
   alias_method :delete_object_without_profiling, :delete_object
-  def delete_object(bucket, key, options={})
+  def delete_object(bucket, key, options = {})
     profile("delete_object bucket=#{bucket.name} key=#{key} options=#{options}") { delete_object_without_profiling(bucket, key, options) }
   end
 
   alias_method :get_bucket_props_without_profiling, :get_bucket_props
-  def get_bucket_props(bucket, options={})
+  def get_bucket_props(bucket, options = {})
     profile("get_bucket_props bucket=#{bucket.name} options=#{options}") { get_bucket_props_without_profiling(bucket, options) }
   end
 
   alias_method :get_index_without_profiling, :get_index
-  def get_index(bucket, index, query, options={})
+  def get_index(bucket, index, query, options = {})
     profile("get_index bucket=#{bucket.name} index=#{index} query=#{query} options=#{options}") { get_index_without_profiling(bucket, index, query, options) }
   end
 
   alias_method :get_preflist_without_profiling, :get_preflist
-  def get_preflist(bucket, key, type=nil, options={})
+  def get_preflist(bucket, key, type = nil, options = {})
     profile("get_preflist bucket=#{bucket.name} key=#{key} type=#{type} options=#{options}") { get_preflist_without_profiling(bucket, key, type, options) }
   end
 
   alias_method :get_object_without_profiling, :get_object
-  def get_object(bucket, key, options={})
+  def get_object(bucket, key, options = {})
     profile("get_object bucket=#{bucket.name} key=#{key} options=#{options}") { get_object_without_profiling(bucket, key, options) }
   end
 
   alias_method :list_keys_without_profiling, :list_keys
-  def list_keys(bucket, options={}, &block)
+  def list_keys(bucket, options = {}, &block)
     profile("list_keys bucket=#{bucket.name} options=#{options}") { list_keys_without_profiling(bucket, options, &block) }
   end
 
@@ -68,22 +70,22 @@ class Riak::Client
   end
 
   alias_method :reload_object_without_profiling, :reload_object
-  def reload_object(object, options={})
+  def reload_object(object, options = {})
     profile("reload_object bucket=#{object.bucket.name} key=#{object.key} vclock=#{object.vclock} options=#{options}") { reload_object_without_profiling(object, options) }
   end
 
   alias_method :set_bucket_props_without_profiling, :set_bucket_props
-  def set_bucket_props(bucket, properties, type=nil)
+  def set_bucket_props(bucket, properties, type = nil)
     profile("set_bucket_props bucket=#{bucket.name} type=#{type}") { set_bucket_props_without_profiling(bucket, properties, type) }
   end
 
   alias_method :clear_bucket_props_without_profiling, :clear_bucket_props
-  def clear_bucket_props(bucket, options={})
+  def clear_bucket_props(bucket, options = {})
     profile("clear_bucket_props bucket=#{bucket.name} options=#{options}") { clear_bucket_props_without_profiling(bucket, options) }
   end
 
   alias_method :store_object_without_profiling, :store_object
-  def store_object(object, options={})
+  def store_object(object, options = {})
     profile("store_object bucket=#{object.bucket.name} key=#{object.key} vclock=#{object.vclock} options=#{options}") { store_object_without_profiling(object, options) }
   end
 
@@ -92,7 +94,7 @@ class Riak::Client
   def profile(request, &blk)
     return yield unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = yield
     elapsed_time = SqlPatches.elapsed_time(start)
     record       = ::Rack::MiniProfiler.record_sql(request, elapsed_time)

data/lib/patches/db/rsolr.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 class RSolr::Connection
   alias_method :execute_without_profiling, :execute
   def execute_with_profiling(client, request_context)
     return execute_without_profiling(client, request_context) unless SqlPatches.should_measure?
 
-    start        = Time.now
+    start        = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result       = execute_without_profiling(client, request_context)
     elapsed_time = SqlPatches.elapsed_time(start)
 
-    data = "#{request_context[:method].upcase} #{request_context[:uri]}"
-    if request_context[:method] == :post and request_context[:data]
-      if request_context[:headers].include?("Content-Type") and request_context[:headers]["Content-Type"] == "text/xml"
+    data = "#{request_context[:method].upcase} #{request_context[:uri]}".dup
+    if (request_context[:method] == :post) && request_context[:data]
+      if request_context[:headers].include?("Content-Type") && (request_context[:headers]["Content-Type"] == "text/xml")
         # it's xml, unescaping isn't needed
         data << "\n#{request_context[:data]}"
       else

data/lib/patches/db/sequel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sequel
   class Database
     alias_method :log_duration_original, :log_duration

data/lib/patches/net_patches.rb

@@ -1,14 +1,26 @@
+# frozen_string_literal: true
+
 if (defined?(Net) && defined?(Net::HTTP))
 
-  Net::HTTP.class_eval do
-    def request_with_mini_profiler(*args, &block)
-      request = args[0]
-      Rack::MiniProfiler.step("Net::HTTP #{request.method} #{request.path}") do
-        request_without_mini_profiler(*args, &block)
+  if defined?(Rack::MINI_PROFILER_PREPEND_NET_HTTP_PATCH)
+    module NetHTTPWithMiniProfiler
+      def request(request, *args, &block)
+        Rack::MiniProfiler.step("Net::HTTP #{request.method} #{request.path}") do
+          super
+        end
+      end
+    end
+    Net::HTTP.prepend(NetHTTPWithMiniProfiler)
+  else
+    Net::HTTP.class_eval do
+      def request_with_mini_profiler(*args, &block)
+        request = args[0]
+        Rack::MiniProfiler.step("Net::HTTP #{request.method} #{request.path}") do
+          request_without_mini_profiler(*args, &block)
+        end
       end
+      alias request_without_mini_profiler request
+      alias request request_with_mini_profiler
     end
-    alias request_without_mini_profiler request
-    alias request request_with_mini_profiler
   end
-
 end

data/lib/patches/sql_patches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SqlPatches
   def self.correct_version?(required_version, klass)
     Gem::Dependency.new('', required_version).match?('', klass::VERSION)
@@ -6,10 +8,10 @@ class SqlPatches
   end
 
   def self.record_sql(statement, parameters = nil, &block)
-    start  = Time.now
+    start  = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     result = yield
     record = ::Rack::MiniProfiler.record_sql(statement, elapsed_time(start), parameters)
-    return result, record
+    [result, record]
   end
 
   def self.should_measure?
@@ -18,7 +20,11 @@ class SqlPatches
   end
 
   def self.elapsed_time(start_time)
-    ((Time.now - start_time).to_f * 1000).round(1)
+    ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time).to_f * 1000).round(1)
+  end
+
+  def self.patch_rails?
+    ::Rack::MiniProfiler.patch_rails?
   end
 
   def self.sql_patches
@@ -27,12 +33,16 @@ class SqlPatches
     patches << 'mysql2' if defined?(Mysql2::Client) && Mysql2::Client.class == Class
     patches << 'pg' if defined?(PG::Result) && PG::Result.class == Class
     patches << 'oracle_enhanced' if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter) && ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class == Class &&
-                                    SqlPatches.correct_version?('~> 1.5.0', ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
+                                    SqlPatches.correct_version?('~> 1.5.0', ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter) &&
+                                    patch_rails?
     # if the adapters were directly patched, don't patch again
-    return patches unless patches.empty?
+    if !patches.empty?
+      Rack::MiniProfiler.subscribe_sql_active_record = false
+      return patches
+    end
     patches << 'sequel' if defined?(Sequel::Database) && Sequel::Database.class == Class
-    patches << 'activerecord' if defined?(ActiveRecord) && ActiveRecord.class == Module
-
+    patches << 'activerecord' if defined?(ActiveRecord) && ActiveRecord.class == Module && patch_rails?
+    Rack::MiniProfiler.subscribe_sql_active_record = patches.empty? && !patch_rails?
     patches
   end
 

data/lib/prepend_net_http_patch.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Rack
+  MINI_PROFILER_PREPEND_NET_HTTP_PATCH = true
+end

data/lib/rack-mini-profiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'timeout'
 require 'thread'
@@ -24,10 +26,8 @@ require 'mini_profiler/profiling_methods'
 require 'mini_profiler/context'
 require 'mini_profiler/client_settings'
 require 'mini_profiler/gc_profiler'
+require 'mini_profiler/snapshots_transporter'
 require 'mini_profiler/profiler'
-# TODO
-# require 'mini_profiler/gc_profiler_ruby_head' if Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION)
-
 require 'patches/sql_patches'
 require 'patches/net_patches'
 

data/rack-mini-profiler.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mini_profiler/version'
@@ -6,29 +8,41 @@ Gem::Specification.new do |s|
   s.name = "rack-mini-profiler"
   s.version = Rack::MiniProfiler::VERSION
   s.summary = "Profiles loading speed for rack applications."
-  s.authors = ["Sam Saffron","Robin Ward","Aleks Totic"]
+  s.authors = ["Sam Saffron", "Robin Ward", "Aleks Totic"]
   s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."
   s.email = "sam.saffron@gmail.com"
-  s.homepage = "http://miniprofiler.com"
+  s.homepage = "https://miniprofiler.com"
   s.license = "MIT"
   s.files = [
     'rack-mini-profiler.gemspec',
-  ].concat( Dir.glob('lib/**/*').reject {|f| File.directory?(f) || f =~ /~$/ } )
+  ].concat(Dir.glob('lib/**/*').reject { |f| File.directory?(f) || f =~ /~$/ })
   s.extra_rdoc_files = [
     "README.md",
     "CHANGELOG.md"
   ]
   s.add_runtime_dependency 'rack', '>= 1.2.0'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.4.0'
+
+  s.metadata = {
+    'source_code_uri' => 'https://github.com/MiniProfiler/rack-mini-profiler',
+    'changelog_uri' => 'https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md'
+  }
 
-  s.add_development_dependency 'rake', '< 11'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'activerecord', '~> 3.0'
   s.add_development_dependency 'dalli'
-  s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rspec', '~> 3.6.0'
   s.add_development_dependency 'redis'
-  s.add_development_dependency 'sass'
-  s.add_development_dependency 'flamegraph'
+  s.add_development_dependency 'sassc'
+  s.add_development_dependency 'stackprof'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'mini_racer'
+  s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'rubocop-discourse'
+  s.add_development_dependency 'listen'
+  s.add_development_dependency 'webpacker'
+  s.add_development_dependency 'rails', '~> 6.0'
+  s.add_development_dependency 'webmock', '3.9.1'
 
   s.require_paths = ["lib"]
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 2.3.0
 platform: ruby
 authors:
 - Sam Saffron
 - Robin Ward
 - Aleks Totic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,16 +30,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -55,21 +55,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
-  name: dalli
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,21 +97,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: stackprof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,7 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,7 +139,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: flamegraph
+  name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,6 +152,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webpacker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.1
 description: Profiling toolkit for Rack applications with Rails integration. Client
   Side profiling, DB profiling and Server profiling.
 email: sam.saffron@gmail.com
@@ -149,20 +247,33 @@ extra_rdoc_files:
 files:
 - CHANGELOG.md
 - README.md
+- lib/enable_rails_patches.rb
 - lib/generators/rack_profiler/USAGE
 - lib/generators/rack_profiler/install_generator.rb
 - lib/generators/rack_profiler/templates/rack_profiler.rb
+- lib/html/dot.1.1.2.min.js
 - lib/html/includes.css
 - lib/html/includes.js
 - lib/html/includes.scss
 - lib/html/includes.tmpl
-- lib/html/jquery.1.7.1.js
-- lib/html/jquery.tmpl.js
-- lib/html/list.css
-- lib/html/list.js
-- lib/html/list.tmpl
+- lib/html/pretty-print.js
 - lib/html/profile_handler.js
+- lib/html/rack-mini-profiler.css
+- lib/html/rack-mini-profiler.js
 - lib/html/share.html
+- lib/html/speedscope/LICENSE
+- lib/html/speedscope/README.md
+- lib/html/speedscope/demangle-cpp.1768f4cc.js
+- lib/html/speedscope/favicon-16x16.f74b3187.png
+- lib/html/speedscope/favicon-32x32.bc503437.png
+- lib/html/speedscope/file-format-schema.json
+- lib/html/speedscope/import.cf0fa83f.js
+- lib/html/speedscope/index.html
+- lib/html/speedscope/release.txt
+- lib/html/speedscope/reset.8c46b7a1.css
+- lib/html/speedscope/source-map.438fa06b.js
+- lib/html/speedscope/speedscope.44364064.js
+- lib/html/vendor.js
 - lib/mini_profiler/asset_version.rb
 - lib/mini_profiler/client_settings.rb
 - lib/mini_profiler/config.rb
@@ -170,6 +281,7 @@ files:
 - lib/mini_profiler/gc_profiler.rb
 - lib/mini_profiler/profiler.rb
 - lib/mini_profiler/profiling_methods.rb
+- lib/mini_profiler/snapshots_transporter.rb
 - lib/mini_profiler/storage/abstract_store.rb
 - lib/mini_profiler/storage/file_store.rb
 - lib/mini_profiler/storage/memcache_store.rb
@@ -183,6 +295,7 @@ files:
 - lib/mini_profiler/timer_struct/sql.rb
 - lib/mini_profiler/version.rb
 - lib/mini_profiler_rails/railtie.rb
+- lib/mini_profiler_rails/railtie_methods.rb
 - lib/patches/db/activerecord.rb
 - lib/patches/db/mongo.rb
 - lib/patches/db/moped.rb
@@ -197,13 +310,16 @@ files:
 - lib/patches/db/sequel.rb
 - lib/patches/net_patches.rb
 - lib/patches/sql_patches.rb
+- lib/prepend_net_http_patch.rb
 - lib/rack-mini-profiler.rb
 - rack-mini-profiler.gemspec
-homepage: http://miniprofiler.com
+homepage: https://miniprofiler.com
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/MiniProfiler/rack-mini-profiler
+  changelog_uri: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,16 +327,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: Profiles loading speed for rack applications.
 test_files: []