Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
8cd962e8
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8cd962e8
编写于
5月 29, 2019
作者:
S
SteVen Batten
提交者:
GitHub
5月 29, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #74591 from sbatten/commonRemoteAuthority
add common.remoteAuthority
上级
e9c50663
683b80aa
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
2 deletion
+20
-2
src/vs/platform/telemetry/node/workbenchCommonProperties.ts
src/vs/platform/telemetry/node/workbenchCommonProperties.ts
+19
-1
src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
...h/services/telemetry/electron-browser/telemetryService.ts
+1
-1
未找到文件。
src/vs/platform/telemetry/node/workbenchCommonProperties.ts
浏览文件 @
8cd962e8
...
...
@@ -11,7 +11,7 @@ export const currentSessionDateStorageKey = 'telemetry.currentSessionDate';
export
const
firstSessionDateStorageKey
=
'
telemetry.firstSessionDate
'
;
export
const
lastSessionDateStorageKey
=
'
telemetry.lastSessionDate
'
;
export
async
function
resolveWorkbenchCommonProperties
(
storageService
:
IStorageService
,
commit
:
string
|
undefined
,
version
:
string
|
undefined
,
machineId
:
string
,
installSourcePath
:
string
):
Promise
<
{
[
name
:
string
]:
string
|
undefined
}
>
{
export
async
function
resolveWorkbenchCommonProperties
(
storageService
:
IStorageService
,
commit
:
string
|
undefined
,
version
:
string
|
undefined
,
machineId
:
string
,
installSourcePath
:
string
,
remoteAuthority
?:
string
):
Promise
<
{
[
name
:
string
]:
string
|
undefined
}
>
{
const
result
=
await
resolveCommonProperties
(
commit
,
version
,
machineId
,
installSourcePath
);
const
instanceId
=
storageService
.
get
(
instanceStorageKey
,
StorageScope
.
GLOBAL
)
!
;
const
firstSessionDate
=
storageService
.
get
(
firstSessionDateStorageKey
,
StorageScope
.
GLOBAL
)
!
;
...
...
@@ -29,6 +29,24 @@ export async function resolveWorkbenchCommonProperties(storageService: IStorageS
result
[
'
common.isNewSession
'
]
=
!
lastSessionDate
?
'
1
'
:
'
0
'
;
// __GDPR__COMMON__ "common.instanceId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
result
[
'
common.instanceId
'
]
=
instanceId
;
// __GDPR__COMMON__ "common.remoteAuthority" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
result
[
'
common.remoteAuthority
'
]
=
cleanRemoteAuthority
(
remoteAuthority
);
return
result
;
}
function
cleanRemoteAuthority
(
remoteAuthority
?:
string
):
string
{
if
(
!
remoteAuthority
)
{
return
'
none
'
;
}
let
ret
=
'
other
'
;
// Whitelisted remote authorities
[
'
ssh-remote
'
,
'
dev-container
'
,
'
wsl
'
].
forEach
((
res
:
string
)
=>
{
if
(
remoteAuthority
!
.
indexOf
(
`
${
res
}
+`
)
===
0
)
{
ret
=
res
;
}
});
return
ret
;
}
src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
浏览文件 @
8cd962e8
...
...
@@ -37,7 +37,7 @@ export class TelemetryService extends Disposable implements ITelemetryService {
const
channel
=
sharedProcessService
.
getChannel
(
'
telemetryAppender
'
);
const
config
:
ITelemetryServiceConfig
=
{
appender
:
combinedAppender
(
new
TelemetryAppenderClient
(
channel
),
new
LogAppender
(
logService
)),
commonProperties
:
resolveWorkbenchCommonProperties
(
storageService
,
productService
.
commit
,
productService
.
version
,
environmentService
.
configuration
.
machineId
,
environmentService
.
installSourcePath
),
commonProperties
:
resolveWorkbenchCommonProperties
(
storageService
,
productService
.
commit
,
productService
.
version
,
environmentService
.
configuration
.
machineId
,
environmentService
.
installSourcePath
,
environmentService
.
configuration
.
remoteAuthority
),
piiPaths
:
[
environmentService
.
appRoot
,
environmentService
.
extensionsPath
]
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录