From 083bba40e4e4e4a8ecd3b227153e8ab109a00c16 Mon Sep 17 00:00:00 2001 From: Harini Malothu Date: Sat, 13 Sep 2025 16:40:25 +0530 Subject: [PATCH 1/7] Fix to retrieve deviceId --- .../telemetry/src/e2etest/telemetry.test.ts | 5 +++++ packages/@react-native-windows/telemetry/src/telemetry.ts | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts b/packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts index ab238b6b14a..f0949f241ad 100644 --- a/packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts +++ b/packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts @@ -365,6 +365,11 @@ function verifyTestCommandTelemetryProcessor( // Verify basics const commonProperties = properties!.common; expect(commonProperties.commandName).toBe('test-command'); + // Verify LocalId + const expectedLocalId = TelemetryTest.getCommonProperty('deviceId'); + expect(envelope.ext?.device?.localId).toBeDefined(); + expect(envelope.ext?.device?.localId).toBe(expectedLocalId); + expect(commonProperties.localId).toBe(expectedLocalId); // Only if you know it's set in the event, not in static commonProperties // Verify versions info const versions = properties!.versions; diff --git a/packages/@react-native-windows/telemetry/src/telemetry.ts b/packages/@react-native-windows/telemetry/src/telemetry.ts index 5663a6206eb..6333d3d7a13 100644 --- a/packages/@react-native-windows/telemetry/src/telemetry.ts +++ b/packages/@react-native-windows/telemetry/src/telemetry.ts @@ -369,7 +369,7 @@ export class Telemetry { // Populate Part A extensions telemetryItem.ext = {}; telemetryItem.ext.device = { - id: Telemetry.commonProperties.deviceId, + localId: Telemetry.commonProperties.deviceId, deviceClass: Telemetry.commonProperties.deviceClass, }; telemetryItem.ext.os = { @@ -394,6 +394,7 @@ export class Telemetry { isCliTest: Telemetry.commonProperties.isTest, sessionId: Telemetry.commonProperties.sessionId, commandName: Telemetry.commonProperties.commandName, + localId: Telemetry.commonProperties.deviceId, }, // Set project and versions props, belonging to Part B. project: Telemetry.projectProp, From cf39cdbc0ceb1e788ead99b1ecb0b598f22fac44 Mon Sep 17 00:00:00 2001 From: Harini Malothu Date: Sat, 13 Sep 2025 16:55:54 +0530 Subject: [PATCH 2/7] Change files --- ...ows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json diff --git a/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json b/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json new file mode 100644 index 00000000000..4bfbfab2621 --- /dev/null +++ b/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Fix to retrieve deviceId", + "packageName": "@react-native-windows/telemetry", + "email": "hmalothu@microsoft.com", + "dependentChangeType": "none" +} From 810d7023513706b2e6dbcae447925f016b1c8890 Mon Sep 17 00:00:00 2001 From: Harini Malothu Date: Wed, 17 Sep 2025 21:16:32 +0530 Subject: [PATCH 3/7] Update change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json Co-authored-by: Jon Thysell --- ...-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json b/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json index 4bfbfab2621..851bd3af74f 100644 --- a/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json +++ b/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json @@ -1,5 +1,5 @@ { - "type": "none", + "type": "prerelease", "comment": "Fix to retrieve deviceId", "packageName": "@react-native-windows/telemetry", "email": "hmalothu@microsoft.com", From 7170d008fe4cd8b90c95509608b8bdffe2386018 Mon Sep 17 00:00:00 2001 From: Harini Malothu Date: Wed, 17 Sep 2025 21:16:56 +0530 Subject: [PATCH 4/7] Update change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json Co-authored-by: Jon Thysell --- ...-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json b/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json index 851bd3af74f..cd6db4b4024 100644 --- a/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json +++ b/change/@react-native-windows-telemetry-e8822c8e-55c2-4622-b9ef-48a80761ca6a.json @@ -3,5 +3,5 @@ "comment": "Fix to retrieve deviceId", "packageName": "@react-native-windows/telemetry", "email": "hmalothu@microsoft.com", - "dependentChangeType": "none" + "dependentChangeType": "patch" } From b00c48399e93a087e2fe9410573bf055421a5ccb Mon Sep 17 00:00:00 2001 From: Harini Malothu Date: Wed, 17 Sep 2025 22:22:19 +0530 Subject: [PATCH 5/7] update localID and deviceClass to populate in partB --- packages/@react-native-windows/telemetry/src/telemetry.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/@react-native-windows/telemetry/src/telemetry.ts b/packages/@react-native-windows/telemetry/src/telemetry.ts index 6333d3d7a13..2f5ec637216 100644 --- a/packages/@react-native-windows/telemetry/src/telemetry.ts +++ b/packages/@react-native-windows/telemetry/src/telemetry.ts @@ -385,6 +385,8 @@ export class Telemetry { numCPUs: Telemetry.commonProperties.numCPUs, totalMemory: Telemetry.commonProperties.totalMemory, diskFreeSpace: Telemetry.commonProperties.deviceDiskFreeSpace, + localId: Telemetry.commonProperties.deviceId, + deviceClass: Telemetry.commonProperties.deviceClass, }, nodePlatform: Telemetry.commonProperties.nodePlatform, nodeArchitecture: Telemetry.commonProperties.nodeArchitecture, From 3b8aa82ba2d8f48e9b5c1b52fc553a190b017841 Mon Sep 17 00:00:00 2001 From: Harini Malothu Date: Wed, 17 Sep 2025 22:24:14 +0530 Subject: [PATCH 6/7] Update packages/@react-native-windows/telemetry/src/telemetry.ts Co-authored-by: Jon Thysell --- packages/@react-native-windows/telemetry/src/telemetry.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/@react-native-windows/telemetry/src/telemetry.ts b/packages/@react-native-windows/telemetry/src/telemetry.ts index 2f5ec637216..d4df35ada91 100644 --- a/packages/@react-native-windows/telemetry/src/telemetry.ts +++ b/packages/@react-native-windows/telemetry/src/telemetry.ts @@ -396,7 +396,6 @@ export class Telemetry { isCliTest: Telemetry.commonProperties.isTest, sessionId: Telemetry.commonProperties.sessionId, commandName: Telemetry.commonProperties.commandName, - localId: Telemetry.commonProperties.deviceId, }, // Set project and versions props, belonging to Part B. project: Telemetry.projectProp, From f02161ad47aa854c62107c000a847c45f904d4c6 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Thu, 18 Sep 2025 10:49:56 -0700 Subject: [PATCH 7/7] Update packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts --- .../telemetry/src/e2etest/telemetry.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts b/packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts index f0949f241ad..388fa6f76ed 100644 --- a/packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts +++ b/packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts @@ -369,7 +369,7 @@ function verifyTestCommandTelemetryProcessor( const expectedLocalId = TelemetryTest.getCommonProperty('deviceId'); expect(envelope.ext?.device?.localId).toBeDefined(); expect(envelope.ext?.device?.localId).toBe(expectedLocalId); - expect(commonProperties.localId).toBe(expectedLocalId); // Only if you know it's set in the event, not in static commonProperties + expect(commonProperties.device?.localId).toBe(expectedLocalId); // Only if you know it's set in the event, not in static commonProperties // Verify versions info const versions = properties!.versions;