@salesforce/plugin-telemetry 1.2.6 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +33 -17
- package/LICENSE.txt +1 -1
- package/lib/commandExecution.js +5 -5
- package/lib/commandExecution.js.map +1 -1
- package/lib/debuger.js +1 -1
- package/lib/debuger.js.map +1 -1
- package/lib/hooks/telemetryPrerun.js +40 -11
- package/lib/hooks/telemetryPrerun.js.map +1 -1
- package/lib/telemetry.d.ts +2 -0
- package/lib/telemetry.js +27 -22
- package/lib/telemetry.js.map +1 -1
- package/lib/telemetryGlobal.d.ts +0 -1
- package/lib/uploader.js +10 -10
- package/lib/uploader.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +9 -16
package/CHANGELOG.md
CHANGED
|
@@ -2,61 +2,77 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
## [1.4.0](https://github.com/salesforcecli/plugin-telemetry/compare/v1.3.0...v1.4.0) (2021-12-01)
|
|
6
|
+
|
|
7
|
+
### Features
|
|
8
|
+
|
|
9
|
+
- bump command, core, and telemetry deps ([7e643bf](https://github.com/salesforcecli/plugin-telemetry/commit/7e643bf4adb62650b688713329b234dfaf96f719))
|
|
10
|
+
|
|
11
|
+
## [1.3.0](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.8...v1.3.0) (2021-11-17)
|
|
12
|
+
|
|
13
|
+
### Features
|
|
6
14
|
|
|
15
|
+
- forwards telemetry ([292a296](https://github.com/salesforcecli/plugin-telemetry/commit/292a296ced7537c06ffebb3e567d4495f0022118))
|
|
7
16
|
|
|
8
17
|
### Bug Fixes
|
|
9
18
|
|
|
10
|
-
|
|
19
|
+
- set event type ([120bbf1](https://github.com/salesforcecli/plugin-telemetry/commit/120bbf1b40377dacf61186ae27a413a37e8441fc))
|
|
11
20
|
|
|
12
|
-
### [1.2.
|
|
21
|
+
### [1.2.8](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.7...v1.2.8) (2021-10-12)
|
|
13
22
|
|
|
23
|
+
### [1.2.7](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.6...v1.2.7) (2021-10-08)
|
|
14
24
|
|
|
15
25
|
### Bug Fixes
|
|
16
26
|
|
|
17
|
-
|
|
27
|
+
- add executable to prerun events ([#209](https://github.com/salesforcecli/plugin-telemetry/issues/209)) ([50248fe](https://github.com/salesforcecli/plugin-telemetry/commit/50248fe2da68d80fb1ab613f3ece88e2ca647bf7))
|
|
18
28
|
|
|
19
|
-
### [1.2.
|
|
29
|
+
### [1.2.6](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.5...v1.2.6) (2021-10-07)
|
|
30
|
+
|
|
31
|
+
### Bug Fixes
|
|
20
32
|
|
|
33
|
+
- leave org as undefined when trying to determine its type ([39954df](https://github.com/salesforcecli/plugin-telemetry/commit/39954df294a8edad9539607e03ee20ee4f4f2f0a))
|
|
34
|
+
|
|
35
|
+
### [1.2.5](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.4...v1.2.5) (2021-10-06)
|
|
21
36
|
|
|
22
37
|
### Bug Fixes
|
|
23
38
|
|
|
24
|
-
|
|
39
|
+
- fix yarn install for CI ([cc8e2ee](https://github.com/salesforcecli/plugin-telemetry/commit/cc8e2eea22993c57bafb40c6309f8d1d8aa262cf))
|
|
25
40
|
|
|
26
|
-
### [1.2.
|
|
41
|
+
### [1.2.4](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.3...v1.2.4) (2021-09-14)
|
|
42
|
+
|
|
43
|
+
### Bug Fixes
|
|
27
44
|
|
|
45
|
+
- bump @salesfoce/command to v4 ([#192](https://github.com/salesforcecli/plugin-telemetry/issues/192)) ([ba63c95](https://github.com/salesforcecli/plugin-telemetry/commit/ba63c959c7942c09e6c7da47ce8a94568fa9898a))
|
|
46
|
+
|
|
47
|
+
### [1.2.3](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.2...v1.2.3) (2021-07-09)
|
|
28
48
|
|
|
29
49
|
### Bug Fixes
|
|
30
50
|
|
|
31
|
-
|
|
51
|
+
- add executable to command execution ([#161](https://github.com/salesforcecli/plugin-telemetry/issues/161)) ([58a4206](https://github.com/salesforcecli/plugin-telemetry/commit/58a4206fc6537e26dc2e390100ffa3b3fba52635))
|
|
32
52
|
|
|
33
53
|
### [1.2.2](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.1...v1.2.2) (2021-06-10)
|
|
34
54
|
|
|
35
|
-
|
|
36
55
|
### Bug Fixes
|
|
37
56
|
|
|
38
|
-
|
|
57
|
+
- dependency bumps ([150bf86](https://github.com/salesforcecli/plugin-telemetry/commit/150bf86ff3d24d5af222ba0fc15a12b58f83ec26))
|
|
39
58
|
|
|
40
59
|
### [1.2.1](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.0...v1.2.1) (2021-05-10)
|
|
41
60
|
|
|
42
61
|
## [1.2.0](https://github.com/salesforcecli/plugin-telemetry/compare/v1.1.2...v1.2.0) (2021-04-27)
|
|
43
62
|
|
|
44
|
-
|
|
45
63
|
### Features
|
|
46
64
|
|
|
47
|
-
|
|
65
|
+
- add nut test ([b515bf9](https://github.com/salesforcecli/plugin-telemetry/commit/b515bf9da73f8b8a87a94653fe64b3b1fbbdb8f2))
|
|
48
66
|
|
|
49
67
|
### [1.1.2](https://github.com/salesforcecli/plugin-telemetry/compare/v1.1.1...v1.1.2) (2021-04-06)
|
|
50
68
|
|
|
51
|
-
|
|
52
69
|
### Bug Fixes
|
|
53
70
|
|
|
54
|
-
|
|
71
|
+
- leif .yml merge [skip-validate-pr] ([6f48246](https://github.com/salesforcecli/plugin-telemetry/commit/6f482462d67c0658ea6045581a0ace92fcb96b71))
|
|
55
72
|
|
|
56
73
|
### [1.1.1](https://github.com/salesforcecli/plugin-telemetry/compare/v1.1.0...v1.1.1) (2021-02-04)
|
|
57
74
|
|
|
58
|
-
|
|
59
75
|
### Bug Fixes
|
|
60
76
|
|
|
61
|
-
|
|
62
|
-
|
|
77
|
+
- inclusive language cleanup ([37c1746](https://github.com/salesforcecli/plugin-telemetry/commit/37c1746c0d694c10311a2180b7833e401be6726f))
|
|
78
|
+
- update ci list ([1612f29](https://github.com/salesforcecli/plugin-telemetry/commit/1612f29a3beaee8b68064dab59f7d8b6dfc6043d))
|
package/LICENSE.txt
CHANGED
package/lib/commandExecution.js
CHANGED
|
@@ -36,10 +36,10 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
36
36
|
possibleVcsPath = await core_1.SfdxProject.resolveProjectPath();
|
|
37
37
|
}
|
|
38
38
|
catch (err) {
|
|
39
|
-
debuger_1.debug('Not in a sfdx project, using current working directory');
|
|
39
|
+
(0, debuger_1.debug)('Not in a sfdx project, using current working directory');
|
|
40
40
|
possibleVcsPath = process.cwd();
|
|
41
41
|
}
|
|
42
|
-
const gitPath = path_1.join(possibleVcsPath, '.git');
|
|
42
|
+
const gitPath = (0, path_1.join)(possibleVcsPath, '.git');
|
|
43
43
|
try {
|
|
44
44
|
await core_1.fs.access(gitPath, core_1.fs.constants.R_OK);
|
|
45
45
|
return 'git';
|
|
@@ -81,7 +81,7 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
81
81
|
// Execution information
|
|
82
82
|
date: new Date().toUTCString(),
|
|
83
83
|
// Don't log status or timestamp as a number, otherwise vscode will think it is a metric
|
|
84
|
-
status: ts_types_1.isNumber(this.status) ? this.status.toString() : undefined,
|
|
84
|
+
status: (0, ts_types_1.isNumber)(this.status) ? this.status.toString() : undefined,
|
|
85
85
|
timestamp: String(Date.now()),
|
|
86
86
|
runtime: Date.now() - this.start,
|
|
87
87
|
upTimeAtCmdStart: this.upTimeAtCmdStart,
|
|
@@ -116,10 +116,10 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
116
116
|
let flags = {};
|
|
117
117
|
try {
|
|
118
118
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
119
|
-
flags = parser_1.parse(argv, commandDef).flags;
|
|
119
|
+
flags = (0, parser_1.parse)(argv, commandDef).flags;
|
|
120
120
|
}
|
|
121
121
|
catch (error) {
|
|
122
|
-
debuger_1.debug('Error parsing flags');
|
|
122
|
+
(0, debuger_1.debug)('Error parsing flags');
|
|
123
123
|
}
|
|
124
124
|
this.orgUsername = flags['targetusername'];
|
|
125
125
|
this.devHubOrgUsername = flags['targetdevhubusername'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA4B;AAE5B,0CAA6C;AAC7C,2CAAmD;AACnD,yCAAiD;AACjD,mDAAmE;AACnE,uCAAkC;AAClC,yDAAiD;AAajD,MAAa,gBAAiB,SAAQ,oBAAc;IAelD,YAAmB,OAAgC;QACjD,KAAK,CAAC,OAAO,CAAC,CAAC;QAZT,mBAAc,GAAa,EAAE,CAAC;QAC9B,2BAAsB,GAAa,EAAE,CAAC;QAa5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,cAAc;QAChC,IAAI,eAAuB,CAAC;QAC5B,IAAI;YACF,eAAe,GAAG,MAAM,kBAAW,CAAC,kBAAkB,EAAE,CAAC;SAC1D;QAAC,OAAO,GAAG,EAAE;YACZ,eAAK,
|
|
1
|
+
{"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"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"}
|
package/lib/debuger.js
CHANGED
|
@@ -11,5 +11,5 @@ const debug_1 = require("debug");
|
|
|
11
11
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
12
12
|
const packageJson = require('../package.json');
|
|
13
13
|
exports.version = packageJson.version;
|
|
14
|
-
exports.debug = debug_1.default(`sfdx:telemetry@${exports.version}`);
|
|
14
|
+
exports.debug = (0, debug_1.default)(`sfdx:telemetry@${exports.version}`);
|
|
15
15
|
//# sourceMappingURL=debuger.js.map
|
package/lib/debuger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debuger.js","sourceRoot":"","sources":["../src/debuger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAA0B;AAO1B,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAgB,CAAC;AACjD,QAAA,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;AAE9B,QAAA,KAAK,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"debuger.js","sourceRoot":"","sources":["../src/debuger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAA0B;AAO1B,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAgB,CAAC;AACjD,QAAA,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;AAE9B,QAAA,KAAK,GAAG,IAAA,eAAK,EAAC,kBAAkB,eAAO,EAAE,CAAC,CAAC"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const path_1 = require("path");
|
|
10
|
+
const core_1 = require("@salesforce/core");
|
|
10
11
|
const telemetry_1 = require("@salesforce/telemetry");
|
|
11
12
|
const telemetry_2 = require("../telemetry");
|
|
12
13
|
const commandExecution_1 = require("../commandExecution");
|
|
@@ -21,34 +22,49 @@ const hook = async function (options) {
|
|
|
21
22
|
const telemetryEnabled = await telemetry_1.TelemetryReporter.determineSfdxTelemetryEnabled();
|
|
22
23
|
// Don't even bother logging if telemetry is disabled
|
|
23
24
|
if (!telemetryEnabled) {
|
|
24
|
-
debuger_1.debug('Telemetry disabled. Doing nothing.');
|
|
25
|
+
(0, debuger_1.debug)('Telemetry disabled. Doing nothing.');
|
|
25
26
|
return;
|
|
26
27
|
}
|
|
27
28
|
try {
|
|
28
29
|
// Instantiating telemetry shows data collection warning.
|
|
29
30
|
// Adding this to the global so that telemetry events are sent even when different
|
|
30
31
|
// versions of this plugin are in use by the CLI.
|
|
31
|
-
const telemetry = (global.cliTelemetry = await telemetry_2.default.create({
|
|
32
|
+
const telemetry = (global.cliTelemetry = await telemetry_2.default.create({
|
|
33
|
+
cacheDir: this.config.cacheDir,
|
|
34
|
+
executable: this.config.bin,
|
|
35
|
+
}));
|
|
32
36
|
const commandExecution = await commandExecution_1.CommandExecution.create({
|
|
33
37
|
command: options.Command,
|
|
34
38
|
argv: options.argv,
|
|
35
39
|
config: this.config,
|
|
36
40
|
});
|
|
41
|
+
let commonData;
|
|
42
|
+
try {
|
|
43
|
+
core_1.Lifecycle.getInstance().onTelemetry(async (data) => {
|
|
44
|
+
// lifecycle wants promises, telemetry is not a promise
|
|
45
|
+
// eslint-disable-next-line @typescript-eslint/await-thenable
|
|
46
|
+
await telemetry.record({
|
|
47
|
+
type: 'EVENT',
|
|
48
|
+
...commonDataMemoized(),
|
|
49
|
+
...data,
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
catch (err) {
|
|
54
|
+
// even if this throws, the rest of telemetry is not affected
|
|
55
|
+
const error = err;
|
|
56
|
+
(0, debuger_1.debug)('Error subscribing to telemetry events', error.message);
|
|
57
|
+
}
|
|
37
58
|
process.on('warning', (warning) => {
|
|
38
|
-
const pluginInfo = commandExecution.getPluginInfo();
|
|
39
59
|
telemetry.record({
|
|
60
|
+
...commonDataMemoized(),
|
|
40
61
|
eventName: 'NODE_WARNING',
|
|
41
62
|
warningType: warning.name,
|
|
42
63
|
stack: warning.stack,
|
|
43
64
|
message: warning.message,
|
|
44
|
-
nodeVersion: process.version,
|
|
45
|
-
plugin: pluginInfo.name,
|
|
46
|
-
// eslint-disable-next-line camelcase
|
|
47
|
-
plugin_version: pluginInfo.version,
|
|
48
|
-
command: commandExecution.getCommandName(),
|
|
49
65
|
});
|
|
50
66
|
});
|
|
51
|
-
debuger_1.debug('Setting up process exit handler');
|
|
67
|
+
(0, debuger_1.debug)('Setting up process exit handler');
|
|
52
68
|
process.once('exit', (status) => {
|
|
53
69
|
commandExecution.status = status;
|
|
54
70
|
telemetry.record(commandExecution.toJson());
|
|
@@ -64,7 +80,7 @@ const hook = async function (options) {
|
|
|
64
80
|
if (telemetry.firstRun) {
|
|
65
81
|
telemetry.record({
|
|
66
82
|
eventName: 'INSTALL',
|
|
67
|
-
installType: this.config.binPath && this.config.binPath.includes(path_1.join('sfdx', 'client')) ? 'installer' : 'npm',
|
|
83
|
+
installType: this.config.binPath && this.config.binPath.includes((0, path_1.join)('sfdx', 'client')) ? 'installer' : 'npm',
|
|
68
84
|
platform: this.config.platform,
|
|
69
85
|
});
|
|
70
86
|
}
|
|
@@ -96,10 +112,23 @@ const hook = async function (options) {
|
|
|
96
112
|
orgType,
|
|
97
113
|
}));
|
|
98
114
|
});
|
|
115
|
+
const commonDataMemoized = () => {
|
|
116
|
+
if (!commonData) {
|
|
117
|
+
const pluginInfo = commandExecution.getPluginInfo();
|
|
118
|
+
commonData = {
|
|
119
|
+
nodeVersion: process.version,
|
|
120
|
+
plugin: pluginInfo.name,
|
|
121
|
+
// eslint-disable-next-line camelcase
|
|
122
|
+
plugin_version: pluginInfo.version,
|
|
123
|
+
command: commandExecution.getCommandName(),
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
return commonData;
|
|
127
|
+
};
|
|
99
128
|
}
|
|
100
129
|
catch (err) {
|
|
101
130
|
const error = err;
|
|
102
|
-
debuger_1.debug('Error with logging or sending telemetry:', error.message);
|
|
131
|
+
(0, debuger_1.debug)('Error with logging or sending telemetry:', error.message);
|
|
103
132
|
}
|
|
104
133
|
};
|
|
105
134
|
exports.default = hook;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,+BAA4B;
|
|
1
|
+
{"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":"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"}
|
package/lib/telemetry.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { JsonMap } from '@salesforce/ts-types';
|
|
|
4
4
|
export declare type TelemetryOptions = {
|
|
5
5
|
cacheDir?: string;
|
|
6
6
|
telemetryFilePath?: string;
|
|
7
|
+
executable?: string;
|
|
7
8
|
};
|
|
8
9
|
export declare type CI = 'circleci' | 'travisci' | 'bitbucket' | 'hudson' | 'heroku' | 'codebuild' | 'bamboo' | 'cirrus' | 'jenkins' | 'github_actions' | 'azure_pipelines' | 'teamcity' | 'gitlab' | 'nevercode' | 'wercker' | 'buildkite' | 'semaphore' | 'bitrise' | 'buddy' | 'appveyor' | 'unknown';
|
|
9
10
|
export default class Telemetry extends AsyncCreatable {
|
|
@@ -20,6 +21,7 @@ export default class Telemetry extends AsyncCreatable {
|
|
|
20
21
|
*/
|
|
21
22
|
static tmpDir: string;
|
|
22
23
|
private static cacheDir;
|
|
24
|
+
private static executable;
|
|
23
25
|
private static telemetryTmpFile;
|
|
24
26
|
private static acknowledged;
|
|
25
27
|
firstRun: boolean;
|
package/lib/telemetry.js
CHANGED
|
@@ -28,6 +28,9 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
28
28
|
if (options.telemetryFilePath) {
|
|
29
29
|
Telemetry.telemetryTmpFile = options.telemetryFilePath;
|
|
30
30
|
}
|
|
31
|
+
if (options.executable) {
|
|
32
|
+
Telemetry.executable = options.executable;
|
|
33
|
+
}
|
|
31
34
|
}
|
|
32
35
|
/**
|
|
33
36
|
* Tell the user they acknowledge data collection.
|
|
@@ -38,13 +41,13 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
38
41
|
return;
|
|
39
42
|
}
|
|
40
43
|
if (!Telemetry.cacheDir) {
|
|
41
|
-
debuger_1.debug('Unable to check acknowledgment path because Telemetry.cacheDir is not set yet');
|
|
44
|
+
(0, debuger_1.debug)('Unable to check acknowledgment path because Telemetry.cacheDir is not set yet');
|
|
42
45
|
return;
|
|
43
46
|
}
|
|
44
|
-
const acknowledgementFilePath = path_1.join(Telemetry.cacheDir, USAGE_ACKNOWLEDGEMENT_FILE_NAME);
|
|
47
|
+
const acknowledgementFilePath = (0, path_1.join)(Telemetry.cacheDir, USAGE_ACKNOWLEDGEMENT_FILE_NAME);
|
|
45
48
|
try {
|
|
46
49
|
await core_1.fs.access(acknowledgementFilePath, core_1.fs.constants.R_OK);
|
|
47
|
-
debuger_1.debug('Usage acknowledgement file already exists');
|
|
50
|
+
(0, debuger_1.debug)('Usage acknowledgement file already exists');
|
|
48
51
|
}
|
|
49
52
|
catch (error) {
|
|
50
53
|
const err = error;
|
|
@@ -56,10 +59,10 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
56
59
|
Telemetry.acknowledged = true;
|
|
57
60
|
await core_1.fs.mkdirp(Telemetry.cacheDir);
|
|
58
61
|
await core_1.fs.writeJson(acknowledgementFilePath, { acknowledged: true });
|
|
59
|
-
debuger_1.debug('Wrote usage acknowledgement file', acknowledgementFilePath);
|
|
62
|
+
(0, debuger_1.debug)('Wrote usage acknowledgement file', acknowledgementFilePath);
|
|
60
63
|
}
|
|
61
64
|
else {
|
|
62
|
-
debuger_1.debug('Could not access', acknowledgementFilePath, 'DUE TO:', err.code, err.message);
|
|
65
|
+
(0, debuger_1.debug)('Could not access', acknowledgementFilePath, 'DUE TO:', err.code, err.message);
|
|
63
66
|
}
|
|
64
67
|
}
|
|
65
68
|
}
|
|
@@ -131,7 +134,7 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
131
134
|
}
|
|
132
135
|
}
|
|
133
136
|
static generateRandomId() {
|
|
134
|
-
return crypto_1.randomBytes(20).toString('hex');
|
|
137
|
+
return (0, crypto_1.randomBytes)(20).toString('hex');
|
|
135
138
|
}
|
|
136
139
|
getTelemetryFilePath() {
|
|
137
140
|
return Telemetry.telemetryTmpFile;
|
|
@@ -139,12 +142,12 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
139
142
|
getCLIId() {
|
|
140
143
|
if (this.cliId)
|
|
141
144
|
return this.cliId;
|
|
142
|
-
const cliIdPath = path_1.join(Telemetry.cacheDir, CLI_ID_FILE_NAME);
|
|
145
|
+
const cliIdPath = (0, path_1.join)(Telemetry.cacheDir, CLI_ID_FILE_NAME);
|
|
143
146
|
try {
|
|
144
147
|
this.cliId = systemFs.readFileSync(cliIdPath, 'utf8');
|
|
145
148
|
}
|
|
146
149
|
catch (err) {
|
|
147
|
-
debuger_1.debug('Unique CLI ID not found, generating and writing new ID to ', cliIdPath);
|
|
150
|
+
(0, debuger_1.debug)('Unique CLI ID not found, generating and writing new ID to ', cliIdPath);
|
|
148
151
|
this.cliId = Telemetry.generateRandomId();
|
|
149
152
|
systemFs.writeFileSync(cliIdPath, this.cliId, 'utf8');
|
|
150
153
|
// If there is not a unique ID for this CLI, consider it a first run.
|
|
@@ -161,7 +164,7 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
161
164
|
const dataToRecord = Object.keys(data).reduce((map, key) => {
|
|
162
165
|
const value = data[key];
|
|
163
166
|
const isException = data.type === Telemetry.EXCEPTION && key === 'error';
|
|
164
|
-
const validType = ts_types_1.isString(value) || ts_types_1.isBoolean(value) || ts_types_1.isNumber(value);
|
|
167
|
+
const validType = (0, ts_types_1.isString)(value) || (0, ts_types_1.isBoolean)(value) || (0, ts_types_1.isNumber)(value);
|
|
165
168
|
if (isException || validType) {
|
|
166
169
|
map[key] = value;
|
|
167
170
|
}
|
|
@@ -182,17 +185,18 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
182
185
|
// Replace HOME for GDPR.
|
|
183
186
|
dataToRecord.requestorLocation = locations[1].replace(process.env.HOME || '', '');
|
|
184
187
|
}
|
|
185
|
-
debuger_1.debug('Missing event name!');
|
|
188
|
+
(0, debuger_1.debug)('Missing event name!');
|
|
186
189
|
}
|
|
187
190
|
// Unique to this CLI installation
|
|
188
191
|
dataToRecord.cliId = this.getCLIId();
|
|
189
192
|
dataToRecord.ci = Telemetry.guessCISystem();
|
|
193
|
+
dataToRecord.executable = Telemetry.executable;
|
|
190
194
|
try {
|
|
191
195
|
systemFs.writeSync(this.fileDescriptor, JSON.stringify(dataToRecord) + os_1.EOL);
|
|
192
196
|
}
|
|
193
197
|
catch (err) {
|
|
194
198
|
const error = err;
|
|
195
|
-
debuger_1.debug(`Error saving telemetry line to file: ${error.message}`);
|
|
199
|
+
(0, debuger_1.debug)(`Error saving telemetry line to file: ${error.message}`);
|
|
196
200
|
}
|
|
197
201
|
}
|
|
198
202
|
recordError(error, data) {
|
|
@@ -208,12 +212,12 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
208
212
|
this.record(data);
|
|
209
213
|
}
|
|
210
214
|
async clear() {
|
|
211
|
-
debuger_1.debug('Deleting the log file', this.getTelemetryFilePath());
|
|
215
|
+
(0, debuger_1.debug)('Deleting the log file', this.getTelemetryFilePath());
|
|
212
216
|
await core_1.fs.unlink(this.getTelemetryFilePath());
|
|
213
217
|
}
|
|
214
218
|
async read() {
|
|
215
219
|
try {
|
|
216
|
-
debuger_1.debug(`Reading ${this.getTelemetryFilePath()}`);
|
|
220
|
+
(0, debuger_1.debug)(`Reading ${this.getTelemetryFilePath()}`);
|
|
217
221
|
const data = await core_1.fs.readFile(this.getTelemetryFilePath(), 'utf8');
|
|
218
222
|
const events = data
|
|
219
223
|
.split(os_1.EOL)
|
|
@@ -223,26 +227,26 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
223
227
|
}
|
|
224
228
|
catch (error) {
|
|
225
229
|
const err = error;
|
|
226
|
-
debuger_1.debug(`Error reading: ${err.message}`);
|
|
230
|
+
(0, debuger_1.debug)(`Error reading: ${err.message}`);
|
|
227
231
|
// If anything goes wrong, it just means a couple of lost telemetry events.
|
|
228
232
|
return [];
|
|
229
233
|
}
|
|
230
234
|
}
|
|
231
235
|
upload() {
|
|
232
236
|
// Completely disconnect from this process so it doesn't wait for telemetry to upload
|
|
233
|
-
const processPath = path_1.join(__dirname, '..', 'processes', 'upload');
|
|
237
|
+
const processPath = (0, path_1.join)(__dirname, '..', 'processes', 'upload');
|
|
234
238
|
const telemetryDebug = kit_1.env.getBoolean('SFDX_TELEMETRY_DEBUG', false);
|
|
235
239
|
const nodePath = process.argv[0];
|
|
236
240
|
// Don't spawn if we are in telemetry debug. This allows us to run the process manually with --inspect-brk.
|
|
237
241
|
if (!telemetryDebug) {
|
|
238
|
-
debuger_1.debug(`Spawning "${nodePath} ${processPath} ${Telemetry.cacheDir} ${this.getTelemetryFilePath()}"`);
|
|
239
|
-
child_process_1.spawn(nodePath, [processPath, Telemetry.cacheDir, this.getTelemetryFilePath()], {
|
|
242
|
+
(0, debuger_1.debug)(`Spawning "${nodePath} ${processPath} ${Telemetry.cacheDir} ${this.getTelemetryFilePath()}"`);
|
|
243
|
+
(0, child_process_1.spawn)(nodePath, [processPath, Telemetry.cacheDir, this.getTelemetryFilePath()], {
|
|
240
244
|
detached: true,
|
|
241
245
|
stdio: 'ignore',
|
|
242
246
|
}).unref();
|
|
243
247
|
}
|
|
244
248
|
else {
|
|
245
|
-
debuger_1.debug(
|
|
249
|
+
(0, debuger_1.debug)(
|
|
246
250
|
// eslint-disable-next-line prettier/prettier
|
|
247
251
|
`DEBUG MODE. Run the uploader manually with the following command:${os_1.EOL}${processPath} ${Telemetry.cacheDir} ${this.getTelemetryFilePath()}`);
|
|
248
252
|
}
|
|
@@ -257,13 +261,13 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
257
261
|
catch (error) {
|
|
258
262
|
const err = error;
|
|
259
263
|
if (err.code === 'ENOENT') {
|
|
260
|
-
debuger_1.debug('Telemetry temp dir does not exist, creating...');
|
|
264
|
+
(0, debuger_1.debug)('Telemetry temp dir does not exist, creating...');
|
|
261
265
|
await core_1.fs.mkdirp(Telemetry.tmpDir);
|
|
262
266
|
}
|
|
263
267
|
}
|
|
264
268
|
// Create a file descriptor to be used
|
|
265
269
|
this.fileDescriptor = systemFs.openSync(this.getTelemetryFilePath(), 'a');
|
|
266
|
-
debuger_1.debug(`Using telemetry logging file ${this.getTelemetryFilePath()}`);
|
|
270
|
+
(0, debuger_1.debug)(`Using telemetry logging file ${this.getTelemetryFilePath()}`);
|
|
267
271
|
}
|
|
268
272
|
}
|
|
269
273
|
exports.default = Telemetry;
|
|
@@ -278,7 +282,8 @@ Telemetry.EXCEPTION = 'EXCEPTION';
|
|
|
278
282
|
/**
|
|
279
283
|
* The temporary directory where telemetry log files are stored.
|
|
280
284
|
*/
|
|
281
|
-
Telemetry.tmpDir = kit_1.env.getString('SFDX_TELEMETRY_PATH', path_1.join(os_1.tmpdir(), 'sfdx-telemetry'));
|
|
282
|
-
Telemetry.
|
|
285
|
+
Telemetry.tmpDir = kit_1.env.getString('SFDX_TELEMETRY_PATH', (0, path_1.join)((0, os_1.tmpdir)(), 'sfdx-telemetry'));
|
|
286
|
+
Telemetry.executable = 'sfdx';
|
|
287
|
+
Telemetry.telemetryTmpFile = (0, path_1.join)(Telemetry.tmpDir, `telemetry-${Telemetry.generateRandomId()}.log`);
|
|
283
288
|
Telemetry.acknowledged = false;
|
|
284
289
|
//# sourceMappingURL=telemetry.js.map
|
package/lib/telemetry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iDAAsC;AACtC,mCAAqC;AACrC,+BAA+B;AAC/B,2BAAiC;AACjC,+BAA4B;AAE5B,yCAAsD;AACtD,2CAAiD;AACjD,mDAA8E;AAC9E,uCAAkC;AAElC,MAAM,gBAAgB,GAAG,WAAW,CAAC;AACrC,MAAM,+BAA+B,GAAG,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"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"}
|
package/lib/telemetryGlobal.d.ts
CHANGED
package/lib/uploader.js
CHANGED
|
@@ -41,7 +41,7 @@ class Uploader {
|
|
|
41
41
|
}
|
|
42
42
|
catch (err) {
|
|
43
43
|
const error = err;
|
|
44
|
-
debuger_1.debug(`Error creating reporter: ${error.message}`);
|
|
44
|
+
(0, debuger_1.debug)(`Error creating reporter: ${error.message}`);
|
|
45
45
|
// We can't do much without a reporter, so clear the telemetry file and move on.
|
|
46
46
|
await this.telemetry.clear();
|
|
47
47
|
return;
|
|
@@ -49,15 +49,15 @@ class Uploader {
|
|
|
49
49
|
try {
|
|
50
50
|
const events = await this.telemetry.read();
|
|
51
51
|
for (const event of events) {
|
|
52
|
-
const eventType = ts_types_1.asString(event.type) || telemetry_2.default.EVENT;
|
|
53
|
-
const eventName = ts_types_1.asString(event.eventName) || 'UNKNOWN';
|
|
52
|
+
const eventType = (0, ts_types_1.asString)(event.type) || telemetry_2.default.EVENT;
|
|
53
|
+
const eventName = (0, ts_types_1.asString)(event.eventName) || 'UNKNOWN';
|
|
54
54
|
delete event.type;
|
|
55
55
|
delete event.eventName;
|
|
56
56
|
if (eventType === telemetry_2.default.EVENT) {
|
|
57
57
|
event.telemetryVersion = debuger_1.version;
|
|
58
58
|
// Resolve orgs for all events.
|
|
59
|
-
event.orgId = await this.getOrgId(false, ts_types_1.asString(event.orgUsername));
|
|
60
|
-
event.devHubId = await this.getOrgId(true, ts_types_1.asString(event.devHubUsername));
|
|
59
|
+
event.orgId = await this.getOrgId(false, (0, ts_types_1.asString)(event.orgUsername));
|
|
60
|
+
event.devHubId = await this.getOrgId(true, (0, ts_types_1.asString)(event.devHubUsername));
|
|
61
61
|
// Usernames are GDPR info, so don't log.
|
|
62
62
|
delete event.orgUsername;
|
|
63
63
|
delete event.devHubUsername;
|
|
@@ -69,16 +69,16 @@ class Uploader {
|
|
|
69
69
|
const errorObject = event.error;
|
|
70
70
|
delete event.error;
|
|
71
71
|
Object.assign(error, errorObject);
|
|
72
|
-
error.name = ts_types_1.asString(errorObject.name) || 'Unknown';
|
|
73
|
-
error.message = ts_types_1.asString(errorObject.message) || 'Unknown';
|
|
74
|
-
error.stack = ts_types_1.asString(errorObject.stack) || 'Unknown';
|
|
72
|
+
error.name = (0, ts_types_1.asString)(errorObject.name) || 'Unknown';
|
|
73
|
+
error.message = (0, ts_types_1.asString)(errorObject.message) || 'Unknown';
|
|
74
|
+
error.stack = (0, ts_types_1.asString)(errorObject.stack) || 'Unknown';
|
|
75
75
|
reporter.sendTelemetryException(error, event);
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
catch (err) {
|
|
80
80
|
const error = err;
|
|
81
|
-
debuger_1.debug(`Error reading or sending telemetry events: ${error.message}`);
|
|
81
|
+
(0, debuger_1.debug)(`Error reading or sending telemetry events: ${error.message}`);
|
|
82
82
|
}
|
|
83
83
|
finally {
|
|
84
84
|
try {
|
|
@@ -87,7 +87,7 @@ class Uploader {
|
|
|
87
87
|
}
|
|
88
88
|
catch (err) {
|
|
89
89
|
const error = err;
|
|
90
|
-
debuger_1.debug(`Error stopping telemetry reporter: ${error.message}`);
|
|
90
|
+
(0, debuger_1.debug)(`Error stopping telemetry reporter: ${error.message}`);
|
|
91
91
|
}
|
|
92
92
|
finally {
|
|
93
93
|
// We alway want to clear the file.
|
package/lib/uploader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../src/uploader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAAkD;AAClD,qDAAsD;AACtD,mDAA4D;AAC5D,2CAAoC;AACpC,uCAA2C;AAM3C,MAAM,OAAO,GAAG,gBAAgB,CAAC;AACjC,MAAM,gBAAgB,GAAG,sCAAsC,CAAC;AAEhE,MAAa,QAAQ;IACnB,YAA4B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAEpD;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,iBAAyB;QACpE,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,MAAM,mBAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAClG,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,QAAQ,CAAC,eAAe,EAAE,CAAC;IACnC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,eAAe;QAC3B,IAAI,QAA2B,CAAC;QAChC,IAAI;YACF,QAAQ,GAAG,MAAM,mBAAiB,CAAC,MAAM,CAAC;gBACxC,OAAO,EAAE,OAAO;gBAChB,GAAG,EAAE,gBAAgB;gBACrB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;gBACjC,iBAAiB,EAAE,IAAI;aACxB,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,KAAK,GAAG,GAAgB,CAAC;YAC/B,eAAK,
|
|
1
|
+
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../src/uploader.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"1.
|
|
1
|
+
{"version":"1.4.0","commands":{"telemetry":{"id":"telemetry","pluginName":"@salesforce/plugin-telemetry","pluginType":"core","hidden":true,"aliases":[],"flags":{},"args":[]}}}
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-telemetry",
|
|
3
3
|
"description": "Command usage and error telemetry for the Salesforce CLI",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.4.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@oclif/config": "^1",
|
|
9
|
-
"@salesforce/command": "^4.
|
|
10
|
-
"@salesforce/core": "^2.
|
|
11
|
-
"@salesforce/telemetry": "^
|
|
9
|
+
"@salesforce/command": "^4.2.0",
|
|
10
|
+
"@salesforce/core": "^2.31.0",
|
|
11
|
+
"@salesforce/telemetry": "^3.1.0",
|
|
12
12
|
"tslib": "^2"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"@oclif/plugin-command-snapshot": "^2.0.0",
|
|
17
17
|
"@salesforce/cli-plugins-testkit": "^1.1.5",
|
|
18
18
|
"@salesforce/dev-config": "^2.1.2",
|
|
19
|
-
"@salesforce/dev-scripts": "0.
|
|
19
|
+
"@salesforce/dev-scripts": "^1.0.0",
|
|
20
20
|
"@salesforce/plugin-command-reference": "^1.3.0",
|
|
21
21
|
"@salesforce/prettier-config": "^0.0.2",
|
|
22
22
|
"@salesforce/ts-sinon": "1.3.21",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"eslint-config-salesforce-license": "^0.1.6",
|
|
32
32
|
"eslint-config-salesforce-typescript": "^0.2.7",
|
|
33
33
|
"eslint-plugin-header": "^3.1.1",
|
|
34
|
-
"eslint-plugin-import": "2.
|
|
34
|
+
"eslint-plugin-import": "2.25.3",
|
|
35
35
|
"eslint-plugin-jsdoc": "^35.1.2",
|
|
36
36
|
"eslint-plugin-prettier": "^3.1.3",
|
|
37
|
-
"husky": "^
|
|
37
|
+
"husky": "^7.0.4",
|
|
38
38
|
"lint-staged": "^11.0.0",
|
|
39
39
|
"mocha": "^8.4.0",
|
|
40
40
|
"nyc": "^15.1.0",
|
|
@@ -101,18 +101,11 @@
|
|
|
101
101
|
"test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000 --parallel",
|
|
102
102
|
"version": "oclif-dev readme"
|
|
103
103
|
},
|
|
104
|
-
"husky": {
|
|
105
|
-
"hooks": {
|
|
106
|
-
"pre-commit": "sf-husky-pre-commit",
|
|
107
|
-
"commit-msg": "sf-husky-commit-msg",
|
|
108
|
-
"pre-push": "sf-husky-pre-push"
|
|
109
|
-
}
|
|
110
|
-
},
|
|
111
104
|
"publishConfig": {
|
|
112
105
|
"access": "public"
|
|
113
106
|
},
|
|
114
107
|
"sfdx": {
|
|
115
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/1.
|
|
116
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/1.
|
|
108
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/1.4.0.crt",
|
|
109
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/1.4.0.sig"
|
|
117
110
|
}
|
|
118
111
|
}
|