diff --git a/src/lib/middleware/origin-middleware.test.ts b/src/lib/middleware/origin-middleware.test.ts index 9eaaa75bcd..bc2244d06e 100644 --- a/src/lib/middleware/origin-middleware.test.ts +++ b/src/lib/middleware/origin-middleware.test.ts @@ -30,11 +30,6 @@ describe('originMiddleware', () => { config = { ...createTestConfig({ getLogger, - experimental: { - flags: { - originMiddlewareRequestLogging: true, - }, - }, }), eventBus, }; @@ -73,19 +68,4 @@ describe('originMiddleware', () => { source: 'Other', }); }); - - it('should log API request', () => { - const middleware = originMiddleware(config); - - req.headers.authorization = TEST_UNLEASH_TOKEN; - req.headers['user-agent'] = TEST_USER_AGENT; - - middleware(req, res, next); - - expect(loggerMock.info).toHaveBeenCalledWith('API request', { - method: req.method, - userAgent: TEST_USER_AGENT, - origin: undefined, - }); - }); }); diff --git a/src/lib/middleware/origin-middleware.ts b/src/lib/middleware/origin-middleware.ts index d9dc17384f..47b129e245 100644 --- a/src/lib/middleware/origin-middleware.ts +++ b/src/lib/middleware/origin-middleware.ts @@ -1,16 +1,12 @@ import type { Request, Response, NextFunction } from 'express'; import type { IUnleashConfig } from '../types/index.js'; import { REQUEST_ORIGIN, emitMetricEvent } from '../metric-events.js'; -import { - determineIntegrationSource, - getFilteredOrigin, -} from './integration-headers.js'; +import { determineIntegrationSource } from './integration-headers.js'; export const originMiddleware = ({ getLogger, eventBus, - flagResolver, -}: Pick) => { +}: Pick) => { const logger = getLogger('/middleware/origin-middleware.ts'); logger.debug('Enabling origin middleware'); return (req: Request, _: Response, next: NextFunction) => { @@ -27,14 +23,6 @@ export const originMiddleware = ({ ? determineIntegrationSource(userAgent) : 'Other'; - if (flagResolver.isEnabled('originMiddlewareRequestLogging')) { - logger.info('API request', { - method: req.method, - userAgent: req.headers['user-agent'], - origin: getFilteredOrigin(req), - }); - } - emitMetricEvent(eventBus, REQUEST_ORIGIN, { type: 'API', method: req.method, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 8e1a4790ba..79e9476191 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -39,7 +39,6 @@ export type IFlagKey = | 'extendedMetrics' | 'removeUnsafeInlineStyleSrc' | 'projectRoleAssignment' - | 'originMiddlewareRequestLogging' | 'webhookDomainLogging' | 'productivityReportEmail' | 'productivityReportUnsubscribers' @@ -203,10 +202,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_PROJECT_ROLE_ASSIGNMENT, false, ), - originMiddlewareRequestLogging: parseEnvVarBoolean( - process.env.UNLEASH_ORIGIN_MIDDLEWARE_REQUEST_LOGGING, - false, - ), webhookDomainLogging: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENT_WEBHOOK_DOMAIN_LOGGING, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 2d5886c5b3..8490358bec 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -44,7 +44,6 @@ process.nextTick(async () => { manyStrategiesPagination: true, enableLegacyVariants: false, extendedMetrics: true, - originMiddlewareRequestLogging: true, webhookDomainLogging: true, showUserDeviceCount: true, deltaApi: true,