@salesforce/plugin-telemetry 2.2.6 → 2.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/lib/commandExecution.d.ts +1 -4
- package/lib/commandExecution.js +2 -24
- package/lib/commandExecution.js.map +1 -1
- package/lib/commands/telemetry.js +5 -5
- package/lib/commands/telemetry.js.map +1 -1
- package/lib/hooks/telemetryPrerun.js +4 -5
- package/lib/hooks/telemetryPrerun.js.map +1 -1
- package/lib/telemetry.d.ts +1 -1
- package/lib/uploader.js +7 -7
- package/lib/uploader.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +8 -8
|
@@ -19,16 +19,13 @@ export declare class CommandExecution extends AsyncCreatable {
|
|
|
19
19
|
private command;
|
|
20
20
|
private readonly argv;
|
|
21
21
|
private config;
|
|
22
|
-
private vcs?;
|
|
23
22
|
private orgId?;
|
|
24
23
|
private devhubId?;
|
|
25
24
|
private orgApiVersion?;
|
|
26
25
|
private devhubApiVersion?;
|
|
27
26
|
constructor(options: CommandExecutionOptions);
|
|
28
27
|
/**
|
|
29
|
-
*
|
|
30
|
-
* Returns a token indicating the VCS for usage stats, or an empty string if the command
|
|
31
|
-
* was executed outside of an SFDX project.
|
|
28
|
+
* @deprecated. Will always return en empty string.
|
|
32
29
|
*/
|
|
33
30
|
static resolveVCSInfo(): Promise<string>;
|
|
34
31
|
toJson(): JsonMap;
|
package/lib/commandExecution.js
CHANGED
|
@@ -7,10 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.CommandExecution = void 0;
|
|
10
|
-
const path_1 = require("path");
|
|
11
|
-
const fs = require("fs");
|
|
12
10
|
const core_1 = require("@oclif/core");
|
|
13
|
-
const core_2 = require("@salesforce/core");
|
|
14
11
|
const kit_1 = require("@salesforce/kit");
|
|
15
12
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
16
13
|
const debugger_1 = require("./debugger");
|
|
@@ -25,27 +22,10 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
25
22
|
this.config = options.config;
|
|
26
23
|
}
|
|
27
24
|
/**
|
|
28
|
-
*
|
|
29
|
-
* Returns a token indicating the VCS for usage stats, or an empty string if the command
|
|
30
|
-
* was executed outside of an SFDX project.
|
|
25
|
+
* @deprecated. Will always return en empty string.
|
|
31
26
|
*/
|
|
32
27
|
static async resolveVCSInfo() {
|
|
33
|
-
|
|
34
|
-
try {
|
|
35
|
-
possibleVcsPath = await core_2.SfProject.resolveProjectPath();
|
|
36
|
-
}
|
|
37
|
-
catch (err) {
|
|
38
|
-
(0, debugger_1.debug)('Not in a sfdx project, using current working directory');
|
|
39
|
-
possibleVcsPath = process.cwd();
|
|
40
|
-
}
|
|
41
|
-
const gitPath = (0, path_1.join)(possibleVcsPath, '.git');
|
|
42
|
-
try {
|
|
43
|
-
await fs.promises.access(gitPath, fs.constants.R_OK);
|
|
44
|
-
return 'git';
|
|
45
|
-
}
|
|
46
|
-
catch (err) {
|
|
47
|
-
return 'other';
|
|
48
|
-
}
|
|
28
|
+
return Promise.resolve('');
|
|
49
29
|
}
|
|
50
30
|
toJson() {
|
|
51
31
|
const pluginInfo = this.getPluginInfo();
|
|
@@ -55,7 +35,6 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
55
35
|
platform: this.config.platform,
|
|
56
36
|
shell: this.config.shell,
|
|
57
37
|
arch: this.config.arch,
|
|
58
|
-
vcs: this.vcs,
|
|
59
38
|
nodeEnv: process.env.NODE_ENV,
|
|
60
39
|
nodeVersion: process.version,
|
|
61
40
|
processUptime: process.uptime() * 1000,
|
|
@@ -137,7 +116,6 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
137
116
|
? flags['target-dev-hub'].getConnection().getApiVersion()
|
|
138
117
|
: null;
|
|
139
118
|
this.determineSpecifiedFlags(argv, flags, flagDefinitions);
|
|
140
|
-
this.vcs = await CommandExecution.resolveVCSInfo();
|
|
141
119
|
}
|
|
142
120
|
determineSpecifiedFlags(argv, flags, flagDefinitions) {
|
|
143
121
|
// Help won't be in the parsed flags
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH
|
|
1
|
+
{"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,21 +7,21 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
|
|
10
|
-
const
|
|
11
|
-
const
|
|
10
|
+
const enabledCheck_1 = require("@salesforce/telemetry/enabledCheck");
|
|
11
|
+
const telemetry_1 = require("../telemetry");
|
|
12
12
|
class TelemetryGet extends sf_plugins_core_1.SfCommand {
|
|
13
13
|
async run() {
|
|
14
|
-
const enabled = await
|
|
14
|
+
const enabled = await (0, enabledCheck_1.isEnabled)();
|
|
15
15
|
const cliId = global.cliTelemetry?.getCLIId();
|
|
16
16
|
this.log(`Telemetry is ${enabled ? 'enabled' : 'disabled'}.`);
|
|
17
|
-
this.log(`Telemetry tmp directory is ${
|
|
17
|
+
this.log(`Telemetry tmp directory is ${telemetry_1.default.tmpDir}.`);
|
|
18
18
|
this.log(`Telemetry cache directory is ${this.config.cacheDir}.`);
|
|
19
19
|
this.log();
|
|
20
20
|
this.log(`Salesforce CLI ID is ${cliId}.`);
|
|
21
21
|
return {
|
|
22
22
|
enabled,
|
|
23
23
|
cliId,
|
|
24
|
-
tmpDir:
|
|
24
|
+
tmpDir: telemetry_1.default.tmpDir,
|
|
25
25
|
cacheDir: this.config.cacheDir,
|
|
26
26
|
};
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/commands/telemetry.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/commands/telemetry.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAAwD;AACxD,qEAA+D;AAC/D,4CAAqC;AAYrC,MAAqB,YAAa,SAAQ,2BAA6B;IAG9D,KAAK,CAAC,GAAG;QACd,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAS,GAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC;QAE9C,IAAI,CAAC,GAAG,CAAC,gBAAgB,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;QAC9D,IAAI,CAAC,GAAG,CAAC,8BAA8B,mBAAS,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,CAAC,gCAAgC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG,CAAC,CAAC;QAE3C,OAAO;YACL,OAAO;YACP,KAAK;YACL,MAAM,EAAE,mBAAS,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;SAC/B,CAAC;IACJ,CAAC;;AAnBH,+BAoBC;AAnBe,mBAAM,GAAG,IAAI,CAAC"}
|
|
@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
const path_1 = require("path");
|
|
10
10
|
const core_1 = require("@oclif/core");
|
|
11
11
|
const core_2 = require("@salesforce/core");
|
|
12
|
-
const
|
|
13
|
-
const
|
|
12
|
+
const enabledCheck_1 = require("@salesforce/telemetry/enabledCheck");
|
|
13
|
+
const telemetry_1 = require("../telemetry");
|
|
14
14
|
const commandExecution_1 = require("../commandExecution");
|
|
15
15
|
const debugger_1 = require("../debugger");
|
|
16
16
|
/**
|
|
@@ -20,9 +20,8 @@ const debugger_1 = require("../debugger");
|
|
|
20
20
|
* 3. Logs command usage data to the server right after the process ends by spawning a detached process.
|
|
21
21
|
*/
|
|
22
22
|
const hook = async function (options) {
|
|
23
|
-
const telemetryEnabled = await telemetry_1.TelemetryReporter.determineSfdxTelemetryEnabled();
|
|
24
23
|
// Don't even bother logging if telemetry is disabled
|
|
25
|
-
if (!
|
|
24
|
+
if (!(await (0, enabledCheck_1.isEnabled)())) {
|
|
26
25
|
(0, debugger_1.debug)('Telemetry disabled. Doing nothing.');
|
|
27
26
|
return;
|
|
28
27
|
}
|
|
@@ -31,7 +30,7 @@ const hook = async function (options) {
|
|
|
31
30
|
// Instantiating telemetry shows data collection warning.
|
|
32
31
|
// Adding this to the global so that telemetry events are sent even when different
|
|
33
32
|
// versions of this plugin are in use by the CLI.
|
|
34
|
-
const telemetry = (global.cliTelemetry = await
|
|
33
|
+
const telemetry = (global.cliTelemetry = await telemetry_1.default.create({
|
|
35
34
|
cacheDir: this.config.cacheDir,
|
|
36
35
|
executable: this.config.bin,
|
|
37
36
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,+BAA4B;AAC5B,sCAAgD;AAChD,2CAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":"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"}
|
package/lib/telemetry.d.ts
CHANGED
package/lib/uploader.js
CHANGED
|
@@ -7,9 +7,8 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Uploader = void 0;
|
|
10
|
-
const telemetry_1 = require("@salesforce/telemetry");
|
|
11
10
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
12
|
-
const
|
|
11
|
+
const telemetry_1 = require("./telemetry");
|
|
13
12
|
const debugger_1 = require("./debugger");
|
|
14
13
|
const PROJECT = 'salesforce-cli';
|
|
15
14
|
const APP_INSIGHTS_KEY = '2ca64abb-6123-4c7b-bd9e-4fe73e71fe9c';
|
|
@@ -21,7 +20,7 @@ class Uploader {
|
|
|
21
20
|
* Sends events from telemetry.
|
|
22
21
|
*/
|
|
23
22
|
static async upload(cacheDir, telemetryFilePath) {
|
|
24
|
-
const telemetry = (global.cliTelemetry = await
|
|
23
|
+
const telemetry = (global.cliTelemetry = await telemetry_1.default.create({ cacheDir, telemetryFilePath }));
|
|
25
24
|
const uploader = new Uploader(telemetry);
|
|
26
25
|
await uploader.sendToTelemetry();
|
|
27
26
|
}
|
|
@@ -29,9 +28,10 @@ class Uploader {
|
|
|
29
28
|
* Reads the telemetry events from file and sends them to the telemetry service.
|
|
30
29
|
*/
|
|
31
30
|
async sendToTelemetry() {
|
|
31
|
+
const { TelemetryReporter } = await import('@salesforce/telemetry');
|
|
32
32
|
let reporter;
|
|
33
33
|
try {
|
|
34
|
-
reporter = await
|
|
34
|
+
reporter = await TelemetryReporter.create({
|
|
35
35
|
project: PROJECT,
|
|
36
36
|
key: APP_INSIGHTS_KEY,
|
|
37
37
|
userId: this.telemetry.getCLIId(),
|
|
@@ -49,14 +49,14 @@ class Uploader {
|
|
|
49
49
|
const events = await this.telemetry.read();
|
|
50
50
|
for (const event of events) {
|
|
51
51
|
event.telemetryVersion = debugger_1.version;
|
|
52
|
-
const eventType = (0, ts_types_1.asString)(event.type) ??
|
|
52
|
+
const eventType = (0, ts_types_1.asString)(event.type) ?? telemetry_1.default.EVENT;
|
|
53
53
|
const eventName = (0, ts_types_1.asString)(event.eventName) ?? 'UNKNOWN';
|
|
54
54
|
delete event.type;
|
|
55
55
|
delete event.eventName;
|
|
56
|
-
if (eventType ===
|
|
56
|
+
if (eventType === telemetry_1.default.EVENT) {
|
|
57
57
|
reporter.sendTelemetryEvent(eventName, event);
|
|
58
58
|
}
|
|
59
|
-
else if (eventType ===
|
|
59
|
+
else if (eventType === telemetry_1.default.EXCEPTION) {
|
|
60
60
|
const error = new Error();
|
|
61
61
|
// We know this is an object because it is logged as such
|
|
62
62
|
const errorObject = event.error;
|
package/lib/uploader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../src/uploader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,
|
|
1
|
+
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../src/uploader.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
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": "2.
|
|
4
|
+
"version": "2.3.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@oclif/core": "^2.11.7",
|
|
9
9
|
"@salesforce/core": "^5.2.0",
|
|
10
10
|
"@salesforce/sf-plugins-core": "^3.1.14",
|
|
11
|
-
"@salesforce/telemetry": "^4.0
|
|
11
|
+
"@salesforce/telemetry": "^4.1.0",
|
|
12
12
|
"debug": "^4.3.4",
|
|
13
13
|
"tslib": "^2"
|
|
14
14
|
},
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"@salesforce/dev-scripts": "^5.7.0",
|
|
21
21
|
"@salesforce/plugin-command-reference": "^3.0.25",
|
|
22
22
|
"@salesforce/prettier-config": "^0.0.3",
|
|
23
|
-
"@salesforce/ts-sinon": "^1.4.
|
|
23
|
+
"@salesforce/ts-sinon": "^1.4.14",
|
|
24
24
|
"@swc/core": "^1.3.69",
|
|
25
25
|
"@types/debug": "^4.1.8",
|
|
26
26
|
"@typescript-eslint/eslint-plugin": "^5.62.0",
|
|
@@ -33,18 +33,18 @@
|
|
|
33
33
|
"eslint-config-salesforce-typescript": "^1.1.2",
|
|
34
34
|
"eslint-plugin-header": "^3.1.1",
|
|
35
35
|
"eslint-plugin-import": "2.27.5",
|
|
36
|
-
"eslint-plugin-jsdoc": "^
|
|
36
|
+
"eslint-plugin-jsdoc": "^46.4.6",
|
|
37
37
|
"husky": "^7.0.4",
|
|
38
38
|
"mocha": "^9.1.3",
|
|
39
39
|
"nyc": "^15.1.0",
|
|
40
|
-
"oclif": "^3.
|
|
40
|
+
"oclif": "^3.11.3",
|
|
41
41
|
"prettier": "^2.8.8",
|
|
42
42
|
"pretty-quick": "^3.1.0",
|
|
43
43
|
"shx": "0.3.4",
|
|
44
44
|
"sinon": "10.0.0",
|
|
45
45
|
"ts-node": "^10.0.0",
|
|
46
46
|
"typescript": "^4.9.5",
|
|
47
|
-
"wireit": "^0.
|
|
47
|
+
"wireit": "^0.10.0"
|
|
48
48
|
},
|
|
49
49
|
"config": {},
|
|
50
50
|
"engines": {
|
|
@@ -203,7 +203,7 @@
|
|
|
203
203
|
}
|
|
204
204
|
},
|
|
205
205
|
"sfdx": {
|
|
206
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.
|
|
207
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.
|
|
206
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.3.0.crt",
|
|
207
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.3.0.sig"
|
|
208
208
|
}
|
|
209
209
|
}
|