@salesforce/telemetry 4.0.12 → 4.0.14

package/lib/appInsights.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppInsights = exports.buildPropertiesAndMeasurements = exports.getCpus = exports.getPlatformVersion = exports.TelemetryClient = void 0;
 /*
@@ -7,11 +30,11 @@ exports.AppInsights = exports.buildPropertiesAndMeasurements = exports.getCpus =
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const os = require("os");
+const os = __importStar(require("os"));
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
-const appInsights = require("applicationinsights");
+const appInsights = __importStar(require("applicationinsights"));
 var applicationinsights_1 = require("applicationinsights");
 Object.defineProperty(exports, "TelemetryClient", { enumerable: true, get: function () { return applicationinsights_1.TelemetryClient; } });
 function getPlatformVersion() {

package/lib/telemetryReporter.js

@@ -1,4 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelemetryReporter = exports.TelemetryClient = void 0;
 /*
@@ -7,10 +33,11 @@ exports.TelemetryReporter = exports.TelemetryClient = void 0;
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const os = require("os");
+const os = __importStar(require("os"));
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
-const axios_1 = require("axios");
+const got_1 = __importDefault(require("got"));
+const proxy_agent_1 = require("proxy-agent");
 const appInsights_1 = require("./appInsights");
 var appInsights_2 = require("./appInsights");
 Object.defineProperty(exports, "TelemetryClient", { enumerable: true, get: function () { return appInsights_2.TelemetryClient; } });
@@ -68,32 +95,31 @@ class TelemetryReporter extends kit_1.AsyncCreatable {
     async testConnection() {
         const timeout = parseInt(kit_1.env.getString('SFDX_TELEMETRY_TIMEOUT', '1000'), 10);
         this.logger.debug(`Testing connection to ${appInsights_1.AppInsights.APP_INSIGHTS_SERVER} with timeout of ${timeout} ms`);
-        // set up a CancelToken to handle connection timeouts because
-        // the built in timeout functionality only handles response timeouts
-        // see here: https://github.com/axios/axios/issues/647#issuecomment-322209906
-        const cancelRequest = axios_1.default.CancelToken.source();
-        setTimeout(() => cancelRequest.cancel('connection timeout'), timeout);
-        let canConnect;
         try {
-            const options = {
-                timeout,
-                cancelToken: cancelRequest.token,
-                // We want any status less than 500 to be resolved (not rejected)
-                validateStatus: (status) => status < 500,
-            };
-            await axios_1.default.get(appInsights_1.AppInsights.APP_INSIGHTS_SERVER, options);
-            canConnect = true;
+            const resp = await got_1.default.get(appInsights_1.AppInsights.APP_INSIGHTS_SERVER, {
+                throwHttpErrors: false,
+                agent: { https: new proxy_agent_1.ProxyAgent() },
+                retry: {
+                    methods: ['GET'],
+                    errorCodes: ['ECONNRESET', 'EADDRINUSE', 'ECONNREFUSED', 'EPIPE'],
+                },
+                timeout: {
+                    lookup: 100,
+                    send: 10000,
+                    response: 1000,
+                },
+            });
+            if (resp.statusCode < 500) {
+                this.logger.debug(`Successfully made a connection to ${appInsights_1.AppInsights.APP_INSIGHTS_SERVER}`);
+                return true;
+            }
+            this.logger.error(`${appInsights_1.AppInsights.APP_INSIGHTS_SERVER} responded with ${resp.statusCode}`);
+            throw new Error(resp.statusCode.toString());
         }
         catch (err) {
-            canConnect = false;
-        }
-        if (canConnect) {
-            this.logger.debug(`Successfully made a connection to ${appInsights_1.AppInsights.APP_INSIGHTS_SERVER}`);
-        }
-        else {
             this.logger.warn(`Connection to ${appInsights_1.AppInsights.APP_INSIGHTS_SERVER} timed out after ${timeout} ms`);
+            return false;
         }
-        return canConnect;
     }
     /**
      * Sends message to child process.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/telemetry",
-  "version": "4.0.12",
+  "version": "4.0.14",
   "description": "Library for application insights",
   "main": "lib/exported",
   "repository": "forcedotcom/telemetry",
@@ -35,36 +35,37 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@salesforce/core": "^4.3.6",
+    "@salesforce/core": "^5.1.4",
     "@salesforce/ts-types": "^2.0.5",
     "applicationinsights": "^2.7.0",
-    "axios": "^1.4.0"
+    "got": "^11",
+    "proxy-agent": "^6.3.0"
   },
   "devDependencies": {
     "@salesforce/dev-config": "^4.0.1",
-    "@salesforce/dev-scripts": "^5.4.2",
+    "@salesforce/dev-scripts": "^5.4.3",
     "@salesforce/prettier-config": "^0.0.3",
-    "@salesforce/ts-sinon": "^1.4.9",
+    "@salesforce/ts-sinon": "^1.4.12",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.61.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "chai": "^4.3.7",
-    "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-config-salesforce": "^2.0.1",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^8.9.0",
+    "eslint-config-salesforce": "^2.0.2",
     "eslint-config-salesforce-license": "^0.2.0",
-    "eslint-config-salesforce-typescript": "^1.1.1",
+    "eslint-config-salesforce-typescript": "^1.1.2",
     "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-import": "2.28.0",
     "eslint-plugin-jsdoc": "^44.2.7",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "prettier": "^2.8.8",
     "pretty-quick": "^3.1.0",
-    "sinon": "10.0.0",
+    "sinon": "^15.2.0",
     "ts-node": "^10.0.0",
     "typescript": "^4.9.5",
-    "wireit": "^0.9.5"
+    "wireit": "^0.10.0"
   },
   "types": "lib/exported.d.ts",
   "publishConfig": {
@@ -142,4 +143,4 @@
       "output": []
     }
   }
-}
+}