diff --git a/package-lock.json b/package-lock.json index e5567e894..860aaef86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@salesforce/plugin-code-analyzer", - "version": "5.0.0-beta.3", + "version": "5.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@salesforce/plugin-code-analyzer", - "version": "5.0.0-beta.3", + "version": "5.0.0", "license": "BSD-3-Clause", "dependencies": { "@oclif/core": "3.27.0", @@ -17,7 +17,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", @@ -4819,9 +4819,9 @@ "license": "MIT" }, "node_modules/@salesforce/code-analyzer-sfge-engine": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@salesforce/code-analyzer-sfge-engine/-/code-analyzer-sfge-engine-0.4.0.tgz", - "integrity": "sha512-us8wFgRRqISC8lh/s6HuGaZTVx1/ZIeJ1sgNgfVSI4I+VAvuW3WtWGK4fYRpaDmaZJu+US0o4RiAcZUl/B5qNA==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@salesforce/code-analyzer-sfge-engine/-/code-analyzer-sfge-engine-0.6.0.tgz", + "integrity": "sha512-ux3TcTob/FYsCvcDTCrxliuI6cy5iAsNjLta9+ybxzrmPHqeOe9oqluEZ8AQiMEp1I/rIomhU+CIahmvnCSpXw==", "license": "BSD-3-Clause", "dependencies": { "@salesforce/code-analyzer-engine-api": "0.23.0", @@ -9524,6 +9524,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, diff --git a/package.json b/package.json index 0829715e7..5c58202c0 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/Constants.ts b/src/Constants.ts index 880b492c7..576fab3ca 100644 --- a/src/Constants.ts +++ b/src/Constants.ts @@ -5,6 +5,7 @@ export enum View { } export const TelemetryEventName = 'plugin-code-analyzer'; +export const TelemetrySource = 'CLI'; export const CliTelemetryEvents = { ENGINE_SELECTION: 'engine_selection', diff --git a/src/lib/actions/RunAction.ts b/src/lib/actions/RunAction.ts index 9563d992b..0fbce1873 100644 --- a/src/lib/actions/RunAction.ts +++ b/src/lib/actions/RunAction.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() diff --git a/test/lib/actions/RunAction.test.ts b/test/lib/actions/RunAction.test.ts index b46193b9f..4da59680d 100644 --- a/test/lib/actions/RunAction.test.ts +++ b/test/lib/actions/RunAction.test.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); });