feat: added info dismissible callout for the license row in workspace settings (#10938 )

* feat: added info dismissible callout for the license row in workspace settings * feat: addressed comments * feat: addressed comments
2026-04-16 17:00:28 +01:00 · 2026-04-16 12:37:18 +00:00
35 changed files with 502 additions and 533 deletions
--- a/cmd/community/server.go
+++ b/cmd/community/server.go
@@ -75,7 +75,7 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 		},
 		signoz.NewEmailingProviderFactories(),
 		signoz.NewCacheProviderFactories(),
-		signoz.NewWebProviderFactories(config.Global),
+		signoz.NewWebProviderFactories(),
 		func(sqlstore sqlstore.SQLStore) factory.NamedMap[factory.ProviderFactory[sqlschema.SQLSchema, sqlschema.Config]] {
 			return signoz.NewSQLSchemaProviderFactories(sqlstore)
 		},
--- a/cmd/enterprise/server.go
+++ b/cmd/enterprise/server.go
@@ -96,7 +96,7 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 		},
 		signoz.NewEmailingProviderFactories(),
 		signoz.NewCacheProviderFactories(),
-		signoz.NewWebProviderFactories(config.Global),
+		signoz.NewWebProviderFactories(),
 		func(sqlstore sqlstore.SQLStore) factory.NamedMap[factory.ProviderFactory[sqlschema.SQLSchema, sqlschema.Config]] {
 			existingFactories := signoz.NewSQLSchemaProviderFactories(sqlstore)
 			if err := existingFactories.Add(postgressqlschema.NewFactory(sqlstore)); err != nil {
--- a/conf/example.yaml
+++ b/conf/example.yaml
@@ -6,8 +6,6 @@
 ##################### Global #####################
 global:
  # the url under which the signoz apiserver is externally reachable.
-  # the path component (e.g. /signoz in https://example.com/signoz) is used
-  # as the base path for all HTTP routes (both API and web frontend).
  external_url: <unset>
  # the url where the SigNoz backend receives telemetry data (traces, metrics, logs) from instrumented applications.
  ingestion_url: <unset>
@@ -52,8 +50,8 @@ pprof:
 web:
  # Whether to enable the web frontend
  enabled: true
-  # The index file to use as the SPA entrypoint.
-  index: index.html
+  # The prefix to serve web on
+  prefix: /
  # The directory containing the static build files.
  directory: /etc/signoz/web

--- a/ee/query-service/app/server.go
+++ b/ee/query-service/app/server.go
@@ -262,20 +262,6 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler, web web.Web) (*h
 		return nil, err
 	}

-	routePrefix := s.config.Global.ExternalPath()
-	if routePrefix != "" {
-		prefixed := http.StripPrefix(routePrefix, handler)
-		handler = http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-			switch req.URL.Path {
-			case "/api/v1/health", "/api/v2/healthz", "/api/v2/readyz", "/api/v2/livez":
-				r.ServeHTTP(w, req)
-				return
-			}
-
-			prefixed.ServeHTTP(w, req)
-		})
-	}
-
 	return &http.Server{
 		Handler: handler,
 	}, nil
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -28,7 +28,4 @@ e2e/test-plan/saved-views/
 e2e/test-plan/service-map/
 e2e/test-plan/services/
 e2e/test-plan/traces/
-e2e/test-plan/user-preferences/
-
-# Generated by `vite build` — do not commit
-index.html.gotmpl
+e2e/test-plan/user-preferences/
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -2,7 +2,6 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="[[.BasePath]]" />
 		<meta
 			http-equiv="Cache-Control"
 			content="no-cache, no-store, must-revalidate, max-age: 0"
@@ -60,7 +59,7 @@
 		<meta data-react-helmet="true" name="docusaurus_locale" content="en" />
 		<meta data-react-helmet="true" name="docusaurus_tag" content="default" />
 		<meta name="robots" content="noindex" />
-		<link data-react-helmet="true" rel="shortcut icon" href="favicon.ico" />
+		<link data-react-helmet="true" rel="shortcut icon" href="/favicon.ico" />
 	</head>
 	<body data-theme="default">
 		<noscript>You need to enable JavaScript to run this app.</noscript>
@@ -114,7 +113,7 @@
 				})(document, 'script');
 			}
 		</script>
-		<link rel="stylesheet" href="css/uPlot.min.css" />
+		<link rel="stylesheet" href="/css/uPlot.min.css" />
 		<script type="module" src="./src/index.tsx"></script>
 	</body>
 </html>
--- a/frontend/src/api/generatedAPIInstance.ts
+++ b/frontend/src/api/generatedAPIInstance.ts
@@ -1,6 +1,5 @@
 import {
 	interceptorRejected,
-	interceptorsRequestBasePath,
 	interceptorsRequestResponse,
 	interceptorsResponse,
 } from 'api';
@@ -18,7 +17,6 @@ export const GeneratedAPIInstance = <T>(
 	return generatedAPIAxiosInstance({ ...config }).then(({ data }) => data);
 };

-generatedAPIAxiosInstance.interceptors.request.use(interceptorsRequestBasePath);
 generatedAPIAxiosInstance.interceptors.request.use(interceptorsRequestResponse);
 generatedAPIAxiosInstance.interceptors.response.use(
 	interceptorsResponse,
--- a/frontend/src/api/index.ts
+++ b/frontend/src/api/index.ts
@@ -11,7 +11,6 @@ import axios, {
 import { ENVIRONMENT } from 'constants/env';
 import { Events } from 'constants/events';
 import { LOCALSTORAGE } from 'constants/localStorage';
-import { getBasePath } from 'utils/getBasePath';
 import { eventEmitter } from 'utils/getEventEmitter';

 import apiV1, { apiAlertManager, apiV2, apiV3, apiV4, apiV5 } from './apiV1';
@@ -68,28 +67,6 @@ export const interceptorsRequestResponse = (
 	return value;
 };

-// Prepends the runtime base path to outgoing requests so API calls work under
-// a URL prefix (e.g. /signoz/api/v1/…). No-op for root deployments and dev
-// (dev baseURL is a full http:// URL, not an absolute path).
-export const interceptorsRequestBasePath = (
-	value: InternalAxiosRequestConfig,
-): InternalAxiosRequestConfig => {
-	const basePath = getBasePath();
-	if (basePath === '/') {
-		return value;
-	}
-
-	if (value.baseURL?.startsWith('/')) {
-		// Named instances: baseURL='/api/v1/' → '/signoz/api/v1/'
-		value.baseURL = basePath + value.baseURL.slice(1);
-	} else if (!value.baseURL && value.url?.startsWith('/')) {
-		// Generated instance: baseURL is '' in prod, path is in url
-		value.url = basePath + value.url.slice(1);
-	}
-
-	return value;
-};
-
 export const interceptorRejected = async (
 	value: AxiosResponse<any>,
 ): Promise<AxiosResponse<any>> => {
@@ -156,7 +133,6 @@ const instance = axios.create({
 });

 instance.interceptors.request.use(interceptorsRequestResponse);
-instance.interceptors.request.use(interceptorsRequestBasePath);
 instance.interceptors.response.use(interceptorsResponse, interceptorRejected);

 export const AxiosAlertManagerInstance = axios.create({
@@ -171,7 +147,6 @@ ApiV2Instance.interceptors.response.use(
 	interceptorRejected,
 );
 ApiV2Instance.interceptors.request.use(interceptorsRequestResponse);
-ApiV2Instance.interceptors.request.use(interceptorsRequestBasePath);

 // axios V3
 export const ApiV3Instance = axios.create({
@@ -183,7 +158,6 @@ ApiV3Instance.interceptors.response.use(
 	interceptorRejected,
 );
 ApiV3Instance.interceptors.request.use(interceptorsRequestResponse);
-ApiV3Instance.interceptors.request.use(interceptorsRequestBasePath);
 //

 // axios V4
@@ -196,7 +170,6 @@ ApiV4Instance.interceptors.response.use(
 	interceptorRejected,
 );
 ApiV4Instance.interceptors.request.use(interceptorsRequestResponse);
-ApiV4Instance.interceptors.request.use(interceptorsRequestBasePath);
 //

 // axios V5
@@ -209,7 +182,6 @@ ApiV5Instance.interceptors.response.use(
 	interceptorRejected,
 );
 ApiV5Instance.interceptors.request.use(interceptorsRequestResponse);
-ApiV5Instance.interceptors.request.use(interceptorsRequestBasePath);
 //

 // axios Base
@@ -222,7 +194,6 @@ LogEventAxiosInstance.interceptors.response.use(
 	interceptorRejectedBase,
 );
 LogEventAxiosInstance.interceptors.request.use(interceptorsRequestResponse);
-LogEventAxiosInstance.interceptors.request.use(interceptorsRequestBasePath);
 //

 AxiosAlertManagerInstance.interceptors.response.use(
@@ -230,7 +201,6 @@ AxiosAlertManagerInstance.interceptors.response.use(
 	interceptorRejected,
 );
 AxiosAlertManagerInstance.interceptors.request.use(interceptorsRequestResponse);
-AxiosAlertManagerInstance.interceptors.request.use(interceptorsRequestBasePath);

 export { apiV1 };
 export default instance;
--- a/frontend/src/constants/localStorage.ts
+++ b/frontend/src/constants/localStorage.ts
@@ -37,4 +37,5 @@ export enum LOCALSTORAGE {
 	SHOW_FREQUENCY_CHART = 'SHOW_FREQUENCY_CHART',
 	DISSMISSED_COST_METER_INFO = 'DISMISSED_COST_METER_INFO',
 	DISMISSED_API_KEYS_DEPRECATION_BANNER = 'DISMISSED_API_KEYS_DEPRECATION_BANNER',
+	LICENSE_KEY_CALLOUT_DISMISSED = 'LICENSE_KEY_CALLOUT_DISMISSED',
 }
--- a/frontend/src/container/GeneralSettings/GeneralSettings.tsx
+++ b/frontend/src/container/GeneralSettings/GeneralSettings.tsx
@@ -38,6 +38,7 @@ import {
 } from 'types/api/settings/getRetention';
 import { USER_ROLES } from 'types/roles';

+import LicenseRowDismissibleCallout from './LicenseKeyRow/LicenseRowDismissibleCallout/LicenseRowDismissibleCallout';
 import Retention from './Retention';
 import StatusMessage from './StatusMessage';
 import { ActionItemsContainer, ErrorText, ErrorTextContainer } from './styles';
@@ -683,7 +684,12 @@ function GeneralSettings({
 					{showCustomDomainSettings && activeLicense?.key && (
 						<div className="custom-domain-card-divider" />
 					)}
-					{activeLicense?.key && <LicenseKeyRow />}
+					{activeLicense?.key && (
+						<>
+							<LicenseKeyRow />
+							<LicenseRowDismissibleCallout />
+						</>
+					)}
 				</div>
 			)}

--- a/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseRowDismissibleCallout/LicenseRowDismissible.styles.scss
+++ b/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseRowDismissibleCallout/LicenseRowDismissible.styles.scss
@@ -0,0 +1,31 @@
+.license-key-callout {
+	margin: var(--spacing-4) var(--spacing-6);
+	width: auto;
+
+	.license-key-callout__description {
+		display: flex;
+		align-items: baseline;
+		gap: var(--spacing-2);
+		min-width: 0;
+		flex-wrap: wrap;
+		font-size: 13px;
+	}
+
+	.license-key-callout__link {
+		display: inline-flex;
+		align-items: center;
+		padding: var(--spacing-1) var(--spacing-3);
+		border-radius: 2px;
+		background: var(--callout-primary-background);
+		color: var(--callout-primary-description);
+		font-family: 'SF Mono', 'Fira Code', 'Fira Mono', monospace;
+		font-size: var(--paragraph-base-400-font-size);
+		text-decoration: none;
+
+		&:hover {
+			background: var(--callout-primary-border);
+			color: var(--callout-primary-icon);
+			text-decoration: none;
+		}
+	}
+}
--- a/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseRowDismissibleCallout/LicenseRowDismissibleCallout.tsx
+++ b/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseRowDismissibleCallout/LicenseRowDismissibleCallout.tsx
@@ -0,0 +1,83 @@
+import { useState } from 'react';
+import { Link } from 'react-router-dom';
+import { Callout } from '@signozhq/callout';
+import getLocalStorageApi from 'api/browser/localstorage/get';
+import setLocalStorageApi from 'api/browser/localstorage/set';
+import { FeatureKeys } from 'constants/features';
+import { LOCALSTORAGE } from 'constants/localStorage';
+import ROUTES from 'constants/routes';
+import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
+import { useAppContext } from 'providers/App/App';
+import { USER_ROLES } from 'types/roles';
+
+import './LicenseRowDismissible.styles.scss';
+
+function LicenseRowDismissibleCallout(): JSX.Element | null {
+	const [isCalloutDismissed, setIsCalloutDismissed] = useState<boolean>(
+		() =>
+			getLocalStorageApi(LOCALSTORAGE.LICENSE_KEY_CALLOUT_DISMISSED) === 'true',
+	);
+
+	const { user, featureFlags } = useAppContext();
+	const { isCloudUser } = useGetTenantLicense();
+
+	const isAdmin = user.role === USER_ROLES.ADMIN;
+	const isEditor = user.role === USER_ROLES.EDITOR;
+
+	const isGatewayEnabled =
+		featureFlags?.find((feature) => feature.name === FeatureKeys.GATEWAY)
+			?.active || false;
+
+	const hasServiceAccountsAccess = isAdmin;
+
+	const hasIngestionAccess =
+		(isCloudUser && !isGatewayEnabled) ||
+		(isGatewayEnabled && (isAdmin || isEditor));
+
+	const handleDismissCallout = (): void => {
+		setLocalStorageApi(LOCALSTORAGE.LICENSE_KEY_CALLOUT_DISMISSED, 'true');
+		setIsCalloutDismissed(true);
+	};
+
+	return !isCalloutDismissed ? (
+		<Callout
+			type="info"
+			size="small"
+			showIcon
+			dismissable
+			onClose={handleDismissCallout}
+			className="license-key-callout"
+			description={
+				<div className="license-key-callout__description">
+					This is <strong>NOT</strong> your ingestion or Service account key.
+					{(hasServiceAccountsAccess || hasIngestionAccess) && (
+						<>
+							{' '}
+							Find your{' '}
+							{hasServiceAccountsAccess && (
+								<Link
+									to={ROUTES.SERVICE_ACCOUNTS_SETTINGS}
+									className="license-key-callout__link"
+								>
+									Service account here
+								</Link>
+							)}
+							{hasServiceAccountsAccess && hasIngestionAccess && ' and '}
+							{hasIngestionAccess && (
+								<Link
+									to={ROUTES.INGESTION_SETTINGS}
+									className="license-key-callout__link"
+								>
+									Ingestion key here
+								</Link>
+							)}
+							.
+						</>
+					)}
+				</div>
+			}
+		/>
+	) : null;
+}
+
+export default LicenseRowDismissibleCallout;
--- a/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseRowDismissibleCallout/tests/LicenseRowDismissibleCallout.test.tsx
+++ b/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseRowDismissibleCallout/tests/LicenseRowDismissibleCallout.test.tsx
@@ -0,0 +1,229 @@
+import { FeatureKeys } from 'constants/features';
+import { LOCALSTORAGE } from 'constants/localStorage';
+import ROUTES from 'constants/routes';
+import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
+import { render, screen, userEvent } from 'tests/test-utils';
+import { USER_ROLES } from 'types/roles';
+
+import LicenseRowDismissibleCallout from '../LicenseRowDismissibleCallout';
+
+const getDescription = (): HTMLElement =>
+	screen.getByText(
+		(_, el) =>
+			el?.classList?.contains('license-key-callout__description') ?? false,
+	);
+
+const queryDescription = (): HTMLElement | null =>
+	screen.queryByText(
+		(_, el) =>
+			el?.classList?.contains('license-key-callout__description') ?? false,
+	);
+
+jest.mock('hooks/useGetTenantLicense', () => ({
+	useGetTenantLicense: jest.fn(),
+}));
+
+const mockLicense = (isCloudUser: boolean): void => {
+	(useGetTenantLicense as jest.Mock).mockReturnValue({
+		isCloudUser,
+		isEnterpriseSelfHostedUser: !isCloudUser,
+		isCommunityUser: false,
+		isCommunityEnterpriseUser: false,
+	});
+};
+
+const renderCallout = (
+	role: string,
+	isCloudUser: boolean,
+	gatewayActive: boolean,
+): void => {
+	mockLicense(isCloudUser);
+	render(
+		<LicenseRowDismissibleCallout />,
+		{},
+		{
+			role,
+			appContextOverrides: {
+				featureFlags: [
+					{
+						name: FeatureKeys.GATEWAY,
+						active: gatewayActive,
+						usage: 0,
+						usage_limit: -1,
+						route: '',
+					},
+				],
+			},
+		},
+	);
+};
+
+describe('LicenseRowDismissibleCallout', () => {
+	beforeEach(() => {
+		localStorage.clear();
+		jest.clearAllMocks();
+	});
+
+	describe('callout content per access level', () => {
+		it.each([
+			{
+				scenario: 'viewer, non-cloud, gateway off — base text only, no links',
+				role: USER_ROLES.VIEWER,
+				isCloudUser: false,
+				gatewayActive: false,
+				serviceAccountLink: false,
+				ingestionLink: false,
+				expectedText: 'This is NOT your ingestion or Service account key.',
+			},
+			{
+				scenario: 'admin, non-cloud, gateway off — service accounts link only',
+				role: USER_ROLES.ADMIN,
+				isCloudUser: false,
+				gatewayActive: false,
+				serviceAccountLink: true,
+				ingestionLink: false,
+				expectedText:
+					'This is NOT your ingestion or Service account key. Find your Service account here.',
+			},
+			{
+				scenario: 'viewer, cloud, gateway off — ingestion link only',
+				role: USER_ROLES.VIEWER,
+				isCloudUser: true,
+				gatewayActive: false,
+				serviceAccountLink: false,
+				ingestionLink: true,
+				expectedText:
+					'This is NOT your ingestion or Service account key. Find your Ingestion key here.',
+			},
+			{
+				scenario: 'admin, cloud, gateway off — both links',
+				role: USER_ROLES.ADMIN,
+				isCloudUser: true,
+				gatewayActive: false,
+				serviceAccountLink: true,
+				ingestionLink: true,
+				expectedText:
+					'This is NOT your ingestion or Service account key. Find your Service account here and Ingestion key here.',
+			},
+			{
+				scenario: 'admin, non-cloud, gateway on — both links',
+				role: USER_ROLES.ADMIN,
+				isCloudUser: false,
+				gatewayActive: true,
+				serviceAccountLink: true,
+				ingestionLink: true,
+				expectedText:
+					'This is NOT your ingestion or Service account key. Find your Service account here and Ingestion key here.',
+			},
+			{
+				scenario: 'editor, non-cloud, gateway on — ingestion link only',
+				role: USER_ROLES.EDITOR,
+				isCloudUser: false,
+				gatewayActive: true,
+				serviceAccountLink: false,
+				ingestionLink: true,
+				expectedText:
+					'This is NOT your ingestion or Service account key. Find your Ingestion key here.',
+			},
+			{
+				scenario: 'editor, cloud, gateway off — ingestion link only',
+				role: USER_ROLES.EDITOR,
+				isCloudUser: true,
+				gatewayActive: false,
+				serviceAccountLink: false,
+				ingestionLink: true,
+				expectedText:
+					'This is NOT your ingestion or Service account key. Find your Ingestion key here.',
+			},
+		])(
+			'$scenario',
+			({
+				role,
+				isCloudUser,
+				gatewayActive,
+				serviceAccountLink,
+				ingestionLink,
+				expectedText,
+			}) => {
+				renderCallout(role, isCloudUser, gatewayActive);
+
+				const description = getDescription();
+				expect(description).toBeInTheDocument();
+				expect(description).toHaveTextContent(expectedText);
+
+				if (serviceAccountLink) {
+					expect(
+						screen.getByRole('link', { name: /Service account here/ }),
+					).toBeInTheDocument();
+				} else {
+					expect(
+						screen.queryByRole('link', { name: /Service account here/ }),
+					).not.toBeInTheDocument();
+				}
+
+				if (ingestionLink) {
+					expect(
+						screen.getByRole('link', { name: /Ingestion key here/ }),
+					).toBeInTheDocument();
+				} else {
+					expect(
+						screen.queryByRole('link', { name: /Ingestion key here/ }),
+					).not.toBeInTheDocument();
+				}
+			},
+		);
+	});
+
+	describe('Link routing', () => {
+		it('should link to service accounts settings', () => {
+			renderCallout(USER_ROLES.ADMIN, false, false);
+
+			const link = screen.getByRole('link', {
+				name: /Service account here/,
+			}) as HTMLAnchorElement;
+
+			expect(link.getAttribute('href')).toBe(ROUTES.SERVICE_ACCOUNTS_SETTINGS);
+		});
+
+		it('should link to ingestion settings', () => {
+			renderCallout(USER_ROLES.VIEWER, true, false);
+
+			const link = screen.getByRole('link', {
+				name: /Ingestion key here/,
+			}) as HTMLAnchorElement;
+
+			expect(link.getAttribute('href')).toBe(ROUTES.INGESTION_SETTINGS);
+		});
+	});
+
+	describe('Dismissal functionality', () => {
+		it('should hide callout when dismiss button is clicked', async () => {
+			const user = userEvent.setup();
+			renderCallout(USER_ROLES.ADMIN, false, false);
+
+			expect(getDescription()).toBeInTheDocument();
+
+			await user.click(screen.getByRole('button'));
+
+			expect(queryDescription()).not.toBeInTheDocument();
+		});
+
+		it('should persist dismissal in localStorage', async () => {
+			const user = userEvent.setup();
+			renderCallout(USER_ROLES.ADMIN, false, false);
+
+			await user.click(screen.getByRole('button'));
+
+			expect(
+				localStorage.getItem(LOCALSTORAGE.LICENSE_KEY_CALLOUT_DISMISSED),
+			).toBe('true');
+		});
+
+		it('should not render when localStorage dismissal is set', () => {
+			localStorage.setItem(LOCALSTORAGE.LICENSE_KEY_CALLOUT_DISMISSED, 'true');
+			renderCallout(USER_ROLES.ADMIN, false, false);
+
+			expect(queryDescription()).not.toBeInTheDocument();
+		});
+	});
+});
--- a/frontend/src/lib/history.ts
+++ b/frontend/src/lib/history.ts
@@ -1,4 +1,3 @@
 import { createBrowserHistory } from 'history';
-import { getBasePath } from 'utils/getBasePath';

-export default createBrowserHistory({ basename: getBasePath() });
+export default createBrowserHistory();
--- a/frontend/src/pages/ErrorBoundaryFallback/ErrorBoundaryFallback.tsx
+++ b/frontend/src/pages/ErrorBoundaryFallback/ErrorBoundaryFallback.tsx
@@ -2,7 +2,6 @@ import { useCallback } from 'react';
 import { Button } from 'antd';
 import ROUTES from 'constants/routes';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
-import history from 'lib/history';
 import { Home, LifeBuoy } from 'lucide-react';
 import { handleContactSupport } from 'pages/Integrations/utils';

@@ -12,9 +11,8 @@ import './ErrorBoundaryFallback.styles.scss';

 function ErrorBoundaryFallback(): JSX.Element {
 	const handleReload = (): void => {
-		// Use history.push so the navigation stays within the base path prefix
-		// (window.location.href would strip any /signoz/ prefix).
-		history.push(ROUTES.HOME);
+		// Go to home page
+		window.location.href = ROUTES.HOME;
 	};

 	const { isCloudUser: isCloudUserVal } = useGetTenantLicense();
--- a/frontend/src/utils/tests/getBasePath.test.ts
+++ b/frontend/src/utils/tests/getBasePath.test.ts
@@ -1,50 +0,0 @@
-import { getBasePath } from 'utils/getBasePath';
-
-/**
- * Contract tests for getBasePath().
- *
- * These lock down the exact DOM-reading contract so that any future change to
- * the utility (or to how index.html injects the <base> tag) surfaces
- * immediately as a test failure.
- */
-describe('getBasePath', () => {
-	afterEach(() => {
-		// Remove any <base> elements added during the test.
-		document.head.querySelectorAll('base').forEach((el) => el.remove());
-	});
-
-	it('returns the href from the <base> tag when present', () => {
-		const base = document.createElement('base');
-		base.setAttribute('href', '/signoz/');
-		document.head.appendChild(base);
-
-		expect(getBasePath()).toBe('/signoz/');
-	});
-
-	it('returns "/" when no <base> tag exists in the document', () => {
-		expect(getBasePath()).toBe('/');
-	});
-
-	it('returns "/" when the <base> tag has no href attribute', () => {
-		const base = document.createElement('base');
-		document.head.appendChild(base);
-
-		expect(getBasePath()).toBe('/');
-	});
-
-	it('returns the href unchanged when it already has a trailing slash', () => {
-		const base = document.createElement('base');
-		base.setAttribute('href', '/my/nested/path/');
-		document.head.appendChild(base);
-
-		expect(getBasePath()).toBe('/my/nested/path/');
-	});
-
-	it('appends a trailing slash when the href is missing one', () => {
-		const base = document.createElement('base');
-		base.setAttribute('href', '/signoz');
-		document.head.appendChild(base);
-
-		expect(getBasePath()).toBe('/signoz/');
-	});
-});
--- a/frontend/src/utils/getBasePath.ts
+++ b/frontend/src/utils/getBasePath.ts
@@ -1,17 +0,0 @@
-/**
- * Returns the base path for this SigNoz deployment by reading the
- * `<base href>` element injected into index.html by the Go backend at
- * serve time.
- *
- * Always returns a string ending with `/` (e.g. `/`, `/signoz/`).
- * Falls back to `/` when no `<base>` element is present so the app
- * behaves correctly in local Vite dev and unit-test environments.
- *
- * @internal — consume through `src/lib/history` and the axios interceptor;
- * do not read `<base>` directly anywhere else in the codebase.
- */
-export function getBasePath(): string {
-	const href = document.querySelector('base')?.getAttribute('href') ?? '/';
-	// Trailing slash is required for relative asset resolution and API prefixing.
-	return href.endsWith('/') ? href : `${href}/`;
-}
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -10,18 +10,6 @@ import { createHtmlPlugin } from 'vite-plugin-html';
 import { ViteImageOptimizer } from 'vite-plugin-image-optimizer';
 import tsconfigPaths from 'vite-tsconfig-paths';

-// In dev the Go backend is not involved, so replace the [[.BasePath]] placeholder
-// with "/" so relative assets resolve correctly from the Vite dev server.
-function devBasePathPlugin(): Plugin {
-	return {
-		name: 'dev-base-path',
-		apply: 'serve',
-		transformIndexHtml(html): string {
-			return html.replace('[[.BasePath]]', '/');
-		},
-	};
-}
-
 function rawMarkdownPlugin(): Plugin {
 	return {
 		name: 'raw-markdown',
@@ -44,7 +32,6 @@ export default defineConfig(
 		const plugins = [
 			tsconfigPaths(),
 			rawMarkdownPlugin(),
-			devBasePathPlugin(),
 			react(),
 			createHtmlPlugin({
 				inject: {
@@ -137,7 +124,6 @@ export default defineConfig(
 				'process.env.TUNNEL_DOMAIN': JSON.stringify(env.VITE_TUNNEL_DOMAIN),
 				'process.env.DOCS_BASE_URL': JSON.stringify(env.VITE_DOCS_BASE_URL),
 			},
-			base: './',
 			build: {
 				sourcemap: true,
 				outDir: 'build',
--- a/pkg/global/config.go
+++ b/pkg/global/config.go
@@ -2,8 +2,6 @@ package global

 import (
 	"net/url"
-	"path"
-	"strings"

 	"github.com/SigNoz/signoz/pkg/errors"

@@ -39,34 +37,5 @@ func newConfig() factory.Config {
 }

 func (c Config) Validate() error {
-	if c.ExternalURL != nil {
-		if c.ExternalURL.Path != "" && c.ExternalURL.Path != "/" {
-			if !strings.HasPrefix(c.ExternalURL.Path, "/") {
-				return errors.NewInvalidInputf(ErrCodeInvalidGlobalConfig, "global::external_url path must start with '/', got %q", c.ExternalURL.Path)
-			}
-		}
-	}
-
 	return nil
 }
-
-func (c Config) ExternalPath() string {
-	if c.ExternalURL == nil || c.ExternalURL.Path == "" || c.ExternalURL.Path == "/" {
-		return ""
-	}
-
-	p := path.Clean("/" + c.ExternalURL.Path)
-	if p == "/" {
-		return ""
-	}
-
-	return p
-}
-
-func (c Config) ExternalPathTrailing() string {
-	if p := c.ExternalPath(); p != "" {
-		return p + "/"
-	}
-
-	return "/"
-}
--- a/pkg/global/config_test.go
+++ b/pkg/global/config_test.go
@@ -1,139 +0,0 @@
-package global
-
-import (
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestExternalPath(t *testing.T) {
-	testCases := []struct {
-		name     string
-		config   Config
-		expected string
-	}{
-		{
-			name:     "NilURL",
-			config:   Config{ExternalURL: nil},
-			expected: "",
-		},
-		{
-			name:     "EmptyPath",
-			config:   Config{ExternalURL: &url.URL{Scheme: "https", Host: "example.com", Path: ""}},
-			expected: "",
-		},
-		{
-			name:     "RootPath",
-			config:   Config{ExternalURL: &url.URL{Scheme: "https", Host: "example.com", Path: "/"}},
-			expected: "",
-		},
-		{
-			name:     "SingleSegment",
-			config:   Config{ExternalURL: &url.URL{Scheme: "https", Host: "example.com", Path: "/signoz"}},
-			expected: "/signoz",
-		},
-		{
-			name:     "TrailingSlash",
-			config:   Config{ExternalURL: &url.URL{Scheme: "https", Host: "example.com", Path: "/signoz/"}},
-			expected: "/signoz",
-		},
-		{
-			name:     "MultiSegment",
-			config:   Config{ExternalURL: &url.URL{Scheme: "https", Host: "example.com", Path: "/a/b/c"}},
-			expected: "/a/b/c",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, tc.config.ExternalPath())
-		})
-	}
-}
-
-func TestExternalPathTrailing(t *testing.T) {
-	testCases := []struct {
-		name     string
-		config   Config
-		expected string
-	}{
-		{
-			name:     "NilURL",
-			config:   Config{ExternalURL: nil},
-			expected: "/",
-		},
-		{
-			name:     "EmptyPath",
-			config:   Config{ExternalURL: &url.URL{Path: ""}},
-			expected: "/",
-		},
-		{
-			name:     "RootPath",
-			config:   Config{ExternalURL: &url.URL{Path: "/"}},
-			expected: "/",
-		},
-		{
-			name:     "SingleSegment",
-			config:   Config{ExternalURL: &url.URL{Path: "/signoz"}},
-			expected: "/signoz/",
-		},
-		{
-			name:     "MultiSegment",
-			config:   Config{ExternalURL: &url.URL{Path: "/a/b/c"}},
-			expected: "/a/b/c/",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			assert.Equal(t, tc.expected, tc.config.ExternalPathTrailing())
-		})
-	}
-}
-
-func TestValidate(t *testing.T) {
-	testCases := []struct {
-		name   string
-		config Config
-		fail   bool
-	}{
-		{
-			name:   "NilURL",
-			config: Config{ExternalURL: nil},
-			fail:   false,
-		},
-		{
-			name:   "EmptyPath",
-			config: Config{ExternalURL: &url.URL{Path: ""}},
-			fail:   false,
-		},
-		{
-			name:   "RootPath",
-			config: Config{ExternalURL: &url.URL{Path: "/"}},
-			fail:   false,
-		},
-		{
-			name:   "ValidPath",
-			config: Config{ExternalURL: &url.URL{Path: "/signoz"}},
-			fail:   false,
-		},
-		{
-			name:   "NoLeadingSlash",
-			config: Config{ExternalURL: &url.URL{Path: "signoz"}},
-			fail:   true,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.config.Validate()
-			if tc.fail {
-				assert.Error(t, err)
-				return
-			}
-
-			assert.NoError(t, err)
-		})
-	}
-}
--- a/pkg/query-service/app/http_handler.go
+++ b/pkg/query-service/app/http_handler.go
@@ -587,6 +587,7 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *middleware.AuthZ) {
 	router.HandleFunc("/api/v1/query_filter/analyze", am.ViewAccess(aH.QueryParserAPI.AnalyzeQueryFilter)).Methods(http.MethodPost)
 }

+
 func Intersection(a, b []int) (c []int) {
 	m := make(map[int]bool)

--- a/pkg/query-service/app/server.go
+++ b/pkg/query-service/app/server.go
@@ -244,20 +244,6 @@ func (s *Server) createPublicServer(api *APIHandler, web web.Web) (*http.Server,
 		return nil, err
 	}

-	routePrefix := s.config.Global.ExternalPath()
-	if routePrefix != "" {
-		prefixed := http.StripPrefix(routePrefix, handler)
-		handler = http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-			switch req.URL.Path {
-			case "/api/v1/health", "/api/v2/healthz", "/api/v2/readyz", "/api/v2/livez":
-				r.ServeHTTP(w, req)
-				return
-			}
-
-			prefixed.ServeHTTP(w, req)
-		})
-	}
-
 	return &http.Server{
 		Handler: handler,
 	}, nil
--- a/pkg/signoz/provider.go
+++ b/pkg/signoz/provider.go
@@ -88,9 +88,9 @@ func NewCacheProviderFactories() factory.NamedMap[factory.ProviderFactory[cache.
 	)
 }

-func NewWebProviderFactories(globalConfig global.Config) factory.NamedMap[factory.ProviderFactory[web.Web, web.Config]] {
+func NewWebProviderFactories() factory.NamedMap[factory.ProviderFactory[web.Web, web.Config]] {
 	return factory.MustNewNamedMap(
-		routerweb.NewFactory(globalConfig),
+		routerweb.NewFactory(),
 		noopweb.NewFactory(),
 	)
 }
--- a/pkg/signoz/provider_test.go
+++ b/pkg/signoz/provider_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/alertmanager/nfmanager/nfmanagertest"
 	"github.com/SigNoz/signoz/pkg/analytics"
 	"github.com/SigNoz/signoz/pkg/flagger"
-	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
 	"github.com/SigNoz/signoz/pkg/modules/organization/implorganization"
 	"github.com/SigNoz/signoz/pkg/modules/user/impluser"
@@ -35,7 +34,7 @@ func TestNewProviderFactories(t *testing.T) {
 	})

 	assert.NotPanics(t, func() {
-		NewWebProviderFactories(global.Config{})
+		NewWebProviderFactories()
 	})

 	assert.NotPanics(t, func() {
--- a/pkg/web/config.go
+++ b/pkg/web/config.go
@@ -8,11 +8,10 @@ import (
 type Config struct {
 	// Whether the web package is enabled.
 	Enabled bool `mapstructure:"enabled"`
-
-	// The name of the index file to serve.
-	Index string `mapstructure:"index"`
-
-	// The directory from which to serve the web files.
+	// The prefix to serve the files from
+	Prefix string `mapstructure:"prefix"`
+	// The directory containing the static build files. The root of this directory should
+	// have an index.html file.
 	Directory string `mapstructure:"directory"`
 }

@@ -23,7 +22,7 @@ func NewConfigFactory() factory.ConfigFactory {
 func newConfig() factory.Config {
 	return &Config{
 		Enabled:   true,
-		Index:     "index.html",
+		Prefix:    "/",
 		Directory: "/etc/signoz/web",
 	}
 }
--- a/pkg/web/config_test.go
+++ b/pkg/web/config_test.go
@@ -12,6 +12,7 @@ import (
 )

 func TestNewWithEnvProvider(t *testing.T) {
+	t.Setenv("SIGNOZ_WEB_PREFIX", "/web")
 	t.Setenv("SIGNOZ_WEB_ENABLED", "false")

 	conf, err := config.New(
@@ -36,7 +37,7 @@ func TestNewWithEnvProvider(t *testing.T) {

 	expected := &Config{
 		Enabled:   false,
-		Index:     def.Index,
+		Prefix:    "/web",
 		Directory: def.Directory,
 	}

--- a/pkg/web/routerweb/provider.go
+++ b/pkg/web/routerweb/provider.go
@@ -8,55 +8,56 @@ import (

 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/http/middleware"
 	"github.com/SigNoz/signoz/pkg/web"
 	"github.com/gorilla/mux"
 )

+const (
+	indexFileName string = "index.html"
+)
+
 type provider struct {
-	config        web.Config
-	indexContents []byte
-	fileHandler   http.Handler
+	config web.Config
 }

-func NewFactory(globalConfig global.Config) factory.ProviderFactory[web.Web, web.Config] {
-	return factory.NewProviderFactory(factory.MustNewName("router"), func(ctx context.Context, settings factory.ProviderSettings, config web.Config) (web.Web, error) {
-		return New(ctx, settings, config, globalConfig)
-	})
+func NewFactory() factory.ProviderFactory[web.Web, web.Config] {
+	return factory.NewProviderFactory(factory.MustNewName("router"), New)
 }

-func New(ctx context.Context, settings factory.ProviderSettings, config web.Config, globalConfig global.Config) (web.Web, error) {
+func New(ctx context.Context, settings factory.ProviderSettings, config web.Config) (web.Web, error) {
 	fi, err := os.Stat(config.Directory)
 	if err != nil {
 		return nil, errors.WrapInvalidInputf(err, errors.CodeInvalidInput, "cannot access web directory")
 	}

-	if !fi.IsDir() {
+	ok := fi.IsDir()
+	if !ok {
 		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "web directory is not a directory")
 	}

-	indexPath := filepath.Join(config.Directory, config.Index)
-	raw, err := os.ReadFile(indexPath)
+	fi, err = os.Stat(filepath.Join(config.Directory, indexFileName))
 	if err != nil {
-		return nil, errors.WrapInvalidInputf(err, errors.CodeInvalidInput, "cannot read %q in web directory", config.Index)
+		return nil, errors.WrapInvalidInputf(err, errors.CodeInvalidInput, "cannot access %q in web directory", indexFileName)
 	}

-	logger := factory.NewScopedProviderSettings(settings, "github.com/SigNoz/signoz/pkg/web/routerweb").Logger()
-	indexContents := web.NewIndex(ctx, logger, config.Index, raw, web.TemplateData{BaseHref: globalConfig.ExternalPathTrailing()})
+	if os.IsNotExist(err) || fi.IsDir() {
+		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "%q does not exist", indexFileName)
+	}

 	return &provider{
-		config:        config,
-		indexContents: indexContents,
-		fileHandler:   http.FileServer(http.Dir(config.Directory)),
+		config: config,
 	}, nil
 }

 func (provider *provider) AddToRouter(router *mux.Router) error {
 	cache := middleware.NewCache(0)
-	err := router.PathPrefix("/").
+	err := router.PathPrefix(provider.config.Prefix).
 		Handler(
-			cache.Wrap(http.HandlerFunc(provider.ServeHTTP)),
+			http.StripPrefix(
+				provider.config.Prefix,
+				cache.Wrap(http.HandlerFunc(provider.ServeHTTP)),
+			),
 		).GetError()
 	if err != nil {
 		return errors.WrapInternalf(err, errors.CodeInternal, "unable to add web to router")
@@ -74,7 +75,7 @@ func (provider *provider) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	if err != nil {
 		// if the file doesn't exist, serve index.html
 		if os.IsNotExist(err) {
-			provider.serveIndex(rw)
+			http.ServeFile(rw, req, filepath.Join(provider.config.Directory, indexFileName))
 			return
 		}

@@ -86,15 +87,10 @@ func (provider *provider) ServeHTTP(rw http.ResponseWriter, req *http.Request) {

 	if fi.IsDir() {
 		// path is a directory, serve index.html
-		provider.serveIndex(rw)
+		http.ServeFile(rw, req, filepath.Join(provider.config.Directory, indexFileName))
 		return
 	}

 	// otherwise, use http.FileServer to serve the static file
-	provider.fileHandler.ServeHTTP(rw, req)
-}
-
-func (provider *provider) serveIndex(rw http.ResponseWriter) {
-	rw.Header().Set("Content-Type", "text/html; charset=utf-8")
-	_, _ = rw.Write(provider.indexContents)
+	http.FileServer(http.Dir(provider.config.Directory)).ServeHTTP(rw, req)
 }
--- a/pkg/web/routerweb/provider_test.go
+++ b/pkg/web/routerweb/provider_test.go
@@ -5,113 +5,45 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"net/url"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"

 	"github.com/SigNoz/signoz/pkg/factory/factorytest"
-	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/web"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

-func startServer(t *testing.T, config web.Config, globalConfig global.Config) string {
-	t.Helper()
+func TestServeHttpWithoutPrefix(t *testing.T) {
+	t.Parallel()
+	fi, err := os.Open(filepath.Join("testdata", indexFileName))
+	require.NoError(t, err)

-	web, err := New(context.Background(), factorytest.NewSettings(), config, globalConfig)
+	expected, err := io.ReadAll(fi)
+	require.NoError(t, err)
+
+	web, err := New(context.Background(), factorytest.NewSettings(), web.Config{Prefix: "/", Directory: filepath.Join("testdata")})
 	require.NoError(t, err)

 	router := mux.NewRouter()
-	require.NoError(t, web.AddToRouter(router))
+	err = web.AddToRouter(router)
+	require.NoError(t, err)

 	listener, err := net.Listen("tcp", "localhost:0")
 	require.NoError(t, err)

-	server := &http.Server{Handler: router}
-	go func() { _ = server.Serve(listener) }()
-	t.Cleanup(func() { _ = server.Close() })
-
-	return "http://" + listener.Addr().String()
-}
-
-func httpGet(t *testing.T, url string) string {
-	t.Helper()
-
-	res, err := http.DefaultClient.Get(url)
-	require.NoError(t, err)
-	defer func() { _ = res.Body.Close() }()
-
-	body, err := io.ReadAll(res.Body)
-	require.NoError(t, err)
-
-	return string(body)
-}
-
-func TestServeTemplatedIndex(t *testing.T) {
-	t.Parallel()
-
-	testCases := []struct {
-		name         string
-		path         string
-		globalConfig global.Config
-		expected     string
-	}{
-		{
-			name:         "RootBaseHrefAtRoot",
-			path:         "/",
-			globalConfig: global.Config{},
-			expected:     `<html><head><base href="/" /></head><body>Welcome to test data!!!</body></html>`,
-		},
-		{
-			name:         "RootBaseHrefAtNonExistentPath",
-			path:         "/does-not-exist",
-			globalConfig: global.Config{},
-			expected:     `<html><head><base href="/" /></head><body>Welcome to test data!!!</body></html>`,
-		},
-		{
-			name:         "RootBaseHrefAtDirectory",
-			path:         "/assets",
-			globalConfig: global.Config{},
-			expected:     `<html><head><base href="/" /></head><body>Welcome to test data!!!</body></html>`,
-		},
-		{
-			name:         "SubPathBaseHrefAtRoot",
-			path:         "/",
-			globalConfig: global.Config{ExternalURL: &url.URL{Scheme: "https", Host: "example.com", Path: "/signoz"}},
-			expected:     `<html><head><base href="/signoz/" /></head><body>Welcome to test data!!!</body></html>`,
-		},
-		{
-			name:         "SubPathBaseHrefAtNonExistentPath",
-			path:         "/does-not-exist",
-			globalConfig: global.Config{ExternalURL: &url.URL{Scheme: "https", Host: "example.com", Path: "/signoz"}},
-			expected:     `<html><head><base href="/signoz/" /></head><body>Welcome to test data!!!</body></html>`,
-		},
-		{
-			name:         "SubPathBaseHrefAtDirectory",
-			path:         "/assets",
-			globalConfig: global.Config{ExternalURL: &url.URL{Scheme: "https", Host: "example.com", Path: "/signoz"}},
-			expected:     `<html><head><base href="/signoz/" /></head><body>Welcome to test data!!!</body></html>`,
-		},
+	server := &http.Server{
+		Handler: router,
 	}

-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			base := startServer(t, web.Config{Index: "valid_template.html", Directory: "testdata"}, testCase.globalConfig)
-
-			assert.Equal(t, testCase.expected, strings.TrimSuffix(httpGet(t, base+testCase.path), "\n"))
-		})
-	}
-}
-
-func TestServeNoTemplateIndex(t *testing.T) {
-	t.Parallel()
-
-	expected, err := os.ReadFile(filepath.Join("testdata", "no_template.html"))
-	require.NoError(t, err)
+	go func() {
+		_ = server.Serve(listener)
+	}()
+	defer func() {
+		_ = server.Close()
+	}()

 	testCases := []struct {
 		name string
@@ -122,7 +54,11 @@ func TestServeNoTemplateIndex(t *testing.T) {
 			path: "/",
 		},
 		{
-			name: "NonExistentPath",
+			name: "Index",
+			path: "/" + indexFileName,
+		},
+		{
+			name: "DoesNotExist",
 			path: "/does-not-exist",
 		},
 		{
@@ -131,55 +67,104 @@ func TestServeNoTemplateIndex(t *testing.T) {
 		},
 	}

-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			base := startServer(t, web.Config{Index: "no_template.html", Directory: "testdata"}, global.Config{})
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			res, err := http.DefaultClient.Get("http://" + listener.Addr().String() + tc.path)
+			require.NoError(t, err)

-			assert.Equal(t, string(expected), httpGet(t, base+testCase.path))
+			defer func() {
+				_ = res.Body.Close()
+			}()
+
+			actual, err := io.ReadAll(res.Body)
+			require.NoError(t, err)
+
+			assert.Equal(t, expected, actual)
 		})
 	}
+
 }

-func TestServeInvalidTemplateIndex(t *testing.T) {
+func TestServeHttpWithPrefix(t *testing.T) {
 	t.Parallel()
-
-	expected, err := os.ReadFile(filepath.Join("testdata", "invalid_template.html"))
+	fi, err := os.Open(filepath.Join("testdata", indexFileName))
 	require.NoError(t, err)

+	expected, err := io.ReadAll(fi)
+	require.NoError(t, err)
+
+	web, err := New(context.Background(), factorytest.NewSettings(), web.Config{Prefix: "/web", Directory: filepath.Join("testdata")})
+	require.NoError(t, err)
+
+	router := mux.NewRouter()
+	err = web.AddToRouter(router)
+	require.NoError(t, err)
+
+	listener, err := net.Listen("tcp", "localhost:0")
+	require.NoError(t, err)
+
+	server := &http.Server{
+		Handler: router,
+	}
+
+	go func() {
+		_ = server.Serve(listener)
+	}()
+	defer func() {
+		_ = server.Close()
+	}()
+
 	testCases := []struct {
-		name string
-		path string
+		name  string
+		path  string
+		found bool
 	}{
 		{
-			name: "Root",
-			path: "/",
+			name:  "Root",
+			path:  "/web",
+			found: true,
 		},
 		{
-			name: "NonExistentPath",
-			path: "/does-not-exist",
+			name:  "Index",
+			path:  "/web/" + indexFileName,
+			found: true,
 		},
 		{
-			name: "Directory",
-			path: "/assets",
+			name:  "FileDoesNotExist",
+			path:  "/web/does-not-exist",
+			found: true,
+		},
+		{
+			name:  "Directory",
+			path:  "/web/assets",
+			found: true,
+		},
+		{
+			name:  "DoesNotExist",
+			path:  "/does-not-exist",
+			found: false,
 		},
 	}

-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			base := startServer(t, web.Config{Index: "invalid_template.html", Directory: "testdata"}, global.Config{ExternalURL: &url.URL{Path: "/signoz"}})
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			res, err := http.DefaultClient.Get("http://" + listener.Addr().String() + tc.path)
+			require.NoError(t, err)
+
+			defer func() {
+				_ = res.Body.Close()
+			}()
+
+			if tc.found {
+				actual, err := io.ReadAll(res.Body)
+				require.NoError(t, err)
+
+				assert.Equal(t, expected, actual)
+			} else {
+				assert.Equal(t, http.StatusNotFound, res.StatusCode)
+			}

-			assert.Equal(t, string(expected), httpGet(t, base+testCase.path))
 		})
 	}
-}
-
-func TestServeStaticFilesUnchanged(t *testing.T) {
-	t.Parallel()
-
-	expected, err := os.ReadFile(filepath.Join("testdata", "assets", "style.css"))
-	require.NoError(t, err)
-
-	base := startServer(t, web.Config{Index: "valid_template.html", Directory: "testdata"}, global.Config{ExternalURL: &url.URL{Path: "/signoz"}})
-
-	assert.Equal(t, string(expected), httpGet(t, base+"/assets/style.css"))
+
 }
--- a/pkg/web/routerweb/testdata/assets/index.css
+++ b/pkg/web/routerweb/testdata/assets/index.css
@@ -0,0 +1,3 @@
+#root {
+  background-color: red;
+}
--- a/pkg/web/routerweb/testdata/assets/style.css
+++ b/pkg/web/routerweb/testdata/assets/style.css
@@ -1 +0,0 @@
-body { color: red; }
--- a/pkg/web/routerweb/testdata/index.html
+++ b/pkg/web/routerweb/testdata/index.html
@@ -0,0 +1 @@
+<h1>Welcome to test data!!!</h1>
--- a/pkg/web/routerweb/testdata/invalid_template.html
+++ b/pkg/web/routerweb/testdata/invalid_template.html
@@ -1 +0,0 @@
-<html><head><base href="[[." /></head><body>Bad template</body></html>
--- a/pkg/web/routerweb/testdata/no_template.html
+++ b/pkg/web/routerweb/testdata/no_template.html
@@ -1 +0,0 @@
-<html><head></head><body>No template here</body></html>
--- a/pkg/web/routerweb/testdata/valid_template.html
+++ b/pkg/web/routerweb/testdata/valid_template.html
@@ -1 +0,0 @@
-<html><head><base href="[[.BaseHref]]" /></head><body>Welcome to test data!!!</body></html>
--- a/pkg/web/template.go
+++ b/pkg/web/template.go
@@ -1,42 +0,0 @@
-package web
-
-import (
-	"bytes"
-	"context"
-	"log/slog"
-	"text/template"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-)
-
-// Field names map to the HTML attributes they populate in the template:
-//   - BaseHref  → <base href="[[.BaseHref]]" />
-type TemplateData struct {
-	BaseHref string
-}
-
-// If the template cannot be parsed or executed, the raw bytes are
-// returned unchanged and the error is logged.
-func NewIndex(ctx context.Context, logger *slog.Logger, name string, raw []byte, data TemplateData) []byte {
-	result, err := NewIndexE(name, raw, data)
-	if err != nil {
-		logger.ErrorContext(ctx, "cannot render index template, serving raw file", slog.String("name", name), errors.Attr(err))
-		return raw
-	}
-
-	return result
-}
-
-func NewIndexE(name string, raw []byte, data TemplateData) ([]byte, error) {
-	tmpl, err := template.New(name).Delims("[[", "]]").Parse(string(raw))
-	if err != nil {
-		return nil, errors.WrapInvalidInputf(err, errors.CodeInvalidInput, "cannot parse %q as template", name)
-	}
-
-	var buf bytes.Buffer
-	if err := tmpl.Execute(&buf, data); err != nil {
-		return nil, errors.WrapInvalidInputf(err, errors.CodeInvalidInput, "cannot execute template for %q", name)
-	}
-
-	return buf.Bytes(), nil
-}
				`@@ -1 +0,0 @@`
				`<html><head><base href="[[." /></head><body>Bad template</body></html>`
				`@@ -1 +0,0 @@`
				`<html><head></head><body>No template here</body></html>`
				`@@ -1 +0,0 @@`
				`<html><head><base href="[[.BaseHref]]" /></head><body>Welcome to test data!!!</body></html>`