Update to ApplicationInsights v2.8.10 (#16)

microsoft · Feb 7, 2023 · 1683c2a · 1683c2a
1 parent 4edc278
commit 1683c2a
Show file tree

Hide file tree

Showing 6 changed files with 1,087 additions and 902 deletions.
diff --git a/applicationinsights-react-native/Tests/UnitTests.html b/applicationinsights-react-native/Tests/UnitTests.html
@@ -30,7 +30,7 @@
         modules.add("@microsoft/applicationinsights-shims", "./node_modules/@microsoft/applicationinsights-shims/browser/applicationinsights-shims");
 
         // Load ts-utils
-        modules.add("@nevware21/ts-utils", "./node_modules/@nevware21/ts-utils/dist/umd/ts-utils");
+        modules.add("@nevware21/ts-utils", "./node_modules/@nevware21/ts-utils/dist/es5/umd/ts-utils");
 
         // Load DynamicProto
         modules.add("@microsoft/dynamicproto-js", "./node_modules/@microsoft/dynamicproto-js/lib/dist/umd/dynamicproto-js", true);

diff --git a/applicationinsights-react-native/package.json b/applicationinsights-react-native/package.json
@@ -69,15 +69,15 @@
         "uglify-js": "3.16.0"
     },
     "dependencies": {
-        "@microsoft/applicationinsights-common": "^2.8.5",
-        "@microsoft/applicationinsights-core-js": "^2.8.5",
-        "@microsoft/applicationinsights-shims": "^2.0.1",
-        "@microsoft/dynamicproto-js": "^1.1.6",
-        "@nevware21/ts-utils": "^0.4.0"
+        "@microsoft/dynamicproto-js": "^1.1.7",
+        "@microsoft/applicationinsights-common": "^2.8.10",
+        "@microsoft/applicationinsights-core-js": "^2.8.10",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@nevware21/ts-utils": ">= 0.7 < 2.x"
     },
     "peerDependencies": {
         "tslib": "*",
         "react-native": "*",
         "react-native-device-info": ">=5.2.1"
     }
-}
+}
diff --git a/applicationinsights-react-native/src/ReactNativePlugin.ts b/applicationinsights-react-native/src/ReactNativePlugin.ts
@@ -12,7 +12,7 @@ import {
 } from "@microsoft/applicationinsights-core-js";
 import { getGlobal, strShimUndefined } from "@microsoft/applicationinsights-shims";
 import { INativeDevice, IReactNativePluginConfig } from "./Interfaces";
-import { isPromiseLike, isString } from "@nevware21/ts-utils";
+import { isPromiseLike, isString, ITimerHandler, scheduleTimeout } from "@nevware21/ts-utils";
 import { IDeviceInfoModule } from "./Interfaces/IDeviceInfoModule";
 import { getReactNativeDeviceInfo } from "./DeviceInfo/ReactNativeDeviceInfo";
 
@@ -36,7 +36,7 @@ export class ReactNativePlugin extends BaseTelemetryPlugin {
         let _analyticsPlugin: IAppInsights;
         let _defaultHandler;
         let _waitingForId: boolean;
-        let _waitingTimer: number;
+        let _waitingTimer: ITimerHandler;
         let _waitingItems: { item: ITelemetryItem, itemCtx?: IProcessTelemetryContext }[] = null;
         let _deviceInfoModule: IDeviceInfoModule;
 
@@ -118,12 +118,13 @@ export class ReactNativePlugin extends BaseTelemetryPlugin {
                     if (isPromiseLike(uniqueId)) {
                         _waitingForId = true;
                         if (_waitingTimer) {
-                            clearTimeout(_waitingTimer);
+                            _waitingTimer.cancel();
                         }
-                        _waitingTimer = setTimeout(() => {
+                        _waitingTimer = scheduleTimeout(() => {
                             _waitingTimer = null;
                             _setDeviceId(_device.id);
-                        });
+                        }, 0);
+                        _waitingTimer.unref();
                         uniqueId.then((value) => {
                             _setDeviceId(value);
                         }, (reason) => {
@@ -157,7 +158,7 @@ export class ReactNativePlugin extends BaseTelemetryPlugin {
                 _device.id = newId;
                 _waitingForId = false;
                 if (_waitingTimer) {
-                    clearTimeout(_waitingTimer);
+                    _waitingTimer.cancel();
                 }
 
                 if (!_waitingForId && _waitingItems && _waitingItems.length > 0 && _self.isInitialized()) {

diff --git a/common/Tests/Framework/package.json b/common/Tests/Framework/package.json
@@ -49,6 +49,6 @@
         "tslib": "*"
     },
     "dependencies": {
-        "@microsoft/dynamicproto-js": "^1.1.6"
+        "@microsoft/dynamicproto-js": "^1.1.7"
     }
 }