Skip to content

fix(OsPlugin): use correct CS 4.0 field names ext.os.name and ext.os.ver #2732

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
hectorhdzg merged 1 commit into from
May 12, 2026
Merged

fix(OsPlugin): use correct CS 4.0 field names ext.os.name and ext.os.ver #2732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 10 additions & 12 deletions extensions/applicationinsights-osplugin-js/Tests/Unit/src/OsPluginTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,8 @@ export class OsPluginTest extends AITestClass {
Assert.equal(this._channelSpy.called, true);
let telemetry = this._channelSpy.getCall(0).args[0];
console.log("telemetry", JSON.stringify(telemetry));
Assert.equal(JSON.stringify(telemetry).includes("osVer"), true, "before timeout, get os version");
Assert.deepEqual(telemetry.ext.os.os, _platformVersion.platform, "OS should be changed");
Assert.deepEqual(telemetry.ext.os.osVer, 11, "windows 11 is detected");
Assert.deepEqual(telemetry.ext.os.name, _platformVersion.platform, "OS name should be set");
Assert.deepEqual(telemetry.ext.os.ver, "11", "OS version should be set as string");
}
});

Expand Down Expand Up @@ -430,8 +429,8 @@ export class OsPluginTest extends AITestClass {

Assert.equal(this._channelSpy.called, true, "event should be sent immediately from cached OS");
let telemetry = this._channelSpy.getCall(0).args[0];
Assert.deepEqual(telemetry.ext.os.os, "Android", "cached OS should be applied to telemetry");
Assert.deepEqual(telemetry.ext.os.osVer, 14, "cached OS version should be applied to telemetry");
Assert.deepEqual(telemetry.ext.os.name, "Android", "cached OS name should be applied to telemetry");
Assert.deepEqual(telemetry.ext.os.ver, "14", "cached OS version should be applied as string");
}
});

Expand Down Expand Up @@ -463,8 +462,8 @@ export class OsPluginTest extends AITestClass {

Assert.equal(this._channelSpy.called, true, "queued event should be released after lookup resolves");
let telemetry = this._channelSpy.getCall(0).args[0];
Assert.deepEqual(telemetry.ext.os.os, _platformVersion.platform, "navigator OS should be applied");
Assert.deepEqual(telemetry.ext.os.osVer, 11, "navigator OS version should be applied");
Assert.deepEqual(telemetry.ext.os.name, _platformVersion.platform, "navigator OS name should be applied");
Assert.deepEqual(telemetry.ext.os.ver, "11", "navigator OS version should be applied as string");
Assert.equal(sessionStorage.getItem("ai_osplugin"), JSON.stringify({ platform: "CachedOS", platformVersion: 99 }), "storage-disabled mode should not overwrite session storage");
}
});
Expand Down Expand Up @@ -497,8 +496,8 @@ export class OsPluginTest extends AITestClass {
Assert.equal(this._getDbgTargets().hasPendingTimeout, false);
Assert.equal(this._channelSpy.called, true);
let telemetry = this._channelSpy.getCall(0).args[0];
Assert.deepEqual(telemetry.ext.os.os, _platformVersion.platform, "OS should be changed");
Assert.deepEqual(telemetry.ext.os.osVer, 11, "windows 11 is detected");
Assert.deepEqual(telemetry.ext.os.name, _platformVersion.platform, "OS name should be set");
Assert.deepEqual(telemetry.ext.os.ver, "11", "OS version should be set as string");
let storedOs = JSON.parse(sessionStorage.getItem("ai_osplugin") || "{}");
QUnit.assert.equal(storedOs.platform, _platformVersion.platform, "os is stored in session storage");
QUnit.assert.equal(storedOs.platformVersion, 11, "os ver is stored in session storage");
Expand All @@ -508,9 +507,8 @@ export class OsPluginTest extends AITestClass {
Assert.equal(this._getDbgTargets().queue.length, 0);
Assert.equal(this._channelSpy.called, true);
telemetry = this._channelSpy.getCall(0).args[0];
Assert.equal(JSON.stringify(telemetry).includes("osVer"), true, "before timeout, get os version");
Assert.deepEqual(telemetry.ext.os.os, _platformVersion.platform, "OS should be changed");
Assert.deepEqual(telemetry.ext.os.osVer, 11, "Windows 11 is detected");
Assert.deepEqual(telemetry.ext.os.name, _platformVersion.platform, "OS name should be set");
Assert.deepEqual(telemetry.ext.os.ver, "11", "OS version should be set as string");
}
});

Expand Down
4 changes: 2 additions & 2 deletions extensions/applicationinsights-osplugin-js/src/OsPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ export class OsPlugin extends BaseTelemetryPlugin {
let mergedOS = (_os || "") + (_osVer ? asString(_osVer) : "");
setValue(extOS, "osVer", mergedOS, isString);
Comment thread
hectorhdzg marked this conversation as resolved.
} else {
setValue(extOS, "osVer", _osVer);
setValue(extOS, "os", _os, isString);
setValue(extOS, "name", _os, isString);
setValue(extOS, "ver", _osVer ? asString(_osVer) : undefined, isString);
Comment thread
hectorhdzg marked this conversation as resolved.
}
}
}
Expand Down
Loading