@microsoft/managed-apps-cli 0.17.0 → 0.19.0

package/dist/Logger/CliLogger.js

@@ -1,15 +1,41 @@
 /*!
  * Copyright (C) Microsoft Corporation. All rights reserved.
  */
+import { randomUUID } from 'node:crypto';
 import { getEnvironmentByName } from '@microsoft/managed-apps-actions';
-import { cloudToRegionSafe } from '@microsoft/managed-apps-common/services';
-import { randomUUID } from 'crypto';
+import { regionToClusterCategory } from '@microsoft/managed-apps-common/services';
 import packageJson from '../../package.json' with { type: 'json' };
 import { getCliEnvVarBool } from '../Utils/EnvVars.js';
+import { BufferedTelemetryWriter } from './BufferedTelemetryWriter.js';
 import { ConsoleWriter } from './ConsoleWriter.js';
 import { EUGeoRegions } from './Constants.js';
 import { resolveUserTelemetrySettings } from './LoggerSettings.js';
 import { OneDSWriter } from './OneDSWriter.js';
+const environmentlessIdentifierDimensions = new Set(['environmentid', 'tenantid', 'objectid']);
+function isEnvironmentlessIdentifierDimension(key) {
+    return environmentlessIdentifierDimensions.has(key.toLowerCase());
+}
+function removeEnvironmentlessIdentifierDimensions(eventData) {
+    if (!eventData) {
+        return eventData;
+    }
+    return Object.fromEntries(Object.entries(eventData).filter(([key]) => !isEnvironmentlessIdentifierDimension(key)));
+}
+/**
+ * Returns true if the environment's cluster category is compatible with the region's cluster
+ * category. First Release environments are part of the public production cloud.
+ * If the environment has no cluster category, it is considered a match for all regions.
+ *
+ * This is required to handle the edge case when a command is run against a non-prod environment
+ * without providing the --cloud param.
+ */
+function doesEnvironmentMatchRegion(metadata, region) {
+    const environmentClusterCategory = metadata?.properties.cluster?.category?.toLowerCase();
+    const regionClusterCategory = regionToClusterCategory(region);
+    return (!environmentClusterCategory ||
+        environmentClusterCategory === regionClusterCategory ||
+        (regionClusterCategory === 'prod' && environmentClusterCategory === 'firstrelease'));
+}
 function stringifyErrorWithStack(error) {
     if (!error)
         return undefined;
@@ -99,162 +125,161 @@ function createScenarioLogger(telemetryWriters, name, data) {
 /**
  * Logger implementation for the CLI.
  *
- * Telemetry is **unauthenticated by default**: the OneDS writer is constructed at
- * `create()` time with `telemetryLocation: 'global'` and no `geoLocation`, so events
- * start flowing immediately without any auth dependency. The writer is then upgraded to
- * the EU-aware authed version via one of two paths:
- *
- * - `tryEagerUpgradeAsync` — called from `runVerb` after MSAL is initialized. If a
- *   cached account already exists, the upgrade runs synchronously before the first event
- *   so signed-in users get authed telemetry for the entire session.
- * - `CliHttpClient.onFirstAuth` callback — registered in `create()`, fires (background)
- *   after the verb's first successful authed HTTP call. Handles users who sign in
- *   mid-session via MSAL.
- *
- * Verbs that never make an authed HTTP call and have no cached account stay on the
- * unauthenticated writer for their whole lifetime — events still reach 1DS, just on
- * the global endpoint with no `geoLocation` or `tenantId`.
- *
- * 1DS event submission uses its own ingestion credentials (not the Entra bearer token),
- * so events can be sent regardless of sign-in state.
+ * Remote telemetry is buffered until the command resolves its target environment and region.
+ * Console telemetry is initialized immediately when enabled.
  */
 export class CliLogger {
     _telemetryWriters = [];
-    _unauthWriter;
+    _bufferedWriter;
+    _remoteWriter;
     _customDimensions = {};
-    _upgradeFired = false;
     _sessionId;
-    _upgradeConfig;
-    constructor(telemetryWriters, sessionId) {
+    _origin;
+    _authenticationProvider;
+    _appId;
+    _httpForwardOptions;
+    _telemetryContext;
+    _environmentMetadataPromise;
+    _isRemoteTelemetrySuppressed = false;
+    _isEnvironmentlessTelemetry = false;
+    constructor(telemetryWriters, sessionId, origin, authenticationProvider, appId, httpForwardOptions) {
         this._telemetryWriters = telemetryWriters;
         this._sessionId = sessionId;
+        this._origin = origin;
+        this._authenticationProvider = authenticationProvider;
+        this._appId = appId ?? '';
+        this._httpForwardOptions = httpForwardOptions;
     }
-    static async create(cliSettings, httpClient, authenticationProvider) {
-        const environmentId = cliSettings.appConfig?.environmentId;
-        const region = cloudToRegionSafe(cliSettings.appConfig?.cloud);
-        const appId = cliSettings.appConfig?.appId;
+    static async create(cliSettings, authenticationProvider, httpForwardOptions) {
         const sessionId = randomUUID();
         const telemetryWriters = [];
         const userTelemetrySettings = resolveUserTelemetrySettings();
         if (userTelemetrySettings.console) {
             telemetryWriters.push(new ConsoleWriter(sessionId, cliSettings.origin));
         }
-        const instance = new CliLogger(telemetryWriters, sessionId);
+        const instance = new CliLogger(telemetryWriters, sessionId, cliSettings.origin, authenticationProvider, cliSettings.appConfig?.appId, httpForwardOptions);
         // In mocked-backend mode (E2E) never open a real 1DS/remote telemetry channel: it bypasses
         // the injected mock HttpClient and would attempt live network egress, hanging the CLI on
         // flush at exit. This keeps "mock all backend calls" complete for E2E runs.
         const suppressRemoteTelemetry = getCliEnvVarBool('MOCK_BACKEND');
-        if (userTelemetrySettings.remote && region && environmentId && !suppressRemoteTelemetry) {
-            // Push the unauthenticated writer immediately. Defaults to the global 1DS endpoint
-            // and omits `geoLocation`; if/when auth succeeds, the upgrade swaps in the EU-aware
-            // writer below.
-            const unauth = new OneDSWriter(sessionId, region, 'global', environmentId, appId ?? '', undefined, packageJson.version, cliSettings.origin);
-            instance._unauthWriter = unauth;
-            instance._telemetryWriters.push(unauth);
-            instance._upgradeConfig = { sessionId, region, environmentId, appId, cliSettings };
-            // Register the lazy upgrade: fires once when the verb makes its first successful
-            // authed HTTP call. By that point we know auth works, so the metadata fetch can't
-            // pop a browser.
-            httpClient.onFirstAuth(() => instance._upgradeToAuthedWriterAsync(authenticationProvider));
+        if (userTelemetrySettings.remote && !suppressRemoteTelemetry) {
+            instance._bufferedWriter = new BufferedTelemetryWriter();
+            instance._telemetryWriters.push(instance._bufferedWriter);
         }
         // Emit the first-party embedding host correlation id (if supplied via
         // MS_CLI_EMBEDDING_HOST_CORRELATION_ID) on every event. It is injected as a default
         // property here and promoted to a dedicated top-level telemetry column
-        // (`embeddingHostCorrelationId`) by the OneDS writer's propertyColumnMap. Set after the
-        // writers exist so it lands on the console + unauth writers immediately and survives the
-        // authed-writer swap (re-applied from `_customDimensions`). The internal per-invocation
-        // `sessionId` is intentionally left untouched.
+        // (`embeddingHostCorrelationId`) by the OneDS writer's propertyColumnMap. Preserve it until
+        // the delayed remote writer is created, while applying it to the console writer immediately.
+        // The internal per-invocation `sessionId` is intentionally left untouched.
         if (cliSettings.embeddingHostCorrelationId) {
             instance.setCustomDimension('embeddingHostCorrelationId', cliSettings.embeddingHostCorrelationId);
         }
         return instance;
     }
-    /**
-     * Eagerly run the upgrade when a cached account already exists at verb-start time,
-     * so even the first telemetry event of the session lands on the authenticated writer.
-     * Called from `ArgumentProvider.runVerb` after `authProvider.initAsync(region)` but
-     * before any event is emitted.
-     *
-     * No-op if no cached account is present (we don't want to block CLI startup on a
-     * network call when the user isn't even signed in), or if the upgrade has already
-     * fired. For not-signed-in users the lazy `onFirstAuth` path still handles things
-     * later if the verb itself triggers a sign-in.
-     *
-     * Cost: ~100-500ms for signed-in users — the time `getEnvironmentByName` takes.
-     * Signed-in-but-offline users will block on the default fetch timeout before
-     * falling through; events still flow to the unauthenticated writer in that case.
-     */
-    async tryEagerUpgradeAsync(authenticationProvider) {
-        if (this._upgradeFired || !this._upgradeConfig) {
-            return;
+    setCustomDimension(_key, _value) {
+        try {
+            if (!_key || !_value) {
+                return;
+            }
+            if (this._isEnvironmentlessTelemetry && isEnvironmentlessIdentifierDimension(_key)) {
+                return;
+            }
+            this._customDimensions[_key] = _value;
+            this._telemetryWriters.forEach((writer) => {
+                writer.setCustomDimension(_key, _value);
+            });
         }
-        if (await authenticationProvider.getCachedAccountAsync()) {
-            await this._upgradeToAuthedWriterAsync(authenticationProvider);
+        catch {
+            // No-op. Telemetry failures should not block CLI operations
         }
     }
     /**
-     * Replaces the unauthenticated OneDS writer with an EU-aware authed one. Called from
-     * two paths:
-     * - `tryEagerUpgradeAsync` (blocking, before the first event) when a cached account
-     *   is already present at verb-start time.
-     * - `CliHttpClient.onFirstAuth` (fire-and-forget) after the verb's first successful
-     *   authed HTTP call, when the user signed in mid-session.
-     * Best-effort — on any failure the unauthenticated writer stays in place and events
-     * keep flowing to the global endpoint.
+     * Records the command's resolved routing context and activates the remote writer once the
+     * environment metadata is available.
      */
-    async _upgradeToAuthedWriterAsync(authenticationProvider) {
-        if (this._upgradeFired || !this._upgradeConfig || !this._unauthWriter) {
+    async setTelemetryContext(context) {
+        if (!this._telemetryContext) {
+            this._telemetryContext = context;
+        }
+        else if (!this._telemetryContext.environmentId && context.environmentId) {
+            // The initial region is authoritative. Environment resolution may happen later.
+            this._telemetryContext = {
+                ...this._telemetryContext,
+                environmentId: context.environmentId,
+            };
+        }
+        else {
+            // Context already complete; avoid redundant metadata lookups.
             return;
         }
-        this._upgradeFired = true;
-        const { sessionId, region, environmentId, appId, cliSettings } = this._upgradeConfig;
-        try {
-            const metadata = await getEnvironmentByName(environmentId);
-            let telemetryLocation = 'global';
-            if (metadata?.properties?.location && EUGeoRegions.has(metadata.properties.location)) {
-                telemetryLocation = 'eu';
-            }
-            const authed = new OneDSWriter(sessionId, region, telemetryLocation, environmentId, appId ?? '', metadata?.properties?.cluster?.geoShortName, packageJson.version, cliSettings.origin);
-            // Replace the unauth writer in place. Pre-upgrade events have already been
-            // dispatched to the unauth writer's channel; we don't re-send them.
-            const idx = this._telemetryWriters.indexOf(this._unauthWriter);
-            if (idx >= 0) {
-                this._telemetryWriters[idx] = authed;
-            }
-            else {
-                this._telemetryWriters.push(authed);
-            }
-            this._unauthWriter = authed;
-            // Re-apply previously set dimensions to the replacement writer.
-            for (const [key, value] of Object.entries(this._customDimensions)) {
-                authed.setCustomDimension(key, value);
-            }
-            // Set the tenantId dimension AFTER the swap so it lands on the authed writer
-            // (and any ConsoleWriter that's still in the list), not the discarded unauth one.
-            const tenantId = authenticationProvider.getUserTenantId();
-            if (tenantId) {
-                this.setCustomDimension('tenantId', tenantId);
+        if (this._telemetryContext.environmentId) {
+            const metadata = await this._getEnvironmentMetadataAsync(this._telemetryContext.environmentId, this._telemetryContext.region);
+            await this._activateRemoteWriter(metadata);
+        }
+    }
+    async _getEnvironmentMetadataAsync(environmentId, region) {
+        this._environmentMetadataPromise ??= getEnvironmentByName(environmentId)
+            .then((metadata) => {
+            if (!metadata.location || !doesEnvironmentMatchRegion(metadata, region)) {
+                this._isRemoteTelemetrySuppressed = true;
+                return undefined;
             }
+            return metadata;
+        })
+            .catch(() => {
+            this._isRemoteTelemetrySuppressed = true;
+            return undefined;
+        });
+        return this._environmentMetadataPromise;
+    }
+    async _activateRemoteWriter(environmentMetadata) {
+        if (!this._bufferedWriter ||
+            !this._telemetryContext?.environmentId ||
+            !environmentMetadata ||
+            !environmentMetadata.location ||
+            this._isRemoteTelemetrySuppressed) {
+            // Keep unresolved or mismatched-environment events buffered for CLI teardown to persist.
+            return;
         }
-        catch {
-            // Best-effort. Unauth writer stays in place; subsequent events keep going to global.
+        const telemetryLocation = EUGeoRegions.has(environmentMetadata.location) ? 'eu' : 'global';
+        this._createRemoteWriterAndReplay(this._telemetryContext.region, telemetryLocation, this._telemetryContext.environmentId, environmentMetadata.properties.cluster?.geoShortName);
+    }
+    _activateEnvironmentlessRemoteWriter() {
+        if (!this._bufferedWriter || this._telemetryContext?.environmentId) {
+            return;
         }
+        this._isEnvironmentlessTelemetry = true;
+        this._createRemoteWriterAndReplay(this._telemetryContext?.region ?? 'prod', 'global', undefined, undefined);
     }
-    setCustomDimension(_key, _value) {
+    _createRemoteWriterAndReplay(region, telemetryLocation, environmentId, geoLocation) {
+        if (!this._bufferedWriter || this._remoteWriter) {
+            return;
+        }
         try {
-            if (!_key || !_value) {
-                return;
+            const remoteWriter = new OneDSWriter(this._sessionId, region, telemetryLocation, environmentId, this._appId, geoLocation, packageJson.version, this._origin, this._httpForwardOptions);
+            this._remoteWriter = remoteWriter;
+            for (const [key, value] of Object.entries(this._customDimensions)) {
+                if (!this._isEnvironmentlessTelemetry || !isEnvironmentlessIdentifierDimension(key)) {
+                    remoteWriter.setCustomDimension(key, value);
+                }
             }
-            // not guarding on _upgradeFired to preserve dimensions set before the swap is complete
-            this._customDimensions[_key] = _value;
-            this._telemetryWriters.forEach((writer) => {
-                writer.setCustomDimension(_key, _value);
-            });
+            if (!this._isEnvironmentlessTelemetry) {
+                const tenantId = this._authenticationProvider.getUserTenantId();
+                if (tenantId) {
+                    remoteWriter.setCustomDimension('tenantId', tenantId);
+                }
+            }
+            this._bufferedWriter.replay(remoteWriter, this._isEnvironmentlessTelemetry ? removeEnvironmentlessIdentifierDimensions : undefined);
+            this._telemetryWriters.push(remoteWriter);
         }
         catch {
-            // No-op. Telemetry failures should not block CLI operations
+            // Keep the buffer intact; CLI teardown persists it after the command session ends.
         }
     }
+    writeBufferedTelemetryToFile(directory) {
+        return this._bufferedWriter?.writeToTemporaryFile(directory);
+    }
     trackActivityEvent(eventName, eventData) {
         try {
             if (this._telemetryWriters.length === 0) {
@@ -312,8 +337,19 @@ export class CliLogger {
     set sessionId(_value) {
         // No-op
     }
-    flush() {
-        return Promise.all(this._telemetryWriters.map((writer) => writer.flush())).then(() => undefined);
+    async flush(retainBufferedTelemetry = false) {
+        if (this._environmentMetadataPromise) {
+            // Ensure any in-flight metadata lookup can activate and replay buffered remote telemetry.
+            const metadata = await this._environmentMetadataPromise;
+            await this._activateRemoteWriter(metadata);
+        }
+        else {
+            this._activateEnvironmentlessRemoteWriter();
+        }
+        await Promise.all(this._telemetryWriters.map((writer) => writer.flush()));
+        if (this._remoteWriter && !retainBufferedTelemetry) {
+            this._bufferedWriter?.clear();
+        }
     }
     withDefaults(_extras) {
         // No-op — CLI logger does not implement local scope defaults today.

package/dist/Logger/CliLogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"CliLogger.js","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CliLogger.js","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"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"}

package/dist/Logger/OneDSWriter.d.ts

@@ -1,19 +1,23 @@
-/*!
- * Copyright (C) Microsoft Corporation. All rights reserved.
- */
+import type { IXHROverride } from '@microsoft/1ds-post-js';
 import { type Region } from '@microsoft/managed-apps-common/services';
 import { type TelemetryLocation } from '@microsoft/managed-apps-common/telemetry';
 import type { ITelemetryWriter } from '../Types/LoggerTypes.types.js';
+export interface OneDsHttpForwardOptions {
+    forwardUrl: string;
+    authToken?: string;
+    customForwardHeadersJson?: string;
+}
+export declare function createOneDsHttpForwardOverride(options: OneDsHttpForwardOptions): IXHROverride;
 export declare class OneDSWriter implements ITelemetryWriter {
     private _provider;
-    constructor(sessionId: string, region: Region, telemetryLocation: TelemetryLocation, environmentId: string, appId: string, geoLocation: string | undefined, cliVersion: string, cliSource: string);
-    trackActivityEvent(operationName: string, eventData?: object): void;
-    trackErrorEvent(operationName: string, eventData?: object): void;
-    startScenario(scenarioName: string, startData?: object): void;
-    progressScenario(scenarioName: string, progressData?: object): void;
-    completeScenario(scenarioName: string, completeData?: object): void;
-    scenarioFailed(scenarioName: string, failureData?: object): void;
-    scenarioCompletedWithError(scenarioName: string, completeWithErrorData?: object): void;
+    constructor(sessionId: string, region: Region, telemetryLocation: TelemetryLocation, environmentId: string | undefined, appId: string, geoLocation: string | undefined, cliVersion: string, cliSource: string, httpForwardOptions?: OneDsHttpForwardOptions);
+    trackActivityEvent(operationName: string, eventData?: object, timestamp?: string): void;
+    trackErrorEvent(operationName: string, eventData?: object, timestamp?: string): void;
+    startScenario(scenarioName: string, startData?: object, timestamp?: string): void;
+    progressScenario(scenarioName: string, progressData?: object, timestamp?: string): void;
+    completeScenario(scenarioName: string, completeData?: object, timestamp?: string): void;
+    scenarioFailed(scenarioName: string, failureData?: object, timestamp?: string): void;
+    scenarioCompletedWithError(scenarioName: string, completeWithErrorData?: object, timestamp?: string): void;
     flush(): Promise<void>;
     setCustomDimension(_key: string, _value: string): void;
     private static readonly _EVENT_PREFIX;

package/dist/Logger/OneDSWriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OneDSWriter.d.ts","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,qBAAa,WAAY,YAAW,gBAAgB;IAClD,OAAO,CAAC,SAAS,CAAyB;gBAGxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM;IAwDZ,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOnE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOhE,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAQ7D,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IAQnE,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IASnE,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAShE,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI;IAStF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAI7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAqB;IAE1D,OAAO,CAAC,WAAW;CAyBpB"}
+{"version":3,"file":"OneDSWriter.d.ts","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAgB,YAAY,EAAsB,MAAM,wBAAwB,CAAC;AAC7F,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAIlD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAuED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,uBAAuB,GAAG,YAAY,CAM7F;AAED,qBAAa,WAAY,YAAW,gBAAgB;IAClD,OAAO,CAAC,SAAS,CAAyB;gBAGxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,kBAAkB,CAAC,EAAE,uBAAuB;IAiEvC,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAWvF,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAWpF,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAYjF,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAYvF,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAavF,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAapF,0BAA0B,CAC/B,YAAY,EAAE,MAAM,EACpB,qBAAqB,CAAC,EAAE,MAAM,EAC9B,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI;IAaA,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAI7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAqB;IAE1D,OAAO,CAAC,WAAW;CAyBpB"}

package/dist/Logger/OneDSWriter.js

@@ -1,14 +1,79 @@
 /*!
  * Copyright (C) Microsoft Corporation. All rights reserved.
  */
+import { randomUUID } from 'node:crypto';
 import { regionToClusterCategory } from '@microsoft/managed-apps-common/services';
 import { OneDsTelemetryProvider, ScenarioResults, TelemetryEventNames, } from '@microsoft/managed-apps-common/telemetry';
+import { MS_CLIENT_REQUESTID, MS_TARGET_URL, USER_AGENT } from '../Constants.js';
+import { applyStaticForwardHeaders, parseForwardHeaders } from '../HttpClient/HttpForward.js';
 import { getScrubbedCustomDimensions } from './Scrubber/ScrubCustomDimensions.js';
+function appendUserAgent(headers) {
+    let existingUserAgent = '';
+    for (const name of Object.keys(headers)) {
+        if (name.toLowerCase() === 'user-agent') {
+            if (headers[name]) {
+                existingUserAgent = existingUserAgent
+                    ? `${existingUserAgent} ${headers[name]}`
+                    : headers[name];
+            }
+            delete headers[name];
+        }
+    }
+    headers['User-Agent'] = existingUserAgent ? `${existingUserAgent} ${USER_AGENT}` : USER_AGENT;
+}
+function buildForwardedTelemetryHeaders(payloadHeaders, forwardHeaders) {
+    const headers = {};
+    applyStaticForwardHeaders(headers, forwardHeaders);
+    for (const [name, value] of Object.entries(payloadHeaders ?? {})) {
+        if (name.toLowerCase() !== 'user-agent') {
+            for (const existingName of Object.keys(headers)) {
+                if (existingName.toLowerCase() === name.toLowerCase()) {
+                    delete headers[existingName];
+                }
+            }
+        }
+        headers[name] = value;
+    }
+    return headers;
+}
+async function sendForwardedTelemetry(payload, oncomplete, options, forwardHeaders) {
+    const headers = buildForwardedTelemetryHeaders(payload.headers, forwardHeaders);
+    headers[MS_TARGET_URL] = payload.urlString;
+    headers[MS_CLIENT_REQUESTID] = randomUUID();
+    if (options.authToken) {
+        headers.Authorization = 'Bearer ' + options.authToken;
+    }
+    appendUserAgent(headers);
+    try {
+        const response = await globalThis.fetch(options.forwardUrl, {
+            method: 'POST',
+            headers,
+            body: payload.data,
+            signal: payload.timeout ? AbortSignal.timeout(payload.timeout) : undefined,
+        });
+        const responseHeaders = {};
+        response.headers.forEach((value, name) => {
+            responseHeaders[name] = value;
+        });
+        const oneDsStatus = response.ok && response.status !== 204 ? 200 : response.status;
+        oncomplete(oneDsStatus, responseHeaders, await response.text());
+        return true;
+    }
+    catch (error) {
+        oncomplete(0, {}, error instanceof Error ? error.message : String(error));
+        return false;
+    }
+}
+export function createOneDsHttpForwardOverride(options) {
+    const forwardHeaders = parseForwardHeaders(options.customForwardHeadersJson);
+    return {
+        sendPOST: (payload, oncomplete) => sendForwardedTelemetry(payload, oncomplete, options, forwardHeaders),
+    };
+}
 export class OneDSWriter {
     _provider;
-    constructor(sessionId, region, telemetryLocation, environmentId, appId, geoLocation, cliVersion, cliSource) {
+    constructor(sessionId, region, telemetryLocation, environmentId, appId, geoLocation, cliVersion, cliSource, httpForwardOptions) {
         const commonProperties = {
-            environmentId,
             isOnePlayer: 'false',
             webPlayerScenario: 'ManagedApps_CLI_Authoring',
             cloud: region === 'preview' ? 'prod' : region,
@@ -18,12 +83,24 @@ export class OneDSWriter {
             cliVersion,
             cliSource,
         };
+        if (environmentId) {
+            commonProperties.environmentId = environmentId;
+        }
         if (appId) {
             commonProperties.playerAppId = appId;
         }
         if (geoLocation) {
             commonProperties.geoLocation = geoLocation;
         }
+        const channelConfig = {
+            maxEvtPerBatch: 500,
+            maxEventRetryAttempts: 6,
+            eventsLimitInMem: 10000,
+        };
+        if (httpForwardOptions) {
+            channelConfig.httpXHROverride = createOneDsHttpForwardOverride(httpForwardOptions);
+            channelConfig.alwaysUseXhrOverride = true;
+        }
         this._provider = new OneDsTelemetryProvider({
             clientType: 'ManagedAppsCLI',
             clusterCategory: regionToClusterCategory(region),
@@ -41,11 +118,7 @@ export class OneDSWriter {
                 // leaving it only inside the customDimensions blob.
                 embeddingHostCorrelationId: 'embeddingHostCorrelationId',
             },
-            channelConfig: {
-                maxEvtPerBatch: 500,
-                maxEventRetryAttempts: 6,
-                eventsLimitInMem: 10000,
-            },
+            channelConfig,
         });
         this._provider.sessionId = sessionId;
         // Sync 1DS session id with CLI session id in Part A extension
@@ -55,55 +128,55 @@ export class OneDSWriter {
             app.sesId = sessionId;
         });
     }
-    trackActivityEvent(operationName, eventData) {
+    trackActivityEvent(operationName, eventData, timestamp) {
         this._trackEvent(TelemetryEventNames.Activity, {
             ...eventData,
             operationName,
-        });
+        }, timestamp);
     }
-    trackErrorEvent(operationName, eventData) {
+    trackErrorEvent(operationName, eventData, timestamp) {
         this._trackEvent(TelemetryEventNames.Error, {
             ...eventData,
             operationName,
-        });
+        }, timestamp);
     }
-    startScenario(scenarioName, startData) {
+    startScenario(scenarioName, startData, timestamp) {
         this._trackEvent(TelemetryEventNames.StartScenario, {
             operationName: scenarioName,
             ...startData,
             scenarioName,
-        });
+        }, timestamp);
     }
-    progressScenario(scenarioName, progressData) {
+    progressScenario(scenarioName, progressData, timestamp) {
         this._trackEvent(TelemetryEventNames.ProgressScenario, {
             operationName: scenarioName,
             ...progressData,
             scenarioName,
-        });
+        }, timestamp);
     }
-    completeScenario(scenarioName, completeData) {
+    completeScenario(scenarioName, completeData, timestamp) {
         this._trackEvent(TelemetryEventNames.EndScenario, {
             operationName: scenarioName,
             ...completeData,
             scenarioName,
             scenarioResult: ScenarioResults.Success,
-        });
+        }, timestamp);
     }
-    scenarioFailed(scenarioName, failureData) {
+    scenarioFailed(scenarioName, failureData, timestamp) {
         this._trackEvent(TelemetryEventNames.EndScenario, {
             operationName: scenarioName,
             ...failureData,
             scenarioName,
             scenarioResult: ScenarioResults.Failed,
-        });
+        }, timestamp);
     }
-    scenarioCompletedWithError(scenarioName, completeWithErrorData) {
+    scenarioCompletedWithError(scenarioName, completeWithErrorData, timestamp) {
         this._trackEvent(TelemetryEventNames.EndScenario, {
             operationName: scenarioName,
             ...completeWithErrorData,
             scenarioName,
             scenarioResult: ScenarioResults.SuccessWithErrors,
-        });
+        }, timestamp);
     }
     flush() {
         return this._provider.flush();
@@ -112,7 +185,7 @@ export class OneDSWriter {
         this._provider.setDefaultProperty(_key, _value);
     }
     static _EVENT_PREFIX = 'ManagedAppsCLI.';
-    _trackEvent(eventName, eventData) {
+    _trackEvent(eventName, eventData, timestamp) {
         const operationName = eventData.operationName || '';
         const scrubbed = getScrubbedCustomDimensions(eventName, operationName, eventData);
         const properties = {};
@@ -129,7 +202,7 @@ export class OneDSWriter {
         }
         this._provider.track({
             eventName,
-            timestamp: new Date().toISOString(),
+            timestamp: timestamp ?? new Date().toISOString(),
             severity: 'info',
             properties,
         });