diff --git a/package-lock.json b/package-lock.json index c894cd310f8e..021d8bc4e7cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,6 @@ "cheerio": "^1.0.0-rc.11", "cheerio-to-text": "0.2.4", "classnames": "^2.5.1", - "connect-datadog": "0.0.9", "connect-timeout": "1.9.0", "cookie-parser": "^1.4.7", "cuss": "2.2.0", @@ -110,7 +109,6 @@ "@playwright/test": "^1.50", "@types/accept-language-parser": "1.5.6", "@types/cheerio": "^0.22.35", - "@types/connect-datadog": "0.0.10", "@types/connect-timeout": "0.0.39", "@types/cookie": "0.6.0", "@types/cookie-parser": "1.4.7", @@ -3365,28 +3363,6 @@ "@types/node": "*" } }, - "node_modules/@types/connect-datadog": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@types/connect-datadog/-/connect-datadog-0.0.10.tgz", - "integrity": "sha512-zYNEyqNmdRyOR/8bWTW9qZAfhCxVpid4B0Yy5NCbzJWDS60Z7kur2rPvzDrRuSpZ1sn6gR/t/aZjIl6fv7gdIQ==", - "dev": true, - "dependencies": { - "@types/express": "*", - "hot-shots": "^6.3.0" - } - }, - "node_modules/@types/connect-datadog/node_modules/hot-shots": { - "version": "6.8.7", - "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-6.8.7.tgz", - "integrity": "sha512-XH8iezBSZgVw2jegu96pUfF1Zv0VZ/iXjb7L5yE3F7mn7/bdhf4qeniXjO0wQWeefe433rhOsazNKLxM+XMI9w==", - "dev": true, - "engines": { - "node": ">=6.0.0" - }, - "optionalDependencies": { - "unix-dgram": "2.0.x" - } - }, "node_modules/@types/connect-timeout": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/connect-timeout/-/connect-timeout-0.0.39.tgz", @@ -5058,26 +5034,6 @@ "version": "0.0.1", "license": "MIT" }, - "node_modules/connect-datadog": { - "version": "0.0.9", - "license": "MIT", - "dependencies": { - "hot-shots": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/connect-datadog/node_modules/hot-shots": { - "version": "6.8.7", - "license": "MIT", - "engines": { - "node": ">=6.0.0" - }, - "optionalDependencies": { - "unix-dgram": "2.0.x" - } - }, "node_modules/connect-timeout": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.9.0.tgz", diff --git a/package.json b/package.json index 8135300b3ac9..c01b658e94d8 100644 --- a/package.json +++ b/package.json @@ -258,7 +258,6 @@ "cheerio": "^1.0.0-rc.11", "cheerio-to-text": "0.2.4", "classnames": "^2.5.1", - "connect-datadog": "0.0.9", "connect-timeout": "1.9.0", "cookie-parser": "^1.4.7", "cuss": "2.2.0", @@ -340,7 +339,6 @@ "@playwright/test": "^1.50", "@types/accept-language-parser": "1.5.6", "@types/cheerio": "^0.22.35", - "@types/connect-datadog": "0.0.10", "@types/connect-timeout": "0.0.39", "@types/cookie": "0.6.0", "@types/cookie-parser": "1.4.7", diff --git a/src/frame/middleware/index.ts b/src/frame/middleware/index.ts index 8a4cc79753a2..e59cce6aaac1 100644 --- a/src/frame/middleware/index.ts +++ b/src/frame/middleware/index.ts @@ -8,7 +8,6 @@ import timeout from 'connect-timeout' import { haltOnDroppedConnection } from './halt-on-dropped-connection' import abort from './abort' import morgan from 'morgan' -import datadog from '@/observability/middleware/connect-datadog' import helmet from './helmet' import cookieParser from './cookie-parser' import { @@ -110,11 +109,6 @@ export default function (app: Express) { app.use(morgan('dev')) } - // *** Observability *** - if (process.env.MODA_PROD_SERVICE_ENV === 'true') { - app.use(datadog) - } - // Put this early to make it as fast as possible because it's used // to check the health of each cluster. app.use('/healthcheck', healthcheck) diff --git a/src/observability/middleware/connect-datadog.ts b/src/observability/middleware/connect-datadog.ts deleted file mode 100644 index acbedc181815..000000000000 --- a/src/observability/middleware/connect-datadog.ts +++ /dev/null @@ -1,13 +0,0 @@ -import connectDatadog from 'connect-datadog' -import type { NextFunction, Request, Response } from 'express' - -import statsd, { tags } from '../lib/statsd.js' - -export default (req: Request, res: Response, next: NextFunction) => { - return connectDatadog({ - dogstatsd: statsd, - method: true, // Track HTTP methods (GET, POST, etc) - response_code: true, // Track response codes - tags: tags as string[], - })(req, res, next) -}