[Beta] Merge Common into Core

.aiAutoMinify.json

@@ -5,8 +5,15 @@
                 "_eSetDynamicPropertyFlags",
                 "ePendingOp",
                 "CallbackType",
+                "eW3CTraceFlags",
+                "eRequestHeaders",
                 "eTraceStateKeyType",
+                "eOfflineValue",
                 "eDependencyTypes",
+                "eStorageType",
+                "FieldType",
+                "eDistributedTracingModes",
+                "EventPersistenceValue",
                 "eEventsDiscardedReason",
                 "eBatchDiscardedReason",
                 "FeatureOptInMode",
@@ -20,34 +27,26 @@
                 "TelemetryUnloadReason",
                 "TelemetryUpdateReason",
                 "eTraceHeadersMode",
-                "eW3CTraceFlags",
-                "eAttributeSource",
-                "AddAttributeResult",
-                "eAttributeFilter",
                 "eAttributeChangeOp",
                 "eOTelSamplingDecision",
                 "eOTelSpanKind",
-                "eOTelSpanStatusCode"
-            ]
-        },
-        "@microsoft/applicationinsights-perfmarkmeasure-js": {
-            "constEnums": []
-        },
-        "@microsoft/applicationinsights-common": {
-            "constEnums": [
-                "eStorageType",
-                "FieldType",
-                "eDistributedTracingModes",
-                "EventPersistenceValue",
-                "eOfflineValue",
-                "eRequestHeaders",
+                "eOTelSpanStatusCode",
+                "eAttributeSource",
+                "AddAttributeResult",
                 "DataPointType",
                 "DependencyKind",
                 "DependencySourceType",
                 "eSeverityLevel",
+                "eAttributeFilter",
                 "DataSanitizerValues"
             ]
         },
+        "@microsoft/applicationinsights-perfmarkmeasure-js": {
+            "constEnums": []
+        },
+        "@microsoft/applicationinsights-common": {
+            "constEnums": []
+        },
         "@microsoft/applicationinsights-properties-js": {
             "constEnums": []
         },

AISKU/Tests/Perf/src/AISKUPerf.Tests.ts

@@ -1,6 +1,6 @@
 import { AITestClass, Assert } from "@microsoft/ai-test-framework";
 import { AppInsightsInitPerfTestClass } from "./AISKUPerf";
-import { utlRemoveSessionStorage } from "@microsoft/applicationinsights-common";
+import { utlRemoveSessionStorage } from "@microsoft/applicationinsights-core-js";
 import { createTimeoutPromise, doAwait } from "@nevware21/ts-async";
 
 function isNullOrUndefined(value: any): boolean {

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

@@ -2,7 +2,7 @@ import { AITestClass, Assert } from "@microsoft/ai-test-framework";
 import { dumpObj } from '@nevware21/ts-utils';
 import { createPromise, doAwait, IPromise } from '@nevware21/ts-async';
 import { strUndefined } from "@microsoft/applicationinsights-core-js";
-import { utlRemoveSessionStorage } from "@microsoft/applicationinsights-common";
+import { utlRemoveSessionStorage } from "@microsoft/applicationinsights-core-js";
 import * as pako from "pako";
 import { Snippet } from "../../../src/Snippet";
 

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

@@ -2,7 +2,7 @@ import { AITestClass, Assert } from "@microsoft/ai-test-framework";
 import { 
     AnalyticsPluginIdentifier, BreezeChannelIdentifier, DEFAULT_BREEZE_ENDPOINT, DisabledPropertyName,
     DistributedTracingModes, PropertiesPluginIdentifier, RequestHeaders, SeverityLevel
-} from "@microsoft/applicationinsights-common";
+} from "@microsoft/applicationinsights-core-js";
 import { dumpObj, LoggingSeverity, objForEachKey, objKeys, strUndefined } from "@microsoft/applicationinsights-core-js";
 import { Snippet } from "../../../src/Snippet";
 

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

@@ -1,6 +1,6 @@
 import { ApplicationInsights, ApplicationInsightsContainer, IApplicationInsights, IConfig, IConfiguration, LoggingSeverity, Snippet, _eInternalMessageId } from '../../../src/applicationinsights-web'
 import { AITestClass, Assert, IFetchArgs, PollingAssert} from '@microsoft/ai-test-framework';
-import { IThrottleInterval, IThrottleLimit, IThrottleMgrConfig } from '@microsoft/applicationinsights-common';
+import { IThrottleInterval, IThrottleLimit, IThrottleMgrConfig } from '@microsoft/applicationinsights-core-js';
 import { SinonSpy } from 'sinon';
 import { AppInsightsSku } from '../../../src/AISku';
 import { createSnippetV5 } from './testSnippetV5';

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

@@ -1,6 +1,6 @@
 import { ApplicationInsights, IAnalyticsConfig, IAppInsights, IConfig, ApplicationAnalytics } from "../../../src/applicationinsights-web";
 import { AITestClass, Assert } from "@microsoft/ai-test-framework";
-import { AnalyticsPluginIdentifier, utlRemoveSessionStorage } from "@microsoft/applicationinsights-common";
+import { AnalyticsPluginIdentifier, utlRemoveSessionStorage } from "@microsoft/applicationinsights-core-js";
 import { AppInsightsCore, IConfiguration, isFunction, onConfigChange } from "@microsoft/applicationinsights-core-js";
 import { Sender } from "@microsoft/applicationinsights-channel-js";
 

AISKU/Tests/Unit/src/OTelInit.Tests.ts

@@ -2,7 +2,7 @@ import { AITestClass, Assert } from "@microsoft/ai-test-framework";
 import { ApplicationInsights } from "../../../src/applicationinsights-web";
 import { eOTelSpanKind, eOTelSpanStatusCode, isTracingSuppressed, ITelemetryItem, unsuppressTracing } from "@microsoft/applicationinsights-core-js";
 import { objIs, setBypassLazyCache } from "@nevware21/ts-utils";
-import { AnalyticsPluginIdentifier, PropertiesPluginIdentifier } from "@microsoft/applicationinsights-common";
+import { AnalyticsPluginIdentifier, PropertiesPluginIdentifier } from "@microsoft/applicationinsights-core-js";
 
 /**
  * Integration Tests for Span APIs with Properties Plugin and Analytics Plugin

AISKU/Tests/Unit/src/SnippetInitialization.Tests.ts

@@ -10,7 +10,7 @@ import { BaseTelemetryPlugin, IProcessTelemetryContext, isNotNullOrUndefined, IT
 import {
     BreezeChannelIdentifier, ContextTagKeys, DistributedTracingModes, IConfig, IDependencyTelemetry, RequestHeaders,
     utlRemoveSessionStorage, utlSetSessionStorage
-} from "@microsoft/applicationinsights-common";
+} from "@microsoft/applicationinsights-core-js";
 import { getGlobal } from "@microsoft/applicationinsights-shims";
 import { IPropTelemetryContext } from "@microsoft/applicationinsights-properties-js";
 import { dumpObj, isPromiseLike, objHasOwnProperty, strSubstring } from "@nevware21/ts-utils";

AISKU/Tests/Unit/src/SpanHelperUtils.Tests.ts

@@ -4,12 +4,12 @@ import {
     createDistributedTraceContext,
     eOTelSpanKind,
     eOTelSpanStatusCode,
+    IDistributedTraceInit,
     isReadableSpan,
     isSpanContextValid,
     ITelemetryItem,
     wrapSpanContext
 } from "@microsoft/applicationinsights-core-js";
-import { IDistributedTraceInit } from "@microsoft/applicationinsights-core-js/src/JavaScriptSDK.Interfaces/IDistributedTraceContext";
 
 /**
  * Comprehensive tests for span helper utility functions

AISKU/Tests/Unit/src/SpanUtils.Tests.ts

@@ -22,7 +22,7 @@ import {
     ATTR_HTTP_ROUTE,
     MicrosoftClientIp
 } from "@microsoft/applicationinsights-core-js";
-import { IRequestTelemetry } from "@microsoft/applicationinsights-common";
+import { IRequestTelemetry } from "@microsoft/applicationinsights-core-js";
 
 export class SpanUtilsTests extends AITestClass {
     private static readonly _instrumentationKey = "b7170927-2d1c-44f1-acec-59f4e1751c11";

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

@@ -1,6 +1,6 @@
 import { ApplicationInsights, ApplicationInsightsContainer, IApplicationInsights, IConfig, IConfiguration, LoggingSeverity, Snippet, _eInternalMessageId } from '../../../src/applicationinsights-web'
 import { AITestClass, Assert} from '@microsoft/ai-test-framework';
-import { IThrottleInterval, IThrottleLimit, IThrottleMgrConfig } from '@microsoft/applicationinsights-common';
+import { IThrottleInterval, IThrottleLimit, IThrottleMgrConfig } from '@microsoft/applicationinsights-core-js';
 import { SinonSpy } from 'sinon';
 import { AppInsightsSku } from '../../../src/AISku';
 import { createSnippetV5 } from './testSnippetV5';

AISKU/Tests/Unit/src/UseSpan.Tests.ts

@@ -1,9 +1,8 @@
 import { AITestClass, Assert } from "@microsoft/ai-test-framework";
 import { ApplicationInsights } from "../../../src/applicationinsights-web";
 import {
-    IReadableSpan, eOTelSpanKind, eOTelSpanStatusCode, useSpan, ITelemetryItem, ISpanScope, ITraceHost
+    IAppInsightsCore, IReadableSpan, eOTelSpanKind, eOTelSpanStatusCode, useSpan, ITelemetryItem, ISpanScope, ITraceHost
 } from "@microsoft/applicationinsights-core-js";
-import { IAppInsightsCore } from "@microsoft/applicationinsights-core-js/src/applicationinsights-core-js";
 
 export class UseSpanTests extends AITestClass {
     private static readonly _instrumentationKey = "b7170927-2d1c-44f1-acec-59f4e1751c11";

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

@@ -1,4 +1,4 @@
-import { DistributedTracingModes, IConfig } from '@microsoft/applicationinsights-common';
+import { DistributedTracingModes, IConfig } from '@microsoft/applicationinsights-core-js';
 import { ApplicationInsightsTests } from './applicationinsights.e2e.tests';
 import { IConfiguration } from '@microsoft/applicationinsights-core-js';
 

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

@@ -2,13 +2,13 @@ import { AITestClass, Assert, PollingAssert, EventValidator, TraceValidator, Exc
 import { SinonSpy } from 'sinon';
 import { ApplicationInsights } from '../../../src/applicationinsights-web'
 import { Sender } from '@microsoft/applicationinsights-channel-js';
-import { IDependencyTelemetry, ContextTagKeys, Exception, DistributedTracingModes, RequestHeaders, IAutoExceptionTelemetry, BreezeChannelIdentifier, IConfig, EventPersistence, EventDataType, PageViewDataType, TraceDataType, ExceptionDataType, MetricDataType, PageViewPerformanceDataType, RemoteDependencyDataType } from '@microsoft/applicationinsights-common';
+import { IDependencyTelemetry, ContextTagKeys, Exception, DistributedTracingModes, RequestHeaders, IAutoExceptionTelemetry, BreezeChannelIdentifier, IConfig, EventPersistence, EventDataType, PageViewDataType, TraceDataType, ExceptionDataType, MetricDataType, PageViewPerformanceDataType, RemoteDependencyDataType } from '@microsoft/applicationinsights-core-js';
 import { ITelemetryItem, getGlobal, newId, dumpObj, BaseTelemetryPlugin, IProcessTelemetryContext, __getRegisteredEvents, arrForEach, IConfiguration, ActiveStatus, FeatureOptInMode } from "@microsoft/applicationinsights-core-js";
 import { IPropTelemetryContext } from '@microsoft/applicationinsights-properties-js';
 import { createAsyncResolvedPromise } from '@nevware21/ts-async';
 import { CONFIG_ENDPOINT_URL } from '../../../src/InternalConstants';
 import { OfflineChannel } from '@microsoft/applicationinsights-offlinechannel-js';
-import { IStackFrame } from '@microsoft/applicationinsights-common/src/Interfaces/Contracts/IStackFrame';
+import { IStackFrame } from '@microsoft/applicationinsights-core-js';
 import { utcNow } from '@nevware21/ts-utils';
 
 function _checkExpectedFrame(expectedFrame: IStackFrame, actualFrame: IStackFrame, index: number) {

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

@@ -3,7 +3,7 @@ import { Sender } from '@microsoft/applicationinsights-channel-js';
 import { AITestClass, Assert, PollingAssert } from '@microsoft/ai-test-framework';
 import { SinonSpy } from 'sinon';
 import { newId } from '@microsoft/applicationinsights-core-js';
-import { BreezeChannelIdentifier } from '@microsoft/applicationinsights-common';
+import { BreezeChannelIdentifier } from '@microsoft/applicationinsights-core-js';
 
 export class SanitizerE2ETests extends AITestClass {
     private readonly _instrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';

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

@@ -1,6 +1,6 @@
 import { ApplicationInsights, IApplicationInsights } from '../../../src/applicationinsights-web'
 import { Sender } from '@microsoft/applicationinsights-channel-js';
-import { BreezeChannelIdentifier, utlGetSessionStorage, utlRemoveSessionStorage } from '@microsoft/applicationinsights-common';
+import { BreezeChannelIdentifier, utlGetSessionStorage, utlRemoveSessionStorage } from '@microsoft/applicationinsights-core-js';
 import { ActiveStatus, dumpObj, getJSON, isArray } from '@microsoft/applicationinsights-core-js';
 import { SinonSpy } from 'sinon';
 import { Assert, AITestClass, PollingAssert} from "@microsoft/ai-test-framework"

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

@@ -3,7 +3,7 @@ import { Sender } from '@microsoft/applicationinsights-channel-js';
 import { SinonSpy } from 'sinon';
 import { AITestClass, Assert, PollingAssert } from '@microsoft/ai-test-framework';
 import { dumpObj } from '@microsoft/applicationinsights-core-js';
-import { BreezeChannelIdentifier } from '@microsoft/applicationinsights-common';
+import { BreezeChannelIdentifier } from '@microsoft/applicationinsights-core-js';
 
 export class ValidateE2ETests extends AITestClass {
     private readonly _instrumentationKey = 'b7170927-2d1c-44f1-acec-59f4e1751c11';

AISKU/Tests/es6-module-type-check/package.json

@@ -32,7 +32,7 @@
         "tslib": ">= 1.0.0"
     },
     "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.11",
+        "@microsoft/applicationinsights-core-js": "3.3.11",
         "@microsoft/applicationinsights-web": "3.3.11"
     }
 }

AISKU/Tests/es6-module-type-check/src/main.ts

@@ -1,2 +1,2 @@
-import { ContextTagKeys } from "@microsoft/applicationinsights-common";
+import { ContextTagKeys } from "@microsoft/applicationinsights-core-js";
 import { ITelemetryItem } from "@microsoft/applicationinsights-web";

AISKU/package.json

@@ -68,7 +68,6 @@
         "@microsoft/applicationinsights-analytics-js": "3.3.11",
         "@microsoft/applicationinsights-channel-js": "3.3.11",
         "@microsoft/applicationinsights-cfgsync-js": "3.3.11",
-        "@microsoft/applicationinsights-common": "3.3.11",
         "@microsoft/applicationinsights-core-js": "3.3.11",
         "@microsoft/applicationinsights-dependencies-js": "3.3.11",
         "@microsoft/applicationinsights-properties-js": "3.3.11",

AISKU/src/AISku.ts

@@ -7,20 +7,17 @@ import { AnalyticsPlugin, ApplicationInsights } from "@microsoft/applicationinsi
 import { CfgSyncPlugin, ICfgSyncConfig, ICfgSyncMode } from "@microsoft/applicationinsights-cfgsync-js";
 import { Sender } from "@microsoft/applicationinsights-channel-js";
 import {
-    AnalyticsPluginIdentifier, ConnectionString, DEFAULT_BREEZE_PATH, IAutoExceptionTelemetry, IConfig, IDependencyTelemetry,
-    IEventTelemetry, IExceptionTelemetry, IMetricTelemetry, IPageViewPerformanceTelemetry, IPageViewTelemetry, IRequestHeaders,
-    ITelemetryContext as Common_ITelemetryContext, IThrottleInterval, IThrottleLimit, IThrottleMgrConfig, ITraceTelemetry,
-    PropertiesPluginIdentifier, ThrottleMgr, parseConnectionString
-} from "@microsoft/applicationinsights-common";
-import {
-    AppInsightsCore, FeatureOptInMode, IAppInsightsCore, IChannelControls, IConfigDefaults, IConfiguration, ICookieMgr, ICustomProperties,
-    IDiagnosticLogger, IDistributedTraceContext, IDynamicConfigHandler, ILoadedPlugin, INotificationManager, IOTelApi, IOTelSpanOptions,
-    IPlugin, IReadableSpan, ISpanScope, ITelemetryInitializerHandler, ITelemetryItem, ITelemetryPlugin, ITelemetryUnloadState, ITraceApi,
-    ITraceProvider, IUnloadHook, OTelTimeInput, UnloadHandler, WatcherFunction, _eInternalMessageId, _throwInternal,
-    addPageHideEventListener, addPageUnloadEventListener, cfgDfMerge, cfgDfValidate, createDynamicConfig, createOTelApi,
-    createProcessTelemetryContext, createTraceProvider, createUniqueNamespace, doPerf, eLoggingSeverity, hasDocument, hasWindow, isArray,
-    isFeatureEnabled, isFunction, isNullOrUndefined, isReactNative, isString, mergeEvtNamespace, onConfigChange, proxyAssign, proxyFunctions,
-    removePageHideEventListener, removePageUnloadEventListener, useSpan
+    AnalyticsPluginIdentifier, AppInsightsCore, ConnectionString, DEFAULT_BREEZE_PATH, FeatureOptInMode, IAppInsightsCore,
+    IAutoExceptionTelemetry, IChannelControls, IConfig, IConfigDefaults, IConfiguration, ICookieMgr, ICustomProperties, IDependencyTelemetry,
+    IDiagnosticLogger, IDistributedTraceContext, IDynamicConfigHandler, IEventTelemetry, IExceptionTelemetry, ILoadedPlugin,
+    IMetricTelemetry, INotificationManager, IOTelApi, IOTelSpanOptions, IPageViewPerformanceTelemetry, IPageViewTelemetry, IPlugin,
+    IReadableSpan, IRequestHeaders, ISpanScope, ITelemetryContext as Common_ITelemetryContext, ITelemetryInitializerHandler, ITelemetryItem,
+    ITelemetryPlugin, ITelemetryUnloadState, IThrottleInterval, IThrottleLimit, IThrottleMgrConfig, ITraceApi, ITraceProvider,
+    ITraceTelemetry, IUnloadHook, OTelTimeInput, PropertiesPluginIdentifier, ThrottleMgr, UnloadHandler, WatcherFunction,
+    _eInternalMessageId, _throwInternal, addPageHideEventListener, addPageUnloadEventListener, cfgDfMerge, cfgDfValidate,
+    createDynamicConfig, createOTelApi, createProcessTelemetryContext, createTraceProvider, createUniqueNamespace, doPerf, eLoggingSeverity,
+    hasDocument, hasWindow, isArray, isFeatureEnabled, isFunction, isNullOrUndefined, isReactNative, isString, mergeEvtNamespace,
+    onConfigChange, parseConnectionString, proxyAssign, proxyFunctions, removePageHideEventListener, removePageUnloadEventListener, useSpan
 } from "@microsoft/applicationinsights-core-js";
 import {
     AjaxPlugin as DependenciesPlugin, DependencyInitializerFunction, DependencyListenerFunction, IDependencyInitializerHandler,

AISKU/src/IApplicationInsights.ts

@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 import { AnalyticsPlugin } from "@microsoft/applicationinsights-analytics-js";
 import { Sender } from "@microsoft/applicationinsights-channel-js";
-import { IAppInsights, IPropertiesPlugin, IRequestHeaders } from "@microsoft/applicationinsights-common";
 import {
-    IConfiguration, ILoadedPlugin, IOTelApi, IPlugin, ITelemetryPlugin, ITelemetryUnloadState, ITraceApi, ITraceHost, UnloadHandler
+    IAppInsights, IConfiguration, ILoadedPlugin, IOTelApi, IPlugin, IPropertiesPlugin, IRequestHeaders, ITelemetryPlugin,
+    ITelemetryUnloadState, ITraceApi, ITraceHost, UnloadHandler
 } from "@microsoft/applicationinsights-core-js";
 import { IDependenciesPlugin } from "@microsoft/applicationinsights-dependencies-js";
 import { IPromise } from "@nevware21/ts-async";

AISKU/src/Init.ts

@@ -44,7 +44,7 @@ export {
     PropertiesPluginIdentifier,
     BreezeChannelIdentifier,
     AnalyticsPluginIdentifier
-} from "@microsoft/applicationinsights-common";
+} from "@microsoft/applicationinsights-core-js";
 
 // ----------------------------------------------------------------------------------------------------
 // End of Exports available from the Cdn bundles
@@ -87,7 +87,7 @@ export {
     eSeverityLevel,
     IRequestHeaders,
     EventPersistence
-} from "@microsoft/applicationinsights-common";
+} from "@microsoft/applicationinsights-core-js";
 
 export { ISenderConfig } from "@microsoft/applicationinsights-channel-js";
 

AISKU/src/Snippet.ts

@@ -2,8 +2,7 @@
 // Licensed under the MIT License.
 "use strict";
 
-import { IConfig } from "@microsoft/applicationinsights-common";
-import { IConfiguration } from "@microsoft/applicationinsights-core-js";
+import { IConfig, IConfiguration } from "@microsoft/applicationinsights-core-js";
 
 /**
  *

AISKU/src/applicationinsights-web.ts

@@ -61,7 +61,7 @@ export {
     DistributedTracingModes,
     IRequestHeaders,
     EventPersistence
-} from "@microsoft/applicationinsights-common";
+} from "@microsoft/applicationinsights-core-js";
 export { Sender, ISenderConfig } from "@microsoft/applicationinsights-channel-js";
 export { ApplicationInsights as ApplicationAnalytics, IAppInsightsInternal, IAnalyticsConfig } from "@microsoft/applicationinsights-analytics-js";
 export { PropertiesPlugin } from "@microsoft/applicationinsights-properties-js";