@salesforce/plugin-telemetry 1.2.8 → 1.3.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 +12 -0
- 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 +36 -10
- package/lib/hooks/telemetryPrerun.js.map +1 -1
- package/lib/telemetry.js +22 -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 +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,18 @@
|
|
|
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
|
+
## [1.3.0](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.8...v1.3.0) (2021-11-17)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* forwards telemetry ([292a296](https://github.com/salesforcecli/plugin-telemetry/commit/292a296ced7537c06ffebb3e567d4495f0022118))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* set event type ([120bbf1](https://github.com/salesforcecli/plugin-telemetry/commit/120bbf1b40377dacf61186ae27a413a37e8441fc))
|
|
16
|
+
|
|
5
17
|
### [1.2.8](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.7...v1.2.8) (2021-10-12)
|
|
6
18
|
|
|
7
19
|
### [1.2.7](https://github.com/salesforcecli/plugin-telemetry/compare/v1.2.6...v1.2.7) (2021-10-08)
|
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":";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,IAAA,eAAK,EAAC,wDAAwD,CAAC,CAAC;YAChE,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;SACjC;QAED,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAI;YACF,MAAM,SAAE,CAAC,MAAM,CAAC,OAAO,EAAE,SAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,OAAO,CAAC;SAChB;IACH,CAAC;IAEM,MAAM;QACX,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,OAAO;YACL,SAAS,EAAE,mBAAmB;YAC9B,qBAAqB;YACrB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YAC7B,WAAW,EAAE,OAAO,CAAC,OAAO;YAC5B,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI;YAEtC,kBAAkB;YAClB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;YAC3B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAC7B,MAAM,EAAE,UAAU,CAAC,IAAI;YACvB,qCAAqC;YACrC,cAAc,EAAE,UAAU,CAAC,OAAO;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YACxB,+CAA+C;YAC/C,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7C,gDAAgD;YAChD,sBAAsB,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7D,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YAC7B,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;YACxC,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAClD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;YAC3B,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YAE7C,wBAAwB;YACxB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC9B,wFAAwF;YACxF,MAAM,EAAE,IAAA,mBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;YAClE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK;YAChC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,wBAAQ,CAAC,YAAY;YACpC,eAAe,EAAE,IAAI,CAAC,gBAAgB,GAAG,wBAAQ,CAAC,YAAY;YAE9D,yBAAyB;YACzB,8DAA8D;YAC9D,wEAAwE;YACxE,kDAAkD;YAClD,cAAc,EAAE,IAAI,CAAC,iBAAiB;YACtC,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;IACJ,CAAC;IAEM,aAAa;QAClB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;YACrD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO;SAC5D,CAAC;IACJ,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IACzB,CAAC;IAES,KAAK,CAAC,IAAI;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAEjD,wFAAwF;QACxF,8DAA8D;QAC9D,MAAM,MAAM,GAAQ,IAAI,CAAC,OAAO,CAAC;QACjC,sEAAsE;QACtE,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAEhG,8DAA8D;QAC9D,IAAI,KAAK,GAAe,EAAE,CAAC;QAC3B,IAAI;YACF,mEAAmE;YACnE,KAAK,GAAG,IAAA,cAAK,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC;SACvC;QAAC,OAAO,KAAK,EAAE;YACd,IAAA,eAAK,EAAC,qBAAqB,CAAC,CAAC;SAC9B;QACD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,gBAAgB,CAAW,CAAC;QACrD,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,sBAAsB,CAAW,CAAC;QAEjE,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;QAE3D,IAAI,CAAC,GAAG,GAAG,MAAM,gBAAgB,CAAC,cAAc,EAAE,CAAC;IACrD,CAAC;IAED,8DAA8D;IACtD,uBAAuB,CAAC,IAAc,EAAE,KAAU,EAAE,eAA2B;QACrF,oCAAoC;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,IAAI,SAAS,IAAI,QAAQ,EAAE;YACzB,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;iBAAM;gBACL,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAClC;YACD,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzC,kEAAkE;SACnE;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACtC,sEAAsE;gBACtE,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,IAAe,CAAC;gBAC1F,uFAAuF;gBACvF,kDAAkD;gBAClD,IAAI,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,SAAS,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;oBAClF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACpC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC5C;qBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,QAAQ,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC5E,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACnC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC5C;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CACF;AArKD,4CAqKC"}
|
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,7 +22,7 @@ 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 {
|
|
@@ -37,21 +38,33 @@ const hook = async function (options) {
|
|
|
37
38
|
argv: options.argv,
|
|
38
39
|
config: this.config,
|
|
39
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
|
+
}
|
|
40
58
|
process.on('warning', (warning) => {
|
|
41
|
-
const pluginInfo = commandExecution.getPluginInfo();
|
|
42
59
|
telemetry.record({
|
|
60
|
+
...commonDataMemoized(),
|
|
43
61
|
eventName: 'NODE_WARNING',
|
|
44
62
|
warningType: warning.name,
|
|
45
63
|
stack: warning.stack,
|
|
46
64
|
message: warning.message,
|
|
47
|
-
nodeVersion: process.version,
|
|
48
|
-
plugin: pluginInfo.name,
|
|
49
|
-
// eslint-disable-next-line camelcase
|
|
50
|
-
plugin_version: pluginInfo.version,
|
|
51
|
-
command: commandExecution.getCommandName(),
|
|
52
65
|
});
|
|
53
66
|
});
|
|
54
|
-
debuger_1.debug('Setting up process exit handler');
|
|
67
|
+
(0, debuger_1.debug)('Setting up process exit handler');
|
|
55
68
|
process.once('exit', (status) => {
|
|
56
69
|
commandExecution.status = status;
|
|
57
70
|
telemetry.record(commandExecution.toJson());
|
|
@@ -67,7 +80,7 @@ const hook = async function (options) {
|
|
|
67
80
|
if (telemetry.firstRun) {
|
|
68
81
|
telemetry.record({
|
|
69
82
|
eventName: 'INSTALL',
|
|
70
|
-
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',
|
|
71
84
|
platform: this.config.platform,
|
|
72
85
|
});
|
|
73
86
|
}
|
|
@@ -99,10 +112,23 @@ const hook = async function (options) {
|
|
|
99
112
|
orgType,
|
|
100
113
|
}));
|
|
101
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
|
+
};
|
|
102
128
|
}
|
|
103
129
|
catch (err) {
|
|
104
130
|
const error = err;
|
|
105
|
-
debuger_1.debug('Error with logging or sending telemetry:', error.message);
|
|
131
|
+
(0, debuger_1.debug)('Error with logging or sending telemetry:', error.message);
|
|
106
132
|
}
|
|
107
133
|
};
|
|
108
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.js
CHANGED
|
@@ -41,13 +41,13 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
if (!Telemetry.cacheDir) {
|
|
44
|
-
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');
|
|
45
45
|
return;
|
|
46
46
|
}
|
|
47
|
-
const acknowledgementFilePath = path_1.join(Telemetry.cacheDir, USAGE_ACKNOWLEDGEMENT_FILE_NAME);
|
|
47
|
+
const acknowledgementFilePath = (0, path_1.join)(Telemetry.cacheDir, USAGE_ACKNOWLEDGEMENT_FILE_NAME);
|
|
48
48
|
try {
|
|
49
49
|
await core_1.fs.access(acknowledgementFilePath, core_1.fs.constants.R_OK);
|
|
50
|
-
debuger_1.debug('Usage acknowledgement file already exists');
|
|
50
|
+
(0, debuger_1.debug)('Usage acknowledgement file already exists');
|
|
51
51
|
}
|
|
52
52
|
catch (error) {
|
|
53
53
|
const err = error;
|
|
@@ -59,10 +59,10 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
59
59
|
Telemetry.acknowledged = true;
|
|
60
60
|
await core_1.fs.mkdirp(Telemetry.cacheDir);
|
|
61
61
|
await core_1.fs.writeJson(acknowledgementFilePath, { acknowledged: true });
|
|
62
|
-
debuger_1.debug('Wrote usage acknowledgement file', acknowledgementFilePath);
|
|
62
|
+
(0, debuger_1.debug)('Wrote usage acknowledgement file', acknowledgementFilePath);
|
|
63
63
|
}
|
|
64
64
|
else {
|
|
65
|
-
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);
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
}
|
|
@@ -134,7 +134,7 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
136
|
static generateRandomId() {
|
|
137
|
-
return crypto_1.randomBytes(20).toString('hex');
|
|
137
|
+
return (0, crypto_1.randomBytes)(20).toString('hex');
|
|
138
138
|
}
|
|
139
139
|
getTelemetryFilePath() {
|
|
140
140
|
return Telemetry.telemetryTmpFile;
|
|
@@ -142,12 +142,12 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
142
142
|
getCLIId() {
|
|
143
143
|
if (this.cliId)
|
|
144
144
|
return this.cliId;
|
|
145
|
-
const cliIdPath = path_1.join(Telemetry.cacheDir, CLI_ID_FILE_NAME);
|
|
145
|
+
const cliIdPath = (0, path_1.join)(Telemetry.cacheDir, CLI_ID_FILE_NAME);
|
|
146
146
|
try {
|
|
147
147
|
this.cliId = systemFs.readFileSync(cliIdPath, 'utf8');
|
|
148
148
|
}
|
|
149
149
|
catch (err) {
|
|
150
|
-
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);
|
|
151
151
|
this.cliId = Telemetry.generateRandomId();
|
|
152
152
|
systemFs.writeFileSync(cliIdPath, this.cliId, 'utf8');
|
|
153
153
|
// If there is not a unique ID for this CLI, consider it a first run.
|
|
@@ -164,7 +164,7 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
164
164
|
const dataToRecord = Object.keys(data).reduce((map, key) => {
|
|
165
165
|
const value = data[key];
|
|
166
166
|
const isException = data.type === Telemetry.EXCEPTION && key === 'error';
|
|
167
|
-
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);
|
|
168
168
|
if (isException || validType) {
|
|
169
169
|
map[key] = value;
|
|
170
170
|
}
|
|
@@ -185,7 +185,7 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
185
185
|
// Replace HOME for GDPR.
|
|
186
186
|
dataToRecord.requestorLocation = locations[1].replace(process.env.HOME || '', '');
|
|
187
187
|
}
|
|
188
|
-
debuger_1.debug('Missing event name!');
|
|
188
|
+
(0, debuger_1.debug)('Missing event name!');
|
|
189
189
|
}
|
|
190
190
|
// Unique to this CLI installation
|
|
191
191
|
dataToRecord.cliId = this.getCLIId();
|
|
@@ -196,7 +196,7 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
196
196
|
}
|
|
197
197
|
catch (err) {
|
|
198
198
|
const error = err;
|
|
199
|
-
debuger_1.debug(`Error saving telemetry line to file: ${error.message}`);
|
|
199
|
+
(0, debuger_1.debug)(`Error saving telemetry line to file: ${error.message}`);
|
|
200
200
|
}
|
|
201
201
|
}
|
|
202
202
|
recordError(error, data) {
|
|
@@ -212,12 +212,12 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
212
212
|
this.record(data);
|
|
213
213
|
}
|
|
214
214
|
async clear() {
|
|
215
|
-
debuger_1.debug('Deleting the log file', this.getTelemetryFilePath());
|
|
215
|
+
(0, debuger_1.debug)('Deleting the log file', this.getTelemetryFilePath());
|
|
216
216
|
await core_1.fs.unlink(this.getTelemetryFilePath());
|
|
217
217
|
}
|
|
218
218
|
async read() {
|
|
219
219
|
try {
|
|
220
|
-
debuger_1.debug(`Reading ${this.getTelemetryFilePath()}`);
|
|
220
|
+
(0, debuger_1.debug)(`Reading ${this.getTelemetryFilePath()}`);
|
|
221
221
|
const data = await core_1.fs.readFile(this.getTelemetryFilePath(), 'utf8');
|
|
222
222
|
const events = data
|
|
223
223
|
.split(os_1.EOL)
|
|
@@ -227,26 +227,26 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
227
227
|
}
|
|
228
228
|
catch (error) {
|
|
229
229
|
const err = error;
|
|
230
|
-
debuger_1.debug(`Error reading: ${err.message}`);
|
|
230
|
+
(0, debuger_1.debug)(`Error reading: ${err.message}`);
|
|
231
231
|
// If anything goes wrong, it just means a couple of lost telemetry events.
|
|
232
232
|
return [];
|
|
233
233
|
}
|
|
234
234
|
}
|
|
235
235
|
upload() {
|
|
236
236
|
// Completely disconnect from this process so it doesn't wait for telemetry to upload
|
|
237
|
-
const processPath = path_1.join(__dirname, '..', 'processes', 'upload');
|
|
237
|
+
const processPath = (0, path_1.join)(__dirname, '..', 'processes', 'upload');
|
|
238
238
|
const telemetryDebug = kit_1.env.getBoolean('SFDX_TELEMETRY_DEBUG', false);
|
|
239
239
|
const nodePath = process.argv[0];
|
|
240
240
|
// Don't spawn if we are in telemetry debug. This allows us to run the process manually with --inspect-brk.
|
|
241
241
|
if (!telemetryDebug) {
|
|
242
|
-
debuger_1.debug(`Spawning "${nodePath} ${processPath} ${Telemetry.cacheDir} ${this.getTelemetryFilePath()}"`);
|
|
243
|
-
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()], {
|
|
244
244
|
detached: true,
|
|
245
245
|
stdio: 'ignore',
|
|
246
246
|
}).unref();
|
|
247
247
|
}
|
|
248
248
|
else {
|
|
249
|
-
debuger_1.debug(
|
|
249
|
+
(0, debuger_1.debug)(
|
|
250
250
|
// eslint-disable-next-line prettier/prettier
|
|
251
251
|
`DEBUG MODE. Run the uploader manually with the following command:${os_1.EOL}${processPath} ${Telemetry.cacheDir} ${this.getTelemetryFilePath()}`);
|
|
252
252
|
}
|
|
@@ -261,13 +261,13 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
261
261
|
catch (error) {
|
|
262
262
|
const err = error;
|
|
263
263
|
if (err.code === 'ENOENT') {
|
|
264
|
-
debuger_1.debug('Telemetry temp dir does not exist, creating...');
|
|
264
|
+
(0, debuger_1.debug)('Telemetry temp dir does not exist, creating...');
|
|
265
265
|
await core_1.fs.mkdirp(Telemetry.tmpDir);
|
|
266
266
|
}
|
|
267
267
|
}
|
|
268
268
|
// Create a file descriptor to be used
|
|
269
269
|
this.fileDescriptor = systemFs.openSync(this.getTelemetryFilePath(), 'a');
|
|
270
|
-
debuger_1.debug(`Using telemetry logging file ${this.getTelemetryFilePath()}`);
|
|
270
|
+
(0, debuger_1.debug)(`Using telemetry logging file ${this.getTelemetryFilePath()}`);
|
|
271
271
|
}
|
|
272
272
|
}
|
|
273
273
|
exports.default = Telemetry;
|
|
@@ -282,8 +282,8 @@ Telemetry.EXCEPTION = 'EXCEPTION';
|
|
|
282
282
|
/**
|
|
283
283
|
* The temporary directory where telemetry log files are stored.
|
|
284
284
|
*/
|
|
285
|
-
Telemetry.tmpDir = kit_1.env.getString('SFDX_TELEMETRY_PATH', path_1.join(os_1.tmpdir(), 'sfdx-telemetry'));
|
|
285
|
+
Telemetry.tmpDir = kit_1.env.getString('SFDX_TELEMETRY_PATH', (0, path_1.join)((0, os_1.tmpdir)(), 'sfdx-telemetry'));
|
|
286
286
|
Telemetry.executable = 'sfdx';
|
|
287
|
-
Telemetry.telemetryTmpFile = path_1.join(Telemetry.tmpDir, `telemetry-${Telemetry.generateRandomId()}.log`);
|
|
287
|
+
Telemetry.telemetryTmpFile = (0, path_1.join)(Telemetry.tmpDir, `telemetry-${Telemetry.generateRandomId()}.log`);
|
|
288
288
|
Telemetry.acknowledged = false;
|
|
289
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;AA+B3E,MAAqB,SAAU,SAAQ,oBAAc;IAyBnD,YAAmB,OAAyB;QAC1C,KAAK,CAAC,OAAO,CAAC,CAAC;QALV,aAAQ,GAAG,KAAK,CAAC;QAOtB,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3C,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;SACvC;QACD,gEAAgE;QAChE,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC7B,SAAS,CAAC,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;SACxD;QAED,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,SAAS,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;SAC3C;IACH,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,yBAAyB;QAC3C,6EAA6E;QAC7E,IAAI,SAAS,CAAC,YAAY,EAAE;YAC1B,OAAO;SACR;QAED,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;YACvB,eAAK,
|
|
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":";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,IAAA,eAAK,EAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACnD,gFAAgF;YAChF,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YAC7B,OAAO;SACR;QAED,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC;gBAC1D,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,KAAK,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC;gBACzD,OAAO,KAAK,CAAC,IAAI,CAAC;gBAClB,OAAO,KAAK,CAAC,SAAS,CAAC;gBAEvB,IAAI,SAAS,KAAK,mBAAS,CAAC,KAAK,EAAE;oBACjC,KAAK,CAAC,gBAAgB,GAAG,iBAAO,CAAC;oBACjC,+BAA+B;oBAC/B,KAAK,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAA,mBAAQ,EAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;oBACtE,KAAK,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAA,mBAAQ,EAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;oBAC3E,yCAAyC;oBACzC,OAAO,KAAK,CAAC,WAAW,CAAC;oBACzB,OAAO,KAAK,CAAC,cAAc,CAAC;oBAE5B,QAAQ,CAAC,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;iBAC/C;qBAAM,IAAI,SAAS,KAAK,mBAAS,CAAC,SAAS,EAAE;oBAC5C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;oBAC1B,yDAAyD;oBACzD,MAAM,WAAW,GAAG,KAAK,CAAC,KAA8B,CAAC;oBACzD,OAAO,KAAK,CAAC,KAAK,CAAC;oBAEnB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;oBAClC,KAAK,CAAC,IAAI,GAAG,IAAA,mBAAQ,EAAC,WAAW,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;oBACrD,KAAK,CAAC,OAAO,GAAG,IAAA,mBAAQ,EAAC,WAAW,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;oBAC3D,KAAK,CAAC,KAAK,GAAG,IAAA,mBAAQ,EAAC,WAAW,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC;oBACvD,QAAQ,CAAC,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBAC/C;aACF;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,KAAK,GAAG,GAAgB,CAAC;YAC/B,IAAA,eAAK,EAAC,8CAA8C,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACtE;gBAAS;YACR,IAAI;gBACF,6BAA6B;gBAC7B,QAAQ,CAAC,IAAI,EAAE,CAAC;aACjB;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,KAAK,GAAG,GAAgB,CAAC;gBAC/B,IAAA,eAAK,EAAC,sCAAsC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aAC9D;oBAAS;gBACR,mCAAmC;gBACnC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;aAC9B;SACF;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,QAAiB,EAAE,eAAwB;QAChE,MAAM,UAAU,GAAgB,EAAE,QAAQ,EAAE,CAAC;QAE7C,wDAAwD;QACxD,IAAI,eAAe,EAAE;YACnB,UAAU,CAAC,eAAe,GAAG,eAAe,CAAC;SAC9C;QACD,IAAI;YACF,OAAO,CAAC,MAAM,UAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;SAClD;QAAC,OAAO,KAAK,EAAE;YACd,uDAAuD;SACxD;IACH,CAAC;CACF;AA7FD,4BA6FC"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"1.
|
|
1
|
+
{"version":"1.3.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.3.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@oclif/config": "^1",
|
|
9
9
|
"@salesforce/command": "^4.1.1",
|
|
10
|
-
"@salesforce/core": "^2.
|
|
11
|
-
"@salesforce/telemetry": "^
|
|
10
|
+
"@salesforce/core": "^2.29.0",
|
|
11
|
+
"@salesforce/telemetry": "^3.0.1",
|
|
12
12
|
"tslib": "^2"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
@@ -31,7 +31,7 @@
|
|
|
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.2",
|
|
35
35
|
"eslint-plugin-jsdoc": "^35.1.2",
|
|
36
36
|
"eslint-plugin-prettier": "^3.1.3",
|
|
37
37
|
"husky": "^4.3.8",
|
|
@@ -112,7 +112,7 @@
|
|
|
112
112
|
"access": "public"
|
|
113
113
|
},
|
|
114
114
|
"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.
|
|
115
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/1.3.0.crt",
|
|
116
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/1.3.0.sig"
|
|
117
117
|
}
|
|
118
118
|
}
|