Merge 8cdf41740a into 0ba7954207

src/lib/middleware/origin-middleware.test.ts

@@ -30,11 +30,6 @@ describe('originMiddleware', () => {
         config = {
             ...createTestConfig({
                 getLogger,
-                experimental: {
-                    flags: {
-                        originMiddlewareRequestLogging: true,
-                    },
-                },
             }),
             eventBus,
         };
@@ -74,18 +69,4 @@ describe('originMiddleware', () => {
         });
     });
 
-    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,
-        });
-    });
 });

src/lib/middleware/origin-middleware.ts

@@ -9,8 +9,7 @@ import {
 export const originMiddleware = ({
     getLogger,
     eventBus,
-    flagResolver,
-}: Pick<IUnleashConfig, 'getLogger' | 'eventBus' | 'flagResolver'>) => {
+}: Pick<IUnleashConfig, 'getLogger' | 'eventBus'>) => {
     const logger = getLogger('/middleware/origin-middleware.ts');
     logger.debug('Enabling origin middleware');
     return (req: Request, _: Response, next: NextFunction) => {
@@ -27,14 +26,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,

src/lib/types/experimental.ts

@@ -39,7 +39,6 @@ export type IFlagKey =
     | 'extendedMetrics'
     | 'removeUnsafeInlineStyleSrc'
     | 'projectRoleAssignment'
-    | 'originMiddlewareRequestLogging'
     | 'webhookDomainLogging'
     | 'productivityReportEmail'
     | 'productivityReportUnsubscribers'

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,