Skip to content

Revert "Update telemetry test to use localId instead of deviceId for consistency" #15251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 15, 2025
Merged

Revert "Update telemetry test to use localId instead of deviceId for consistency" #15251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83f7dc2
Revert "Update telemetry test to use localId instead of deviceId for …
HariniMalothu17 Oct 14, 2025
27342df
Merge branch 'main' into revert-15144-user/harinimalothu/FixToRetriev…
HariniMalothu17 Oct 14, 2025
81f3450
rever passing localid to telmetry pipeline
Oct 14, 2025
1e1c165
Change files
Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e8822c8e-55c2-4622-b9ef-48a80761ca6a.json → ...db0f2c4f-871c-4759-b316-69e2494c8ab3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "prerelease",
"comment": "Fix to retrieve deviceId",
"comment": "rever passing localid to telmetry pipeline",
"packageName": "@react-native-windows/telemetry",
"email": "[email protected]",
"dependentChangeType": "patch"
Expand Down
7 changes: 1 addition & 6 deletions packages/@react-native-windows/telemetry/src/e2etest/telemetry.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ test('setup() verify static common property values with async sources', async ()
await TelemetryTest.startTest();

const props: Record<string, () => Promise<string | undefined>> = {
deviceId: basePropUtils.deviceId,
//deviceId: basePropUtils.deviceId,
deviceLocale: basePropUtils.deviceLocale,
};

Expand Down Expand Up @@ -365,11 +365,6 @@ 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.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;
Expand Down
6 changes: 2 additions & 4 deletions packages/@react-native-windows/telemetry/src/telemetry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export class Telemetry {

/** Sets up any base properties that all telemetry events require. */
private static async setupBaseProperties() {
Telemetry.commonProperties.deviceId = await basePropUtils.deviceId();
// Telemetry.commonProperties.deviceId = await basePropUtils.deviceId();
Telemetry.commonProperties.fullBuildInfo =
await basePropUtils.fullBuildInfo();
Telemetry.commonProperties.deviceArchitecture =
Expand Down Expand Up @@ -369,7 +369,7 @@ export class Telemetry {
// Populate Part A extensions
telemetryItem.ext = {};
telemetryItem.ext.device = {
localId: Telemetry.commonProperties.deviceId,
//id: Telemetry.commonProperties.deviceId,
deviceClass: Telemetry.commonProperties.deviceClass,
};
telemetryItem.ext.os = {
Expand All @@ -385,8 +385,6 @@ 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,
Expand Down
Loading