@salesforce/plugin-telemetry 3.3.12 → 3.4.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 -0
- package/lib/commandExecution.js +21 -14
- package/lib/commandExecution.js.map +1 -1
- package/lib/gatherEnvs.d.ts +4 -0
- package/lib/gatherEnvs.js +23 -0
- package/lib/gatherEnvs.js.map +1 -0
- package/oclif.manifest.json +1 -1
- package/package.json +7 -7
|
@@ -23,6 +23,7 @@ export declare class CommandExecution extends AsyncCreatable {
|
|
|
23
23
|
private devhubId?;
|
|
24
24
|
private orgApiVersion?;
|
|
25
25
|
private devhubApiVersion?;
|
|
26
|
+
private argKeys;
|
|
26
27
|
constructor(options: CommandExecutionOptions);
|
|
27
28
|
/**
|
|
28
29
|
* @deprecated. Will always return en empty string.
|
package/lib/commandExecution.js
CHANGED
|
@@ -7,7 +7,9 @@
|
|
|
7
7
|
import { Flags, Parser } from '@oclif/core';
|
|
8
8
|
import { AsyncCreatable } from '@salesforce/kit';
|
|
9
9
|
import { isNumber } from '@salesforce/ts-types';
|
|
10
|
+
import { parseVarArgs } from '@salesforce/sf-plugins-core';
|
|
10
11
|
import { debug } from './debugger.js';
|
|
12
|
+
import { getRelevantEnvs } from './gatherEnvs.js';
|
|
11
13
|
export class CommandExecution extends AsyncCreatable {
|
|
12
14
|
status;
|
|
13
15
|
specifiedFlags = [];
|
|
@@ -21,6 +23,7 @@ export class CommandExecution extends AsyncCreatable {
|
|
|
21
23
|
devhubId;
|
|
22
24
|
orgApiVersion;
|
|
23
25
|
devhubApiVersion;
|
|
26
|
+
argKeys = [];
|
|
24
27
|
constructor(options) {
|
|
25
28
|
super(options);
|
|
26
29
|
this.command = options.command;
|
|
@@ -35,6 +38,7 @@ export class CommandExecution extends AsyncCreatable {
|
|
|
35
38
|
}
|
|
36
39
|
toJson() {
|
|
37
40
|
const pluginInfo = this.getPluginInfo();
|
|
41
|
+
const envs = getRelevantEnvs();
|
|
38
42
|
return {
|
|
39
43
|
eventName: 'COMMAND_EXECUTION',
|
|
40
44
|
// System information
|
|
@@ -54,16 +58,15 @@ export class CommandExecution extends AsyncCreatable {
|
|
|
54
58
|
plugin_version: pluginInfo.version,
|
|
55
59
|
command: this.command.id,
|
|
56
60
|
// As the user specified, including short names
|
|
57
|
-
specifiedFlags: this.specifiedFlags.join(' '),
|
|
61
|
+
specifiedFlags: this.specifiedFlags.sort().join(' '),
|
|
58
62
|
// Flags the user specified, only the full names
|
|
59
|
-
specifiedFlagFullNames: this.specifiedFlagFullNames.join(' '),
|
|
60
|
-
deprecatedFlagsUsed: this.deprecatedFlagsUsed.join(' '),
|
|
63
|
+
specifiedFlagFullNames: this.specifiedFlagFullNames.sort().join(' '),
|
|
64
|
+
deprecatedFlagsUsed: this.deprecatedFlagsUsed.sort().join(' '),
|
|
61
65
|
deprecatedCommandUsed: this.deprecatedCommandUsed,
|
|
62
66
|
sfdxEnv: process.env.SFDX_ENV,
|
|
63
|
-
s3HostOverride: process.env.SFDX_S3_HOST,
|
|
64
|
-
npmRegistryOverride: process.env.SFDX_NPM_REGISTRY,
|
|
67
|
+
s3HostOverride: process.env.SF_S3_HOST ?? process.env.SFDX_S3_HOST,
|
|
68
|
+
npmRegistryOverride: process.env.SF_NPM_REGISTRY ?? process.env.SFDX_NPM_REGISTRY,
|
|
65
69
|
tool: process.env.SFDX_TOOL,
|
|
66
|
-
interceptorMode: process.env.INTERCEPTOR_MODE,
|
|
67
70
|
// Execution information
|
|
68
71
|
date: new Date().toUTCString(),
|
|
69
72
|
// Don't log status or timestamp as a number, otherwise vscode will think it is a metric
|
|
@@ -74,6 +77,9 @@ export class CommandExecution extends AsyncCreatable {
|
|
|
74
77
|
devhubId: this.devhubId,
|
|
75
78
|
orgApiVersion: this.orgApiVersion,
|
|
76
79
|
devhubApiVersion: this.devhubApiVersion,
|
|
80
|
+
specifiedEnvs: envs.specifiedEnvs.join(' '),
|
|
81
|
+
uniqueEnvs: envs.uniqueEnvs.join(' '),
|
|
82
|
+
argKeys: this.argKeys.sort().join(' '),
|
|
77
83
|
};
|
|
78
84
|
}
|
|
79
85
|
getPluginInfo() {
|
|
@@ -107,12 +113,14 @@ export class CommandExecution extends AsyncCreatable {
|
|
|
107
113
|
}
|
|
108
114
|
let flags = {};
|
|
109
115
|
try {
|
|
110
|
-
|
|
116
|
+
const parseResult = await Parser.parse(argv, {
|
|
111
117
|
flags: flagDefinitions,
|
|
112
118
|
args: this.command.args,
|
|
113
119
|
// @ts-expect-error because varargs is not on SfCommand but is on SfdxCommand
|
|
114
120
|
strict: this.command.strict ?? !this.command.varargs,
|
|
115
|
-
})
|
|
121
|
+
});
|
|
122
|
+
flags = parseResult.flags;
|
|
123
|
+
this.argKeys = [...new Set(Object.keys(parseVarArgs(parseResult.args, parseResult.argv)))];
|
|
116
124
|
}
|
|
117
125
|
catch (error) {
|
|
118
126
|
debug('Error parsing flags');
|
|
@@ -159,12 +167,11 @@ export class CommandExecution extends AsyncCreatable {
|
|
|
159
167
|
// get present flags in argv, that is everything starting with `-`, then strip dashes from it.
|
|
160
168
|
// e.g. ['-u', 'test', '--json'] -> [ 'u', undefined, 'json' ]
|
|
161
169
|
const argvFlags = this.argv.map((a) => a.match(/-([a-zA-Z]+)/g)).map((a) => a?.[0].replace('-', ''));
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
}
|
|
170
|
+
const possibleAliases = [
|
|
171
|
+
...(flagDefinitions[flagName].aliases ?? []),
|
|
172
|
+
// charAliases is optional. Ensure compatibility with commands using oclif/core < 3 where `charAliases` isn't supported.
|
|
173
|
+
...(flagDefinitions[flagName].charAliases ?? []),
|
|
174
|
+
];
|
|
168
175
|
// if you have a flag that sets a default value and has aliases
|
|
169
176
|
// this check will ensure it only gets captured if the user specified it using aliases
|
|
170
177
|
const specifiedFlag = possibleAliases.find((a) => argvFlags.includes(a));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAmB,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) 2023, salesforce.com, inc.
|
|
3
|
+
* All rights reserved.
|
|
4
|
+
* Licensed under the BSD 3-Clause license.
|
|
5
|
+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
|
+
*/
|
|
7
|
+
export const getRelevantEnvs = () => {
|
|
8
|
+
const specifiedEnvs = Object.keys(process.env).filter(isOurEnv).sort();
|
|
9
|
+
return {
|
|
10
|
+
specifiedEnvs,
|
|
11
|
+
uniqueEnvs: specifiedEnvs.filter(isNotDuplicatedAcrossCLIs),
|
|
12
|
+
};
|
|
13
|
+
};
|
|
14
|
+
const isOurEnv = (key) => key.startsWith('SF_') ||
|
|
15
|
+
key.startsWith('SFDX_') ||
|
|
16
|
+
key.startsWith('OCLIF') ||
|
|
17
|
+
key.startsWith('JSFORCE_') ||
|
|
18
|
+
key === 'FORCE_OPEN_URL' ||
|
|
19
|
+
key === 'FORCE_SHOW_SPINNER' ||
|
|
20
|
+
key === 'FORCE_SPINNER_DELAY';
|
|
21
|
+
/** we do some automatic SFDX => SF and we don't want 2 of all of those */
|
|
22
|
+
const isNotDuplicatedAcrossCLIs = (key, index, array) => !(key.startsWith('SFDX_') && array.includes(key.replace('SFDX_', 'SF_')));
|
|
23
|
+
//# sourceMappingURL=gatherEnvs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gatherEnvs.js","sourceRoot":"","sources":["../src/gatherEnvs.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,GAAsD,EAAE;IACrF,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IACvE,OAAO;QACL,aAAa;QACb,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,yBAAyB,CAAC;KAC5D,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAW,EAAE,CACxC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;IACrB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;IACvB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;IACvB,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC;IAC1B,GAAG,KAAK,gBAAgB;IACxB,GAAG,KAAK,oBAAoB;IAC5B,GAAG,KAAK,qBAAqB,CAAC;AAEhC,2EAA2E;AAC3E,MAAM,yBAAyB,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,KAAe,EAAW,EAAE,CACzF,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC"}
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-telemetry",
|
|
3
3
|
"description": "Command usage and error telemetry for the Salesforce CLI",
|
|
4
|
-
"version": "3.
|
|
4
|
+
"version": "3.4.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@oclif/core": "^
|
|
8
|
+
"@oclif/core": "^4.0.3",
|
|
9
9
|
"@salesforce/core": "^7.3.5",
|
|
10
10
|
"@salesforce/kit": "^3.1.2",
|
|
11
|
-
"@salesforce/sf-plugins-core": "^
|
|
11
|
+
"@salesforce/sf-plugins-core": "^10.0.0",
|
|
12
12
|
"@salesforce/telemetry": "^6.0.9",
|
|
13
13
|
"@salesforce/ts-types": "^2.0.9",
|
|
14
14
|
"debug": "^4.3.4"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
|
17
17
|
"@oclif/plugin-command-snapshot": "^5.0.6",
|
|
18
|
-
"@oclif/plugin-help": "^6.0
|
|
18
|
+
"@oclif/plugin-help": "^6.1.0",
|
|
19
19
|
"@salesforce/cli-plugins-testkit": "^5.3.2",
|
|
20
|
-
"@salesforce/dev-scripts": "^
|
|
20
|
+
"@salesforce/dev-scripts": "^10.1.0",
|
|
21
21
|
"@salesforce/plugin-command-reference": "^3.0.82",
|
|
22
22
|
"@salesforce/ts-sinon": "^1.4.15",
|
|
23
23
|
"@types/debug": "^4.1.12",
|
|
@@ -199,7 +199,7 @@
|
|
|
199
199
|
"exports": "./lib/index.js",
|
|
200
200
|
"type": "module",
|
|
201
201
|
"sfdx": {
|
|
202
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.
|
|
203
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.
|
|
202
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.4.0.crt",
|
|
203
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.4.0.sig"
|
|
204
204
|
}
|
|
205
205
|
}
|