From 25abe054a4cd1b8cea91eb7562a238df70c86e2f Mon Sep 17 00:00:00 2001
From: "unleash-bot[bot]" <194219037+unleash-bot[bot]@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:42:10 +0100
Subject: [PATCH] chore(AI): originMiddlewareRequestLogging flag cleanup
 (#10864)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR cleans up the originMiddlewareRequestLogging flag. These changes
were automatically generated by AI and should be reviewed carefully.

Fixes #10863

## 🧹 AI Flag Cleanup Summary
This change removes the `originMiddlewareRequestLogging` feature flag
and its
associated code. The flag's outcome was to be discarded, so the logging
it
controlled has been removed from `originMiddleware`.
### 🚮 Removed
- **Flag Definition**
- Removed `originMiddlewareRequestLogging` from the `IFlagKey` type in
`src/lib/types/experimental.ts`.
- Removed the flag from the development server configuration in
`src/server-dev.ts`.
- **Logic**
- Removed the conditional logging of API requests from
`originMiddleware`.
- **Tests**
- Removed the test case for API request logging in
`origin-middleware.test.ts`.
- Removed the flag setup from the test configuration.
### 🛠 Kept
- **Core functionality**
- The core logic of the `originMiddleware` for emitting `REQUEST_ORIGIN`
metric events for UI and API requests remains unchanged.
### 📝 Why
The `originMiddlewareRequestLogging` feature flag was completed and its
outcome
was 'discarded'. This cleanup removes the flag and the now-dead code
related to
it, simplifying the middleware and tests.

---------

Co-authored-by: unleash-bot <194219037+unleash-bot[bot]@users.noreply.github.com>
Co-authored-by: Gastón Fournier <gaston@getunleash.io>
---
 src/lib/middleware/origin-middleware.test.ts | 20 --------------------
 src/lib/middleware/origin-middleware.ts      | 16 ++--------------
 src/lib/types/experimental.ts                |  5 -----
 src/server-dev.ts                            |  1 -
 4 files changed, 2 insertions(+), 40 deletions(-)

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<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 +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,