update

Author: zhiyuanliang-ms

src/feature-management-applicationinsights-browser/src/index.ts

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export { createTelemetryPublisher, trackEvent, createTargetingTelemetryInitializer } from "./telemetry.js";
+export { createTargetingTelemetryInitializer, createTelemetryPublisher, trackEvent } from "./telemetry.js";
 export { VERSION } from "./version.js";

src/feature-management-applicationinsights-browser/src/telemetry.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { EvaluationResult, createFeatureEvaluationEventProperties, TargetingContextAccessor } from "@microsoft/feature-management";
+import { EvaluationResult, createFeatureEvaluationEventProperties, ITargetingContextAccessor } from "@microsoft/feature-management";
 import { ApplicationInsights, IEventTelemetry, ITelemetryItem } from "@microsoft/applicationinsights-web";
 
 const TARGETING_ID = "TargetingId";
@@ -45,9 +45,9 @@ export function trackEvent(client: ApplicationInsights, targetingId: string, eve
  * @param targetingContextAccessor The accessor function to get the targeting context.
  * @returns A telemetry initializer that attaches targeting id to telemetry items.
  */
-export function createTargetingTelemetryInitializer(targetingContextAccessor: TargetingContextAccessor): (item: ITelemetryItem) => void {
+export function createTargetingTelemetryInitializer(targetingContextAccessor: ITargetingContextAccessor): (item: ITelemetryItem) => void {
     return (item: ITelemetryItem) => {
-        const targetingContext = targetingContextAccessor();
+        const targetingContext = targetingContextAccessor.getTargetingContext();
         if (targetingContext?.userId === undefined) {
             console.warn("Targeting id is undefined.");
         }

src/feature-management-applicationinsights-node/src/index.ts

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export { createTelemetryPublisher, trackEvent, createTargetingTelemetryProcessor } from "./telemetry.js";
+export { createTargetingTelemetryProcessor, createTelemetryPublisher, trackEvent } from "./telemetry.js";
 export { VERSION } from "./version.js";

src/feature-management-applicationinsights-node/src/telemetry.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { EvaluationResult, createFeatureEvaluationEventProperties, TargetingContextAccessor } from "@microsoft/feature-management";
+import { EvaluationResult, createFeatureEvaluationEventProperties, ITargetingContextAccessor } from "@microsoft/feature-management";
 import { TelemetryClient, Contracts } from "applicationinsights";
 
 const TARGETING_ID = "TargetingId";
@@ -45,14 +45,14 @@ export function trackEvent(client: TelemetryClient, targetingId: string, event:
  * @param targetingContextAccessor The accessor function to get the targeting context.
  * @returns A telemetry processor that attaches targeting id to telemetry envelopes.
  */
-export function createTargetingTelemetryProcessor(targetingContextAccessor: TargetingContextAccessor): (envelope: Contracts.EnvelopeTelemetry) => boolean {
+export function createTargetingTelemetryProcessor(targetingContextAccessor: ITargetingContextAccessor): (envelope: Contracts.EnvelopeTelemetry) => boolean {
     return (envelope: Contracts.EnvelopeTelemetry) => {
-        const targetingContext = targetingContextAccessor();
+        const targetingContext = targetingContextAccessor.getTargetingContext();
         if (targetingContext?.userId === undefined) {
             console.warn("Targeting id is undefined.");
         }
         envelope.data.baseData = envelope.data.baseData || {};
-        envelope.data.baseData.properties = {...envelope.data.baseData.properties, [TARGETING_ID]: targetingContext.userId};
+        envelope.data.baseData.properties = {...envelope.data.baseData.properties, [TARGETING_ID]: targetingContext?.userId || ""};
         return true; // If a telemetry processor returns false, that telemetry item isn't sent.
     };
 }