From 9ee511fca10feec9e0ab2a1a77ae9345d43ba289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20G=C3=B3is?= Date: Wed, 18 Jun 2025 14:19:03 +0100 Subject: [PATCH] chore: remove registerFrontendClient flag ws-swe1 [discard] --- .../application/ApplicationChart.tsx | 60 +++---------------- .../frontend-api/frontend-api-service.ts | 16 +---- .../features/metrics/instance/metrics.test.ts | 8 +-- src/lib/features/metrics/instance/metrics.ts | 19 +----- src/lib/types/experimental.ts | 5 -- src/server-dev.ts | 1 - 6 files changed, 12 insertions(+), 97 deletions(-) diff --git a/frontend/src/component/application/ApplicationChart.tsx b/frontend/src/component/application/ApplicationChart.tsx index 3e2ee9323c..f76fc5b89f 100644 --- a/frontend/src/component/application/ApplicationChart.tsx +++ b/frontend/src/component/application/ApplicationChart.tsx @@ -16,7 +16,6 @@ import WarningAmberRounded from '@mui/icons-material/WarningAmberRounded'; import { TimeAgo } from 'component/common/TimeAgo/TimeAgo'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; import { getApplicationIssues } from './ApplicationIssues/ApplicationIssues.tsx'; -import { useUiFlag } from 'hooks/useUiFlag'; const StyledTable = styled('table')(({ theme }) => ({ fontSize: theme.fontSizes.smallerBody, @@ -197,7 +196,6 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { const { elementRef, width } = useElementWidth(); const navigate = useNavigate(); const theme = useTheme(); - const registerFrontendClientEnabled = useUiFlag('registerFrontendClient'); const mode = getApplicationIssues(data); @@ -296,56 +294,14 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { {environment.instanceCount} - {!registerFrontendClientEnabled ? ( - - SDK: - - {environment.sdks.map( - (sdk) => ( -
- {sdk} -
- ), - )} -
- - ) : null} - - {registerFrontendClientEnabled && - environment.backendSdks.length > 0 ? ( - - - Backend SDK: - - - {environment.backendSdks.map( - (sdk) => ( -
- {sdk} -
- ), - )} -
- - ) : null} - - {registerFrontendClientEnabled && - environment.frontendSdks.length > 0 ? ( - - - Frontend SDK: - - - {environment.frontendSdks.map( - (sdk) => ( -
- {sdk} -
- ), - )} -
- - ) : null} + + SDK: + + {environment.sdks.map((sdk) => ( +
{sdk}
+ ))} +
+ Last seen: diff --git a/src/lib/features/frontend-api/frontend-api-service.ts b/src/lib/features/frontend-api/frontend-api-service.ts index cc17714ff6..589d96b783 100644 --- a/src/lib/features/frontend-api/frontend-api-service.ts +++ b/src/lib/features/frontend-api/frontend-api-service.ts @@ -135,21 +135,7 @@ export class FrontendApiService { ip, ); - if ( - metrics.instanceId && - typeof sdkVersion === 'string' && - this.flagResolver.isEnabled('registerFrontendClient') - ) { - const client = { - appName: metrics.appName, - instanceId: metrics.instanceId, - sdkVersion: sdkVersion, - sdkType: 'frontend' as const, - environment: environment, - projects: this.resolveProject(token), - }; - this.services.clientInstanceService.registerFrontendClient(client); - } + // Frontend client registration has been removed as part of the registerFrontendClient flag removal } private async clientForFrontendApiToken(token: IApiUser): Promise { diff --git a/src/lib/features/metrics/instance/metrics.test.ts b/src/lib/features/metrics/instance/metrics.test.ts index 0f729d9cb8..a3935b1c1e 100644 --- a/src/lib/features/metrics/instance/metrics.test.ts +++ b/src/lib/features/metrics/instance/metrics.test.ts @@ -45,13 +45,7 @@ let services: IUnleashServices; let destroy: () => Promise; beforeAll(async () => { - const setup = await getSetup({ - experimental: { - flags: { - registerFrontendClient: true, - }, - }, - }); + const setup = await getSetup(); request = setup.request; stores = setup.stores; destroy = setup.destroy; diff --git a/src/lib/features/metrics/instance/metrics.ts b/src/lib/features/metrics/instance/metrics.ts index 649bdd12e8..d7a80d2931 100644 --- a/src/lib/features/metrics/instance/metrics.ts +++ b/src/lib/features/metrics/instance/metrics.ts @@ -223,24 +223,9 @@ export default class ClientMetricsController extends Controller { const promises: Promise[] = []; for (const app of applications) { if ( - app.sdkType === 'frontend' && - typeof app.sdkVersion === 'string' + app.sdkType !== 'frontend' || + typeof app.sdkVersion !== 'string' ) { - if ( - this.flagResolver.isEnabled( - 'registerFrontendClient', - ) - ) { - this.clientInstanceService.registerFrontendClient({ - appName: app.appName, - instanceId: app.instanceId, - environment: app.environment, - sdkType: app.sdkType, - sdkVersion: app.sdkVersion, - projects: app.projects, - }); - } - } else { promises.push( this.clientInstanceService.registerBackendClient( app, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 41111f6c4a..86a4002305 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -55,7 +55,6 @@ export type IFlagKey = | 'uniqueSdkTracking' | 'consumptionModel' | 'edgeObservability' - | 'registerFrontendClient' | 'reportUnknownFlags' | 'lastSeenBulkQuery' | 'lifecycleMetrics' @@ -264,10 +263,6 @@ const flags: IFlags = { process.env.EXPERIMENTAL_EDGE_OBSERVABILITY, false, ), - registerFrontendClient: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_REGISTER_FRONTEND_CLIENT, - false, - ), reportUnknownFlags: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_REPORT_UNKNOWN_FLAGS, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 2d12dba8e5..84b49a608b 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -51,7 +51,6 @@ process.nextTick(async () => { deltaApi: true, uniqueSdkTracking: true, strictSchemaValidation: true, - registerFrontendClient: true, reportUnknownFlags: true, customMetrics: true, lifecycleMetrics: true,