Skip to content

Commit b8b938e

Browse files
authored
@W-21242351: pft telem (#397)
* feat: pft telem * chore: bump telem lib * fix: bump o11y
1 parent 9ddc456 commit b8b938e

File tree

5 files changed

+83
-53
lines changed

5 files changed

+83
-53
lines changed

packages/mcp-provider-dx-core/test/e2e/deploy_metadata.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { deployMetadataParams } from '../../src/tools/deploy_metadata.js';
2626

2727
describe('deploy_metadata', () => {
2828
const client = new McpTestClient({
29-
timeout: 120_000,
29+
timeout: 180_000,
3030
});
3131

3232
let testSession: TestSession;
@@ -230,7 +230,7 @@ describe('deploy_metadata', () => {
230230
expect(deployResult.runTestsEnabled).to.be.true;
231231
});
232232

233-
it('should deploy remote edit when ignoreConflicts is set to true', async () => {
233+
it('should deploy remote edit when ignoreConflicts is set to true', async () => {
234234
// deploy the whole project to ensure the file exists
235235
const fullProjectDeploy = await client.callTool(deployMetadataSchema, {
236236
name: 'deploy_metadata',
@@ -263,8 +263,8 @@ describe('deploy_metadata', () => {
263263
authInfo: await AuthInfo.create({ username: orgUsername }),
264264
});
265265

266-
const customApp = await conn.singleRecordQuery<{
267-
Id: string;
266+
const customApp = await conn.singleRecordQuery<{
267+
Id: string;
268268
Metadata: {
269269
description: string | null;
270270
};
@@ -277,7 +277,7 @@ describe('deploy_metadata', () => {
277277

278278
const updatedMetadata = {
279279
...customApp.Metadata,
280-
description: customApp.Metadata.description
280+
description: customApp.Metadata.description
281281
? `${customApp.Metadata.description} - Remote edit via Tooling API`
282282
: 'Remote edit via Tooling API',
283283
};

packages/mcp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@salesforce/mcp-provider-metadata-enrichment": "0.1.0",
5555
"@salesforce/source-deploy-retrieve": "^12.31.7",
5656
"@salesforce/source-tracking": "^7.8.2",
57-
"@salesforce/telemetry": "6.4.1",
57+
"@salesforce/telemetry": "^6.8.0",
5858
"@salesforce/ts-types": "^2.0.11",
5959
"zod": "^3.25.76"
6060
},

packages/mcp/src/sf-mcp-server.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ export class SfMcpServer extends McpServer implements ToolMethodSignatures {
153153
isError: result.isError ?? false,
154154
});
155155

156+
this.telemetry?.sendPdpEvent({
157+
eventName: 'salesforceMcp.executed',
158+
productFeatureId: 'aJCEE0000007Uiv4AE', // DX MCP Server
159+
componentId: name, // MCP tool name
160+
});
161+
156162
return result;
157163
};
158164

packages/mcp/src/telemetry.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { randomBytes } from 'node:crypto';
1818
import { readFileSync } from 'node:fs';
1919
import { join } from 'node:path';
2020
import * as os from 'node:os';
21-
import { Attributes, TelemetryReporter } from '@salesforce/telemetry';
21+
import { Attributes, TelemetryReporter, PdpEvent } from '@salesforce/telemetry';
2222
import { warn } from '@oclif/core/ux';
2323
import { Config } from '@oclif/core';
2424
import { TelemetryService } from '@salesforce/mcp-provider-api/src/index.js';
@@ -135,7 +135,15 @@ export class Telemetry implements TelemetryService {
135135
...(isInternalHost() ? getInternalProperties() : {}),
136136
});
137137
} catch {
138-
/* empty */
138+
/* intentionally empty */
139+
}
140+
}
141+
142+
public sendPdpEvent(event: PdpEvent): void {
143+
try {
144+
this.reporter?.sendPdpEvent(event);
145+
} catch {
146+
/* intentionally empty */
139147
}
140148
}
141149

yarn.lock

Lines changed: 61 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2997,7 +2997,7 @@
29972997
semver "^7.5.4"
29982998
ts-retry-promise "^0.7.1"
29992999

3000-
"@salesforce/core@^8", "@salesforce/core@^8.10.3", "@salesforce/core@^8.19.0", "@salesforce/core@^8.19.1", "@salesforce/core@^8.23.1", "@salesforce/core@^8.23.4", "@salesforce/core@^8.24.0", "@salesforce/core@^8.24.3", "@salesforce/core@^8.8.0":
3000+
"@salesforce/core@^8", "@salesforce/core@^8.10.3", "@salesforce/core@^8.19.0", "@salesforce/core@^8.19.1", "@salesforce/core@^8.23.1", "@salesforce/core@^8.24.0", "@salesforce/core@^8.24.3", "@salesforce/core@^8.8.0":
30013001
version "8.24.3"
30023002
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.24.3.tgz#c18fb2481ab212c460fd351520712a4fa8b4329f"
30033003
integrity sha512-E9k4G3S8svS6QtsPVhUvxr0VHWyzg7KxH8sYM0o5pk7QEUXZCKQEQE5VjQOa+Gl3jRyX6zv/8Cp4UpQ2ZszOVg==
@@ -3022,6 +3022,31 @@
30223022
ts-retry-promise "^0.8.1"
30233023
zod "^4.1.12"
30243024

3025+
"@salesforce/core@^8.26.3":
3026+
version "8.26.3"
3027+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.26.3.tgz#0b2502cacca8977f2ae95283d944771040eb7869"
3028+
integrity sha512-lPNFHjHFeC4V3KuH88xuVLGhAqmtM8meUcvyejNh8bQ5w642APKRTGDZ0pOnWHJAe5SQy7cSQ1WqvO3V73ouQw==
3029+
dependencies:
3030+
"@jsforce/jsforce-node" "^3.10.13"
3031+
"@salesforce/kit" "^3.2.4"
3032+
"@salesforce/ts-types" "^2.0.12"
3033+
ajv "^8.18.0"
3034+
change-case "^4.1.2"
3035+
fast-levenshtein "^3.0.0"
3036+
faye "^1.4.1"
3037+
form-data "^4.0.4"
3038+
js2xmlparser "^4.0.1"
3039+
jsonwebtoken "9.0.3"
3040+
jszip "3.10.1"
3041+
memfs "^4.30.1"
3042+
pino "^9.7.0"
3043+
pino-abstract-transport "^1.2.0"
3044+
pino-pretty "^11.3.0"
3045+
proper-lockfile "^4.1.2"
3046+
semver "^7.7.3"
3047+
ts-retry-promise "^0.8.1"
3048+
zod "^4.1.12"
3049+
30253050
"@salesforce/dev-config@^4.3.2":
30263051
version "4.3.2"
30273052
resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.3.2.tgz#10047e2b8d289c93f157ab4243a1b1de57f2d6a2"
@@ -3177,10 +3202,10 @@
31773202
"@salesforce/ts-types" "^2.0.11"
31783203
fast-xml-parser "^5.3.4"
31793204

3180-
"@salesforce/o11y-reporter@1.6.0":
3181-
version "1.6.0"
3182-
resolved "https://registry.yarnpkg.com/@salesforce/o11y-reporter/-/o11y-reporter-1.6.0.tgz#b2c5e538d64337c44b69ce5ec8b43c55d6c409eb"
3183-
integrity sha512-FAdmfTtRlpuCwXSwPFrpp+mYn8h47EUAaHKL1PpVZYU+DoktVXrDoKTm3MxKRarcqtK1fc4PaO3UOcL5tIT1iA==
3205+
"@salesforce/o11y-reporter@1.8.1":
3206+
version "1.8.1"
3207+
resolved "https://registry.yarnpkg.com/@salesforce/o11y-reporter/-/o11y-reporter-1.8.1.tgz#19470752359a1931f207ecea98511451cfa626d7"
3208+
integrity sha512-zXfFWoNBxkBDPq96X7wJuO2E6T+VsY9sWVfqVnqA2bMrw4ix8hWkXa6IdEytXMCe8mMsaXwGD4Iua0WNzrYhWA==
31843209
dependencies:
31853210
o11y "^258.7.0"
31863211
o11y_schema "256.154.0"
@@ -3269,18 +3294,6 @@
32693294
isomorphic-git "^1.34.2"
32703295
ts-retry-promise "^0.8.1"
32713296

3272-
"@salesforce/telemetry@6.4.1":
3273-
version "6.4.1"
3274-
resolved "https://registry.yarnpkg.com/@salesforce/telemetry/-/telemetry-6.4.1.tgz#ad6cc5ae65d80f7c6317dd184523aee3a1e0d3aa"
3275-
integrity sha512-bfKRn7PShTKGe8SOUeXjWPchAGJ6vFbSRhMVq6Ty/5gSeSGegGl+cpA09fqLfBqzk9aLhP38E2VFNY7DsYhifA==
3276-
dependencies:
3277-
"@salesforce/core" "^8.23.4"
3278-
"@salesforce/kit" "^3.2.4"
3279-
"@salesforce/o11y-reporter" "1.6.0"
3280-
applicationinsights "^2.9.8"
3281-
got "^11"
3282-
proxy-agent "^6.5.0"
3283-
32843297
"@salesforce/telemetry@^4.0.0":
32853298
version "4.1.21"
32863299
resolved "https://registry.yarnpkg.com/@salesforce/telemetry/-/telemetry-4.1.21.tgz#5047652cec61c01d7b7aee04f3a9c371dbc88ebb"
@@ -3292,6 +3305,19 @@
32923305
got "^11"
32933306
proxy-agent "^6.3.1"
32943307

3308+
"@salesforce/telemetry@^6.8.0":
3309+
version "6.8.0"
3310+
resolved "https://registry.yarnpkg.com/@salesforce/telemetry/-/telemetry-6.8.0.tgz#37cc1badf112374580ef717b86080bf2f7a8343c"
3311+
integrity sha512-iUT4Svyqr7dPqHJZqK52XQT/prNnutRT/KmElihb39iQ6Kw7cDyH/OuKBF8I72s1vCeHMyc66DzoJ0XT/TFTrA==
3312+
dependencies:
3313+
"@salesforce/core" "^8.26.3"
3314+
"@salesforce/kit" "^3.2.4"
3315+
"@salesforce/o11y-reporter" "1.8.1"
3316+
applicationinsights "^2.9.8"
3317+
got "^11"
3318+
o11y_schema "^260.47.0"
3319+
proxy-agent "^6.5.0"
3320+
32953321
"@salesforce/ts-types@^2", "@salesforce/ts-types@^2.0.11", "@salesforce/ts-types@^2.0.12", "@salesforce/ts-types@^2.0.9":
32963322
version "2.0.12"
32973323
resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.12.tgz#60420622812a7ec7e46d220667bc29b42dc247ff"
@@ -4605,6 +4631,16 @@ ajv@^8.0.1, ajv@^8.11.0, ajv@^8.12.0, ajv@^8.17.1:
46054631
json-schema-traverse "^1.0.0"
46064632
require-from-string "^2.0.2"
46074633

4634+
ajv@^8.18.0:
4635+
version "8.18.0"
4636+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.18.0.tgz#8864186b6738d003eb3a933172bb3833e10cefbc"
4637+
integrity sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==
4638+
dependencies:
4639+
fast-deep-equal "^3.1.3"
4640+
fast-uri "^3.0.1"
4641+
json-schema-traverse "^1.0.0"
4642+
require-from-string "^2.0.2"
4643+
46084644
ansi-colors@^4.1.1:
46094645
version "4.1.3"
46104646
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
@@ -9065,6 +9101,11 @@ o11y_schema@256.154.0:
90659101
resolved "https://registry.yarnpkg.com/o11y_schema/-/o11y_schema-256.154.0.tgz#1f2f94f1e42d07e62a3e18e09b026345b057dc0c"
90669102
integrity sha512-czvU/9cibyZptbr0gLJSM70U7zLlhWC2D2L5e9nOG84Wnqmn4F5YzVjrH1ZQzAzDbBbtbeU6WTS3F/SHqtMQ5g==
90679103

9104+
o11y_schema@^260.47.0:
9105+
version "260.50.0"
9106+
resolved "https://registry.yarnpkg.com/o11y_schema/-/o11y_schema-260.50.0.tgz#e886a2c80f44f19c94562714c173f8b2468dae06"
9107+
integrity sha512-87ig+sAQ6ohHH0DmdX7I+sVcYpRXqRy676+VjBsrwkzwzMOCgKNmEGkxaTyqNZW5pJogdcvS8jy7zdcxuKyapQ==
9108+
90689109
object-assign@^4:
90699110
version "4.1.1"
90709111
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -10773,16 +10814,7 @@ stop-iteration-iterator@^1.1.0:
1077310814
es-errors "^1.3.0"
1077410815
internal-slot "^1.1.0"
1077510816

10776-
"string-width-cjs@npm:string-width@^4.2.0":
10777-
version "4.2.3"
10778-
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
10779-
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
10780-
dependencies:
10781-
emoji-regex "^8.0.0"
10782-
is-fullwidth-code-point "^3.0.0"
10783-
strip-ansi "^6.0.1"
10784-
10785-
string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
10817+
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
1078610818
version "4.2.3"
1078710819
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
1078810820
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10846,14 +10878,7 @@ string_decoder@~1.1.1:
1084610878
dependencies:
1084710879
safe-buffer "~5.1.0"
1084810880

10849-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
10850-
version "6.0.1"
10851-
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
10852-
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
10853-
dependencies:
10854-
ansi-regex "^5.0.1"
10855-
10856-
strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
10881+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
1085710882
version "6.0.1"
1085810883
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
1085910884
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11739,7 +11764,7 @@ workerpool@^9.2.0:
1173911764
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.3.4.tgz#f6c92395b2141afd78e2a889e80cb338fe9fca41"
1174011765
integrity sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==
1174111766

11742-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
11767+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
1174311768
version "7.0.0"
1174411769
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
1174511770
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -11757,15 +11782,6 @@ wrap-ansi@^6.2.0:
1175711782
string-width "^4.1.0"
1175811783
strip-ansi "^6.0.0"
1175911784

11760-
wrap-ansi@^7.0.0:
11761-
version "7.0.0"
11762-
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
11763-
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
11764-
dependencies:
11765-
ansi-styles "^4.0.0"
11766-
string-width "^4.1.0"
11767-
strip-ansi "^6.0.0"
11768-
1176911785
wrap-ansi@^8.1.0:
1177011786
version "8.1.0"
1177111787
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)