Skip to content

Commit 488fa6d

Browse files
TyriarTyriar
committed
Merge remote-tracking branch 'origin/master' into tyriar/puppeteer
2 parents 2eb4b1a + ccc4fbf commit 488fa6d

372 files changed

Lines changed: 5967 additions & 4239 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/azure-pipelines/common/extract-telemetry.sh‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,18 @@
22
set -e
33

44
cd $BUILD_STAGINGDIRECTORY
5-
git clone https://github.com/microsoft/vscode-telemetry-extractor.git
6-
cd vscode-telemetry-extractor
7-
git checkout 4e64f3de30f8fccb58ebdc0d85c4861a135d46cf
8-
npm i
9-
npm run compile
10-
cd src
11-
mkdir telemetry-sources
12-
cd telemetry-sources
5+
mkdir extraction
6+
cd extraction
137
git clone --depth 1 https://github.com/Microsoft/vscode-extension-telemetry.git
148
git clone --depth 1 https://github.com/Microsoft/vscode-chrome-debug-core.git
15-
git clone --depth 1 https://github.com/Microsoft/vscode-chrome-debug.git
169
git clone --depth 1 https://github.com/Microsoft/vscode-node-debug2.git
1710
git clone --depth 1 https://github.com/Microsoft/vscode-node-debug.git
18-
git clone --depth 1 https://github.com/Microsoft/vscode-docker.git
19-
git clone --depth 1 https://github.com/Microsoft/vscode-go.git
20-
git clone --depth 1 https://github.com/Microsoft/vscode-azure-account.git
2111
git clone --depth 1 https://github.com/Microsoft/vscode-html-languageservice.git
2212
git clone --depth 1 https://github.com/Microsoft/vscode-json-languageservice.git
23-
git clone --depth 1 https://github.com/Microsoft/vscode-mono-debug.git
24-
git clone --depth 1 https://github.com/Microsoft/TypeScript.git
25-
cd ../../
26-
node ./out/cli-extract.js --sourceDir $BUILD_SOURCESDIRECTORY --excludedDirPattern extensions --outputDir . --applyEndpoints --includeIsMeasurement
27-
node ./out/cli-extract-extensions.js --sourceDir ./src/telemetry-sources --outputDir . --applyEndpoints --includeIsMeasurement
13+
$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
14+
$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
2815
mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
2916
mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
30-
mv declarations-extensions-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
17+
mv config-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
18+
cd ..
19+
rm -rf extraction

‎build/azure-pipelines/common/telemetry-config.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
[
2+
{
3+
"eventPrefix": "typescript-language-features/",
4+
"sourceDirs": [
5+
"../../s/extensions/typescript-language-features"
6+
],
7+
"excludedDirs": [],
8+
"applyEndpoints": true
9+
},
10+
{
11+
"eventPrefix": "git/",
12+
"sourceDirs": [
13+
"../../s/extensions/git"
14+
],
15+
"excludedDirs": [],
16+
"applyEndpoints": true
17+
},
18+
{
19+
"eventPrefix": "extension-telemetry/",
20+
"sourceDirs": [
21+
"vscode-extension-telemetry"
22+
],
23+
"excludedDirs": [],
24+
"applyEndpoints": true
25+
},
26+
{
27+
"eventPrefix": "vscode-markdown/",
28+
"sourceDirs": [
29+
"../../s/extensions/markdown-language-features"
30+
],
31+
"excludedDirs": [],
32+
"applyEndpoints": true
33+
},
34+
{
35+
"eventPrefix": "html-language-features/",
36+
"sourceDirs": [
37+
"../../s/extensions/html-language-features",
38+
"vscode-html-languageservice"
39+
],
40+
"excludedDirs": [],
41+
"applyEndpoints": true
42+
},
43+
{
44+
"eventPrefix": "json-language-features/",
45+
"sourceDirs": [
46+
"../../s/extensions/json-language-features",
47+
"vscode-json-languageservice"
48+
],
49+
"excludedDirs": [],
50+
"applyEndpoints": true
51+
},
52+
{
53+
"eventPrefix": "ms-vscode.node2/",
54+
"sourceDirs": [
55+
"vscode-chrome-debug-core",
56+
"vscode-node-debug2"
57+
],
58+
"excludedDirs": [],
59+
"applyEndpoints": true,
60+
"patchDebugEvents": true
61+
},
62+
{
63+
"eventPrefix": "ms-vscode.node/",
64+
"sourceDirs": [
65+
"vscode-chrome-debug-core",
66+
"vscode-node-debug"
67+
],
68+
"excludedDirs": [],
69+
"applyEndpoints": true,
70+
"patchDebugEvents": true
71+
}
72+
]

‎build/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"tslint": "^5.9.1",
4343
"typescript": "3.5.2",
4444
"vsce": "1.48.0",
45+
"vscode-telemetry-extractor": "1.4.3",
4546
"xml2js": "^0.4.17"
4647
},
4748
"scripts": {

0 commit comments

Comments
 (0)