Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
92f31bf7
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
92f31bf7
编写于
7月 24, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Call flush instead of dispose for flushing telemetry appenders
Wait until data is flushed in cli
上级
06c2853f
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
15 addition
and
14 deletion
+15
-14
src/vs/code/node/cliProcessMain.ts
src/vs/code/node/cliProcessMain.ts
+2
-2
src/vs/platform/telemetry/common/telemetryUtils.ts
src/vs/platform/telemetry/common/telemetryUtils.ts
+4
-4
src/vs/platform/telemetry/node/appInsightsAppender.ts
src/vs/platform/telemetry/node/appInsightsAppender.ts
+2
-2
src/vs/platform/telemetry/node/telemetryIpc.ts
src/vs/platform/telemetry/node/telemetryIpc.ts
+2
-1
src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
...lemetry/test/electron-browser/appInsightsAppender.test.ts
+1
-1
src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
.../telemetry/test/electron-browser/telemetryService.test.ts
+1
-1
src/vs/workbench/contrib/debug/node/telemetryApp.ts
src/vs/workbench/contrib/debug/node/telemetryApp.ts
+1
-1
src/vs/workbench/services/telemetry/browser/telemetryService.ts
.../workbench/services/telemetry/browser/telemetryService.ts
+2
-2
未找到文件。
src/vs/code/node/cliProcessMain.ts
浏览文件 @
92f31bf7
...
...
@@ -354,8 +354,6 @@ export async function main(argv: ParsedArgs): Promise<void> {
services
.
set
(
ITelemetryService
,
new
SyncDescriptor
(
TelemetryService
,
[
config
]));
// Dispose the AI adapter so that remaining data gets flushed.
disposables
.
add
(
combinedAppender
(...
appenders
));
}
else
{
services
.
set
(
ITelemetryService
,
NullTelemetryService
);
}
...
...
@@ -365,6 +363,8 @@ export async function main(argv: ParsedArgs): Promise<void> {
try
{
await
main
.
run
(
argv
);
// Flush the remaining data in AI adapter.
await
combinedAppender
(...
appenders
).
flush
();
}
finally
{
disposables
.
dispose
();
}
...
...
src/vs/platform/telemetry/common/telemetryUtils.ts
浏览文件 @
92f31bf7
...
...
@@ -33,17 +33,17 @@ export const NullTelemetryService = new class implements ITelemetryService {
export
interface
ITelemetryAppender
{
log
(
eventName
:
string
,
data
:
any
):
void
;
dispose
():
Promise
<
any
>
|
undefined
;
flush
():
Promise
<
any
>
;
}
export
function
combinedAppender
(...
appenders
:
ITelemetryAppender
[]):
ITelemetryAppender
{
return
{
log
:
(
e
,
d
)
=>
appenders
.
forEach
(
a
=>
a
.
log
(
e
,
d
)),
dispose
:
()
=>
Promise
.
all
(
appenders
.
map
(
a
=>
a
.
dispose
()))
flush
:
()
=>
Promise
.
all
(
appenders
.
map
(
a
=>
a
.
flush
()))
};
}
export
const
NullAppender
:
ITelemetryAppender
=
{
log
:
()
=>
null
,
dispose
:
()
=>
Promise
.
resolve
(
null
)
};
export
const
NullAppender
:
ITelemetryAppender
=
{
log
:
()
=>
null
,
flush
:
()
=>
Promise
.
resolve
(
null
)
};
export
class
LogAppender
implements
ITelemetryAppender
{
...
...
@@ -51,7 +51,7 @@ export class LogAppender implements ITelemetryAppender {
private
commonPropertiesRegex
=
/^sessionID$|^version$|^timestamp$|^commitHash$|^common
\.
/
;
constructor
(@
ILogService
private
readonly
_logService
:
ILogService
)
{
}
dispose
():
Promise
<
any
>
{
flush
():
Promise
<
any
>
{
return
Promise
.
resolve
(
undefined
);
}
...
...
src/vs/platform/telemetry/node/appInsightsAppender.ts
浏览文件 @
92f31bf7
...
...
@@ -73,7 +73,7 @@ export class AppInsightsAppender implements ITelemetryAppender {
});
}
dispose
():
Promise
<
any
>
|
undefined
{
flush
():
Promise
<
any
>
{
if
(
this
.
_aiClient
)
{
return
new
Promise
(
resolve
=>
{
this
.
_aiClient
!
.
flush
({
...
...
@@ -85,6 +85,6 @@ export class AppInsightsAppender implements ITelemetryAppender {
});
});
}
return
undefined
;
return
Promise
.
resolve
(
undefined
)
;
}
}
src/vs/platform/telemetry/node/telemetryIpc.ts
浏览文件 @
92f31bf7
...
...
@@ -37,7 +37,8 @@ export class TelemetryAppenderClient implements ITelemetryAppender {
return
Promise
.
resolve
(
null
);
}
dispose
():
any
{
flush
():
Promise
<
void
>
{
// TODO
return
Promise
.
resolve
();
}
}
src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
浏览文件 @
92f31bf7
...
...
@@ -84,7 +84,7 @@ suite('AIAdapter', () => {
});
teardown
(()
=>
{
adapter
.
dispose
();
return
adapter
.
flush
();
});
test
(
'
Simple event
'
,
()
=>
{
...
...
src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
浏览文件 @
92f31bf7
...
...
@@ -30,7 +30,7 @@ class TestTelemetryAppender implements ITelemetryAppender {
return
this
.
events
.
length
;
}
public
dispose
():
Promise
<
any
>
{
public
flush
():
Promise
<
any
>
{
this
.
isDisposed
=
true
;
return
Promise
.
resolve
(
null
);
}
...
...
src/vs/workbench/contrib/debug/node/telemetryApp.ts
浏览文件 @
92f31bf7
...
...
@@ -8,7 +8,7 @@ import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppen
import
{
TelemetryAppenderChannel
}
from
'
vs/platform/telemetry/node/telemetryIpc
'
;
const
appender
=
new
AppInsightsAppender
(
process
.
argv
[
2
],
JSON
.
parse
(
process
.
argv
[
3
]),
process
.
argv
[
4
]);
process
.
once
(
'
exit
'
,
()
=>
appender
.
dispose
());
process
.
once
(
'
exit
'
,
()
=>
appender
.
flush
());
const
channel
=
new
TelemetryAppenderChannel
(
appender
);
const
server
=
new
Server
(
'
telemetry
'
);
...
...
src/vs/workbench/services/telemetry/browser/telemetryService.ts
浏览文件 @
92f31bf7
...
...
@@ -104,7 +104,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
this
.
_aiClient
.
trackEvent
(
'
monacoworkbench/
'
+
eventName
,
data
.
properties
,
data
.
measurements
);
}
dispose
():
Promise
<
any
>
|
undefined
{
flush
():
Promise
<
void
>
{
if
(
this
.
_aiClient
)
{
return
new
Promise
(
resolve
=>
{
this
.
_aiClient
!
.
flush
();
...
...
@@ -113,7 +113,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
});
}
return
undefined
;
return
Promise
.
resolve
()
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录