[OTel-Sdk] Import changes from Beta branch and synchronize the structures

.aiAutoMinify.json

@@ -1,59 +1,26 @@
 {
     "pkgs": {
-        "@microsoft/applicationinsights-core-js": {
-            "constEnums": [
-                "_eSetDynamicPropertyFlags",
-                "ePendingOp",
-                "CallbackType"
-            ]
-        },
         "@microsoft/applicationinsights-perfmarkmeasure-js": {
             "constEnums": []
         },
-        "@microsoft/applicationinsights-common": {
-            "constEnums": [
-                "eOfflineValue",
-                "eRequestHeaders",
-                "eTraceStateKeyType",
-                "eStorageType",
-                "FieldType",
-                "eDistributedTracingModes",
-                "EventPersistenceValue",
-                "eEventsDiscardedReason",
-                "eBatchDiscardedReason",
-                "FeatureOptInMode",
-                "CdnFeatureMode",
-                "eActiveStatus",
-                "eLoggingSeverity",
-                "_eInternalMessageId",
-                "SendRequestReason",
-                "TransportType",
-                "eStatsType",
-                "TelemetryUnloadReason",
-                "TelemetryUpdateReason",
-                "eTraceHeadersMode",
-                "eW3CTraceFlags",
-                "DataPointType",
-                "DependencyKind",
-                "DependencySourceType",
-                "eSeverityLevel",
-                "DataSanitizerValues"
-            ]
-        },
         "@microsoft/applicationinsights-properties-js": {
             "constEnums": []
         },
         "@microsoft/applicationinsights-dependencies-js": {
             "constEnums": []
         },
         "@microsoft/applicationinsights-channel-js": {
-            "constEnums": []
+            "constEnums": [
+                "eSerializeType"
+            ]
         },
         "@microsoft/applicationinsights-web-basic": {
             "constEnums": []
         },
         "@microsoft/applicationinsights-analytics-js": {
-            "constEnums": []
+            "constEnums": [
+                "eRouteTraceStrategy"
+            ]
         },
         "@microsoft/applicationinsights-web": {
             "constEnums": []
@@ -78,6 +45,7 @@
                 "eRequestHeaders",
                 "eTraceStateKeyType",
                 "eOfflineValue",
+                "eDependencyTypes",
                 "eStorageType",
                 "FieldType",
                 "eDistributedTracingModes",

AISKU/Tests/Unit/src/AISKUSize.Tests.ts

@@ -1,6 +1,6 @@
 import { AITestClass, Assert } from "@microsoft/ai-test-framework";
-import { dumpObj } from '@nevware21/ts-utils';
-import { createPromise, doAwait, IPromise } from '@nevware21/ts-async';
+import { dumpObj } from "@nevware21/ts-utils";
+import { createPromise, doAwait, IPromise } from "@nevware21/ts-async";
 import { strUndefined } from "@microsoft/otel-core-js";
 import { utlRemoveSessionStorage } from "@microsoft/otel-core-js";
 import * as pako from "pako";

AISKU/Tests/Unit/src/CdnThrottle.tests.ts

@@ -1,14 +1,17 @@
-import { ApplicationInsights, ApplicationInsightsContainer, IApplicationInsights, IConfig, IConfiguration, LoggingSeverity, Snippet, _eInternalMessageId } from '../../../src/index'
-import { AITestClass, Assert, IFetchArgs, PollingAssert} from '@microsoft/ai-test-framework';
-import { IThrottleInterval, IThrottleLimit, IThrottleMgrConfig } from '@microsoft/otel-core-js';
-import { SinonSpy } from 'sinon';
-import { AppInsightsSku } from '../../../src/AISku';
-import { createSnippetV5 } from './testSnippetV5';
-import { CdnFeatureMode, FeatureOptInMode, getGlobal, getGlobalInst, isFunction, newId } from '@microsoft/otel-core-js';
-import { createSnippetV6 } from './testSnippetV6';
-import { CfgSyncPlugin, ICfgSyncConfig, ICfgSyncMode } from '@microsoft/applicationinsights-cfgsync-js';
-import { createSyncPromise, doAwait } from '@nevware21/ts-async';
-import { ICfgSyncCdnConfig } from '@microsoft/applicationinsights-cfgsync-js/src/Interfaces/ICfgSyncCdnConfig';
+import { AppInsightsSku } from "../../../src/AISku";
+import { ApplicationInsightsContainer } from "../../../src/ApplicationInsightsContainer";
+import { IApplicationInsights } from "../../../src/IApplicationInsights";
+import { Snippet } from "../../../src/Snippet";
+import { AITestClass, Assert, IFetchArgs, PollingAssert } from "@microsoft/ai-test-framework";
+import { IConfig, IConfiguration, LoggingSeverity, _eInternalMessageId, IThrottleInterval, IThrottleLimit, IThrottleMgrConfig } from "@microsoft/otel-core-js";
+import { SinonSpy } from "sinon";
+import { createSnippetV5 } from "./testSnippetV5";
+import { CdnFeatureMode, FeatureOptInMode, getGlobal, getGlobalInst, isFunction, newId } from "@microsoft/otel-core-js";
+import { createSnippetV6 } from "./testSnippetV6";
+import { CfgSyncPlugin, ICfgSyncConfig, ICfgSyncMode } from "@microsoft/applicationinsights-cfgsync-js";
+import { createSyncPromise, doAwait } from "@nevware21/ts-async";
+import { ICfgSyncCdnConfig } from "@microsoft/applicationinsights-cfgsync-js/src/Interfaces/ICfgSyncCdnConfig";
+const ApplicationInsights = AppInsightsSku;
 
 
 const TestInstrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';

AISKU/Tests/Unit/src/IAnalyticsConfig.Tests.ts

@@ -1,8 +1,8 @@
-import { ApplicationInsights, IAnalyticsConfig, IAppInsights, IConfig, ApplicationAnalytics } from "../../../src/index";
+import { AppInsightsSku as ApplicationInsights } from "../../../src/AISku";
+import { IConfig } from "@microsoft/otel-core-js";
 import { AITestClass, Assert } from "@microsoft/ai-test-framework";
-import { AnalyticsPluginIdentifier, utlRemoveSessionStorage } from "@microsoft/otel-core-js";
+import { utlRemoveSessionStorage } from "@microsoft/otel-core-js";
 import { AppInsightsCore, IConfiguration, isFunction, onConfigChange } from "@microsoft/otel-core-js";
-import { Sender } from "@microsoft/applicationinsights-channel-js";
 
 const TestInstrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';
 

AISKU/Tests/Unit/src/ThrottleSentMessage.tests.ts

@@ -1,11 +1,14 @@
-import { ApplicationInsights, ApplicationInsightsContainer, IApplicationInsights, IConfig, IConfiguration, LoggingSeverity, Snippet, _eInternalMessageId } from '../../../src/index'
-import { AITestClass, Assert} from '@microsoft/ai-test-framework';
-import { IThrottleInterval, IThrottleLimit, IThrottleMgrConfig } from '@microsoft/otel-core-js';
-import { SinonSpy } from 'sinon';
-import { AppInsightsSku } from '../../../src/AISku';
-import { createSnippetV5 } from './testSnippetV5';
-import { FeatureOptInMode, newId } from '@microsoft/otel-core-js';
-import { createSnippetV6 } from './testSnippetV6';
+import { AppInsightsSku } from "../../../src/AISku";
+import { ApplicationInsightsContainer } from "../../../src/ApplicationInsightsContainer";
+import { IApplicationInsights } from "../../../src/IApplicationInsights";
+import { Snippet } from "../../../src/Snippet";
+import { AITestClass, Assert } from "@microsoft/ai-test-framework";
+import { IConfig, IConfiguration, LoggingSeverity, _eInternalMessageId, IThrottleInterval, IThrottleLimit, IThrottleMgrConfig } from "@microsoft/otel-core-js";
+import { SinonSpy } from "sinon";
+import { createSnippetV5 } from "./testSnippetV5";
+import { FeatureOptInMode, newId } from "@microsoft/otel-core-js";
+import { createSnippetV6 } from "./testSnippetV6";
+const ApplicationInsights = AppInsightsSku;
 
 const TestInstrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';
 

AISKU/Tests/Unit/src/aiskuunittests.ts

@@ -1,15 +1,15 @@
 import { AISKUSizeCheck } from "./AISKUSize.Tests";
-import { ApplicationInsightsTests } from './applicationinsights.e2e.tests';
-import { ApplicationInsightsFetchTests } from './applicationinsights.e2e.fetch.tests';
-import { CdnPackagingChecks } from './CdnPackaging.tests';
-import { GlobalTestHooks } from './GlobalTestHooks.Test';
-import { SanitizerE2ETests } from './sanitizer.e2e.tests';
-import { ValidateE2ETests } from './validate.e2e.tests';
-import { SenderE2ETests } from './sender.e2e.tests';
-import { SnippetInitializationTests } from './SnippetInitialization.Tests';
+import { ApplicationInsightsTests } from "./applicationinsights.e2e.tests";
+import { ApplicationInsightsFetchTests } from "./applicationinsights.e2e.fetch.tests";
+import { CdnPackagingChecks } from "./CdnPackaging.tests";
+import { GlobalTestHooks } from "./GlobalTestHooks.Test";
+import { SanitizerE2ETests } from "./sanitizer.e2e.tests";
+import { ValidateE2ETests } from "./validate.e2e.tests";
+import { SenderE2ETests } from "./sender.e2e.tests";
+import { SnippetInitializationTests } from "./SnippetInitialization.Tests";
 import { CdnThrottle} from "./CdnThrottle.tests";
 import { ThrottleSentMessage } from "./ThrottleSentMessage.tests";
-import { IAnalyticsConfigTests } from './IAnalyticsConfig.Tests';
+import { IAnalyticsConfigTests } from "./IAnalyticsConfig.Tests";
 
 export function runTests() {
     new GlobalTestHooks().registerTests();

AISKU/Tests/Unit/src/applicationinsights.e2e.fetch.tests.ts

@@ -1,6 +1,6 @@
-import { DistributedTracingModes, IConfig } from '@microsoft/otel-core-js';
-import { ApplicationInsightsTests } from './applicationinsights.e2e.tests';
-import { IConfiguration } from '@microsoft/otel-core-js';
+import { DistributedTracingModes, IConfig } from "@microsoft/otel-core-js";
+import { ApplicationInsightsTests } from "./applicationinsights.e2e.tests";
+import { IConfiguration } from "@microsoft/otel-core-js";
 
 const _instrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';
 const _connectionString = `InstrumentationKey=${_instrumentationKey}`;

AISKU/Tests/Unit/src/applicationinsights.e2e.tests.ts

@@ -1,14 +1,13 @@
-import { AITestClass, Assert, PollingAssert, EventValidator, TraceValidator, ExceptionValidator, MetricValidator, PageViewValidator, PageViewPerformanceValidator, RemoteDepdencyValidator } from '@microsoft/ai-test-framework';
-import { SinonSpy } from 'sinon';
-import { ApplicationInsights } from '../../../src/index'
-import { Sender } from '@microsoft/applicationinsights-channel-js';
-import { IDependencyTelemetry, ContextTagKeys, Event, Trace, Exception, Metric, PageView, PageViewPerformance, RemoteDependencyData, DistributedTracingModes, RequestHeaders, IAutoExceptionTelemetry, BreezeChannelIdentifier, IConfig, EventPersistence } from '@microsoft/otel-core-js';
-import { ITelemetryItem, getGlobal, newId, dumpObj, BaseTelemetryPlugin, IProcessTelemetryContext, __getRegisteredEvents, arrForEach, IConfiguration, ActiveStatus, FeatureOptInMode } from "@microsoft/otel-core-js";
-import { IPropTelemetryContext } from '@microsoft/applicationinsights-properties-js';
-import { createAsyncResolvedPromise } from '@nevware21/ts-async';
-import { CONFIG_ENDPOINT_URL } from '../../../src/InternalConstants';
-import { IStackFrame } from '@microsoft/otel-core-js/src/Interfaces/Contracts/IStackFrame';
-import { utcNow } from '@nevware21/ts-utils';
+import { AITestClass, Assert, PollingAssert, EventValidator, TraceValidator, ExceptionValidator, MetricValidator, PageViewValidator, PageViewPerformanceValidator, RemoteDepdencyValidator } from "@microsoft/ai-test-framework";
+import { SinonSpy } from "sinon";
+import { AppInsightsSku as ApplicationInsights } from "../../../src/AISku";
+import { Sender } from "@microsoft/applicationinsights-channel-js";
+import { IDependencyTelemetry, ContextTagKeys, Event, Trace, Exception, Metric, PageView, PageViewPerformance, DistributedTracingModes, RequestHeaders, IAutoExceptionTelemetry, BreezeChannelIdentifier, IConfig, RemoteDependencyDataType } from "@microsoft/otel-core-js";
+import { ITelemetryItem, getGlobal, newId, dumpObj, BaseTelemetryPlugin, IProcessTelemetryContext, __getRegisteredEvents, arrForEach, IConfiguration, ActiveStatus, FeatureOptInMode, IStackFrame } from "@microsoft/otel-core-js";
+import { IPropTelemetryContext } from "@microsoft/applicationinsights-properties-js";
+import { createAsyncResolvedPromise } from "@nevware21/ts-async";
+import { CONFIG_ENDPOINT_URL } from "../../../src/InternalConstants";
+import { utcNow } from "@nevware21/ts-utils";
 
 function _checkExpectedFrame(expectedFrame: IStackFrame, actualFrame: IStackFrame,  index: number) {
     Assert.equal(expectedFrame.assembly, actualFrame.assembly, index + ") Assembly is not as expected");
@@ -1248,7 +1247,7 @@ export class ApplicationInsightsTests extends AITestClass {
                             "   c@http://example.com/stacktrace.js:9:3\n" +
                             "   b@http://example.com/stacktrace.js:6:3\n" +
                             "   a@http://example.com/stacktrace.js:3:3\n" +
-                            "  at Object.testMethod (http://localhost:9001/shared/AppInsightsCommon/node_modules/@microsoft/ai-test-framework/dist/es5/ai-test-framework.js:53058:48)"
+                            "  at Object.testMethod (http://localhost:9002/shared/AppInsightsCommon/node_modules/@microsoft/ai-test-framework/dist/es5/ai-test-framework.js:53058:48)"
                     }
                 };
 
@@ -1290,7 +1289,7 @@ export class ApplicationInsightsTests extends AITestClass {
                     { level: 25, method: "c", assembly: "c@http://example.com/stacktrace.js:9:3", fileName: "http://example.com/stacktrace.js", line: 9 },
                     { level: 26, method: "b", assembly: "b@http://example.com/stacktrace.js:6:3", fileName: "http://example.com/stacktrace.js", line: 6 },
                     { level: 27, method: "a", assembly: "a@http://example.com/stacktrace.js:3:3", fileName: "http://example.com/stacktrace.js", line: 3 },
-                    { level: 28, method: "Object.testMethod", assembly: "at Object.testMethod (http://localhost:9001/shared/AppInsightsCommon/node_modules/@microsoft/ai-test-framework/dist/es5/ai-test-framework.js:53058:48)", fileName: "http://localhost:9001/shared/AppInsightsCommon/node_modules/@microsoft/ai-test-framework/dist/es5/ai-test-framework.js", line: 53058 }
+                    { level: 28, method: "Object.testMethod", assembly: "at Object.testMethod (http://localhost:9002/shared/AppInsightsCommon/node_modules/@microsoft/ai-test-framework/dist/es5/ai-test-framework.js:53058:48)", fileName: "http://localhost:9002/shared/AppInsightsCommon/node_modules/@microsoft/ai-test-framework/dist/es5/ai-test-framework.js", line: 53058 }
                 ];
 
                 const payloadStr: string[] = this.getPayloadMessages(this.successSpy);
@@ -2008,7 +2007,7 @@ export class ApplicationInsightsTests extends AITestClass {
                                 return PageViewValidator.PageViewValidator.Validate(payload, baseType);
                             case PageViewPerformance.dataType:
                                 return PageViewPerformanceValidator.PageViewPerformanceValidator.Validate(payload, baseType);
-                            case RemoteDependencyData.dataType:
+                            case RemoteDependencyDataType:
                                 return RemoteDepdencyValidator.RemoteDepdencyValidator.Validate(payload, baseType);
 
                             default:

AISKU/Tests/Unit/src/sanitizer.e2e.tests.ts

@@ -1,9 +1,10 @@
-import { ApplicationInsights, IApplicationInsights, LoggingSeverity, _eInternalMessageId } from '../../../src/index'
-import { Sender } from '@microsoft/applicationinsights-channel-js';
-import { AITestClass, Assert, PollingAssert } from '@microsoft/ai-test-framework';
-import { SinonSpy } from 'sinon';
-import { newId } from '@microsoft/otel-core-js';
-import { BreezeChannelIdentifier } from '@microsoft/otel-core-js';
+import { AppInsightsSku as ApplicationInsights } from "../../../src/AISku";
+import { IApplicationInsights } from "../../../src/IApplicationInsights";
+import { Sender } from "@microsoft/applicationinsights-channel-js";
+import { AITestClass, Assert, PollingAssert } from "@microsoft/ai-test-framework";
+import { SinonSpy } from "sinon";
+import { LoggingSeverity, _eInternalMessageId, newId } from "@microsoft/otel-core-js";
+import { BreezeChannelIdentifier } from "@microsoft/otel-core-js";
 
 export class SanitizerE2ETests extends AITestClass {
     private readonly _instrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';

AISKU/Tests/Unit/src/sender.e2e.tests.ts

@@ -1,10 +1,11 @@
-import { ApplicationInsights, IApplicationInsights } from '../../../src/index'
-import { Sender } from '@microsoft/applicationinsights-channel-js';
-import { BreezeChannelIdentifier, utlGetSessionStorage, utlRemoveSessionStorage } from '@microsoft/otel-core-js';
-import { ActiveStatus, dumpObj, getJSON, isArray } from '@microsoft/otel-core-js';
-import { SinonSpy } from 'sinon';
-import { Assert, AITestClass, PollingAssert} from "@microsoft/ai-test-framework"
-import { createAsyncResolvedPromise } from '@nevware21/ts-async';
+import { AppInsightsSku as ApplicationInsights } from "../../../src/AISku";
+import { IApplicationInsights } from "../../../src/IApplicationInsights";
+import { Sender } from "@microsoft/applicationinsights-channel-js";
+import { BreezeChannelIdentifier, utlGetSessionStorage, utlRemoveSessionStorage } from "@microsoft/otel-core-js";
+import { ActiveStatus, dumpObj, getJSON, isArray } from "@microsoft/otel-core-js";
+import { SinonSpy } from "sinon";
+import { Assert, AITestClass, PollingAssert } from "@microsoft/ai-test-framework";
+import { createAsyncResolvedPromise } from "@nevware21/ts-async";
 
 export class SenderE2ETests extends AITestClass {
     private readonly _instrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';

AISKU/Tests/Unit/src/validate.e2e.tests.ts

@@ -1,9 +1,10 @@
-import { ApplicationInsights, IApplicationInsights } from '../../../src/index'
-import { Sender } from '@microsoft/applicationinsights-channel-js';
-import { SinonSpy } from 'sinon';
-import { AITestClass, Assert, PollingAssert } from '@microsoft/ai-test-framework';
-import { dumpObj } from '@microsoft/otel-core-js';
-import { BreezeChannelIdentifier } from '@microsoft/otel-core-js';
+import { AppInsightsSku as ApplicationInsights } from "../../../src/AISku";
+import { IApplicationInsights } from "../../../src/IApplicationInsights";
+import { Sender } from "@microsoft/applicationinsights-channel-js";
+import { SinonSpy } from "sinon";
+import { AITestClass, Assert, PollingAssert } from "@microsoft/ai-test-framework";
+import { dumpObj } from "@microsoft/otel-core-js";
+import { BreezeChannelIdentifier } from "@microsoft/otel-core-js";
 
 export class ValidateE2ETests extends AITestClass {
     private readonly _instrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';

AISKU/package.json

@@ -40,7 +40,7 @@
         "finalhandler": "^1.1.1",
         "grunt": "^1.5.3",
         "grunt-cli": "^1.4.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x", 
+        "@nevware21/ts-async": ">= 0.5.5 < 2.x", 
         "grunt-rollup": "^12.0.0",
         "@nevware21/grunt-ts-plugin": "^0.5.1",
         "@nevware21/grunt-eslint-ts": "^0.5.1",
@@ -73,8 +73,8 @@
         "@microsoft/otel-core-js": "0.0.1-alpha",
         "@microsoft/applicationinsights-dependencies-js": "3.3.11",
         "@microsoft/applicationinsights-properties-js": "3.3.11",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.12.6 < 2.x",
+        "@nevware21/ts-async": ">= 0.5.5 < 2.x"
     },
     "license": "MIT"
 }

AISKU/src/index.ts

@@ -55,7 +55,6 @@ export {
     Metric,
     PageView,
     PageViewPerformance,
-    RemoteDependencyData,
     Trace,
     DistributedTracingModes,
     IRequestHeaders,

AISKULight/Tests/Unit/src/AISKULightSize.Tests.ts

@@ -1,6 +1,6 @@
 import { AITestClass, Assert } from "@microsoft/ai-test-framework";
-import { dumpObj } from '@nevware21/ts-utils';
-import { createPromise, doAwait, IPromise } from '@nevware21/ts-async';
+import { dumpObj } from "@nevware21/ts-utils";
+import { createPromise, doAwait, IPromise } from "@nevware21/ts-async";
 import * as pako from "pako";
 
 const PACKAGE_JSON = "../package.json";

AISKULight/Tests/Unit/src/config.tests.ts

@@ -1,8 +1,8 @@
-import { AITestClass, Assert, PollingAssert } from "@microsoft/ai-test-framework";
-import { ITelemetryItem, newId } from "@microsoft/otel-core-js";
-import { ApplicationInsights} from "../../../src/index";
-import { BreezeChannelIdentifier, ContextTagKeys, utlRemoveSessionStorage } from "@microsoft/otel-core-js";
+import { AITestClass, Assert } from "@microsoft/ai-test-framework";
+import { newId } from "@microsoft/otel-core-js";
+import { BreezeChannelIdentifier, utlRemoveSessionStorage } from "@microsoft/otel-core-js";
 import { Sender } from "@microsoft/applicationinsights-channel-js";
+import { ApplicationInsights } from "../../../src/index";
 
 export class ApplicationInsightsConfigTests extends AITestClass {
     private readonly _instrumentationKey = "b7170927-2d1c-44f1-acec-59f4e1751c11";