Skip to content

Commit a199874

Browse files
Sm/telemetry-and-warning-events (#500)
* feat: telemetry on unresolvable metadata * feat: warning via events instead of node process * chore: bump core Co-authored-by: Willie Ruemmele <[email protected]>
1 parent 69fcece commit a199874

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"node": ">=12.0.0"
2525
},
2626
"dependencies": {
27-
"@salesforce/core": "2.28.0",
27+
"@salesforce/core": "2.29.0",
2828
"@salesforce/kit": "^1.5.0",
2929
"@salesforce/ts-types": "^1.4.2",
3030
"archiver": "^5.3.0",

src/client/metadataTransfer.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
import { EventEmitter } from 'events';
88
import { join } from 'path';
9-
import { AuthInfo, Connection, Logger, PollingClient, StatusResult } from '@salesforce/core';
9+
import { AuthInfo, Connection, Lifecycle, Logger, PollingClient, StatusResult } from '@salesforce/core';
1010
import { Duration } from '@salesforce/kit';
1111
import { AnyJson, isNumber } from '@salesforce/ts-types';
1212
import * as fs from 'graceful-fs';
@@ -141,7 +141,9 @@ export abstract class MetadataTransfer<Status extends MetadataRequestStatus, Res
141141
protected async maybeSaveTempDirectory(target: SfdxFileFormat, cs?: ComponentSet): Promise<void> {
142142
const mdapiTempDir = process.env.SFDX_MDAPI_TEMP_DIR;
143143
if (mdapiTempDir) {
144-
process.emitWarning('The SFDX_MDAPI_TEMP_DIR environment variable is set, which may degrade performance');
144+
await Lifecycle.getInstance().emitWarning(
145+
'The SFDX_MDAPI_TEMP_DIR environment variable is set, which may degrade performance'
146+
);
145147
this.logger.debug(
146148
`Converting metadata to: ${mdapiTempDir} because the SFDX_MDAPI_TEMP_DIR environment variable is set`
147149
);

src/resolve/metadataResolver.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
77
import { basename, dirname, join, sep } from 'path';
8+
import { Lifecycle } from '@salesforce/core';
89
import { TypeInferenceError } from '../errors';
910
import { extName, parentName, parseMetadataXml } from '../utils';
1011
import { RegistryAccess } from '../registry/registryAccess';
@@ -15,7 +16,6 @@ import { SourceAdapterFactory } from './adapters/sourceAdapterFactory';
1516
import { ForceIgnore } from './forceIgnore';
1617
import { SourceComponent } from './sourceComponent';
1718
import { NodeFSTreeContainer, TreeContainer } from './treeContainers';
18-
1919
/**
2020
* Resolver for metadata type and component objects.
2121
*
@@ -137,6 +137,12 @@ export class MetadataResolver {
137137
!adapter.allowMetadataWithContent();
138138
return shouldResolve ? adapter.getComponent(fsPath, isResolvingSource) : undefined;
139139
}
140+
void Lifecycle.getInstance().emitTelemetry({
141+
eventName: 'metadata_resolver_type_inference_error',
142+
library: 'SDR',
143+
function: 'resolveComponent',
144+
path: fsPath,
145+
});
140146
throw new TypeInferenceError('error_could_not_infer_type', fsPath);
141147
}
142148

yarn.lock

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -555,24 +555,25 @@
555555
mv "~2"
556556
safe-json-stringify "~1"
557557

558-
"@salesforce/core@2.28.0":
559-
version "2.28.0"
560-
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-2.28.0.tgz#2fb3d7be0dfac8505332f558b7dd4274afd34901"
561-
integrity sha512-CFw2xloL3UwuvLm+0nK588kFVGPRZFmUzeUBYFCIz+34CJShc1B7yN+anPlZcHWgT12Ih9yzKYaki0BjCeIgKQ==
558+
"@salesforce/core@2.29.0":
559+
version "2.29.0"
560+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-2.29.0.tgz#abc941e1c018c3d622f708e09803436175e34caa"
561+
integrity sha512-b34bR68Mbvm2ASMTItY2HdVmstVFv/Lj4sK1ddhi/aqYNWTF3wfaqGg8nB6+iIVeBQ4iVlw4x5sQvp3GS48Hhg==
562562
dependencies:
563563
"@salesforce/bunyan" "^2.0.0"
564564
"@salesforce/kit" "^1.5.0"
565565
"@salesforce/schemas" "^1.0.1"
566566
"@salesforce/ts-types" "^1.5.13"
567567
"@types/graceful-fs" "^4.1.5"
568-
"@types/jsforce" "^1.9.29"
568+
"@types/jsforce" "^1.9.35"
569569
"@types/mkdirp" "^1.0.1"
570570
debug "^3.1.0"
571571
graceful-fs "^4.2.4"
572572
jsen "0.6.6"
573573
jsforce "^1.10.1"
574574
jsonwebtoken "8.5.0"
575575
mkdirp "1.0.4"
576+
semver "^7.3.5"
576577
sfdx-faye "^1.0.9"
577578
ts-retry-promise "^0.6.0"
578579

@@ -821,10 +822,10 @@
821822
resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
822823
integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
823824

824-
"@types/jsforce@^1.9.29":
825-
version "1.9.30"
826-
resolved "https://registry.yarnpkg.com/@types/jsforce/-/jsforce-1.9.30.tgz#725cba4175ddc17cf9902b6e647f2ed4a9614b50"
827-
integrity sha512-T0fgAfa99sx13gkClPkJsQRHzTcJ0Rgj7//6XEY9Qq6VRQH0U+cxlM1fqAsQ8rhAfAzyGhQk+j1nR1cWkp06NQ==
825+
"@types/jsforce@^1.9.35":
826+
version "1.9.35"
827+
resolved "https://registry.yarnpkg.com/@types/jsforce/-/jsforce-1.9.35.tgz#abda87c796910d286420b07a97382c782b576ca8"
828+
integrity sha512-GEb1iMAK8raElbBbozR7aVEuMl47jrPYLNkeh+3h2vLJIG21uQ/kOk4kPgMiMFwCmgfX4/tPDugnjb7qrMav4A==
828829
dependencies:
829830
"@types/node" "*"
830831

0 commit comments

Comments
 (0)