@salesforce/plugin-telemetry 2.2.5 → 2.2.7-qa.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/README.md +4 -44
- package/lib/commandExecution.d.ts +4 -5
- package/lib/commandExecution.js +25 -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/telemetry.js +3 -3
- package/lib/telemetry.js.map +1 -1
- package/lib/uploader.js +8 -8
- package/lib/uploader.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -10,10 +10,10 @@ This plugin is bundled with the CLI and will automatically collect usage data on
|
|
|
10
10
|
|
|
11
11
|
All command usage is recorded by initializing on the `init` oclif hook, recording all events to a log file, then spawning a process on exit to send the data to appinsights.
|
|
12
12
|
|
|
13
|
-
To debug the telemetry spawned process, run a command with the environment variables `
|
|
13
|
+
To debug the telemetry spawned process, run a command with the environment variables `SF_TELEMETRY_DEBUG=true` and `DEBUG=sfdx:telemetry*`.
|
|
14
14
|
|
|
15
15
|
```bash
|
|
16
|
-
|
|
16
|
+
SF_TELEMETRY_DEBUG=true DEBUG=sfdx:telemetry* ./bin/dev telemetry
|
|
17
17
|
```
|
|
18
18
|
|
|
19
19
|
## Getting Started
|
|
@@ -40,47 +40,7 @@ There should be no differences when running via the Salesforce CLI or using the
|
|
|
40
40
|
|
|
41
41
|
```bash
|
|
42
42
|
# Link your plugin to the sfdx cli
|
|
43
|
-
|
|
43
|
+
sf plugins:link .
|
|
44
44
|
# To verify
|
|
45
|
-
|
|
46
|
-
```
|
|
47
|
-
|
|
48
|
-
## Commands
|
|
49
|
-
|
|
50
|
-
- [`sfdx hello:org [-n <string>] [-f] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-helloorg--n-string--f--v-string--u-string---apiversion-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
|
|
51
|
-
|
|
52
|
-
## `sfdx hello:org [-n <string>] [-f] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
|
|
53
|
-
|
|
54
|
-
print a greeting and your org IDs
|
|
55
|
-
|
|
56
|
-
```
|
|
57
|
-
USAGE
|
|
58
|
-
$ sfdx hello:org [-n <string>] [-f] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel
|
|
59
|
-
trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
|
|
60
|
-
|
|
61
|
-
OPTIONS
|
|
62
|
-
-f, --force example boolean flag
|
|
63
|
-
-n, --name=name name to print
|
|
64
|
-
|
|
65
|
-
-u, --targetusername=targetusername username or alias for the target
|
|
66
|
-
org; overrides default target org
|
|
67
|
-
|
|
68
|
-
-v, --targetdevhubusername=targetdevhubusername username or alias for the dev hub
|
|
69
|
-
org; overrides default dev hub org
|
|
70
|
-
|
|
71
|
-
--apiversion=apiversion override the api version used for
|
|
72
|
-
api requests made by this command
|
|
73
|
-
|
|
74
|
-
--json format output as json
|
|
75
|
-
|
|
76
|
-
--loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL) [default: warn] logging level for
|
|
77
|
-
this command invocation
|
|
78
|
-
|
|
79
|
-
EXAMPLES
|
|
80
|
-
$ sfdx hello:org --targetusername myOrg@example.com --targetdevhubusername devhub@org.com
|
|
81
|
-
Hello world! This is org: MyOrg and I will be around until Tue Mar 20 2018!
|
|
82
|
-
My hub org id is: 00Dxx000000001234
|
|
83
|
-
|
|
84
|
-
$ sfdx hello:org --name myname --targetusername myOrg@example.com
|
|
85
|
-
Hello myname! This is org: MyOrg and I will be around until Tue Mar 20 2018!
|
|
45
|
+
sf plugins
|
|
86
46
|
```
|
|
@@ -14,19 +14,18 @@ export declare class CommandExecution extends AsyncCreatable {
|
|
|
14
14
|
status?: number;
|
|
15
15
|
private specifiedFlags;
|
|
16
16
|
private specifiedFlagFullNames;
|
|
17
|
+
private deprecatedFlagsUsed;
|
|
18
|
+
private deprecatedCommandUsed?;
|
|
17
19
|
private command;
|
|
18
|
-
private argv;
|
|
20
|
+
private readonly argv;
|
|
19
21
|
private config;
|
|
20
|
-
private vcs?;
|
|
21
22
|
private orgId?;
|
|
22
23
|
private devhubId?;
|
|
23
24
|
private orgApiVersion?;
|
|
24
25
|
private devhubApiVersion?;
|
|
25
26
|
constructor(options: CommandExecutionOptions);
|
|
26
27
|
/**
|
|
27
|
-
*
|
|
28
|
-
* Returns a token indicating the VCS for usage stats, or an empty string if the command
|
|
29
|
-
* was executed outside of an SFDX project.
|
|
28
|
+
* @deprecated. Will always return en empty string.
|
|
30
29
|
*/
|
|
31
30
|
static resolveVCSInfo(): Promise<string>;
|
|
32
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");
|
|
@@ -19,32 +16,16 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
19
16
|
super(options);
|
|
20
17
|
this.specifiedFlags = [];
|
|
21
18
|
this.specifiedFlagFullNames = [];
|
|
19
|
+
this.deprecatedFlagsUsed = [];
|
|
22
20
|
this.command = options.command;
|
|
23
21
|
this.argv = options.argv;
|
|
24
22
|
this.config = options.config;
|
|
25
23
|
}
|
|
26
24
|
/**
|
|
27
|
-
*
|
|
28
|
-
* Returns a token indicating the VCS for usage stats, or an empty string if the command
|
|
29
|
-
* was executed outside of an SFDX project.
|
|
25
|
+
* @deprecated. Will always return en empty string.
|
|
30
26
|
*/
|
|
31
27
|
static async resolveVCSInfo() {
|
|
32
|
-
|
|
33
|
-
try {
|
|
34
|
-
possibleVcsPath = await core_2.SfProject.resolveProjectPath();
|
|
35
|
-
}
|
|
36
|
-
catch (err) {
|
|
37
|
-
(0, debugger_1.debug)('Not in a sfdx project, using current working directory');
|
|
38
|
-
possibleVcsPath = process.cwd();
|
|
39
|
-
}
|
|
40
|
-
const gitPath = (0, path_1.join)(possibleVcsPath, '.git');
|
|
41
|
-
try {
|
|
42
|
-
await fs.promises.access(gitPath, fs.constants.R_OK);
|
|
43
|
-
return 'git';
|
|
44
|
-
}
|
|
45
|
-
catch (err) {
|
|
46
|
-
return 'other';
|
|
47
|
-
}
|
|
28
|
+
return Promise.resolve('');
|
|
48
29
|
}
|
|
49
30
|
toJson() {
|
|
50
31
|
const pluginInfo = this.getPluginInfo();
|
|
@@ -54,7 +35,6 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
54
35
|
platform: this.config.platform,
|
|
55
36
|
shell: this.config.shell,
|
|
56
37
|
arch: this.config.arch,
|
|
57
|
-
vcs: this.vcs,
|
|
58
38
|
nodeEnv: process.env.NODE_ENV,
|
|
59
39
|
nodeVersion: process.version,
|
|
60
40
|
processUptime: process.uptime() * 1000,
|
|
@@ -71,6 +51,8 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
71
51
|
specifiedFlags: this.specifiedFlags.join(' '),
|
|
72
52
|
// Flags the user specified, only the full names
|
|
73
53
|
specifiedFlagFullNames: this.specifiedFlagFullNames.join(' '),
|
|
54
|
+
deprecatedFlagsUsed: this.deprecatedFlagsUsed.join(' '),
|
|
55
|
+
deprecatedCommandUsed: this.deprecatedCommandUsed,
|
|
74
56
|
sfdxEnv: process.env.SFDX_ENV,
|
|
75
57
|
s3HostOverride: process.env.SFDX_S3_HOST,
|
|
76
58
|
npmRegistryOverride: process.env.SFDX_NPM_REGISTRY,
|
|
@@ -100,6 +82,19 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
100
82
|
async init() {
|
|
101
83
|
const argv = this.argv;
|
|
102
84
|
const flagDefinitions = this.command.flags ?? {};
|
|
85
|
+
// slice off node or bin path, and the executable path, and then remove anything that's been processed as a flag
|
|
86
|
+
const typedCommand = process.argv
|
|
87
|
+
.splice(2)
|
|
88
|
+
.filter((arg) => !argv.includes(arg))
|
|
89
|
+
.join(':');
|
|
90
|
+
if (this.command.deprecationOptions ||
|
|
91
|
+
(typedCommand !== this.command.id &&
|
|
92
|
+
this.command.aliases?.includes(typedCommand) &&
|
|
93
|
+
this.command.deprecateAliases)) {
|
|
94
|
+
// check the deprecationOptions for cases where we've used OCLIF to point to a replacement
|
|
95
|
+
// check the aliases and deprecated aliases for where we're deprecating in place
|
|
96
|
+
this.deprecatedCommandUsed = typedCommand;
|
|
97
|
+
}
|
|
103
98
|
let flags = {};
|
|
104
99
|
try {
|
|
105
100
|
flags = (await core_1.Parser.parse(argv, {
|
|
@@ -121,7 +116,6 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
121
116
|
? flags['target-dev-hub'].getConnection().getApiVersion()
|
|
122
117
|
: null;
|
|
123
118
|
this.determineSpecifiedFlags(argv, flags, flagDefinitions);
|
|
124
|
-
this.vcs = await CommandExecution.resolveVCSInfo();
|
|
125
119
|
}
|
|
126
120
|
determineSpecifiedFlags(argv, flags, flagDefinitions) {
|
|
127
121
|
// Help won't be in the parsed flags
|
|
@@ -150,6 +144,13 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
150
144
|
this.specifiedFlags.push(flagName);
|
|
151
145
|
this.specifiedFlagFullNames.push(flagName);
|
|
152
146
|
}
|
|
147
|
+
else if (flagDefinitions[flagName].deprecateAliases) {
|
|
148
|
+
// we can't find the flag as the key (long name) or short char, so it must be a deprecated flag
|
|
149
|
+
const argvFlags = this.argv.map((a) => a.match(/-([a-zA-Z]+)/g)).map((a) => a?.[0].replace('-', ''));
|
|
150
|
+
this.deprecatedFlagsUsed.push(flagDefinitions[flagName].aliases?.find((a) => argvFlags.includes(a)) ?? '');
|
|
151
|
+
this.specifiedFlagFullNames.push(flagName);
|
|
152
|
+
this.specifiedFlags.push(flagName);
|
|
153
|
+
}
|
|
153
154
|
});
|
|
154
155
|
}
|
|
155
156
|
}
|
|
@@ -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/telemetry.js
CHANGED
|
@@ -51,7 +51,7 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
51
51
|
catch (error) {
|
|
52
52
|
const err = error;
|
|
53
53
|
if (err.code === 'ENOENT') {
|
|
54
|
-
if (!kit_1.env.getBoolean('
|
|
54
|
+
if (!kit_1.env.getBoolean('SF_TELEMETRY_DISABLE_ACKNOWLEDGEMENT', false)) {
|
|
55
55
|
// eslint-disable-next-line no-console
|
|
56
56
|
console.warn(`You acknowledge and agree that the CLI tool may collect usage information, user environment, and crash reports for the purposes of providing services or functions that are relevant to use of the CLI tool and product improvements.${os_1.EOL}`);
|
|
57
57
|
}
|
|
@@ -237,7 +237,7 @@ class Telemetry extends kit_1.AsyncCreatable {
|
|
|
237
237
|
upload() {
|
|
238
238
|
// Completely disconnect from this process so it doesn't wait for telemetry to upload
|
|
239
239
|
const processPath = (0, path_1.join)(__dirname, '..', 'processes', 'upload');
|
|
240
|
-
const telemetryDebug = kit_1.env.getBoolean('
|
|
240
|
+
const telemetryDebug = kit_1.env.getBoolean('SF_TELEMETRY_DEBUG', false);
|
|
241
241
|
const nodePath = process.argv[0];
|
|
242
242
|
// Don't spawn if we are in telemetry debug. This allows us to run the process manually with --inspect-brk.
|
|
243
243
|
if (!telemetryDebug) {
|
|
@@ -282,7 +282,7 @@ 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('
|
|
285
|
+
Telemetry.tmpDir = kit_1.env.getString('SF_TELEMETRY_PATH', (0, path_1.join)((0, os_1.tmpdir)(), 'sf-telemetry'));
|
|
286
286
|
Telemetry.executable = 'sfdx';
|
|
287
287
|
Telemetry.telemetryTmpFile = (0, path_1.join)(Telemetry.tmpDir, `telemetry-${Telemetry.generateRandomId()}.log`);
|
|
288
288
|
Telemetry.acknowledged = false;
|
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,yBAAyB;AACzB,2BAAiC;AACjC,+BAA4B;AAE5B,yCAAsD;AAEtD,mDAA8E;AAC9E,yCAAmC;AAEnC,MAAM,gBAAgB,GAAG,WAAW,CAAC;AACrC,MAAM,+BAA+B,GAAG,kCAAkC,CAAC;AAgC3E,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,IAAA,gBAAK,EAAC,+EAA+E,CAAC,CAAC;YACvF,OAAO;SACR;QAED,MAAM,uBAAuB,GAAG,IAAA,WAAI,EAAC,SAAS,CAAC,QAAQ,EAAE,+BAA+B,CAAC,CAAC;QAC1F,IAAI;YACF,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,uBAAuB,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACrE,IAAA,gBAAK,EAAC,2CAA2C,CAAC,CAAC;SACpD;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,GAAG,GAAG,KAAgB,CAAC;YAC7B,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACzB,IAAI,CAAC,SAAG,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"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"}
|
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;
|
|
@@ -83,7 +83,7 @@ class Uploader {
|
|
|
83
83
|
(0, debugger_1.debug)(`Error stopping telemetry reporter: ${error.message}`);
|
|
84
84
|
}
|
|
85
85
|
finally {
|
|
86
|
-
// We
|
|
86
|
+
// We always want to clear the file.
|
|
87
87
|
await this.telemetry.clear();
|
|
88
88
|
}
|
|
89
89
|
}
|
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.2.
|
|
4
|
+
"version": "2.2.7-qa.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.0.17-qa.0",
|
|
12
12
|
"debug": "^4.3.4",
|
|
13
13
|
"tslib": "^2"
|
|
14
14
|
},
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"license": "BSD-3-Clause",
|
|
67
67
|
"oclif": {
|
|
68
68
|
"commands": "./lib/commands",
|
|
69
|
-
"bin": "
|
|
69
|
+
"bin": "sf",
|
|
70
70
|
"hooks": {
|
|
71
71
|
"prerun": "./lib/hooks/telemetryPrerun.js"
|
|
72
72
|
},
|
|
@@ -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.2.
|
|
207
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.2.
|
|
206
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.2.7-qa.0.crt",
|
|
207
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.2.7-qa.0.sig"
|
|
208
208
|
}
|
|
209
209
|
}
|