Skip to content

Fix missing telemetry context fields for web extension events #1554

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
amitjoshi438 merged 2 commits into from
Apr 15, 2026
Merged

Fix missing telemetry context fields for web extension events #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed4bee
Fix missing telemetry context fields for web extension events
Apr 15, 2026
2ce2569
Merge branch 'main' into users/amitjoshi/fix-telemetry-context-fields
amitjoshi438 Apr 15, 2026
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
4 changes: 4 additions & 0 deletions src/web/client/telemetry/webExtensionTelemetry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { webExtensionTelemetryEventNames } from "../../../common/OneDSLoggerTele
import { IPortalWebExtensionInitQueryParametersTelemetryData, IWebExtensionAPITelemetryData, IWebExtensionExceptionTelemetryData, IWebExtensionInitPathTelemetryData, IWebExtensionPerfTelemetryData } from "../../../common/OneDSLoggerTelemetry/web/client/webExtensionTelemetryInterface";
import { getEnvironmentIdFromUrl, isNullOrUndefined } from '../utilities/commonUtil';
import { oneDSLoggerWrapper } from "../../../common/OneDSLoggerTelemetry/oneDSLoggerWrapper";
import WebExtensionContext from "../WebExtensionContext";

export class WebExtensionTelemetry {

Expand All @@ -33,7 +34,10 @@ export class WebExtensionTelemetry {
eventName: webExtensionTelemetryEventNames.WEB_EXTENSION_INIT_QUERY_PARAMETERS,
properties: {
orgId: queryParamsMap.get(queryParameters.ORG_ID),
tenantId: WebExtensionContext.tenantId,
websiteId: WebExtensionContext.websiteId,
portalId: queryParamsMap.get(queryParameters.PORTAL_ID),
schema: WebExtensionContext.schema,
referrerSessionId: queryParamsMap.get(queryParameters.REFERRER_SESSION_ID),
referrer: queryParamsMap.get(queryParameters.REFERRER),
geo: queryParamsMap.get(queryParameters.GEO),
Expand Down
17 changes: 16 additions & 1 deletion src/web/client/test/integration/webExtensionTelemetry.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
*/

import sinon, { stub, assert } from "sinon";
import { queryParameters } from "../../common/constants";
import { portalSchemaVersion, queryParameters } from "../../common/constants";
import { sanitizeURL } from "../../utilities/urlBuilderUtil";
import { webExtensionTelemetryEventNames } from "../../../../common/OneDSLoggerTelemetry/web/client/webExtensionTelemetryEvents";
import { WebExtensionTelemetry } from "../../telemetry/webExtensionTelemetry";
import * as commonUtil from "../../utilities/commonUtil";
import { expect } from "chai";
import { oneDSLoggerWrapper } from "../../../../common/OneDSLoggerTelemetry/oneDSLoggerWrapper";
import WebExtensionContext from "../../WebExtensionContext";

describe("webExtensionTelemetry", () => {
let traceInfoStub: sinon.SinonStub;
Expand Down Expand Up @@ -86,6 +87,10 @@ describe("webExtensionTelemetry", () => {

it("sendExtensionInitQueryParametersTelemetry_whenQueryParamHaveAllTheKey_shouldCallSendTelemetryEventWithValidData", () => {
//Act
WebExtensionContext.tenantId = "a1103406-182b-4498-80f0-e1a5d92e9f82";
WebExtensionContext.websiteId = "783ee9d0-4199-4e5a-aece-ea87b9d83f77";
WebExtensionContext.schema = portalSchemaVersion.V2;

const queryParamsMap = new Map<string, string>([
[queryParameters.ORG_ID, "e5dce21c-f85f-4849-b699-920c0fad5fbf"],
[queryParameters.PORTAL_ID, "36429b2e-8b29-4020-8493-bd5e277444d8"],
Expand All @@ -106,7 +111,10 @@ describe("webExtensionTelemetry", () => {

const properties = {
orgId: queryParamsMap.get(queryParameters.ORG_ID),
tenantId: "a1103406-182b-4498-80f0-e1a5d92e9f82",
websiteId: "783ee9d0-4199-4e5a-aece-ea87b9d83f77",
portalId: queryParamsMap.get(queryParameters.PORTAL_ID),
schema: portalSchemaVersion.V2,
referrerSessionId: queryParamsMap.get(
queryParameters.REFERRER_SESSION_ID
),
Expand Down Expand Up @@ -139,11 +147,18 @@ describe("webExtensionTelemetry", () => {

it("sendExtensionInitQueryParametersTelemetry_whenQueryParamsMapIsEmpty_shouldNotThrowException", () => {
//Act
WebExtensionContext.tenantId = "";
WebExtensionContext.websiteId = "";
WebExtensionContext.schema = undefined;

const queryParamsMap = new Map<string, string>([]);

const properties = {
orgId: queryParamsMap.get(queryParameters.ORG_ID),
tenantId: "",
websiteId: "",
portalId: queryParamsMap.get(queryParameters.PORTAL_ID),
schema: undefined,
referrerSessionId: queryParamsMap.get(
queryParameters.REFERRER_SESSION_ID
),
Expand Down
Loading