mirror of
https://github.com/outline/outline.git
synced 2026-06-13 03:14:59 +03:00
chore: Remove datadog-metrics lib (#11665)
* chore: Remove datadog-metrics lib * Restore Pako transient dep types * PR feedback
This commit is contained in:
+2
-1
@@ -106,6 +106,7 @@
|
||||
"@tanstack/react-virtual": "^3.13.12",
|
||||
"@types/form-data": "^2.5.2",
|
||||
"@types/mailparser": "^3.4.6",
|
||||
"@types/pako": "^2.0.4",
|
||||
"@types/sanitize-filename": "^1.6.3",
|
||||
"@vitejs/plugin-react-oxc": "^0.2.3",
|
||||
"addressparser": "^1.0.1",
|
||||
@@ -121,7 +122,6 @@
|
||||
"copy-to-clipboard": "^3.3.3",
|
||||
"core-js": "^3.45.1",
|
||||
"crypto-js": "^4.2.0",
|
||||
"datadog-metrics": "^0.12.1",
|
||||
"date-fns": "^3.6.0",
|
||||
"dd-trace": "^5.82.0",
|
||||
"diff": "^5.2.0",
|
||||
@@ -138,6 +138,7 @@
|
||||
"fs-extra": "^11.3.2",
|
||||
"fuzzy-search": "^3.2.1",
|
||||
"glob": "^8.1.0",
|
||||
"hot-shots": "^12.1.0",
|
||||
"http-errors": "2.0.1",
|
||||
"https-proxy-agent": "^7.0.6",
|
||||
"i18next": "^22.5.1",
|
||||
|
||||
+19
-29
@@ -1,54 +1,44 @@
|
||||
import ddMetrics from "datadog-metrics";
|
||||
import { StatsD } from "hot-shots";
|
||||
import env from "@server/env";
|
||||
|
||||
class Metrics {
|
||||
enabled = !!env.DD_API_KEY;
|
||||
private client: StatsD;
|
||||
|
||||
constructor() {
|
||||
if (!this.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
ddMetrics.init({
|
||||
apiKey: env.DD_API_KEY,
|
||||
this.client = new StatsD({
|
||||
prefix: "outline.",
|
||||
defaultTags: [`env:${process.env.DD_ENV ?? env.ENVIRONMENT}`],
|
||||
globalTags: { env: process.env.DD_ENV ?? env.ENVIRONMENT },
|
||||
errorHandler: () => {
|
||||
// Silently ignore StatsD errors to avoid crashing the server
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
gauge(key: string, value: number, tags?: string[]): void {
|
||||
if (!this.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
return ddMetrics.gauge(key, value, tags);
|
||||
this.client.gauge(key, value, tags);
|
||||
}
|
||||
|
||||
gaugePerInstance(key: string, value: number, tags: string[] = []): void {
|
||||
if (!this.enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
const instanceId =
|
||||
process.env.INSTANCE_ID || process.env.HEROKU_DYNO_ID || process.pid;
|
||||
|
||||
return ddMetrics.gauge(key, value, [...tags, `instance:${instanceId}`]);
|
||||
this.client.gauge(key, value, [...tags, `instance:${instanceId}`]);
|
||||
}
|
||||
|
||||
increment(key: string, _tags?: Record<string, string>): void {
|
||||
if (!this.enabled) {
|
||||
return;
|
||||
}
|
||||
increment(key: string, tags?: Record<string, string>): void {
|
||||
const tagList = tags
|
||||
? Object.entries(tags).map(([k, v]) => `${k}:${v}`)
|
||||
: undefined;
|
||||
|
||||
return ddMetrics.increment(key);
|
||||
this.client.increment(key, 1, tagList);
|
||||
}
|
||||
|
||||
flush(): Promise<void> {
|
||||
if (!this.enabled) {
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
return ddMetrics.flush();
|
||||
return new Promise<void>((resolve) => {
|
||||
this.client.close(() => {
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2964,23 +2964,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@datadog/datadog-api-client@npm:^1.17.0":
|
||||
version: 1.48.0
|
||||
resolution: "@datadog/datadog-api-client@npm:1.48.0"
|
||||
dependencies:
|
||||
"@types/buffer-from": "npm:^1.1.0"
|
||||
"@types/node": "npm:*"
|
||||
"@types/pako": "npm:^1.0.3"
|
||||
buffer-from: "npm:^1.1.2"
|
||||
cross-fetch: "npm:^3.1.5"
|
||||
es6-promise: "npm:^4.2.8"
|
||||
form-data: "npm:^4.0.4"
|
||||
loglevel: "npm:^1.8.1"
|
||||
pako: "npm:^2.0.4"
|
||||
checksum: 10c0/066060c404875fa68654d363f3667ba8ccd579ed133d781576c3a93229a0331d33cfedf3013ec3e193c918dffaf894390b8b12d3e364cd6aa93cb3e646c83150
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@datadog/flagging-core@npm:0.2.0":
|
||||
version: 0.2.0
|
||||
resolution: "@datadog/flagging-core@npm:0.2.0"
|
||||
@@ -7672,15 +7655,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/buffer-from@npm:^1.1.0":
|
||||
version: 1.1.3
|
||||
resolution: "@types/buffer-from@npm:1.1.3"
|
||||
dependencies:
|
||||
"@types/node": "npm:*"
|
||||
checksum: 10c0/c8e0e3a9e24085a3af83b8c10ce1630aa3e21d6800263d4bdcb0b734afa75addc02a2ccb1d404f83ccff4619e5100219d3aaae8d558df6709c97e6c458c99e05
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/co-body@npm:^6.1.0, @types/co-body@npm:^6.1.3":
|
||||
version: 6.1.3
|
||||
resolution: "@types/co-body@npm:6.1.3"
|
||||
@@ -8578,10 +8552,10 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/pako@npm:^1.0.3":
|
||||
version: 1.0.7
|
||||
resolution: "@types/pako@npm:1.0.7"
|
||||
checksum: 10c0/1ba133db0b30a974c3d651c85651fd30135f629727b4b4d7ef2649c8f8b01014d5ef41f75399d939e320a50bfa87c32beccbb513badfeaf85d74ea6d5370fdcc
|
||||
"@types/pako@npm:^2.0.4":
|
||||
version: 2.0.4
|
||||
resolution: "@types/pako@npm:2.0.4"
|
||||
checksum: 10c0/5765bf8bc7e77ee141c454118f03e544b8f6cb51eb257d82dc5830feeab8cd00818af3a1eabefdfbe8dd3ae9916ed5403937bf1031a0ee51deea27fdf4dccdfb
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -9909,6 +9883,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"bindings@npm:^1.5.0":
|
||||
version: 1.5.0
|
||||
resolution: "bindings@npm:1.5.0"
|
||||
dependencies:
|
||||
file-uri-to-path: "npm:1.0.0"
|
||||
checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"bl@npm:^4.0.2":
|
||||
version: 4.1.0
|
||||
resolution: "bl@npm:4.1.0"
|
||||
@@ -10119,7 +10102,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"buffer-from@npm:^1.0.0, buffer-from@npm:^1.1.2":
|
||||
"buffer-from@npm:^1.0.0":
|
||||
version: 1.1.2
|
||||
resolution: "buffer-from@npm:1.1.2"
|
||||
checksum: 10c0/124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34
|
||||
@@ -11022,7 +11005,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"cross-fetch@npm:^3.0.4, cross-fetch@npm:^3.1.5":
|
||||
"cross-fetch@npm:^3.0.4":
|
||||
version: 3.2.0
|
||||
resolution: "cross-fetch@npm:3.2.0"
|
||||
dependencies:
|
||||
@@ -11580,16 +11563,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"datadog-metrics@npm:^0.12.1":
|
||||
version: 0.12.1
|
||||
resolution: "datadog-metrics@npm:0.12.1"
|
||||
dependencies:
|
||||
"@datadog/datadog-api-client": "npm:^1.17.0"
|
||||
debug: "npm:^4.1.0"
|
||||
checksum: 10c0/fb2d4a7f0d9a3f9c40d60e73f3db275b1452f09529ab3ed6624c0cdf4d74864cbc2c18d464c85bbae07c09dbb37c81df914c586264c1e2864ee3ddef2167c2b8
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"date-fns@npm:^2.30.0":
|
||||
version: 2.30.0
|
||||
resolution: "date-fns@npm:2.30.0"
|
||||
@@ -12388,13 +12361,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"es6-promise@npm:^4.2.8":
|
||||
version: 4.2.8
|
||||
resolution: "es6-promise@npm:4.2.8"
|
||||
checksum: 10c0/2373d9c5e9a93bdd9f9ed32ff5cb6dd3dd785368d1c21e9bbbfd07d16345b3774ae260f2bd24c8f836a6903f432b4151e7816a7fa8891ccb4e1a55a028ec42c3
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"esbuild@npm:^0.20.1":
|
||||
version: 0.20.2
|
||||
resolution: "esbuild@npm:0.20.2"
|
||||
@@ -12873,6 +12839,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"file-uri-to-path@npm:1.0.0":
|
||||
version: 1.0.0
|
||||
resolution: "file-uri-to-path@npm:1.0.0"
|
||||
checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"filelist@npm:^1.0.4":
|
||||
version: 1.0.4
|
||||
resolution: "filelist@npm:1.0.4"
|
||||
@@ -13734,6 +13707,18 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"hot-shots@npm:^12.1.0":
|
||||
version: 12.1.0
|
||||
resolution: "hot-shots@npm:12.1.0"
|
||||
dependencies:
|
||||
unix-dgram: "npm:2.x"
|
||||
dependenciesMeta:
|
||||
unix-dgram:
|
||||
optional: true
|
||||
checksum: 10c0/d47526b1646d35e6bc47f4076fd4aee152ccadd448c5f09de1b3689dd1357842a97827e236f9a1b14d017e7b2884b6cc1ed9890babd5bf3a17f5b9601c4522cc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"html-encoding-sniffer@npm:^3.0.0":
|
||||
version: 3.0.0
|
||||
resolution: "html-encoding-sniffer@npm:3.0.0"
|
||||
@@ -16478,13 +16463,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"loglevel@npm:^1.8.1":
|
||||
version: 1.9.2
|
||||
resolution: "loglevel@npm:1.9.2"
|
||||
checksum: 10c0/1e317fa4648fe0b4a4cffef6de037340592cee8547b07d4ce97a487abe9153e704b98451100c799b032c72bb89c9366d71c9fb8192ada8703269263ae77acdc7
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
|
||||
version: 1.4.0
|
||||
resolution: "loose-envify@npm:1.4.0"
|
||||
@@ -17188,6 +17166,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"nan@npm:^2.20.0":
|
||||
version: 2.24.0
|
||||
resolution: "nan@npm:2.24.0"
|
||||
dependencies:
|
||||
node-gyp: "npm:latest"
|
||||
checksum: 10c0/6f9828a15464999ccefcae61b0f94f1f37067048a56363966e892cc6a194e3500966ae6964dd5a6a8acc5e1a849d60d620b120a84bc66c60445379a930c5b0f8
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"nanoid@npm:^3.3.11":
|
||||
version: 3.3.11
|
||||
resolution: "nanoid@npm:3.3.11"
|
||||
@@ -17707,6 +17694,7 @@ __metadata:
|
||||
"@types/node": "npm:20.19.21"
|
||||
"@types/node-fetch": "npm:^2.6.9"
|
||||
"@types/nodemailer": "npm:^6.4.17"
|
||||
"@types/pako": "npm:^2.0.4"
|
||||
"@types/passport-oauth2": "npm:^1.8.0"
|
||||
"@types/pluralize": "npm:^0.0.33"
|
||||
"@types/png-chunks-extract": "npm:^1.0.2"
|
||||
@@ -17756,7 +17744,6 @@ __metadata:
|
||||
copy-to-clipboard: "npm:^3.3.3"
|
||||
core-js: "npm:^3.45.1"
|
||||
crypto-js: "npm:^4.2.0"
|
||||
datadog-metrics: "npm:^0.12.1"
|
||||
date-fns: "npm:^3.6.0"
|
||||
dd-trace: "npm:^5.82.0"
|
||||
diff: "npm:^5.2.0"
|
||||
@@ -17774,6 +17761,7 @@ __metadata:
|
||||
fs-extra: "npm:^11.3.2"
|
||||
fuzzy-search: "npm:^3.2.1"
|
||||
glob: "npm:^8.1.0"
|
||||
hot-shots: "npm:^12.1.0"
|
||||
http-errors: "npm:2.0.1"
|
||||
https-proxy-agent: "npm:^7.0.6"
|
||||
husky: "npm:^8.0.3"
|
||||
@@ -18122,7 +18110,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"pako@npm:^2.0.4, pako@npm:^2.1.0":
|
||||
"pako@npm:^2.1.0":
|
||||
version: 2.1.0
|
||||
resolution: "pako@npm:2.1.0"
|
||||
checksum: 10c0/8e8646581410654b50eb22a5dfd71159cae98145bd5086c9a7a816ec0370b5f72b4648d08674624b3870a521e6a3daffd6c2f7bc00fdefc7063c9d8232ff5116
|
||||
@@ -22129,6 +22117,17 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"unix-dgram@npm:2.x":
|
||||
version: 2.0.7
|
||||
resolution: "unix-dgram@npm:2.0.7"
|
||||
dependencies:
|
||||
bindings: "npm:^1.5.0"
|
||||
nan: "npm:^2.20.0"
|
||||
node-gyp: "npm:latest"
|
||||
checksum: 10c0/1f6f033c9b7ee7c8db39a1b5f49a5ea19dd669bdda99cab714d2f253ca9d7f252c8e7472626c6b87e2378db0d114d9b8bbb6defffce911bd63e0c6c5e7029d0a
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"unpipe@npm:~1.0.0":
|
||||
version: 1.0.0
|
||||
resolution: "unpipe@npm:1.0.0"
|
||||
|
||||
Reference in New Issue
Block a user