Merge pull request #1786 from forcedotcom/m2d/v5.0.0

Main2Dev @W-18117811@ Merging main to dev after v5.0.0

Author: randi274

package-lock.json

@@ -1,7 +1,7 @@
 {
 	"name": "@salesforce/plugin-code-analyzer",
 	"description": "Static code scanner that applies quality and security rules to Apex code, and provides feedback.",
-	"version": "5.0.0-beta.3",
+	"version": "5.0.0",
 	"author": "Salesforce Code Analyzer Team",
 	"bugs": "https://github.com/forcedotcom/sfdx-scanner/issues",
 	"dependencies": {
@@ -13,7 +13,7 @@
 		"@salesforce/code-analyzer-pmd-engine": "0.24.0",
 		"@salesforce/code-analyzer-regex-engine": "0.21.0",
 		"@salesforce/code-analyzer-retirejs-engine": "0.21.0",
-		"@salesforce/code-analyzer-sfge-engine": "0.4.0",
+		"@salesforce/code-analyzer-sfge-engine": "0.6.0",
 		"@salesforce/core": "6.7.6",
 		"@salesforce/sf-plugins-core": "5.0.13",
 		"@salesforce/ts-types": "^2.0.12",

package.json

@@ -5,6 +5,7 @@ export enum View {
 }
 
 export const TelemetryEventName = 'plugin-code-analyzer';
+export const TelemetrySource = 'CLI';
 
 export const CliTelemetryEvents = {
 	ENGINE_SELECTION: 'engine_selection',

src/Constants.ts

@@ -103,13 +103,13 @@ export class RunAction {
 			if (!selectedEngineNames.has(coreEngineName)) {
 				continue;
 			}
-			this.dependencies.telemetryEmitter.emitTelemetry('RunAction', Constants.TelemetryEventName, {
+			this.dependencies.telemetryEmitter.emitTelemetry(Constants.TelemetrySource, Constants.TelemetryEventName, {
 				sfcaEvent: Constants.CliTelemetryEvents.ENGINE_SELECTION,
 				engine: coreEngineName,
 				ruleCount: ruleSelection.getRulesFor(coreEngineName).length
 			});
 
-			this.dependencies.telemetryEmitter.emitTelemetry('RunAction', Constants.TelemetryEventName, {
+			this.dependencies.telemetryEmitter.emitTelemetry(Constants.TelemetrySource, Constants.TelemetryEventName, {
 				sfcaEvent: Constants.CliTelemetryEvents.ENGINE_EXECUTION,
 				engine: coreEngineName,
 				violationCount: results.getEngineRunResults(coreEngineName).getViolationCount()

src/lib/actions/RunAction.ts

@@ -397,12 +397,12 @@ describe('RunAction tests', () => {
 			expect(spyTelemetryEmitter.getCapturedTelemetry()[1].data.sfcaEvent).toEqual('engine1ExecuteTelemetry');
 
 			expect(spyTelemetryEmitter.getCapturedTelemetry()[2].eventName).toEqual('plugin-code-analyzer');
-			expect(spyTelemetryEmitter.getCapturedTelemetry()[2].source).toEqual('RunAction');
+			expect(spyTelemetryEmitter.getCapturedTelemetry()[2].source).toEqual('CLI');
 			expect(spyTelemetryEmitter.getCapturedTelemetry()[2].data.sfcaEvent).toEqual('engine_selection');
 			expect(spyTelemetryEmitter.getCapturedTelemetry()[2].data.ruleCount).toEqual(5);
 
 			expect(spyTelemetryEmitter.getCapturedTelemetry()[3].eventName).toEqual('plugin-code-analyzer');
-			expect(spyTelemetryEmitter.getCapturedTelemetry()[3].source).toEqual('RunAction');
+			expect(spyTelemetryEmitter.getCapturedTelemetry()[3].source).toEqual('CLI');
 			expect(spyTelemetryEmitter.getCapturedTelemetry()[3].data.sfcaEvent).toEqual('engine_execution');
 			expect(spyTelemetryEmitter.getCapturedTelemetry()[3].data.violationCount).toEqual(0);
 		});