Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9101915c
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
9101915c
编写于
6月 23, 2016
作者:
P
Paco Guzman
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add Sidekiq queue duration to transaction metrics.
上级
62948886
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
1 deletion
+19
-1
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/metrics/sidekiq_middleware.rb
lib/gitlab/metrics/sidekiq_middleware.rb
+2
-0
spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
+16
-1
未找到文件。
CHANGELOG
浏览文件 @
9101915c
...
...
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.10.0 (unreleased)
- Wrap code blocks on Activies and Todos page. !4783 (winniehell)
- Add Sidekiq queue duration to transaction metrics.
- Fix MR-auto-close text added to description. !4836
- Implement Subresource Integrity for CSS and JavaScript assets. This prevents malicious assets from loading in the case of a CDN compromise.
...
...
lib/gitlab/metrics/sidekiq_middleware.rb
浏览文件 @
9101915c
...
...
@@ -8,6 +8,8 @@ module Gitlab
trans
=
Transaction
.
new
(
"
#{
worker
.
class
.
name
}
#perform"
)
begin
# Old gitlad-shell messages don't provide enqueued_at/created_at attributes
trans
.
set
(
:sidekiq_queue_duration
,
Time
.
now
.
to_f
-
(
message
[
'enqueued_at'
]
||
message
[
'created_at'
]
||
0
))
trans
.
run
{
yield
}
ensure
trans
.
finish
...
...
spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
浏览文件 @
9101915c
...
...
@@ -2,6 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
Metrics
::
SidekiqMiddleware
do
let
(
:middleware
)
{
described_class
.
new
}
let
(
:message
)
{
{
'args'
=>
[
'test'
],
'enqueued_at'
=>
Time
.
new
(
2016
,
6
,
23
,
6
,
59
).
to_f
}
}
describe
'#call'
do
it
'tracks the transaction'
do
...
...
@@ -11,9 +12,23 @@ describe Gitlab::Metrics::SidekiqMiddleware do
with
(
'TestWorker#perform'
).
and_call_original
expect_any_instance_of
(
Gitlab
::
Metrics
::
Transaction
).
to
receive
(
:set
).
with
(
:sidekiq_queue_duration
,
instance_of
(
Float
))
expect_any_instance_of
(
Gitlab
::
Metrics
::
Transaction
).
to
receive
(
:finish
)
middleware
.
call
(
worker
,
'test'
,
:test
)
{
nil
}
middleware
.
call
(
worker
,
message
,
:test
)
{
nil
}
end
it
'tracks the transaction (for messages without `enqueued_at`)'
do
worker
=
double
(
:worker
,
class:
double
(
:class
,
name:
'TestWorker'
))
expect
(
Gitlab
::
Metrics
::
Transaction
).
to
receive
(
:new
).
with
(
'TestWorker#perform'
).
and_call_original
expect_any_instance_of
(
Gitlab
::
Metrics
::
Transaction
).
to
receive
(
:set
).
with
(
:sidekiq_queue_duration
,
instance_of
(
Float
))
expect_any_instance_of
(
Gitlab
::
Metrics
::
Transaction
).
to
receive
(
:finish
)
middleware
.
call
(
worker
,
{},
:test
)
{
nil
}
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录