Fix/upgrade segment package (#2558)

acunniffe · web-flow · commit 23719087e8f7 · 2023-11-28T08:53:59.000-05:00
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "openapi-workspaces",
   "license": "MIT",
   "private": true,
-  "version": "0.53.4",
+  "version": "0.53.5",
   "workspaces": [
     "projects/json-pointer-helpers",
     "projects/openapi-io",
diff --git a/projects/fastify-capture/package.json b/projects/fastify-capture/package.json
@@ -2,7 +2,7 @@
   "name": "@useoptic/fastify-capture",
   "license": "MIT",
   "packageManager": "yarn@4.0.1",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
diff --git a/projects/json-pointer-helpers/package.json b/projects/json-pointer-helpers/package.json
@@ -2,7 +2,7 @@
   "name": "@useoptic/json-pointer-helpers",
   "license": "MIT",
   "packageManager": "yarn@4.0.1",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
diff --git a/projects/openapi-io/package.json b/projects/openapi-io/package.json
@@ -2,7 +2,7 @@
   "name": "@useoptic/openapi-io",
   "license": "MIT",
   "packageManager": "yarn@4.0.1",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
diff --git a/projects/openapi-utilities/package.json b/projects/openapi-utilities/package.json
@@ -2,7 +2,7 @@
   "name": "@useoptic/openapi-utilities",
   "license": "MIT",
   "packageManager": "yarn@4.0.1",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
diff --git a/projects/optic/package.json b/projects/optic/package.json
@@ -2,7 +2,7 @@
   "name": "@useoptic/optic",
   "license": "MIT",
   "packageManager": "yarn@4.0.1",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
@@ -23,7 +23,6 @@
     "@babel/plugin-transform-runtime": "^7.17.0",
     "@babel/preset-env": "^7.17.0",
     "@babel/preset-typescript": "^7.17.0",
-    "@types/analytics-node": "^3.1.10",
     "@types/babel__core": "^7",
     "@types/babel__preset-env": "^7",
     "@types/fs-extra": "^11.0.0",
@@ -60,6 +59,7 @@
     "@httptoolkit/httpolyglot": "^2.0.1",
     "@jsdevtools/ono": "^7.1.3",
     "@octokit/rest": "^19.0.0",
+    "@segment/analytics-node": "^1.1.3",
     "@sentry/node": "^7.74.0",
     "@sinclair/typebox": "^0.31.0",
     "@stoplight/spectral-core": "^1.8.1",
@@ -69,7 +69,6 @@
     "@useoptic/standard-rulesets": "workspace:*",
     "ajv": "^8.6.0",
     "ajv-formats": "~2.1.0",
-    "analytics-node": "^6.2.0",
     "async-exit-hook": "^2.0.1",
     "axax": "^0.2.2",
     "bottleneck": "^2.19.5",
diff --git a/projects/optic/src/segment.ts b/projects/optic/src/segment.ts
@@ -1,4 +1,4 @@
-import Analytics from 'analytics-node';
+import Analytics from '@segment/analytics-node';
 const packageJson = require('../package.json');
 import { machineIdSync } from 'node-machine-id';
 
@@ -16,10 +16,7 @@ export const initSegment = (key: string | undefined) => {
     process.env.OPTIC_ENV === 'staging' ||
     process.env.OPTIC_ENV === 'local';
   if (key && !isSegmentDisabled) {
-    analytics = new Analytics(key, {
-      // Handle errors thrown here
-      errorHandler: (err) => {},
-    });
+    analytics = new Analytics({ writeKey: key });
   }
 };
 export const trackEvent = (
@@ -42,12 +39,7 @@ export const trackEvent = (
 
 export const flushEvents = (): Promise<void> => {
   if (analytics) {
-    return new Promise((resolve, reject) => {
-      analytics!.flush((err, _batch) => {
-        // Don't reject when error, we will silently ignore since it's non-critical code
-        resolve();
-      });
-    });
+    return analytics!.closeAndFlush({ timeout: 3000 });
   } else {
     return Promise.resolve();
   }
diff --git a/projects/rulesets-base/package.json b/projects/rulesets-base/package.json
@@ -2,7 +2,7 @@
   "name": "@useoptic/rulesets-base",
   "license": "MIT",
   "packageManager": "yarn@4.0.1",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
diff --git a/projects/standard-rulesets/package.json b/projects/standard-rulesets/package.json
@@ -2,7 +2,7 @@
   "name": "@useoptic/standard-rulesets",
   "license": "MIT",
   "packageManager": "yarn@4.0.1",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
diff --git a/yarn.lock b/yarn.lock
@@ -2390,6 +2390,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lukeed/csprng@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@lukeed/csprng@npm:1.1.0"
+  checksum: 5d6dcf478af732972083ab2889c294b57f1028fa13c2c240d7a4aaa079c2c75df7ef0dcbdda5419147fc6704b4adf96b2de92f1a9a72ac21c6350c4014fffe6c
+  languageName: node
+  linkType: hard
+
+"@lukeed/uuid@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@lukeed/uuid@npm:2.0.1"
+  dependencies:
+    "@lukeed/csprng": "npm:^1.1.0"
+  checksum: f9cc0385021f352f444d96dd101afd2a0efd3b2e85a61ac67deb8220409f75a6a426ed6525d297d97746f7931e3079ac6218777551a7c82686de7d292220cb1f
+  languageName: node
+  linkType: hard
+
 "@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3":
   version: 2.1.8-no-fsevents.3
   resolution: "@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3"
@@ -2608,13 +2624,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@segment/loosely-validate-event@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@segment/loosely-validate-event@npm:2.0.0"
+"@segment/analytics-core@npm:1.3.2":
+  version: 1.3.2
+  resolution: "@segment/analytics-core@npm:1.3.2"
+  dependencies:
+    "@lukeed/uuid": "npm:^2.0.0"
+    dset: "npm:^3.1.2"
+    tslib: "npm:^2.4.1"
+  checksum: c367722f6861c16e55f924a3681b273e56643d2f986b0e12a7a7af532b3dc687ca4c0d67c07234ca507d55325dbcdf084f890b030cf53452a3f1212d9d0dbd31
+  languageName: node
+  linkType: hard
+
+"@segment/analytics-generic-utils@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@segment/analytics-generic-utils@npm:1.0.0"
+  checksum: 03a4baef674c934352506882e57b4d362996afeaee87ee2edbf8d74e1c18d6e0d0b9a387787b6f01faf2837c82045df641cd95eb6d13de19568291e249b7d542
+  languageName: node
+  linkType: hard
+
+"@segment/analytics-node@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@segment/analytics-node@npm:1.1.3"
   dependencies:
-    component-type: "npm:^1.2.1"
-    join-component: "npm:^1.1.0"
-  checksum: c083c70c5f0a42a2bc5b685f82830b968d01b5b8de2a9a1c362a3952c6bb33ffbdfcf8196c8ce110a5050f78ff9dcf395832eb55687843c80dc77dfe659b0803
+    "@lukeed/uuid": "npm:^2.0.0"
+    "@segment/analytics-core": "npm:1.3.2"
+    "@segment/analytics-generic-utils": "npm:1.0.0"
+    buffer: "npm:^6.0.3"
+    node-fetch: "npm:^2.6.7"
+    tslib: "npm:^2.4.1"
+  checksum: b74abaed0284dd8af0de015be0d793ba090ec2a29116170850293f1bb38002e783745a126729b83094f95dfc505bc7c8dd47fdc7e696c2650b3ac080c2cc9991
   languageName: node
   linkType: hard
 
@@ -3063,13 +3101,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/analytics-node@npm:^3.1.10":
-  version: 3.1.14
-  resolution: "@types/analytics-node@npm:3.1.14"
-  checksum: 5bb8b3ffce8ead360eabc561fee0e8403cb594fbfcbfb6675c7170a41460df913ac881ea52ad771251814b37eb526296b78bbb65838d9053e6575dfa6a149b79
-  languageName: node
-  linkType: hard
-
 "@types/babel__core@npm:^7, @types/babel__core@npm:^7.1.14":
   version: 7.20.4
   resolution: "@types/babel__core@npm:7.20.4"
@@ -3712,10 +3743,10 @@ __metadata:
     "@httptoolkit/httpolyglot": "npm:^2.0.1"
     "@jsdevtools/ono": "npm:^7.1.3"
     "@octokit/rest": "npm:^19.0.0"
+    "@segment/analytics-node": "npm:^1.1.3"
     "@sentry/node": "npm:^7.74.0"
     "@sinclair/typebox": "npm:^0.31.0"
     "@stoplight/spectral-core": "npm:^1.8.1"
-    "@types/analytics-node": "npm:^3.1.10"
     "@types/babel__core": "npm:^7"
     "@types/babel__preset-env": "npm:^7"
     "@types/fs-extra": "npm:^11.0.0"
@@ -3744,7 +3775,6 @@ __metadata:
     "@useoptic/standard-rulesets": "workspace:*"
     ajv: "npm:^8.6.0"
     ajv-formats: "npm:~2.1.0"
-    analytics-node: "npm:^6.2.0"
     async-exit-hook: "npm:^2.0.1"
     axax: "npm:^0.2.2"
     babel-jest: "npm:^29.3.1"
@@ -4029,22 +4059,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"analytics-node@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "analytics-node@npm:6.2.0"
-  dependencies:
-    "@segment/loosely-validate-event": "npm:^2.0.0"
-    axios: "npm:^0.27.2"
-    axios-retry: "npm:3.2.0"
-    lodash.isstring: "npm:^4.0.1"
-    md5: "npm:^2.2.1"
-    ms: "npm:^2.0.0"
-    remove-trailing-slash: "npm:^0.1.0"
-    uuid: "npm:^8.3.2"
-  checksum: f7caf5f7692fee994c7ee5d32eeaad0eb26d97a0975d3d6685e0d14b84b497085d5c16c1f84fc9ad337adb1cce4aaa6b54d422066f19f6279f05be5816893854
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.1
   resolution: "ansi-align@npm:3.0.1"
@@ -4279,25 +4293,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios-retry@npm:3.2.0":
-  version: 3.2.0
-  resolution: "axios-retry@npm:3.2.0"
-  dependencies:
-    is-retry-allowed: "npm:^1.1.0"
-  checksum: 2d0cde156270739e87577e3a7673fcc139db48447b843cf23b735108ef8323bd78de2695637848182cc014edecb66e7a8ea00fd605dc08a32d5f47c67a64404c
-  languageName: node
-  linkType: hard
-
-"axios@npm:^0.27.2":
-  version: 0.27.2
-  resolution: "axios@npm:0.27.2"
-  dependencies:
-    follow-redirects: "npm:^1.14.9"
-    form-data: "npm:^4.0.0"
-  checksum: 76d673d2a90629944b44d6f345f01e58e9174690f635115d5ffd4aca495d99bcd8f95c590d5ccb473513f5ebc1d1a6e8934580d0c57cdd0498c3a101313ef771
-  languageName: node
-  linkType: hard
-
 "babel-jest@npm:^29.3.1, babel-jest@npm:^29.5.0, babel-jest@npm:^29.7.0":
   version: 29.7.0
   resolution: "babel-jest@npm:29.7.0"
@@ -5114,13 +5109,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"component-type@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "component-type@npm:1.2.1"
-  checksum: 8f9537d529d619484b8572cd569f212ea264d8c84dc65ccaaa0136e4a2e06696e9a2b2b1979ef264251f8b4ebfa075f23c860b6e4270385fd7663b42e5727cee
-  languageName: node
-  linkType: hard
-
 "concat-map@npm:0.0.1":
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"
@@ -5626,6 +5614,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dset@npm:^3.1.2":
+  version: 3.1.3
+  resolution: "dset@npm:3.1.3"
+  checksum: b1ff68f1f42af373baa85b00b04d89094cd0d7f74f94bd11364cba575f2762ed52a0a0503bbfcc92eccd07c6d55426813c8a7a6cfa020338eaea1f4edfd332c2
+  languageName: node
+  linkType: hard
+
 "duplexer3@npm:^0.1.4":
   version: 0.1.5
   resolution: "duplexer3@npm:0.1.5"
@@ -6366,16 +6361,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.14.9":
-  version: 1.15.1
-  resolution: "follow-redirects@npm:1.15.1"
-  peerDependenciesMeta:
-    debug:
-      optional: true
-  checksum: ea21337fe38eac8d75f5af12c425cc40e0bb44dcc3091fd0bde1c828596251a7a9638b5720fee5a0a5c62524450cbe16c52aae1dce88c6aee68577e441842e7f
-  languageName: node
-  linkType: hard
-
 "for-each@npm:^0.3.3":
   version: 0.3.3
   resolution: "for-each@npm:0.3.3"
@@ -7458,13 +7443,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-retry-allowed@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "is-retry-allowed@npm:1.2.0"
-  checksum: a80f14e1e11c27a58f268f2927b883b635703e23a853cb7b8436e3456bf2ea3efd5082a4e920093eec7bd372c1ce6ea7cea78a9376929c211039d0cc4a393a44
-  languageName: node
-  linkType: hard
-
 "is-root@npm:^2.1.0":
   version: 2.1.0
   resolution: "is-root@npm:2.1.0"
@@ -8143,13 +8121,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"join-component@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "join-component@npm:1.1.0"
-  checksum: 7319cb1ca6ffc514d82ac1b965c4e6cd6bf852adec1e7833bd8613e17f4965e78e2653c8de75a1fe51d9a2cae36af3298008df4079cfd903ef3ecbd231fe11c1
-  languageName: node
-  linkType: hard
-
 "js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
@@ -8489,13 +8460,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.isstring@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "lodash.isstring@npm:4.0.1"
-  checksum: 09eaf980a283f9eef58ef95b30ec7fee61df4d6bf4aba3b5f096869cc58f24c9da17900febc8ffd67819b4e29de29793190e88dc96983db92d84c95fa85d1c92
-  languageName: node
-  linkType: hard
-
 "lodash.memoize@npm:4.x":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
@@ -8715,7 +8679,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"md5@npm:^2.2.1, md5@npm:^2.3.0":
+"md5@npm:^2.3.0":
   version: 2.3.0
   resolution: "md5@npm:2.3.0"
   dependencies:
@@ -10215,13 +10179,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"remove-trailing-slash@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "remove-trailing-slash@npm:0.1.1"
-  checksum: 6fa91e7b89e0675fdca6ce54af5fad9bd612d51e2251913a2e113b521b157647f1f8c694b55447780b489b30a63ebe949ccda7411ef383d09136bb27121c6c09
-  languageName: node
-  linkType: hard
-
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"
@@ -11273,6 +11230,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.4.1":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
+  languageName: node
+  linkType: hard
+
 "tunnel@npm:^0.0.6":
   version: 0.0.6
   resolution: "tunnel@npm:0.0.6"
