@salesforce/plugin-telemetry 3.7.3 → 3.8.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.
@@ -28,6 +28,7 @@ export declare class CommandExecution extends AsyncCreatable {
28
28
  private enableO11y?;
29
29
  private o11yUploadEndpoint?;
30
30
  private productFeatureId?;
31
+ private targetOrgUsername?;
31
32
  constructor(options: CommandExecutionOptions);
32
33
  /**
33
34
  * @deprecated. Will always return en empty string.
@@ -40,6 +40,7 @@ export class CommandExecution extends AsyncCreatable {
40
40
  enableO11y;
41
41
  o11yUploadEndpoint;
42
42
  productFeatureId;
43
+ targetOrgUsername;
43
44
  constructor(options) {
44
45
  super(options);
45
46
  this.command = options.command;
@@ -94,6 +95,7 @@ export class CommandExecution extends AsyncCreatable {
94
95
  timestamp: String(Date.now()),
95
96
  // Salesforce Information
96
97
  orgId: this.orgId,
98
+ targetOrgUsername: this.targetOrgUsername,
97
99
  devhubId: this.devhubId,
98
100
  orgApiVersion: this.orgApiVersion,
99
101
  devhubApiVersion: this.devhubApiVersion,
@@ -148,14 +150,13 @@ export class CommandExecution extends AsyncCreatable {
148
150
  catch (error) {
149
151
  debug('Error parsing flags');
150
152
  }
151
- this.orgId = flags['target-org'] ? flags['target-org'].getOrgId() : null;
152
- this.devhubId = flags['target-dev-hub'] ? flags['target-dev-hub'].getOrgId() : null;
153
- this.orgApiVersion = flags['target-org']
154
- ? flags['target-org'].getConnection().getApiVersion()
155
- : null;
156
- this.devhubApiVersion = flags['target-dev-hub']
157
- ? flags['target-dev-hub'].getConnection().getApiVersion()
158
- : null;
153
+ const targetOrg = flags['target-org'] ? flags['target-org'] : undefined;
154
+ const targetDevHub = flags['target-dev-hub'] ? flags['target-dev-hub'] : undefined;
155
+ this.orgId = targetOrg ? targetOrg.getOrgId() : undefined;
156
+ this.targetOrgUsername = targetOrg ? targetOrg.getUsername() : undefined;
157
+ this.devhubId = targetDevHub ? targetDevHub.getOrgId() : undefined;
158
+ this.orgApiVersion = targetOrg ? targetOrg.getConnection().getApiVersion() : undefined;
159
+ this.devhubApiVersion = targetDevHub ? targetDevHub.getConnection().getApiVersion() : undefined;
159
160
  this.determineSpecifiedFlags(argv, flags, flagDefinitions);
160
161
  // Read o11y configuration from the plugin's package.json (plugin that owns the command)
161
162
  const pluginRoot = this.command.plugin?.root;
@@ -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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"}
package/lib/uploader.d.ts CHANGED
@@ -1,3 +1,7 @@
1
+ import type { PdpEvent } from '@salesforce/telemetry';
2
+ export type PdpEventWithUsername = PdpEvent & {
3
+ targetOrgUsername?: string;
4
+ };
1
5
  export declare class Uploader {
2
6
  private telemetry;
3
7
  private version;
package/lib/uploader.js CHANGED
@@ -15,6 +15,7 @@
15
15
  */
16
16
  import { SfError } from '@salesforce/core/sfError';
17
17
  import { asBoolean, asString } from '@salesforce/ts-types';
18
+ import { Org } from '@salesforce/core';
18
19
  import Telemetry from './telemetry.js';
19
20
  import { debug } from './debugger.js';
20
21
  const PROJECT = 'salesforce-cli';
@@ -41,7 +42,7 @@ export class Uploader {
41
42
  async sendToTelemetry() {
42
43
  const { TelemetryReporter } = await import('@salesforce/telemetry');
43
44
  let appInsightsReporter;
44
- let o11yReporter;
45
+ const o11yReporterMap = new Map();
45
46
  try {
46
47
  appInsightsReporter = await TelemetryReporter.create({
47
48
  project: PROJECT,
@@ -54,16 +55,13 @@ export class Uploader {
54
55
  }
55
56
  catch (err) {
56
57
  const error = SfError.wrap(err);
57
- debug(`Error creating reporter: ${error.message}`);
58
- // We can't do much without a reporter, so clear the telemetry file and move on.
59
- await this.telemetry.clear();
60
- return;
58
+ debug(`Error creating app insightsreporter: ${error.message}`);
61
59
  }
62
60
  try {
63
61
  const events = await this.telemetry.read();
64
62
  const { appInsightsEvents, appInsightsErrors, o11yEvents } = this.parseEvents(events);
65
63
  // Send AppInsights events
66
- if (appInsightsEvents.length > 0) {
64
+ if (appInsightsReporter && appInsightsEvents.length > 0) {
67
65
  appInsightsEvents.forEach((event) => {
68
66
  const eventName = asString(event.eventName) ?? 'UNKNOWN';
69
67
  delete event.eventName;
@@ -71,7 +69,7 @@ export class Uploader {
71
69
  });
72
70
  }
73
71
  // Send AppInsights errors
74
- if (appInsightsErrors.length > 0) {
72
+ if (appInsightsReporter && appInsightsErrors.length > 0) {
75
73
  appInsightsErrors.forEach((event) => {
76
74
  const error = new Error();
77
75
  // We know this is an object because it is logged as such
@@ -87,22 +85,41 @@ export class Uploader {
87
85
  }
88
86
  // Send PDP events via O11y
89
87
  if (o11yEvents.length > 0) {
90
- try {
91
- o11yReporter = await TelemetryReporter.create({
92
- project: PROJECT,
93
- key: 'not-used',
94
- userId: this.telemetry.getCLIId(),
95
- waitForConnection: true,
96
- enableO11y: true,
97
- enableAppInsights: false,
98
- o11yUploadEndpoint: this.o11yUploadEndpoint,
99
- });
100
- }
101
- catch (err) {
102
- const error = SfError.wrap(err);
103
- debug(`Error creating o11y reporter: ${error.message}`);
88
+ for (const event of o11yEvents) {
89
+ let o11yReporter;
90
+ const o11yReporterKey = event.targetOrgUsername ?? 'default';
91
+ if (!o11yReporterMap.has(o11yReporterKey)) {
92
+ try {
93
+ const telemetryReporterOptions = {
94
+ project: PROJECT,
95
+ key: 'not-used',
96
+ userId: this.telemetry.getCLIId(),
97
+ waitForConnection: true,
98
+ enableO11y: true,
99
+ enableAppInsights: false,
100
+ o11yUploadEndpoint: this.o11yUploadEndpoint,
101
+ // We shouldn't batch events from the plugin since it uses a 30 second
102
+ // timer and will keep the uploader process alive.
103
+ o11yBatching: { enableAutoBatching: false },
104
+ };
105
+ if (event.targetOrgUsername) {
106
+ telemetryReporterOptions.getConnectionFn = async () => (await Org.create({ aliasOrUsername: event.targetOrgUsername })).getConnection();
107
+ }
108
+ // eslint-disable-next-line no-await-in-loop
109
+ o11yReporter = await TelemetryReporter.create(telemetryReporterOptions);
110
+ o11yReporterMap.set(o11yReporterKey, o11yReporter);
111
+ }
112
+ catch (err) {
113
+ const error = SfError.wrap(err);
114
+ debug(`Error creating o11y reporter for PDP event: ${error.message}`);
115
+ }
116
+ }
117
+ else {
118
+ o11yReporter = o11yReporterMap.get(o11yReporterKey);
119
+ }
120
+ delete event.targetOrgUsername;
121
+ o11yReporter?.sendPdpEvent(event);
104
122
  }
105
- o11yEvents.forEach((event) => o11yReporter?.sendPdpEvent(event));
106
123
  }
107
124
  }
108
125
  catch (err) {
@@ -112,9 +129,11 @@ export class Uploader {
112
129
  finally {
113
130
  try {
114
131
  // We are done sending events
115
- appInsightsReporter.stop();
116
- if (o11yReporter) {
117
- o11yReporter.stop();
132
+ appInsightsReporter?.stop();
133
+ if (o11yReporterMap.size > 0) {
134
+ for (const reporter of o11yReporterMap.values()) {
135
+ reporter.stop();
136
+ }
118
137
  }
119
138
  }
120
139
  catch (err) {
@@ -137,11 +156,13 @@ export class Uploader {
137
156
  const eventName = asString(event.eventName) ?? 'UNKNOWN';
138
157
  const enableO11y = asBoolean(event.enableO11y) ?? false;
139
158
  const productFeatureId = asString(event.productFeatureId) ?? 'aJCEE0000000mHP4AY';
159
+ const targetOrgUsername = asString(event.targetOrgUsername) ?? undefined;
140
160
  this.o11yUploadEndpoint = asString(event.o11yUploadEndpoint) ?? '';
141
161
  delete event.type;
142
162
  delete event.enableO11y;
143
163
  delete event.o11yUploadEndpoint;
144
164
  delete event.productFeatureId;
165
+ delete event.targetOrgUsername;
145
166
  if (eventType === Telemetry.EVENT) {
146
167
  appInsightsEvents.push(event);
147
168
  if (enableO11y && this.o11yUploadEndpoint.length > 0 && eventName === 'COMMAND_EXECUTION') {
@@ -149,6 +170,7 @@ export class Uploader {
149
170
  const commandName = `${asString(event.command) ?? 'unknownCommand'}`;
150
171
  o11yEvents.push({
151
172
  eventName: 'salesforceCli.executed',
173
+ targetOrgUsername,
152
174
  productFeatureId: productFeatureId,
153
175
  componentId: `${pluginName}.${commandName}`,
154
176
  contextName: 'orgId::devhubId', // Delimited string of keys
@@ -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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"}
@@ -41,5 +41,5 @@
41
41
  ]
42
42
  }
43
43
  },
44
- "version": "3.7.3"
44
+ "version": "3.8.0"
45
45
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@salesforce/plugin-telemetry",
3
3
  "description": "Command usage and error telemetry for the Salesforce CLI",
4
- "version": "3.7.3",
4
+ "version": "3.8.0",
5
5
  "author": "Salesforce",
6
6
  "bugs": "https://github.com/forcedotcom/cli/issues",
7
7
  "enableO11y": true,
@@ -11,7 +11,7 @@
11
11
  "@salesforce/core": "^8.25.1",
12
12
  "@salesforce/kit": "^3.2.4",
13
13
  "@salesforce/sf-plugins-core": "^12",
14
- "@salesforce/telemetry": "^6.6.4",
14
+ "@salesforce/telemetry": "^6.7.0",
15
15
  "@salesforce/ts-types": "^2.0.12",
16
16
  "debug": "^4.4.3"
17
17
  },
@@ -20,7 +20,7 @@
20
20
  "@oclif/plugin-help": "^6.2.36",
21
21
  "@salesforce/cli-plugins-testkit": "^5.3.41",
22
22
  "@salesforce/dev-scripts": "^11.0.4",
23
- "@salesforce/plugin-command-reference": "^3.1.79",
23
+ "@salesforce/plugin-command-reference": "^3.1.80",
24
24
  "@salesforce/ts-sinon": "^1.4.31",
25
25
  "@types/debug": "^4.1.12",
26
26
  "oclif": "^4.22.77",
@@ -202,7 +202,7 @@
202
202
  "exports": "./lib/index.js",
203
203
  "type": "module",
204
204
  "sfdx": {
205
- "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.7.3.crt",
206
- "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.7.3.sig"
205
+ "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.8.0.crt",
206
+ "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.8.0.sig"
207
207
  }
208
208
  }