Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
9bdfc982
Commit
9bdfc982
authored
May 26, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'measure-proxy-timing' into 'master'
Measure proxy flight time See merge request !4278
parents
d4d0fdb4
5771114f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
0 deletions
+56
-0
config/initializers/metrics.rb
config/initializers/metrics.rb
+1
-0
lib/gitlab/middleware/rails_queue_duration.rb
lib/gitlab/middleware/rails_queue_duration.rb
+24
-0
spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
+31
-0
No files found.
config/initializers/metrics.rb
View file @
9bdfc982
...
...
@@ -12,6 +12,7 @@ if Gitlab::Metrics.enabled?
Gitlab
::
Application
.
configure
do
|
config
|
config
.
middleware
.
use
(
Gitlab
::
Metrics
::
RackMiddleware
)
config
.
middleware
.
use
(
Gitlab
::
Middleware
::
RailsQueueDuration
)
end
Sidekiq
.
configure_server
do
|
config
|
...
...
lib/gitlab/middleware/rails_queue_duration.rb
0 → 100644
View file @
9bdfc982
# This Rack middleware is intended to measure the latency between
# gitlab-workhorse forwarding a request to the Rails application and the
# time this middleware is reached.
module
Gitlab
module
Middleware
class
RailsQueueDuration
def
initialize
(
app
)
@app
=
app
end
def
call
(
env
)
trans
=
Gitlab
::
Metrics
.
current_transaction
proxy_start
=
env
[
'HTTP_GITLAB_WORHORSE_PROXY_START'
].
presence
if
trans
&&
proxy_start
# Time in milliseconds since gitlab-workhorse started the request
trans
.
set
(
:rails_queue_duration
,
Time
.
now
.
to_f
*
1_000
-
proxy_start
.
to_f
/
1_000_000
)
end
@app
.
call
(
env
)
end
end
end
end
spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
0 → 100644
View file @
9bdfc982
require
'spec_helper'
describe
Gitlab
::
Middleware
::
RailsQueueDuration
do
let
(
:app
)
{
double
(
:app
)
}
let
(
:middleware
)
{
described_class
.
new
(
app
)
}
let
(
:env
)
{
{}
}
let
(
:transaction
)
{
double
(
:transaction
)
}
before
{
expect
(
app
).
to
receive
(
:call
).
with
(
env
).
and_return
(
'yay'
)
}
describe
'#call'
do
it
'calls the app when metrics are disabled'
do
expect
(
Gitlab
::
Metrics
).
to
receive
(
:current_transaction
).
and_return
(
nil
)
expect
(
middleware
.
call
(
env
)).
to
eq
(
'yay'
)
end
context
'when metrics are enabled'
do
before
{
allow
(
Gitlab
::
Metrics
).
to
receive
(
:current_transaction
).
and_return
(
transaction
)
}
it
'calls the app when metrics are enabled but no timing header is found'
do
expect
(
middleware
.
call
(
env
)).
to
eq
(
'yay'
)
end
it
'sets proxy_flight_time and calls the app when the header is present'
do
env
[
'HTTP_GITLAB_WORHORSE_PROXY_START'
]
=
'123'
expect
(
transaction
).
to
receive
(
:set
).
with
(
:rails_queue_duration
,
an_instance_of
(
Float
))
expect
(
middleware
.
call
(
env
)).
to
eq
(
'yay'
)
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment