Merge branch 'rc/bump-peek-performance_bar' into 'master'
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939
This commit is contained in:
commit
1c7893c5c1
4 changed files with 3 additions and 29 deletions
2
Gemfile
2
Gemfile
|
@ -268,7 +268,7 @@ gem 'peek', '~> 1.0.1'
|
|||
gem 'peek-gc', '~> 0.0.2'
|
||||
gem 'peek-host', '~> 1.0.0'
|
||||
gem 'peek-mysql2', '~> 1.1.0', group: :mysql
|
||||
gem 'peek-performance_bar', '~> 1.2.1'
|
||||
gem 'peek-performance_bar', '~> 1.3.0'
|
||||
gem 'peek-pg', '~> 1.3.0', group: :postgres
|
||||
gem 'peek-rblineprof', '~> 0.2.0'
|
||||
gem 'peek-redis', '~> 1.2.0'
|
||||
|
|
|
@ -557,7 +557,7 @@ GEM
|
|||
atomic (>= 1.0.0)
|
||||
mysql2
|
||||
peek
|
||||
peek-performance_bar (1.2.1)
|
||||
peek-performance_bar (1.3.0)
|
||||
peek (>= 0.1.0)
|
||||
peek-pg (1.3.0)
|
||||
concurrent-ruby
|
||||
|
@ -1034,7 +1034,7 @@ DEPENDENCIES
|
|||
peek-gc (~> 0.0.2)
|
||||
peek-host (~> 1.0.0)
|
||||
peek-mysql2 (~> 1.1.0)
|
||||
peek-performance_bar (~> 1.2.1)
|
||||
peek-performance_bar (~> 1.3.0)
|
||||
peek-pg (~> 1.3.0)
|
||||
peek-rblineprof (~> 0.2.0)
|
||||
peek-redis (~> 1.2.0)
|
||||
|
|
|
@ -26,7 +26,3 @@ class PEEK_DB_CLIENT
|
|||
end
|
||||
|
||||
PEEK_DB_VIEW.prepend ::Gitlab::PerformanceBar::PeekQueryTracker
|
||||
|
||||
class Peek::Views::PerformanceBar::ProcessUtilization
|
||||
prepend ::Gitlab::PerformanceBar::PeekPerformanceBarWithRackBody
|
||||
end
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
# This solves a bug with a X-Senfile header that wouldn't be set properly, see
|
||||
# https://github.com/peek/peek-performance_bar/pull/27
|
||||
module Gitlab
|
||||
module PerformanceBar
|
||||
module PeekPerformanceBarWithRackBody
|
||||
def call(env)
|
||||
@env = env
|
||||
reset_stats
|
||||
|
||||
@total_requests += 1
|
||||
first_request if @total_requests == 1
|
||||
|
||||
env['process.request_start'] = @start.to_f
|
||||
env['process.total_requests'] = total_requests
|
||||
|
||||
status, headers, body = @app.call(env)
|
||||
body = Rack::BodyProxy.new(body) { record_request }
|
||||
[status, headers, body]
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in a new issue