Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
Container registry
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
6e9f4627
提交
6e9f4627
编辑于
2 years ago
作者:
Jan Provaznik
浏览文件
操作
下载
差异文件
Merge branch 'refactor/tracking_tracker' into 'master'
Rename tracker in Gitlab::Tracking See merge request gitlab-org/gitlab!91013
上级
a5fe769b
73dfaee5
No related branches found
分支 包含提交
No related tags found
标签 包含提交
无相关合并请求
变更
4
隐藏空白变更内容
行内
左右并排
显示
4 个更改的文件
ee/spec/requests/api/experiments_spec.rb
+1
-1
1 个添加, 1 个删除
ee/spec/requests/api/experiments_spec.rb
lib/gitlab/tracking.rb
+10
-10
10 个添加, 10 个删除
lib/gitlab/tracking.rb
spec/lib/gitlab/tracking_spec.rb
+2
-2
2 个添加, 2 个删除
spec/lib/gitlab/tracking_spec.rb
spec/support/snowplow.rb
+1
-1
1 个添加, 1 个删除
spec/support/snowplow.rb
有
14 个添加
和
14 个删除
ee/spec/requests/api/experiments_spec.rb
+
1
−
1
浏览文件 @
6e9f4627
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
# Yes, we really do want to test this and the only way to get here
# Yes, we really do want to test this and the only way to get here
# is by calling a private method.
# is by calling a private method.
expect
(
Gitlab
::
Tracking
.
send
(
:
snowplow
)).
to
receive
(
:event
).
with
(
expect
(
Gitlab
::
Tracking
.
send
(
:
tracker
)).
to
receive
(
:event
).
with
(
'null_hypothesis'
,
'null_hypothesis'
,
'assignment'
,
'assignment'
,
label:
nil
,
label:
nil
,
...
...
此差异已折叠。
点击以展开。
lib/gitlab/tracking.rb
+
10
−
10
浏览文件 @
6e9f4627
...
@@ -4,13 +4,13 @@ module Gitlab
...
@@ -4,13 +4,13 @@ module Gitlab
module
Tracking
module
Tracking
class
<<
self
class
<<
self
def
enabled?
def
enabled?
snowplow
.
enabled?
tracker
.
enabled?
end
end
def
event
(
category
,
action
,
label:
nil
,
property:
nil
,
value:
nil
,
context:
[],
project:
nil
,
user:
nil
,
namespace:
nil
,
**
extra
)
# rubocop:disable Metrics/ParameterLists
def
event
(
category
,
action
,
label:
nil
,
property:
nil
,
value:
nil
,
context:
[],
project:
nil
,
user:
nil
,
namespace:
nil
,
**
extra
)
# rubocop:disable Metrics/ParameterLists
contexts
=
[
Tracking
::
StandardContext
.
new
(
project:
project
,
user:
user
,
namespace:
namespace
,
**
extra
).
to_context
,
*
context
]
contexts
=
[
Tracking
::
StandardContext
.
new
(
project:
project
,
user:
user
,
namespace:
namespace
,
**
extra
).
to_context
,
*
context
]
snowplow
.
event
(
category
,
action
,
label:
label
,
property:
property
,
value:
value
,
context:
contexts
)
tracker
.
event
(
category
,
action
,
label:
label
,
property:
property
,
value:
value
,
context:
contexts
)
rescue
StandardError
=>
error
rescue
StandardError
=>
error
Gitlab
::
ErrorTracking
.
track_and_raise_for_dev_exception
(
error
,
snowplow_category:
category
,
snowplow_action:
action
)
Gitlab
::
ErrorTracking
.
track_and_raise_for_dev_exception
(
error
,
snowplow_category:
category
,
snowplow_action:
action
)
end
end
...
@@ -31,11 +31,11 @@ def dispatch_from_definition(definition, **event_data)
...
@@ -31,11 +31,11 @@ def dispatch_from_definition(definition, **event_data)
end
end
def
options
(
group
)
def
options
(
group
)
snowplow
.
options
(
group
)
tracker
.
options
(
group
)
end
end
def
collector_hostname
def
collector_hostname
snowplow
.
hostname
tracker
.
hostname
end
end
def
snowplow_micro_enabled?
def
snowplow_micro_enabled?
...
@@ -44,12 +44,12 @@ def snowplow_micro_enabled?
...
@@ -44,12 +44,12 @@ def snowplow_micro_enabled?
private
private
def
snowplow
def
tracker
@
snowplow
||=
if
snowplow_micro_enabled?
@
tracker
||=
if
snowplow_micro_enabled?
Gitlab
::
Tracking
::
Destinations
::
SnowplowMicro
.
new
Gitlab
::
Tracking
::
Destinations
::
SnowplowMicro
.
new
else
else
Gitlab
::
Tracking
::
Destinations
::
Snowplow
.
new
Gitlab
::
Tracking
::
Destinations
::
Snowplow
.
new
end
end
end
end
end
end
end
end
...
...
此差异已折叠。
点击以展开。
spec/lib/gitlab/tracking_spec.rb
+
2
−
2
浏览文件 @
6e9f4627
...
@@ -10,11 +10,11 @@
...
@@ -10,11 +10,11 @@
stub_application_setting
(
snowplow_cookie_domain:
'.gitfoo.com'
)
stub_application_setting
(
snowplow_cookie_domain:
'.gitfoo.com'
)
stub_application_setting
(
snowplow_app_id:
'_abc123_'
)
stub_application_setting
(
snowplow_app_id:
'_abc123_'
)
described_class
.
instance_variable_set
(
"@
snowplow
"
,
nil
)
described_class
.
instance_variable_set
(
"@
tracker
"
,
nil
)
end
end
after
do
after
do
described_class
.
instance_variable_set
(
"@
snowplow
"
,
nil
)
described_class
.
instance_variable_set
(
"@
tracker
"
,
nil
)
end
end
describe
'.options'
do
describe
'.options'
do
...
...
此差异已折叠。
点击以展开。
spec/support/snowplow.rb
+
1
−
1
浏览文件 @
6e9f4627
...
@@ -11,6 +11,6 @@
...
@@ -11,6 +11,6 @@
end
end
config
.
after
(
:each
,
:snowplow
)
do
config
.
after
(
:each
,
:snowplow
)
do
Gitlab
::
Tracking
.
send
(
:
snowplow
).
send
(
:tracker
).
flush
Gitlab
::
Tracking
.
send
(
:
tracker
).
send
(
:tracker
).
flush
end
end
end
end
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录