@salesforce/plugin-telemetry 2.1.5 → 2.2.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.
@@ -6,10 +6,10 @@ export type CommandExecutionOptions = {
6
6
  argv: string[];
7
7
  config: Partial<Config>;
8
8
  };
9
- interface PluginInfo {
9
+ type PluginInfo = {
10
10
  name: Optional<string>;
11
11
  version: Optional<string>;
12
- }
12
+ };
13
13
  export declare class CommandExecution extends AsyncCreatable {
14
14
  status?: number;
15
15
  private specifiedFlags;
@@ -18,8 +18,10 @@ export declare class CommandExecution extends AsyncCreatable {
18
18
  private argv;
19
19
  private config;
20
20
  private vcs?;
21
- private orgUsername?;
22
- private devHubOrgUsername?;
21
+ private orgId?;
22
+ private devhubId?;
23
+ private orgApiVersion?;
24
+ private devhubApiVersion?;
23
25
  constructor(options: CommandExecutionOptions);
24
26
  /**
25
27
  * Determines whether the SFDX project is using GIT for version control or some other VCS.
@@ -48,33 +48,6 @@ class CommandExecution extends kit_1.AsyncCreatable {
48
48
  }
49
49
  toJson() {
50
50
  const pluginInfo = this.getPluginInfo();
51
- let oclifPerf = {};
52
- try {
53
- oclifPerf = {
54
- 'oclif.runMs': core_1.Performance.highlights.runTime,
55
- // The amount of time (ms) required for oclif to get to the point where it can start running the command.
56
- 'oclif.initMs': core_1.Performance.highlights.initTime,
57
- // The amount of time (ms) required for oclif to load the Config.
58
- 'oclif.configLoadMs': core_1.Performance.highlights.configLoadTime,
59
- // The amount of time (ms) required for oclif to load the command.
60
- 'oclif.commandLoadMs': core_1.Performance.highlights.commandLoadTime,
61
- // The amount of time (ms) required for oclif to load core (i.e. bundled) plugins.
62
- 'oclif.corePluginsLoadMs': core_1.Performance.highlights.corePluginsLoadTime,
63
- // The amount of time (ms) required for oclif to load user plugins.
64
- 'oclif.userPluginsLoadMs': core_1.Performance.highlights.userPluginsLoadTime,
65
- // The amount of time (ms) required for oclif to load linked plugins.
66
- 'oclif.linkedPluginsLoadMs': core_1.Performance.highlights.linkedPluginsLoadTime,
67
- // The amount of time (ms) required for oclif to run all the init hooks
68
- 'oclif.initHookMs': core_1.Performance.highlights.hookRunTimes.init?.total,
69
- // The amount of time (ms) required for oclif to run all the prerun hooks
70
- 'oclif.prerunHookMs': core_1.Performance.highlights.hookRunTimes.prerun?.total,
71
- // The amount of time (ms) required for oclif to run all the postrun hooks
72
- 'oclif.postrunHookMs': core_1.Performance.highlights.hookRunTimes.postrun?.total,
73
- };
74
- }
75
- catch (err) {
76
- (0, debugger_1.debug)('Unable to get oclif performance metrics', err);
77
- }
78
51
  return {
79
52
  eventName: 'COMMAND_EXECUTION',
80
53
  // System information
@@ -108,14 +81,11 @@ class CommandExecution extends kit_1.AsyncCreatable {
108
81
  // Don't log status or timestamp as a number, otherwise vscode will think it is a metric
109
82
  status: (0, ts_types_1.isNumber)(this.status) ? this.status.toString() : undefined,
110
83
  timestamp: String(Date.now()),
111
- // Oclif Performance Metrics
112
- ...oclifPerf,
113
84
  // Salesforce Information
114
- // Set the usernames so the uploader can resolve it to orgIds.
115
- // Since resolving org ids can make API calls, we want to do that in the
116
- // uploader process so we don't slow down the CLI.
117
- devHubUsername: this.devHubOrgUsername,
118
- orgUsername: this.orgUsername,
85
+ orgId: this.orgId,
86
+ devhubId: this.devhubId,
87
+ orgApiVersion: this.orgApiVersion,
88
+ devhubApiVersion: this.devhubApiVersion,
119
89
  };
120
90
  }
121
91
  getPluginInfo() {
@@ -142,8 +112,14 @@ class CommandExecution extends kit_1.AsyncCreatable {
142
112
  catch (error) {
143
113
  (0, debugger_1.debug)('Error parsing flags');
144
114
  }
145
- this.orgUsername = flags['targetusername'];
146
- this.devHubOrgUsername = flags['targetdevhubusername'];
115
+ this.orgId = flags['target-org'] ? flags['target-org'].getOrgId() : null;
116
+ this.devhubId = flags['target-dev-hub'] ? flags['target-dev-hub'].getOrgId() : null;
117
+ this.orgApiVersion = flags['target-org']
118
+ ? flags['target-org'].getConnection().getApiVersion()
119
+ : null;
120
+ this.devhubApiVersion = flags['target-dev-hub']
121
+ ? flags['target-dev-hub'].getConnection().getApiVersion()
122
+ : null;
147
123
  this.determineSpecifiedFlags(argv, flags, flagDefinitions);
148
124
  this.vcs = await CommandExecution.resolveVCSInfo();
149
125
  }
@@ -1 +1 @@
1
- {"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,11 @@
1
- import { Command } from '@oclif/core';
2
- export default class TelemetryGet extends Command {
1
+ import { SfCommand } from '@salesforce/sf-plugins-core';
2
+ export type TelemetryGetResult = {
3
+ enabled: boolean;
4
+ cliId: string;
5
+ tmpDir: string;
6
+ cacheDir: string;
7
+ };
8
+ export default class TelemetryGet extends SfCommand<TelemetryGetResult> {
3
9
  static hidden: boolean;
4
- run(): Promise<void>;
10
+ run(): Promise<TelemetryGetResult>;
5
11
  }
@@ -6,17 +6,24 @@
6
6
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- const core_1 = require("@oclif/core");
9
+ const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
10
10
  const telemetry_1 = require("@salesforce/telemetry");
11
11
  const telemetry_2 = require("../telemetry");
12
- class TelemetryGet extends core_1.Command {
12
+ class TelemetryGet extends sf_plugins_core_1.SfCommand {
13
13
  async run() {
14
14
  const enabled = await telemetry_1.default.determineSfdxTelemetryEnabled();
15
+ const cliId = global.cliTelemetry?.getCLIId();
15
16
  this.log(`Telemetry is ${enabled ? 'enabled' : 'disabled'}.`);
16
17
  this.log(`Telemetry tmp directory is ${telemetry_2.default.tmpDir}.`);
17
18
  this.log(`Telemetry cache directory is ${this.config.cacheDir}.`);
18
19
  this.log();
19
- this.log(`Salesforce CLI ID is ${global.cliTelemetry?.getCLIId()}.`);
20
+ this.log(`Salesforce CLI ID is ${cliId}.`);
21
+ return {
22
+ enabled,
23
+ cliId,
24
+ tmpDir: telemetry_2.default.tmpDir,
25
+ cacheDir: this.config.cacheDir,
26
+ };
20
27
  }
21
28
  }
22
29
  exports.default = TelemetryGet;
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/commands/telemetry.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,sCAAsC;AACtC,qDAAsD;AACtD,4CAAqC;AAKrC,MAAqB,YAAa,SAAQ,cAAO;IAGxC,KAAK,CAAC,GAAG;QACd,MAAM,OAAO,GAAG,MAAM,mBAAiB,CAAC,6BAA6B,EAAE,CAAC;QAExE,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,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvE,CAAC;;AAXH,+BAYC;AAXe,mBAAM,GAAG,IAAI,CAAC"}
1
+ {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/commands/telemetry.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iEAAwD;AACxD,qDAAsD;AACtD,4CAAqC;AAYrC,MAAqB,YAAa,SAAQ,2BAA6B;IAG9D,KAAK,CAAC,GAAG;QACd,MAAM,OAAO,GAAG,MAAM,mBAAiB,CAAC,6BAA6B,EAAE,CAAC;QACxE,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"}
@@ -27,6 +27,7 @@ const hook = async function (options) {
27
27
  return;
28
28
  }
29
29
  try {
30
+ const errors = [];
30
31
  // Instantiating telemetry shows data collection warning.
31
32
  // Adding this to the global so that telemetry events are sent even when different
32
33
  // versions of this plugin are in use by the CLI.
@@ -65,8 +66,38 @@ const hook = async function (options) {
65
66
  });
66
67
  (0, debugger_1.debug)('Setting up process exit handler');
67
68
  process.once('exit', (status) => {
69
+ let oclifPerf = {};
70
+ try {
71
+ oclifPerf = {
72
+ 'oclif.runMs': core_1.Performance.highlights.runTime,
73
+ // The amount of time (ms) required for oclif to get to the point where it can start running the command.
74
+ 'oclif.initMs': core_1.Performance.highlights.initTime,
75
+ // The amount of time (ms) required for oclif to load the Config.
76
+ 'oclif.configLoadMs': core_1.Performance.highlights.configLoadTime,
77
+ // The amount of time (ms) required for oclif to load the command.
78
+ 'oclif.commandLoadMs': core_1.Performance.highlights.commandLoadTime,
79
+ // The amount of time (ms) required for oclif to load core (i.e. bundled) plugins.
80
+ 'oclif.corePluginsLoadMs': core_1.Performance.highlights.corePluginsLoadTime,
81
+ // The amount of time (ms) required for oclif to load user plugins.
82
+ 'oclif.userPluginsLoadMs': core_1.Performance.highlights.userPluginsLoadTime,
83
+ // The amount of time (ms) required for oclif to load linked plugins.
84
+ 'oclif.linkedPluginsLoadMs': core_1.Performance.highlights.linkedPluginsLoadTime,
85
+ // The amount of time (ms) required for oclif to run all the init hooks
86
+ 'oclif.initHookMs': core_1.Performance.highlights.hookRunTimes.init?.total,
87
+ // The amount of time (ms) required for oclif to run all the prerun hooks
88
+ 'oclif.prerunHookMs': core_1.Performance.highlights.hookRunTimes.prerun?.total,
89
+ // The amount of time (ms) required for oclif to run all the postrun hooks
90
+ 'oclif.postrunHookMs': core_1.Performance.highlights.hookRunTimes.postrun?.total,
91
+ };
92
+ }
93
+ catch (err) {
94
+ (0, debugger_1.debug)('Unable to get oclif performance metrics', err);
95
+ }
96
+ for (const { event, error } of errors) {
97
+ telemetry.recordError(error, { ...event, ...oclifPerf });
98
+ }
68
99
  commandExecution.status = status;
69
- telemetry.record(commandExecution.toJson());
100
+ telemetry.record({ ...commandExecution.toJson(), ...oclifPerf });
70
101
  if (process.listenerCount('exit') >= 20) {
71
102
  // On exit listeners have been a problem in the past. Make sure we don't accumulate too many...
72
103
  // This could be from too many plugins. If we start getting this, log number of plugins too.
@@ -89,30 +120,14 @@ const hook = async function (options) {
89
120
  // At this point, any other events during the CLI lifecycle should be logged.
90
121
  telemetry.upload();
91
122
  });
92
- // Log command errors to the server. The ts-ignore is necessary
93
- // because TS is strict about the events that can be handled on process.
94
- process.on('cmdError',
95
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
96
- async (cmdErr, _, org) => {
97
- await core_1.Performance.collect();
98
- const apiVersion = org ? org.getConnection().getApiVersion() : undefined;
99
- let orgType;
100
- try {
101
- orgType = org && (await org.determineIfDevHubOrg()) ? 'devhub' : undefined;
102
- if (!orgType && org) {
103
- await org.checkScratchOrg();
104
- orgType = 'scratch';
105
- }
106
- }
107
- catch (err) {
108
- /* leave the org as unknown for app insights */
109
- }
110
- // Telemetry will scrub the exception
111
- telemetry.recordError(cmdErr, Object.assign(commandExecution.toJson(), {
112
- eventName: 'COMMAND_ERROR',
113
- apiVersion,
114
- orgType,
115
- }));
123
+ // Log command errors to the server.
124
+ // Record failed command executions from commands that extend SfdxCommand
125
+ process.on('cmdError', (error) => {
126
+ errors.push({ error, event: { ...commandExecution.toJson(), eventName: 'COMMAND_ERROR' } });
127
+ });
128
+ // Record failed command executions from commands that extend SfCommand
129
+ process.on('sfCommandError', (error) => {
130
+ errors.push({ error, event: { ...commandExecution.toJson(), eventName: 'COMMAND_ERROR' } });
116
131
  });
117
132
  const commonDataMemoized = () => {
118
133
  if (!commonData) {
@@ -1 +1 @@
1
- {"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":"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"}
package/lib/uploader.js CHANGED
@@ -7,7 +7,6 @@
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.Uploader = void 0;
10
- const core_1 = require("@salesforce/core");
11
10
  const telemetry_1 = require("@salesforce/telemetry");
12
11
  const ts_types_1 = require("@salesforce/ts-types");
13
12
  const telemetry_2 = require("./telemetry");
@@ -49,20 +48,12 @@ class Uploader {
49
48
  try {
50
49
  const events = await this.telemetry.read();
51
50
  for (const event of events) {
51
+ event.telemetryVersion = debugger_1.version;
52
52
  const eventType = (0, ts_types_1.asString)(event.type) || telemetry_2.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
56
  if (eventType === telemetry_2.default.EVENT) {
57
- event.telemetryVersion = debugger_1.version;
58
- // Resolve orgs for all events.
59
- // eslint-disable-next-line no-await-in-loop
60
- event.orgId = await getOrgId(false, (0, ts_types_1.asString)(event.orgUsername));
61
- // eslint-disable-next-line no-await-in-loop
62
- event.devHubId = await getOrgId(true, (0, ts_types_1.asString)(event.devHubUsername));
63
- // Usernames are GDPR info, so don't log.
64
- delete event.orgUsername;
65
- delete event.devHubUsername;
66
57
  reporter.sendTelemetryEvent(eventName, event);
67
58
  }
68
59
  else if (eventType === telemetry_2.default.EXCEPTION) {
@@ -99,17 +90,4 @@ class Uploader {
99
90
  }
100
91
  }
101
92
  exports.Uploader = Uploader;
102
- const getOrgId = async (isDevHub, aliasOrUsername) => {
103
- const orgOptions = { isDevHub };
104
- // If no aliasOrUsername, it will try to get the default
105
- if (aliasOrUsername) {
106
- orgOptions.aliasOrUsername = aliasOrUsername;
107
- }
108
- try {
109
- return (await core_1.Org.create(orgOptions)).getOrgId();
110
- }
111
- catch (error) {
112
- // Don't do anything, there is no specified or default.
113
- }
114
- };
115
93
  //# sourceMappingURL=uploader.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"uploader.js","sourceRoot":"","sources":["../src/uploader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"uploader.js","sourceRoot":"","sources":["../src/uploader.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "2.1.5",
2
+ "version": "2.2.0",
3
3
  "commands": {
4
4
  "telemetry": {
5
5
  "id": "telemetry",
@@ -9,7 +9,15 @@
9
9
  "pluginType": "core",
10
10
  "hidden": true,
11
11
  "aliases": [],
12
- "flags": {},
12
+ "flags": {
13
+ "json": {
14
+ "name": "json",
15
+ "type": "boolean",
16
+ "description": "Format output as json.",
17
+ "helpGroup": "GLOBAL",
18
+ "allowNo": false
19
+ }
20
+ },
13
21
  "args": {}
14
22
  }
15
23
  }
package/package.json CHANGED
@@ -1,20 +1,21 @@
1
1
  {
2
2
  "name": "@salesforce/plugin-telemetry",
3
3
  "description": "Command usage and error telemetry for the Salesforce CLI",
4
- "version": "2.1.5",
4
+ "version": "2.2.0",
5
5
  "author": "Salesforce",
6
6
  "bugs": "https://github.com/forcedotcom/cli/issues",
7
7
  "dependencies": {
8
8
  "@oclif/core": "^2.8.2",
9
- "@salesforce/core": "^3.34.6",
10
- "@salesforce/telemetry": "^3.2.5",
9
+ "@salesforce/core": "^3.35.0",
10
+ "@salesforce/sf-plugins-core": "^2.3.0",
11
+ "@salesforce/telemetry": "^3.2.25",
11
12
  "debug": "^4.3.4",
12
13
  "tslib": "^2"
13
14
  },
14
15
  "devDependencies": {
15
16
  "@oclif/plugin-command-snapshot": "^3.3.10",
16
17
  "@oclif/plugin-help": "^5.2.8",
17
- "@salesforce/cli-plugins-testkit": "^3.2.21",
18
+ "@salesforce/cli-plugins-testkit": "^3.3.4",
18
19
  "@salesforce/dev-config": "^3.0.1",
19
20
  "@salesforce/dev-scripts": "^4.3.0",
20
21
  "@salesforce/plugin-command-reference": "^1.6.5",
@@ -202,7 +203,7 @@
202
203
  }
203
204
  },
204
205
  "sfdx": {
205
- "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.1.5.crt",
206
- "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.1.5.sig"
206
+ "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.2.0.crt",
207
+ "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/2.2.0.sig"
207
208
  }
208
209
  }