@microsoft/managed-apps-cli 0.18.0 → 0.20.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +17 -149
- package/dist/ArgumentProvider.d.ts +25 -1
- package/dist/ArgumentProvider.d.ts.map +1 -1
- package/dist/ArgumentProvider.js +80 -23
- package/dist/ArgumentProvider.js.map +1 -1
- package/dist/Authentication/ActiveAccountStore.d.ts +1 -1
- package/dist/Authentication/ActiveAccountStore.d.ts.map +1 -1
- package/dist/Authentication/ActiveAccountStore.js +3 -3
- package/dist/Authentication/ActiveAccountStore.js.map +1 -1
- package/dist/Authentication/NodeMsalAuthenticationProvider.d.ts +16 -1
- package/dist/Authentication/NodeMsalAuthenticationProvider.d.ts.map +1 -1
- package/dist/Authentication/NodeMsalAuthenticationProvider.js +72 -11
- package/dist/Authentication/NodeMsalAuthenticationProvider.js.map +1 -1
- package/dist/Cli.d.ts.map +1 -1
- package/dist/Cli.js +15 -7
- package/dist/Cli.js.map +1 -1
- package/dist/CliUtils.d.ts +12 -7
- package/dist/CliUtils.d.ts.map +1 -1
- package/dist/CliUtils.js +15 -12
- package/dist/CliUtils.js.map +1 -1
- package/dist/Constants/HelpStrings.d.ts +2 -1
- package/dist/Constants/HelpStrings.d.ts.map +1 -1
- package/dist/Constants/HelpStrings.js +5 -3
- package/dist/Constants/HelpStrings.js.map +1 -1
- package/dist/Constants.d.ts +3 -0
- package/dist/Constants.d.ts.map +1 -1
- package/dist/Constants.js +6 -0
- package/dist/Constants.js.map +1 -1
- package/dist/Errors/GitHubErrorMap.d.ts.map +1 -1
- package/dist/Errors/GitHubErrorMap.js +2 -0
- package/dist/Errors/GitHubErrorMap.js.map +1 -1
- package/dist/HttpClient/CliHttpClient.d.ts +0 -13
- package/dist/HttpClient/CliHttpClient.d.ts.map +1 -1
- package/dist/HttpClient/CliHttpClient.js +0 -24
- package/dist/HttpClient/CliHttpClient.js.map +1 -1
- package/dist/Logger/BufferedTelemetryWriter.d.ts +20 -0
- package/dist/Logger/BufferedTelemetryWriter.d.ts.map +1 -0
- package/dist/Logger/BufferedTelemetryWriter.js +163 -0
- package/dist/Logger/BufferedTelemetryWriter.js.map +1 -0
- package/dist/Logger/CliLogger.d.ts +28 -50
- package/dist/Logger/CliLogger.d.ts.map +1 -1
- package/dist/Logger/CliLogger.js +151 -122
- package/dist/Logger/CliLogger.js.map +1 -1
- package/dist/Logger/OneDSWriter.d.ts +8 -8
- package/dist/Logger/OneDSWriter.d.ts.map +1 -1
- package/dist/Logger/OneDSWriter.js +19 -17
- package/dist/Logger/OneDSWriter.js.map +1 -1
- package/dist/Types/Cli.types.d.ts +3 -2
- package/dist/Types/Cli.types.d.ts.map +1 -1
- package/dist/Types/LoggerTypes.types.d.ts +7 -7
- package/dist/Types/LoggerTypes.types.d.ts.map +1 -1
- package/dist/Utils/EnvironmentRoutingUtils.d.ts +1 -1
- package/dist/Utils/EnvironmentRoutingUtils.js +3 -3
- package/dist/Utils/EnvironmentRoutingUtils.js.map +1 -1
- package/dist/Utils/FindAvailablePort.d.ts +39 -0
- package/dist/Utils/FindAvailablePort.d.ts.map +1 -0
- package/dist/Utils/FindAvailablePort.js +105 -0
- package/dist/Utils/FindAvailablePort.js.map +1 -0
- package/dist/Utils/GitUtils.d.ts +16 -0
- package/dist/Utils/GitUtils.d.ts.map +1 -1
- package/dist/Utils/GitUtils.js +87 -9
- package/dist/Utils/GitUtils.js.map +1 -1
- package/dist/Verbs/AddAction.d.ts.map +1 -1
- package/dist/Verbs/AddAction.js +2 -1
- package/dist/Verbs/AddAction.js.map +1 -1
- package/dist/Verbs/AddConnector.d.ts.map +1 -1
- package/dist/Verbs/AddConnector.js +2 -1
- package/dist/Verbs/AddConnector.js.map +1 -1
- package/dist/Verbs/AddDataSource.d.ts.map +1 -1
- package/dist/Verbs/AddDataSource.js +2 -1
- package/dist/Verbs/AddDataSource.js.map +1 -1
- package/dist/Verbs/AddFlow.d.ts.map +1 -1
- package/dist/Verbs/AddFlow.js +2 -1
- package/dist/Verbs/AddFlow.js.map +1 -1
- package/dist/Verbs/AddTable.d.ts.map +1 -1
- package/dist/Verbs/AddTable.js +2 -1
- package/dist/Verbs/AddTable.js.map +1 -1
- package/dist/Verbs/BuildMaafApp.d.ts.map +1 -1
- package/dist/Verbs/BuildMaafApp.js +7 -8
- package/dist/Verbs/BuildMaafApp.js.map +1 -1
- package/dist/Verbs/CreateMaafApp.d.ts +1 -8
- package/dist/Verbs/CreateMaafApp.d.ts.map +1 -1
- package/dist/Verbs/CreateMaafApp.js +8 -68
- package/dist/Verbs/CreateMaafApp.js.map +1 -1
- package/dist/Verbs/DeleteMaafApp.d.ts.map +1 -1
- package/dist/Verbs/DeleteMaafApp.js +6 -10
- package/dist/Verbs/DeleteMaafApp.js.map +1 -1
- package/dist/Verbs/Dev.d.ts.map +1 -1
- package/dist/Verbs/Dev.js +37 -8
- package/dist/Verbs/Dev.js.map +1 -1
- package/dist/Verbs/GetMaafApp.js +2 -3
- package/dist/Verbs/GetMaafApp.js.map +1 -1
- package/dist/Verbs/GetSettings.d.ts.map +1 -1
- package/dist/Verbs/GetSettings.js +2 -2
- package/dist/Verbs/GetSettings.js.map +1 -1
- package/dist/Verbs/Init.d.ts.map +1 -1
- package/dist/Verbs/Init.js +44 -17
- package/dist/Verbs/Init.js.map +1 -1
- package/dist/Verbs/ListConnectorActions.d.ts.map +1 -1
- package/dist/Verbs/ListConnectorActions.js +9 -2
- package/dist/Verbs/ListConnectorActions.js.map +1 -1
- package/dist/Verbs/ListConnectors.d.ts.map +1 -1
- package/dist/Verbs/ListConnectors.js +12 -6
- package/dist/Verbs/ListConnectors.js.map +1 -1
- package/dist/Verbs/ListMaafApps.d.ts.map +1 -1
- package/dist/Verbs/ListMaafApps.js +5 -5
- package/dist/Verbs/ListMaafApps.js.map +1 -1
- package/dist/Verbs/Login.d.ts.map +1 -1
- package/dist/Verbs/Login.js +9 -1
- package/dist/Verbs/Login.js.map +1 -1
- package/dist/Verbs/MaafAppPermissions.d.ts +1 -1
- package/dist/Verbs/MaafAppPermissions.js +15 -14
- package/dist/Verbs/MaafAppPermissions.js.map +1 -1
- package/dist/Verbs/RefreshDataSource.d.ts.map +1 -1
- package/dist/Verbs/RefreshDataSource.js +2 -0
- package/dist/Verbs/RefreshDataSource.js.map +1 -1
- package/dist/Verbs/RefreshGitAuth.d.ts.map +1 -1
- package/dist/Verbs/RefreshGitAuth.js +2 -3
- package/dist/Verbs/RefreshGitAuth.js.map +1 -1
- package/dist/Verbs/RemoveDataSource.d.ts.map +1 -1
- package/dist/Verbs/RemoveDataSource.js +2 -1
- package/dist/Verbs/RemoveDataSource.js.map +1 -1
- package/dist/Verbs/RemoveFlow.d.ts.map +1 -1
- package/dist/Verbs/RemoveFlow.js +2 -1
- package/dist/Verbs/RemoveFlow.js.map +1 -1
- package/dist/Verbs/SetSetting.d.ts.map +1 -1
- package/dist/Verbs/SetSetting.js +7 -5
- package/dist/Verbs/SetSetting.js.map +1 -1
- package/dist/Verbs/VerbConstants.d.ts +8 -3
- package/dist/Verbs/VerbConstants.d.ts.map +1 -1
- package/dist/Verbs/VerbConstants.js +14 -3
- package/dist/Verbs/VerbConstants.js.map +1 -1
- package/package.json +5 -5
package/dist/Logger/CliLogger.js
CHANGED
|
@@ -3,13 +3,39 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { randomUUID } from 'node:crypto';
|
|
5
5
|
import { getEnvironmentByName } from '@microsoft/managed-apps-actions';
|
|
6
|
-
import {
|
|
6
|
+
import { regionToClusterCategory } from '@microsoft/managed-apps-common/services';
|
|
7
7
|
import packageJson from '../../package.json' with { type: 'json' };
|
|
8
8
|
import { getCliEnvVarBool } from '../Utils/EnvVars.js';
|
|
9
|
+
import { BufferedTelemetryWriter } from './BufferedTelemetryWriter.js';
|
|
9
10
|
import { ConsoleWriter } from './ConsoleWriter.js';
|
|
10
11
|
import { EUGeoRegions } from './Constants.js';
|
|
11
12
|
import { resolveUserTelemetrySettings } from './LoggerSettings.js';
|
|
12
13
|
import { OneDSWriter } from './OneDSWriter.js';
|
|
14
|
+
const environmentlessIdentifierDimensions = new Set(['environmentid', 'tenantid', 'objectid']);
|
|
15
|
+
function isEnvironmentlessIdentifierDimension(key) {
|
|
16
|
+
return environmentlessIdentifierDimensions.has(key.toLowerCase());
|
|
17
|
+
}
|
|
18
|
+
function removeEnvironmentlessIdentifierDimensions(eventData) {
|
|
19
|
+
if (!eventData) {
|
|
20
|
+
return eventData;
|
|
21
|
+
}
|
|
22
|
+
return Object.fromEntries(Object.entries(eventData).filter(([key]) => !isEnvironmentlessIdentifierDimension(key)));
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Returns true if the environment's cluster category is compatible with the region's cluster
|
|
26
|
+
* category. First Release environments are part of the public production cloud.
|
|
27
|
+
* If the environment has no cluster category, it is considered a match for all regions.
|
|
28
|
+
*
|
|
29
|
+
* This is required to handle the edge case when a command is run against a non-prod environment
|
|
30
|
+
* without providing the --cloud param.
|
|
31
|
+
*/
|
|
32
|
+
function doesEnvironmentMatchRegion(metadata, region) {
|
|
33
|
+
const environmentClusterCategory = metadata?.properties.cluster?.category?.toLowerCase();
|
|
34
|
+
const regionClusterCategory = regionToClusterCategory(region);
|
|
35
|
+
return (!environmentClusterCategory ||
|
|
36
|
+
environmentClusterCategory === regionClusterCategory ||
|
|
37
|
+
(regionClusterCategory === 'prod' && environmentClusterCategory === 'firstrelease'));
|
|
38
|
+
}
|
|
13
39
|
function stringifyErrorWithStack(error) {
|
|
14
40
|
if (!error)
|
|
15
41
|
return undefined;
|
|
@@ -99,169 +125,161 @@ function createScenarioLogger(telemetryWriters, name, data) {
|
|
|
99
125
|
/**
|
|
100
126
|
* Logger implementation for the CLI.
|
|
101
127
|
*
|
|
102
|
-
*
|
|
103
|
-
*
|
|
104
|
-
* start flowing immediately without any auth dependency. The writer is then upgraded to
|
|
105
|
-
* the EU-aware authed version via one of two paths:
|
|
106
|
-
*
|
|
107
|
-
* - `tryEagerUpgradeAsync` — called from `runVerb` after MSAL is initialized. If a
|
|
108
|
-
* cached account already exists, the upgrade runs synchronously before the first event
|
|
109
|
-
* so signed-in users get authed telemetry for the entire session.
|
|
110
|
-
* - `CliHttpClient.onFirstAuth` callback — registered in `create()`, fires (background)
|
|
111
|
-
* after the verb's first successful authed HTTP call. Handles users who sign in
|
|
112
|
-
* mid-session via MSAL.
|
|
113
|
-
*
|
|
114
|
-
* Verbs that never make an authed HTTP call and have no cached account stay on the
|
|
115
|
-
* unauthenticated writer for their whole lifetime — events still reach 1DS, just on
|
|
116
|
-
* the global endpoint with no `geoLocation` or `tenantId`.
|
|
117
|
-
*
|
|
118
|
-
* 1DS event submission uses its own ingestion credentials (not the Entra bearer token),
|
|
119
|
-
* so events can be sent regardless of sign-in state.
|
|
128
|
+
* Remote telemetry is buffered until the command resolves its target environment and region.
|
|
129
|
+
* Console telemetry is initialized immediately when enabled.
|
|
120
130
|
*/
|
|
121
131
|
export class CliLogger {
|
|
122
132
|
_telemetryWriters = [];
|
|
123
|
-
|
|
133
|
+
_bufferedWriter;
|
|
134
|
+
_remoteWriter;
|
|
124
135
|
_customDimensions = {};
|
|
125
|
-
_upgradeFired = false;
|
|
126
136
|
_sessionId;
|
|
127
|
-
|
|
128
|
-
|
|
137
|
+
_origin;
|
|
138
|
+
_authenticationProvider;
|
|
139
|
+
_appId;
|
|
140
|
+
_httpForwardOptions;
|
|
141
|
+
_telemetryContext;
|
|
142
|
+
_environmentMetadataPromise;
|
|
143
|
+
_isRemoteTelemetrySuppressed = false;
|
|
144
|
+
_isEnvironmentlessTelemetry = false;
|
|
145
|
+
constructor(telemetryWriters, sessionId, origin, authenticationProvider, appId, httpForwardOptions) {
|
|
129
146
|
this._telemetryWriters = telemetryWriters;
|
|
130
147
|
this._sessionId = sessionId;
|
|
148
|
+
this._origin = origin;
|
|
149
|
+
this._authenticationProvider = authenticationProvider;
|
|
150
|
+
this._appId = appId ?? '';
|
|
151
|
+
this._httpForwardOptions = httpForwardOptions;
|
|
131
152
|
}
|
|
132
|
-
static async create(cliSettings,
|
|
133
|
-
const environmentId = cliSettings.appConfig?.environmentId;
|
|
134
|
-
const region = cloudToRegionSafe(cliSettings.appConfig?.cloud);
|
|
135
|
-
const appId = cliSettings.appConfig?.appId;
|
|
153
|
+
static async create(cliSettings, authenticationProvider, httpForwardOptions) {
|
|
136
154
|
const sessionId = randomUUID();
|
|
137
155
|
const telemetryWriters = [];
|
|
138
156
|
const userTelemetrySettings = resolveUserTelemetrySettings();
|
|
139
157
|
if (userTelemetrySettings.console) {
|
|
140
158
|
telemetryWriters.push(new ConsoleWriter(sessionId, cliSettings.origin));
|
|
141
159
|
}
|
|
142
|
-
const instance = new CliLogger(telemetryWriters, sessionId);
|
|
160
|
+
const instance = new CliLogger(telemetryWriters, sessionId, cliSettings.origin, authenticationProvider, cliSettings.appConfig?.appId, httpForwardOptions);
|
|
143
161
|
// In mocked-backend mode (E2E) never open a real 1DS/remote telemetry channel: it bypasses
|
|
144
162
|
// the injected mock HttpClient and would attempt live network egress, hanging the CLI on
|
|
145
163
|
// flush at exit. This keeps "mock all backend calls" complete for E2E runs.
|
|
146
164
|
const suppressRemoteTelemetry = getCliEnvVarBool('MOCK_BACKEND');
|
|
147
|
-
if (userTelemetrySettings.remote &&
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
// writer below.
|
|
151
|
-
const unauth = new OneDSWriter(sessionId, region, 'global', environmentId, appId ?? '', undefined, packageJson.version, cliSettings.origin, httpForwardOptions);
|
|
152
|
-
instance._unauthWriter = unauth;
|
|
153
|
-
instance._telemetryWriters.push(unauth);
|
|
154
|
-
instance._upgradeConfig = {
|
|
155
|
-
sessionId,
|
|
156
|
-
region,
|
|
157
|
-
environmentId,
|
|
158
|
-
appId,
|
|
159
|
-
cliSettings,
|
|
160
|
-
httpForwardOptions,
|
|
161
|
-
};
|
|
162
|
-
// Register the lazy upgrade: fires once when the verb makes its first successful
|
|
163
|
-
// authed HTTP call. By that point we know auth works, so the metadata fetch can't
|
|
164
|
-
// pop a browser.
|
|
165
|
-
httpClient.onFirstAuth(() => instance._upgradeToAuthedWriterAsync(authenticationProvider));
|
|
165
|
+
if (userTelemetrySettings.remote && !suppressRemoteTelemetry) {
|
|
166
|
+
instance._bufferedWriter = new BufferedTelemetryWriter();
|
|
167
|
+
instance._telemetryWriters.push(instance._bufferedWriter);
|
|
166
168
|
}
|
|
167
169
|
// Emit the first-party embedding host correlation id (if supplied via
|
|
168
170
|
// MS_CLI_EMBEDDING_HOST_CORRELATION_ID) on every event. It is injected as a default
|
|
169
171
|
// property here and promoted to a dedicated top-level telemetry column
|
|
170
|
-
// (`embeddingHostCorrelationId`) by the OneDS writer's propertyColumnMap.
|
|
171
|
-
//
|
|
172
|
-
//
|
|
173
|
-
// `sessionId` is intentionally left untouched.
|
|
172
|
+
// (`embeddingHostCorrelationId`) by the OneDS writer's propertyColumnMap. Preserve it until
|
|
173
|
+
// the delayed remote writer is created, while applying it to the console writer immediately.
|
|
174
|
+
// The internal per-invocation `sessionId` is intentionally left untouched.
|
|
174
175
|
if (cliSettings.embeddingHostCorrelationId) {
|
|
175
176
|
instance.setCustomDimension('embeddingHostCorrelationId', cliSettings.embeddingHostCorrelationId);
|
|
176
177
|
}
|
|
177
178
|
return instance;
|
|
178
179
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
* Signed-in-but-offline users will block on the default fetch timeout before
|
|
192
|
-
* falling through; events still flow to the unauthenticated writer in that case.
|
|
193
|
-
*/
|
|
194
|
-
async tryEagerUpgradeAsync(authenticationProvider) {
|
|
195
|
-
if (this._upgradeFired || !this._upgradeConfig) {
|
|
196
|
-
return;
|
|
180
|
+
setCustomDimension(_key, _value) {
|
|
181
|
+
try {
|
|
182
|
+
if (!_key || !_value) {
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
if (this._isEnvironmentlessTelemetry && isEnvironmentlessIdentifierDimension(_key)) {
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
this._customDimensions[_key] = _value;
|
|
189
|
+
this._telemetryWriters.forEach((writer) => {
|
|
190
|
+
writer.setCustomDimension(_key, _value);
|
|
191
|
+
});
|
|
197
192
|
}
|
|
198
|
-
|
|
199
|
-
|
|
193
|
+
catch {
|
|
194
|
+
// No-op. Telemetry failures should not block CLI operations
|
|
200
195
|
}
|
|
201
196
|
}
|
|
202
197
|
/**
|
|
203
|
-
*
|
|
204
|
-
*
|
|
205
|
-
* - `tryEagerUpgradeAsync` (blocking, before the first event) when a cached account
|
|
206
|
-
* is already present at verb-start time.
|
|
207
|
-
* - `CliHttpClient.onFirstAuth` (fire-and-forget) after the verb's first successful
|
|
208
|
-
* authed HTTP call, when the user signed in mid-session.
|
|
209
|
-
* Best-effort — on any failure the unauthenticated writer stays in place and events
|
|
210
|
-
* keep flowing to the global endpoint.
|
|
198
|
+
* Records the command's resolved routing context and activates the remote writer once the
|
|
199
|
+
* environment metadata is available.
|
|
211
200
|
*/
|
|
212
|
-
async
|
|
213
|
-
if (
|
|
201
|
+
async setTelemetryContext(context) {
|
|
202
|
+
if (!this._telemetryContext) {
|
|
203
|
+
this._telemetryContext = context;
|
|
204
|
+
}
|
|
205
|
+
else if (!this._telemetryContext.environmentId && context.environmentId) {
|
|
206
|
+
// The initial region is authoritative. Environment resolution may happen later.
|
|
207
|
+
this._telemetryContext = {
|
|
208
|
+
...this._telemetryContext,
|
|
209
|
+
environmentId: context.environmentId,
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
else {
|
|
213
|
+
// Context already complete; avoid redundant metadata lookups.
|
|
214
214
|
return;
|
|
215
215
|
}
|
|
216
|
-
this.
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
const idx = this._telemetryWriters.indexOf(this._unauthWriter);
|
|
228
|
-
if (idx >= 0) {
|
|
229
|
-
this._telemetryWriters[idx] = authed;
|
|
230
|
-
}
|
|
231
|
-
else {
|
|
232
|
-
this._telemetryWriters.push(authed);
|
|
233
|
-
}
|
|
234
|
-
this._unauthWriter = authed;
|
|
235
|
-
// Re-apply previously set dimensions to the replacement writer.
|
|
236
|
-
for (const [key, value] of Object.entries(this._customDimensions)) {
|
|
237
|
-
authed.setCustomDimension(key, value);
|
|
238
|
-
}
|
|
239
|
-
// Set the tenantId dimension AFTER the swap so it lands on the authed writer
|
|
240
|
-
// (and any ConsoleWriter that's still in the list), not the discarded unauth one.
|
|
241
|
-
const tenantId = authenticationProvider.getUserTenantId();
|
|
242
|
-
if (tenantId) {
|
|
243
|
-
this.setCustomDimension('tenantId', tenantId);
|
|
216
|
+
if (this._telemetryContext.environmentId) {
|
|
217
|
+
const metadata = await this._getEnvironmentMetadataAsync(this._telemetryContext.environmentId, this._telemetryContext.region);
|
|
218
|
+
await this._activateRemoteWriter(metadata);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
async _getEnvironmentMetadataAsync(environmentId, region) {
|
|
222
|
+
this._environmentMetadataPromise ??= getEnvironmentByName(environmentId)
|
|
223
|
+
.then((metadata) => {
|
|
224
|
+
if (!metadata.location || !doesEnvironmentMatchRegion(metadata, region)) {
|
|
225
|
+
this._isRemoteTelemetrySuppressed = true;
|
|
226
|
+
return undefined;
|
|
244
227
|
}
|
|
228
|
+
return metadata;
|
|
229
|
+
})
|
|
230
|
+
.catch(() => {
|
|
231
|
+
this._isRemoteTelemetrySuppressed = true;
|
|
232
|
+
return undefined;
|
|
233
|
+
});
|
|
234
|
+
return this._environmentMetadataPromise;
|
|
235
|
+
}
|
|
236
|
+
async _activateRemoteWriter(environmentMetadata) {
|
|
237
|
+
if (!this._bufferedWriter ||
|
|
238
|
+
!this._telemetryContext?.environmentId ||
|
|
239
|
+
!environmentMetadata ||
|
|
240
|
+
!environmentMetadata.location ||
|
|
241
|
+
this._isRemoteTelemetrySuppressed) {
|
|
242
|
+
// Keep unresolved or mismatched-environment events buffered for CLI teardown to persist.
|
|
243
|
+
return;
|
|
245
244
|
}
|
|
246
|
-
|
|
247
|
-
|
|
245
|
+
const telemetryLocation = EUGeoRegions.has(environmentMetadata.location) ? 'eu' : 'global';
|
|
246
|
+
this._createRemoteWriterAndReplay(this._telemetryContext.region, telemetryLocation, this._telemetryContext.environmentId, environmentMetadata.properties.cluster?.geoShortName);
|
|
247
|
+
}
|
|
248
|
+
_activateEnvironmentlessRemoteWriter() {
|
|
249
|
+
if (!this._bufferedWriter || this._telemetryContext?.environmentId) {
|
|
250
|
+
return;
|
|
248
251
|
}
|
|
252
|
+
this._isEnvironmentlessTelemetry = true;
|
|
253
|
+
this._createRemoteWriterAndReplay(this._telemetryContext?.region ?? 'prod', 'global', undefined, undefined);
|
|
249
254
|
}
|
|
250
|
-
|
|
255
|
+
_createRemoteWriterAndReplay(region, telemetryLocation, environmentId, geoLocation) {
|
|
256
|
+
if (!this._bufferedWriter || this._remoteWriter) {
|
|
257
|
+
return;
|
|
258
|
+
}
|
|
251
259
|
try {
|
|
252
|
-
|
|
253
|
-
|
|
260
|
+
const remoteWriter = new OneDSWriter(this._sessionId, region, telemetryLocation, environmentId, this._appId, geoLocation, packageJson.version, this._origin, this._httpForwardOptions);
|
|
261
|
+
this._remoteWriter = remoteWriter;
|
|
262
|
+
for (const [key, value] of Object.entries(this._customDimensions)) {
|
|
263
|
+
if (!this._isEnvironmentlessTelemetry || !isEnvironmentlessIdentifierDimension(key)) {
|
|
264
|
+
remoteWriter.setCustomDimension(key, value);
|
|
265
|
+
}
|
|
254
266
|
}
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
267
|
+
if (!this._isEnvironmentlessTelemetry) {
|
|
268
|
+
const tenantId = this._authenticationProvider.getUserTenantId();
|
|
269
|
+
if (tenantId) {
|
|
270
|
+
remoteWriter.setCustomDimension('tenantId', tenantId);
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
this._bufferedWriter.replay(remoteWriter, this._isEnvironmentlessTelemetry ? removeEnvironmentlessIdentifierDimensions : undefined);
|
|
274
|
+
this._telemetryWriters.push(remoteWriter);
|
|
260
275
|
}
|
|
261
276
|
catch {
|
|
262
|
-
//
|
|
277
|
+
// Keep the buffer intact; CLI teardown persists it after the command session ends.
|
|
263
278
|
}
|
|
264
279
|
}
|
|
280
|
+
writeBufferedTelemetryToFile(directory) {
|
|
281
|
+
return this._bufferedWriter?.writeToTemporaryFile(directory);
|
|
282
|
+
}
|
|
265
283
|
trackActivityEvent(eventName, eventData) {
|
|
266
284
|
try {
|
|
267
285
|
if (this._telemetryWriters.length === 0) {
|
|
@@ -319,8 +337,19 @@ export class CliLogger {
|
|
|
319
337
|
set sessionId(_value) {
|
|
320
338
|
// No-op
|
|
321
339
|
}
|
|
322
|
-
flush() {
|
|
323
|
-
|
|
340
|
+
async flush(retainBufferedTelemetry = false) {
|
|
341
|
+
if (this._environmentMetadataPromise) {
|
|
342
|
+
// Ensure any in-flight metadata lookup can activate and replay buffered remote telemetry.
|
|
343
|
+
const metadata = await this._environmentMetadataPromise;
|
|
344
|
+
await this._activateRemoteWriter(metadata);
|
|
345
|
+
}
|
|
346
|
+
else {
|
|
347
|
+
this._activateEnvironmentlessRemoteWriter();
|
|
348
|
+
}
|
|
349
|
+
await Promise.all(this._telemetryWriters.map((writer) => writer.flush()));
|
|
350
|
+
if (this._remoteWriter && !retainBufferedTelemetry) {
|
|
351
|
+
this._bufferedWriter?.clear();
|
|
352
|
+
}
|
|
324
353
|
}
|
|
325
354
|
withDefaults(_extras) {
|
|
326
355
|
// No-op — CLI logger does not implement local scope defaults today.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliLogger.js","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CliLogger.js","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,14 +10,14 @@ export interface OneDsHttpForwardOptions {
|
|
|
10
10
|
export declare function createOneDsHttpForwardOverride(options: OneDsHttpForwardOptions): IXHROverride;
|
|
11
11
|
export declare class OneDSWriter implements ITelemetryWriter {
|
|
12
12
|
private _provider;
|
|
13
|
-
constructor(sessionId: string, region: Region, telemetryLocation: TelemetryLocation, environmentId: string, appId: string, geoLocation: string | undefined, cliVersion: string, cliSource: string, httpForwardOptions?: OneDsHttpForwardOptions);
|
|
14
|
-
trackActivityEvent(operationName: string, eventData?: object): void;
|
|
15
|
-
trackErrorEvent(operationName: string, eventData?: object): void;
|
|
16
|
-
startScenario(scenarioName: string, startData?: object): void;
|
|
17
|
-
progressScenario(scenarioName: string, progressData?: object): void;
|
|
18
|
-
completeScenario(scenarioName: string, completeData?: object): void;
|
|
19
|
-
scenarioFailed(scenarioName: string, failureData?: object): void;
|
|
20
|
-
scenarioCompletedWithError(scenarioName: string, completeWithErrorData?: object): void;
|
|
13
|
+
constructor(sessionId: string, region: Region, telemetryLocation: TelemetryLocation, environmentId: string | undefined, appId: string, geoLocation: string | undefined, cliVersion: string, cliSource: string, httpForwardOptions?: OneDsHttpForwardOptions);
|
|
14
|
+
trackActivityEvent(operationName: string, eventData?: object, timestamp?: string): void;
|
|
15
|
+
trackErrorEvent(operationName: string, eventData?: object, timestamp?: string): void;
|
|
16
|
+
startScenario(scenarioName: string, startData?: object, timestamp?: string): void;
|
|
17
|
+
progressScenario(scenarioName: string, progressData?: object, timestamp?: string): void;
|
|
18
|
+
completeScenario(scenarioName: string, completeData?: object, timestamp?: string): void;
|
|
19
|
+
scenarioFailed(scenarioName: string, failureData?: object, timestamp?: string): void;
|
|
20
|
+
scenarioCompletedWithError(scenarioName: string, completeWithErrorData?: object, timestamp?: string): void;
|
|
21
21
|
flush(): Promise<void>;
|
|
22
22
|
setCustomDimension(_key: string, _value: string): void;
|
|
23
23
|
private static readonly _EVENT_PREFIX;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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"}
|
|
@@ -74,7 +74,6 @@ export class OneDSWriter {
|
|
|
74
74
|
_provider;
|
|
75
75
|
constructor(sessionId, region, telemetryLocation, environmentId, appId, geoLocation, cliVersion, cliSource, httpForwardOptions) {
|
|
76
76
|
const commonProperties = {
|
|
77
|
-
environmentId,
|
|
78
77
|
isOnePlayer: 'false',
|
|
79
78
|
webPlayerScenario: 'ManagedApps_CLI_Authoring',
|
|
80
79
|
cloud: region === 'preview' ? 'prod' : region,
|
|
@@ -84,6 +83,9 @@ export class OneDSWriter {
|
|
|
84
83
|
cliVersion,
|
|
85
84
|
cliSource,
|
|
86
85
|
};
|
|
86
|
+
if (environmentId) {
|
|
87
|
+
commonProperties.environmentId = environmentId;
|
|
88
|
+
}
|
|
87
89
|
if (appId) {
|
|
88
90
|
commonProperties.playerAppId = appId;
|
|
89
91
|
}
|
|
@@ -126,55 +128,55 @@ export class OneDSWriter {
|
|
|
126
128
|
app.sesId = sessionId;
|
|
127
129
|
});
|
|
128
130
|
}
|
|
129
|
-
trackActivityEvent(operationName, eventData) {
|
|
131
|
+
trackActivityEvent(operationName, eventData, timestamp) {
|
|
130
132
|
this._trackEvent(TelemetryEventNames.Activity, {
|
|
131
133
|
...eventData,
|
|
132
134
|
operationName,
|
|
133
|
-
});
|
|
135
|
+
}, timestamp);
|
|
134
136
|
}
|
|
135
|
-
trackErrorEvent(operationName, eventData) {
|
|
137
|
+
trackErrorEvent(operationName, eventData, timestamp) {
|
|
136
138
|
this._trackEvent(TelemetryEventNames.Error, {
|
|
137
139
|
...eventData,
|
|
138
140
|
operationName,
|
|
139
|
-
});
|
|
141
|
+
}, timestamp);
|
|
140
142
|
}
|
|
141
|
-
startScenario(scenarioName, startData) {
|
|
143
|
+
startScenario(scenarioName, startData, timestamp) {
|
|
142
144
|
this._trackEvent(TelemetryEventNames.StartScenario, {
|
|
143
145
|
operationName: scenarioName,
|
|
144
146
|
...startData,
|
|
145
147
|
scenarioName,
|
|
146
|
-
});
|
|
148
|
+
}, timestamp);
|
|
147
149
|
}
|
|
148
|
-
progressScenario(scenarioName, progressData) {
|
|
150
|
+
progressScenario(scenarioName, progressData, timestamp) {
|
|
149
151
|
this._trackEvent(TelemetryEventNames.ProgressScenario, {
|
|
150
152
|
operationName: scenarioName,
|
|
151
153
|
...progressData,
|
|
152
154
|
scenarioName,
|
|
153
|
-
});
|
|
155
|
+
}, timestamp);
|
|
154
156
|
}
|
|
155
|
-
completeScenario(scenarioName, completeData) {
|
|
157
|
+
completeScenario(scenarioName, completeData, timestamp) {
|
|
156
158
|
this._trackEvent(TelemetryEventNames.EndScenario, {
|
|
157
159
|
operationName: scenarioName,
|
|
158
160
|
...completeData,
|
|
159
161
|
scenarioName,
|
|
160
162
|
scenarioResult: ScenarioResults.Success,
|
|
161
|
-
});
|
|
163
|
+
}, timestamp);
|
|
162
164
|
}
|
|
163
|
-
scenarioFailed(scenarioName, failureData) {
|
|
165
|
+
scenarioFailed(scenarioName, failureData, timestamp) {
|
|
164
166
|
this._trackEvent(TelemetryEventNames.EndScenario, {
|
|
165
167
|
operationName: scenarioName,
|
|
166
168
|
...failureData,
|
|
167
169
|
scenarioName,
|
|
168
170
|
scenarioResult: ScenarioResults.Failed,
|
|
169
|
-
});
|
|
171
|
+
}, timestamp);
|
|
170
172
|
}
|
|
171
|
-
scenarioCompletedWithError(scenarioName, completeWithErrorData) {
|
|
173
|
+
scenarioCompletedWithError(scenarioName, completeWithErrorData, timestamp) {
|
|
172
174
|
this._trackEvent(TelemetryEventNames.EndScenario, {
|
|
173
175
|
operationName: scenarioName,
|
|
174
176
|
...completeWithErrorData,
|
|
175
177
|
scenarioName,
|
|
176
178
|
scenarioResult: ScenarioResults.SuccessWithErrors,
|
|
177
|
-
});
|
|
179
|
+
}, timestamp);
|
|
178
180
|
}
|
|
179
181
|
flush() {
|
|
180
182
|
return this._provider.flush();
|
|
@@ -183,7 +185,7 @@ export class OneDSWriter {
|
|
|
183
185
|
this._provider.setDefaultProperty(_key, _value);
|
|
184
186
|
}
|
|
185
187
|
static _EVENT_PREFIX = 'ManagedAppsCLI.';
|
|
186
|
-
_trackEvent(eventName, eventData) {
|
|
188
|
+
_trackEvent(eventName, eventData, timestamp) {
|
|
187
189
|
const operationName = eventData.operationName || '';
|
|
188
190
|
const scrubbed = getScrubbedCustomDimensions(eventName, operationName, eventData);
|
|
189
191
|
const properties = {};
|
|
@@ -200,7 +202,7 @@ export class OneDSWriter {
|
|
|
200
202
|
}
|
|
201
203
|
this._provider.track({
|
|
202
204
|
eventName,
|
|
203
|
-
timestamp: new Date().toISOString(),
|
|
205
|
+
timestamp: timestamp ?? new Date().toISOString(),
|
|
204
206
|
severity: 'info',
|
|
205
207
|
properties,
|
|
206
208
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneDSWriter.js","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OneDSWriter.js","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,9 +40,10 @@ export interface IAccountManager {
|
|
|
40
40
|
/**
|
|
41
41
|
* Forces an interactive browser sign-in for `resource`. Used by `auth login` so users
|
|
42
42
|
* can add a new account even when one is already cached. Writes the signed-in account
|
|
43
|
-
* as the active one.
|
|
43
|
+
* as the active one. When `useDeviceCode` is set, uses the OAuth 2.0 device authorization
|
|
44
|
+
* grant instead of the browser flow — the no-browser path for headless/SSH sessions.
|
|
44
45
|
*/
|
|
45
|
-
loginInteractiveAsync(resource: string, loginHint?: string): Promise<CachedAccount>;
|
|
46
|
+
loginInteractiveAsync(resource: string, loginHint?: string, useDeviceCode?: boolean): Promise<CachedAccount>;
|
|
46
47
|
/**
|
|
47
48
|
* Removes every cached account and the active-account pointer. Backs `auth logout`.
|
|
48
49
|
* Routing through the account manager (rather than `fs.rmSync` directly in the verb)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cli.types.d.ts","sourceRoot":"","sources":["../../src/Types/Cli.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAEtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC5B,4FAA4F;IAC5F,aAAa,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjF,eAAe,IAAI,MAAM,GAAG,SAAS,CAAC;IACtC,oFAAoF;IACpF,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACtD;AAED;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,2EAA2E;IAC3E,uBAAuB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IACpD;;;OAGG;IACH,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAClE
|
|
1
|
+
{"version":3,"file":"Cli.types.d.ts","sourceRoot":"","sources":["../../src/Types/Cli.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAEtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC5B,4FAA4F;IAC5F,aAAa,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjF,eAAe,IAAI,MAAM,GAAG,SAAS,CAAC;IACtC,oFAAoF;IACpF,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACtD;AAED;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,2EAA2E;IAC3E,uBAAuB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IACpD;;;OAGG;IACH,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAClE;;;;;OAKG;IACH,qBAAqB,CACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,cAAc,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;;OAMG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,6DAA6D;IAC7D,MAAM,EAAE,OAAO,CAAC;IAChB,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC"}
|
|
@@ -5,13 +5,13 @@
|
|
|
5
5
|
* Interface for writers used by the logger to write telemetry data
|
|
6
6
|
*/
|
|
7
7
|
export interface ITelemetryWriter {
|
|
8
|
-
trackActivityEvent(eventName: string, eventData?: object): void;
|
|
9
|
-
trackErrorEvent(eventName: string, eventData?: object): void;
|
|
10
|
-
startScenario(scenarioName: string, startData?: object): void;
|
|
11
|
-
progressScenario(scenarioName: string, progressData?: object): void;
|
|
12
|
-
completeScenario(scenarioName: string, completeData?: object): void;
|
|
13
|
-
scenarioFailed(scenarioName: string, failureData?: object): void;
|
|
14
|
-
scenarioCompletedWithError(scenarioName: string, completeWithErrorData?: object): void;
|
|
8
|
+
trackActivityEvent(eventName: string, eventData?: object, timestamp?: string): void;
|
|
9
|
+
trackErrorEvent(eventName: string, eventData?: object, timestamp?: string): void;
|
|
10
|
+
startScenario(scenarioName: string, startData?: object, timestamp?: string): void;
|
|
11
|
+
progressScenario(scenarioName: string, progressData?: object, timestamp?: string): void;
|
|
12
|
+
completeScenario(scenarioName: string, completeData?: object, timestamp?: string): void;
|
|
13
|
+
scenarioFailed(scenarioName: string, failureData?: object, timestamp?: string): void;
|
|
14
|
+
scenarioCompletedWithError(scenarioName: string, completeWithErrorData?: object, timestamp?: string): void;
|
|
15
15
|
flush(): Promise<void>;
|
|
16
16
|
setCustomDimension(_key: string, _value: string): void;
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggerTypes.types.d.ts","sourceRoot":"","sources":["../../src/Types/LoggerTypes.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"LoggerTypes.types.d.ts","sourceRoot":"","sources":["../../src/Types/LoggerTypes.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpF,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjF,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClF,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxF,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxF,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrF,0BAA0B,CACxB,YAAY,EAAE,MAAM,EACpB,qBAAqB,CAAC,EAAE,MAAM,EAC9B,SAAS,CAAC,EAAE,MAAM,GACjB,IAAI,CAAC;IACR,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACxD"}
|