Merge branch 'main' into feat/native-fetch-support

readmeio · Jul 28, 2024 · 3875633 · 3875633
2 parents c787cd1 + 97a4172
commit 3875633
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -32,8 +32,7 @@
     "oas": "^20.10.2",
     "ssri": "^10.0.1",
     "timeout-signal": "^1.1.0",
-    "type-is": "^1.6.18",
-    "uuid": "^9.0.0"
+    "type-is": "^1.6.18"
   },
   "devDependencies": {
     "@readme/eslint-config": "^14.0.0",
@@ -48,7 +47,6 @@
     "@types/ssri": "^7.1.1",
     "@types/supertest": "^2.0.12",
     "@types/type-is": "^1.6.3",
-    "@types/uuid": "^9.0.2",
     "@vitest/coverage-v8": "^2.0.4",
     "eslint": "^8.34.0",
     "express": "^4.18.2",

diff --git a/packages/node/src/lib/construct-payload.ts b/packages/node/src/lib/construct-payload.ts
@@ -3,11 +3,11 @@ import type { UUID } from 'node:crypto';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { TLSSocket } from 'tls';
 
+import { randomUUID } from 'node:crypto';
 import os from 'os';
 import { URL } from 'url';
 
 import ssri from 'ssri';
-import { v4 as uuidv4 } from 'uuid';
 
 import { version } from '../../package.json';
 
@@ -142,7 +142,7 @@ export function constructPayload(
   const serverTime = payloadData.responseEndDateTime.getTime() - payloadData.startedDateTime.getTime();
 
   return {
-    _id: payloadData.logId || (uuidv4() as UUID),
+    _id: payloadData.logId || randomUUID(),
     _version: 3,
     group: {
       id: mask(payloadData.apiKey),

diff --git a/packages/node/src/lib/log.ts b/packages/node/src/lib/log.ts
@@ -1,12 +1,11 @@
 import type { LogOptions } from './construct-payload';
 import type { GroupingObject, OutgoingLogBody } from './metrics-log';
-import type { UUID } from 'node:crypto';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 
+import { randomUUID } from 'node:crypto';
 import * as url from 'url';
 
 import clamp from 'lodash/clamp';
-import { v4 as uuidv4 } from 'uuid';
 
 import config from '../config';
 
@@ -108,7 +107,7 @@ export function log(
   const bufferLength = clamp(options.bufferLength || config.bufferLength, 1, 30);
 
   const startedDateTime = new Date();
-  const logId = uuidv4() as UUID;
+  const logId = randomUUID();
 
   // baseLogUrl can be provided, but if it isn't then we
   // attempt to fetch it from the ReadMe API

diff --git a/packages/node/src/lib/metrics-log.ts b/packages/node/src/lib/metrics-log.ts
@@ -1,6 +1,6 @@
 import type { Options } from './log';
-import type { UUID } from 'crypto';
 import type { Har } from 'har-format';
+import type { UUID } from 'node:crypto';
 
 import timeoutSignal from 'timeout-signal';