Revert "Merge branch 'nv/v2-public-dashboard' into nv/dashboard-create-aggregation"

This reverts commit e91785bfe3, reversing
changes made to fe838a3464.

cmd/enterprise/server.go

@@ -177,11 +177,9 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 				return nil, err
 			}
 			azureCloudProviderModule := implcloudprovider.NewAzureCloudProvider(defStore)
-			gcpCloudProviderModule := implcloudprovider.NewGCPCloudProvider(defStore)
 			cloudProvidersMap := map[cloudintegrationtypes.CloudProviderType]cloudintegration.CloudProviderModule{
 				cloudintegrationtypes.CloudProviderTypeAWS:   awsCloudProviderModule,
 				cloudintegrationtypes.CloudProviderTypeAzure: azureCloudProviderModule,
-				cloudintegrationtypes.CloudProviderTypeGCP:   gcpCloudProviderModule,
 			}
 
 			return implcloudintegration.NewModule(pkgcloudintegration.NewStore(sqlStore), dashboardModule, global, zeus, gateway, licensing, serviceAccount, cloudProvidersMap, config)

docs/api/openapi.yml

@@ -1024,8 +1024,6 @@ components:
           $ref: '#/components/schemas/CloudintegrationtypesAWSAccountConfig'
         azure:
           $ref: '#/components/schemas/CloudintegrationtypesAzureAccountConfig'
-        gcp:
-          $ref: '#/components/schemas/CloudintegrationtypesGCPAccountConfig'
       type: object
     CloudintegrationtypesAgentReport:
       nullable: true
@@ -1171,8 +1169,6 @@ components:
           $ref: '#/components/schemas/CloudintegrationtypesAWSConnectionArtifact'
         azure:
           $ref: '#/components/schemas/CloudintegrationtypesAzureConnectionArtifact'
-        gcp:
-          $ref: '#/components/schemas/CloudintegrationtypesGCPConnectionArtifact'
       type: object
     CloudintegrationtypesCredentials:
       properties:
@@ -1203,46 +1199,6 @@ components:
           nullable: true
           type: array
       type: object
-    CloudintegrationtypesGCPAccountConfig:
-      properties:
-        deploymentProjectId:
-          type: string
-        deploymentRegion:
-          type: string
-        projectIds:
-          items:
-            type: string
-          type: array
-      required:
-      - deploymentProjectId
-      - deploymentRegion
-      - projectIds
-      type: object
-    CloudintegrationtypesGCPConnectionArtifact:
-      type: object
-    CloudintegrationtypesGCPIntegrationConfig:
-      type: object
-    CloudintegrationtypesGCPServiceConfig:
-      properties:
-        logs:
-          $ref: '#/components/schemas/CloudintegrationtypesGCPServiceLogsConfig'
-        metrics:
-          $ref: '#/components/schemas/CloudintegrationtypesGCPServiceMetricsConfig'
-      type: object
-    CloudintegrationtypesGCPServiceLogsConfig:
-      properties:
-        enabled:
-          type: boolean
-      required:
-      - enabled
-      type: object
-    CloudintegrationtypesGCPServiceMetricsConfig:
-      properties:
-        enabled:
-          type: boolean
-      required:
-      - enabled
-      type: object
     CloudintegrationtypesGettableAccountWithConnectionArtifact:
       properties:
         connectionArtifact:
@@ -1375,8 +1331,6 @@ components:
           $ref: '#/components/schemas/CloudintegrationtypesAWSPostableAccountConfig'
         azure:
           $ref: '#/components/schemas/CloudintegrationtypesAzureAccountConfig'
-        gcp:
-          $ref: '#/components/schemas/CloudintegrationtypesGCPAccountConfig'
       type: object
     CloudintegrationtypesPostableAgentCheckIn:
       properties:
@@ -1401,8 +1355,6 @@ components:
           $ref: '#/components/schemas/CloudintegrationtypesAWSIntegrationConfig'
         azure:
           $ref: '#/components/schemas/CloudintegrationtypesAzureIntegrationConfig'
-        gcp:
-          $ref: '#/components/schemas/CloudintegrationtypesGCPIntegrationConfig'
       type: object
     CloudintegrationtypesService:
       properties:
@@ -1447,8 +1399,6 @@ components:
           $ref: '#/components/schemas/CloudintegrationtypesAWSServiceConfig'
         azure:
           $ref: '#/components/schemas/CloudintegrationtypesAzureServiceConfig'
-        gcp:
-          $ref: '#/components/schemas/CloudintegrationtypesGCPServiceConfig'
       type: object
     CloudintegrationtypesServiceDashboard:
       properties:
@@ -1491,7 +1441,6 @@ components:
       - cosmosdb
       - cassandradb
       - redis
-      - cloudsql
       type: string
     CloudintegrationtypesServiceMetadata:
       properties:
@@ -1553,8 +1502,6 @@ components:
           $ref: '#/components/schemas/CloudintegrationtypesAWSAccountConfig'
         azure:
           $ref: '#/components/schemas/CloudintegrationtypesUpdatableAzureAccountConfig'
-        gcp:
-          $ref: '#/components/schemas/CloudintegrationtypesUpdatableGCPAccountConfig'
       type: object
     CloudintegrationtypesUpdatableAzureAccountConfig:
       properties:
@@ -1565,22 +1512,6 @@ components:
       required:
       - resourceGroups
       type: object
-    CloudintegrationtypesUpdatableGCPAccountConfig:
-      properties:
-        deploymentProjectId:
-          type: string
-        deploymentRegion:
-          type: string
-        projectIds:
-          items:
-            type: string
-          nullable: true
-          type: array
-      required:
-      - deploymentProjectId
-      - deploymentRegion
-      - projectIds
-      type: object
     CloudintegrationtypesUpdatableService:
       properties:
         config:

ee/modules/cloudintegration/implcloudintegration/implcloudprovider/gcpcloudprovider.go

@@ -1,36 +0,0 @@
-package implcloudprovider
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-	"github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
-)
-
-type gcpcloudprovider struct {
-	serviceDefinitions cloudintegrationtypes.ServiceDefinitionStore
-}
-
-func NewGCPCloudProvider(defStore cloudintegrationtypes.ServiceDefinitionStore) cloudintegration.CloudProviderModule {
-	return &gcpcloudprovider{
-		serviceDefinitions: defStore,
-	}
-}
-
-func (g *gcpcloudprovider) BuildIntegrationConfig(ctx context.Context, account *cloudintegrationtypes.Account, services []*cloudintegrationtypes.StorableCloudIntegrationService) (*cloudintegrationtypes.ProviderIntegrationConfig, error) {
-	// for manual flow we don't have any integration config to return, so returning empty config for now.
-	return &cloudintegrationtypes.ProviderIntegrationConfig{}, nil
-}
-
-func (g *gcpcloudprovider) GetConnectionArtifact(ctx context.Context, account *cloudintegrationtypes.Account, req *cloudintegrationtypes.GetConnectionArtifactRequest) (*cloudintegrationtypes.ConnectionArtifact, error) {
-	// for manual flow we don't have any connection artifact to return, so returning empty artifact for now.
-	return &cloudintegrationtypes.ConnectionArtifact{}, nil
-}
-
-func (g *gcpcloudprovider) GetServiceDefinition(ctx context.Context, serviceID cloudintegrationtypes.ServiceID) (*cloudintegrationtypes.ServiceDefinition, error) {
-	return g.serviceDefinitions.Get(ctx, cloudintegrationtypes.CloudProviderTypeGCP, serviceID)
-}
-
-func (g *gcpcloudprovider) ListServiceDefinitions(ctx context.Context) ([]*cloudintegrationtypes.ServiceDefinition, error) {
-	return g.serviceDefinitions.List(ctx, cloudintegrationtypes.CloudProviderTypeGCP)
-}

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -2630,25 +2630,9 @@ export interface CloudintegrationtypesAzureAccountConfigDTO {
 	resourceGroups: string[];
 }
 
-export interface CloudintegrationtypesGCPAccountConfigDTO {
-	/**
-	 * @type string
-	 */
-	deploymentProjectId: string;
-	/**
-	 * @type string
-	 */
-	deploymentRegion: string;
-	/**
-	 * @type array
-	 */
-	projectIds: string[];
-}
-
 export interface CloudintegrationtypesAccountConfigDTO {
 	aws?: CloudintegrationtypesAWSAccountConfigDTO;
 	azure?: CloudintegrationtypesAzureAccountConfigDTO;
-	gcp?: CloudintegrationtypesGCPAccountConfigDTO;
 }
 
 export interface CloudintegrationtypesAccountDTO {
@@ -2756,29 +2740,9 @@ export interface CloudintegrationtypesAzureServiceConfigDTO {
 	metrics: CloudintegrationtypesAzureServiceMetricsConfigDTO;
 }
 
-export interface CloudintegrationtypesGCPServiceLogsConfigDTO {
-	/**
-	 * @type boolean
-	 */
-	enabled: boolean;
-}
-
-export interface CloudintegrationtypesGCPServiceMetricsConfigDTO {
-	/**
-	 * @type boolean
-	 */
-	enabled: boolean;
-}
-
-export interface CloudintegrationtypesGCPServiceConfigDTO {
-	logs?: CloudintegrationtypesGCPServiceLogsConfigDTO;
-	metrics?: CloudintegrationtypesGCPServiceMetricsConfigDTO;
-}
-
 export interface CloudintegrationtypesServiceConfigDTO {
 	aws?: CloudintegrationtypesAWSServiceConfigDTO;
 	azure?: CloudintegrationtypesAzureServiceConfigDTO;
-	gcp?: CloudintegrationtypesGCPServiceConfigDTO;
 }
 
 export enum CloudintegrationtypesServiceIDDTO {
@@ -2809,7 +2773,6 @@ export enum CloudintegrationtypesServiceIDDTO {
 	cosmosdb = 'cosmosdb',
 	cassandradb = 'cassandradb',
 	redis = 'redis',
-	cloudsql = 'cloudsql',
 }
 export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	/**
@@ -2874,14 +2837,9 @@ export interface CloudintegrationtypesCollectedMetricDTO {
 	unit?: string;
 }
 
-export interface CloudintegrationtypesGCPConnectionArtifactDTO {
-	[key: string]: unknown;
-}
-
 export interface CloudintegrationtypesConnectionArtifactDTO {
 	aws?: CloudintegrationtypesAWSConnectionArtifactDTO;
 	azure?: CloudintegrationtypesAzureConnectionArtifactDTO;
-	gcp?: CloudintegrationtypesGCPConnectionArtifactDTO;
 }
 
 export interface CloudintegrationtypesCredentialsDTO {
@@ -2914,10 +2872,6 @@ export interface CloudintegrationtypesDataCollectedDTO {
 	metrics?: CloudintegrationtypesCollectedMetricDTO[] | null;
 }
 
-export interface CloudintegrationtypesGCPIntegrationConfigDTO {
-	[key: string]: unknown;
-}
-
 export interface CloudintegrationtypesGettableAccountWithConnectionArtifactDTO {
 	connectionArtifact: CloudintegrationtypesConnectionArtifactDTO;
 	/**
@@ -3009,7 +2963,6 @@ export type CloudintegrationtypesIntegrationConfigDTO =
 export interface CloudintegrationtypesProviderIntegrationConfigDTO {
 	aws?: CloudintegrationtypesAWSIntegrationConfigDTO;
 	azure?: CloudintegrationtypesAzureIntegrationConfigDTO;
-	gcp?: CloudintegrationtypesGCPIntegrationConfigDTO;
 }
 
 export interface CloudintegrationtypesGettableAgentCheckInDTO {
@@ -3072,7 +3025,6 @@ export interface CloudintegrationtypesGettableServicesMetadataDTO {
 export interface CloudintegrationtypesPostableAccountConfigDTO {
 	aws?: CloudintegrationtypesAWSPostableAccountConfigDTO;
 	azure?: CloudintegrationtypesAzureAccountConfigDTO;
-	gcp?: CloudintegrationtypesGCPAccountConfigDTO;
 }
 
 export interface CloudintegrationtypesPostableAccountDTO {
@@ -3202,25 +3154,9 @@ export interface CloudintegrationtypesUpdatableAzureAccountConfigDTO {
 	resourceGroups: string[];
 }
 
-export interface CloudintegrationtypesUpdatableGCPAccountConfigDTO {
-	/**
-	 * @type string
-	 */
-	deploymentProjectId: string;
-	/**
-	 * @type string
-	 */
-	deploymentRegion: string;
-	/**
-	 * @type array,null
-	 */
-	projectIds: string[] | null;
-}
-
 export interface CloudintegrationtypesUpdatableAccountConfigDTO {
 	aws?: CloudintegrationtypesAWSAccountConfigDTO;
 	azure?: CloudintegrationtypesUpdatableAzureAccountConfigDTO;
-	gcp?: CloudintegrationtypesUpdatableGCPAccountConfigDTO;
 }
 
 export interface CloudintegrationtypesUpdatableAccountDTO {

frontend/src/components/MembersTable/MembersTable.styles.scss

@@ -3,6 +3,7 @@
 	flex-direction: column;
 	flex: 1;
 	min-height: 0;
+	overflow: hidden;
 	border-radius: 4px;
 }
 

frontend/src/components/YAxisUnitSelector/__tests__/formatter.test.tsx

@@ -680,13 +680,6 @@ describe('formatUniversalUnit', () => {
 	});
 
 	describe('Datetime', () => {
-		beforeAll(() => {
-			jest.useFakeTimers().setSystemTime(new Date('2026-01-01T00:00:00Z'));
-		});
-		afterAll(() => {
-			jest.useRealTimers();
-		});
-
 		it('formats datetime units', () => {
 			expect(formatUniversalUnit(900, UniversalYAxisUnit.DATETIME_FROM_NOW)).toBe(
 				'56 years ago',

frontend/src/container/MembersSettings/MembersSettings.styles.scss

@@ -1,14 +1,9 @@
-@use '../../styles/scrollbar' as *;
-
 .members-settings-page {
 	display: flex;
 	flex-direction: column;
 	gap: var(--spacing-8);
 	padding: var(--padding-4) var(--padding-2) var(--padding-6) var(--padding-4);
 	height: 100%;
-	overflow-y: auto;
-
-	@include custom-scrollbar;
 }
 
 .members-settings {

frontend/src/container/PanelWrapper/PiePanelWrapper.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { Color } from '@signozhq/design-tokens';
 import { Group } from '@visx/group';
 import { Pie } from '@visx/shape';
@@ -8,10 +8,12 @@ import { themeColors } from 'constants/theme';
 import { getPieChartClickData } from 'container/QueryTable/Drilldown/drilldownUtils';
 import useGraphContextMenu from 'container/QueryTable/Drilldown/useGraphContextMenu';
 import { useIsDarkMode } from 'hooks/useDarkMode';
+import getLabelName from 'lib/getLabelName';
+import { generateColor } from 'lib/uPlotLib/utils/generateColor';
+import { isNaN } from 'lodash-es';
 import ContextMenu, { useCoordinates } from 'periscope/components/ContextMenu';
 
 import { PanelWrapperProps, TooltipData } from './panelWrapper.types';
-import { preparePieChartData } from './preparePieChartData';
 import { lightenColor, tooltipStyles } from './utils';
 
 import './PiePanelWrapper.styles.scss';
@@ -42,15 +44,37 @@ function PiePanelWrapper({
 		detectBounds: true,
 	});
 
+	const panelData = queryResponse.data?.payload?.data?.result || [];
+
 	const isDarkMode = useIsDarkMode();
 
-	const pieChartData = useMemo(
-		() =>
-			preparePieChartData(queryResponse.data?.payload, {
-				customLegendColors: widget?.customLegendColors,
-				colorMap: isDarkMode ? themeColors.chartcolors : themeColors.lightModeColor,
-			}),
-		[queryResponse.data?.payload, widget?.customLegendColors, isDarkMode],
+	let pieChartData: {
+		label: string;
+		value: string;
+		color: string;
+		record: any;
+	}[] = [].concat(
+		...(panelData
+			.map((d) => {
+				const label = getLabelName(d.metric, d.queryName || '', d.legend || '');
+				return {
+					label,
+					value: d?.values?.[0]?.[1],
+					record: d,
+					color:
+						widget?.customLegendColors?.[label] ||
+						generateColor(
+							label,
+							isDarkMode ? themeColors.chartcolors : themeColors.lightModeColor,
+						),
+				};
+			})
+			.filter((d) => d !== undefined) as never[]),
+	);
+
+	pieChartData = pieChartData.filter(
+		(arc) =>
+			arc.value && !isNaN(parseFloat(arc.value)) && parseFloat(arc.value) > 0,
 	);
 
 	let size = 0;

frontend/src/container/PanelWrapper/__tests__/preparePieChartData.test.ts

@@ -1,185 +0,0 @@
-import { themeColors } from 'constants/theme';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { QueryData, QueryDataV3 } from 'types/api/widgets/getQuery';
-
-import { preparePieChartData } from '../preparePieChartData';
-
-const options = { colorMap: themeColors.chartcolors };
-
-/**
- * Mirrors a query-range payload: the (possibly collapsed) time-series `result`
- * plus the scalar table nested under `newResult` (as getQueryResults produces it).
- */
-function makePayload(
-	result: QueryData[],
-	tables: QueryDataV3[],
-): MetricRangePayloadProps {
-	return {
-		data: {
-			result,
-			resultType: 'scalar',
-			newResult: { data: { result: tables, resultType: 'scalar' } },
-		},
-	} as MetricRangePayloadProps;
-}
-
-function tableEntry(
-	columns: NonNullable<QueryDataV3['table']>['columns'],
-	rows: NonNullable<QueryDataV3['table']>['rows'],
-	overrides: Partial<QueryDataV3> = {},
-): QueryDataV3 {
-	return {
-		queryName: 'A',
-		legend: '',
-		series: null,
-		list: null,
-		table: { columns, rows },
-		...overrides,
-	} as QueryDataV3;
-}
-
-describe('preparePieChartData', () => {
-	it('renders a slice per value column for a multi-column ClickHouse scalar', () => {
-		// SELECT count() AS col1, sum(value) AS col2 — the backend collapses the
-		// time-series result onto col1; the full data lives in the scalar table.
-		const payload = makePayload(
-			[
-				{
-					metric: {},
-					queryName: 'A',
-					legend: '',
-					values: [[0, '23399927']],
-				} as QueryData,
-			],
-			[
-				tableEntry(
-					[
-						{ name: 'col1', queryName: 'A', isValueColumn: true, id: 'col1' },
-						{ name: 'col2', queryName: 'A', isValueColumn: true, id: 'col2' },
-					],
-					[{ data: { col1: 23399927, col2: 588691297 } }],
-				),
-			],
-		);
-
-		const slices = preparePieChartData(payload, options);
-
-		expect(slices).toHaveLength(2);
-		expect(slices.map((s) => [s.label, s.value])).toStrictEqual([
-			['col1', '23399927'],
-			['col2', '588691297'],
-		]);
-	});
-
-	it('prefixes the group when multiple value columns are grouped', () => {
-		const payload = makePayload(
-			[],
-			[
-				tableEntry(
-					[
-						{ name: 'env', queryName: 'A', isValueColumn: false, id: 'env' },
-						{ name: 'col1', queryName: 'A', isValueColumn: true, id: 'col1' },
-						{ name: 'col2', queryName: 'A', isValueColumn: true, id: 'col2' },
-					],
-					[{ data: { env: 'prod', col1: 10, col2: 20 } }],
-				),
-			],
-		);
-
-		const slices = preparePieChartData(payload, options);
-
-		expect(slices.map((s) => s.label)).toStrictEqual([
-			'prod · col1',
-			'prod · col2',
-		]);
-		expect(slices[0].record.metric).toStrictEqual({ env: 'prod' });
-	});
-
-	it('drops non-positive and non-numeric values', () => {
-		const payload = makePayload(
-			[],
-			[
-				tableEntry(
-					[
-						{ name: 'col1', queryName: 'A', isValueColumn: true, id: 'col1' },
-						{ name: 'col2', queryName: 'A', isValueColumn: true, id: 'col2' },
-						{ name: 'col3', queryName: 'A', isValueColumn: true, id: 'col3' },
-					],
-					[{ data: { col1: 5, col2: 0, col3: 'n/a' } }],
-				),
-			],
-		);
-
-		const slices = preparePieChartData(payload, options);
-
-		expect(slices.map((s) => s.label)).toStrictEqual(['col1']);
-	});
-
-	it('keeps the series path for a single value column (grouped panel)', () => {
-		// One value column → the time-series result is authoritative (one slice per
-		// group), so existing behaviour is preserved.
-		const payload = makePayload(
-			[
-				{
-					metric: { 'service.name': 'adservice' },
-					queryName: 'A',
-					legend: 'adservice',
-					values: [[0, '100']],
-				} as QueryData,
-				{
-					metric: { 'service.name': 'cartservice' },
-					queryName: 'A',
-					legend: 'cartservice',
-					values: [[0, '200']],
-				} as QueryData,
-			],
-			[
-				tableEntry(
-					[
-						{
-							name: 'service.name',
-							queryName: 'A',
-							isValueColumn: false,
-							id: 'service.name',
-						},
-						{ name: 'count', queryName: 'A', isValueColumn: true, id: 'A' },
-					],
-					[
-						{ data: { 'service.name': 'adservice', A: 100 } },
-						{ data: { 'service.name': 'cartservice', A: 200 } },
-					],
-				),
-			],
-		);
-
-		const slices = preparePieChartData(payload, options);
-
-		expect(slices.map((s) => [s.label, s.value])).toStrictEqual([
-			['adservice', '100'],
-			['cartservice', '200'],
-		]);
-	});
-
-	it('uses the legacy series result when there is no scalar table', () => {
-		const payload = makePayload(
-			[
-				{
-					metric: { 'service.name': 'adservice' },
-					queryName: 'A',
-					legend: '{{service.name}}',
-					values: [[1000, '42']],
-				} as QueryData,
-			],
-			[],
-		);
-
-		const slices = preparePieChartData(payload, options);
-
-		expect(slices).toHaveLength(1);
-		expect(slices[0].value).toBe('42');
-	});
-
-	it('returns no slices for an empty payload', () => {
-		expect(preparePieChartData(undefined, options)).toStrictEqual([]);
-	});
-});

frontend/src/container/PanelWrapper/preparePieChartData.ts

@@ -1,144 +0,0 @@
-import getLabelName from 'lib/getLabelName';
-import { generateColor } from 'lib/uPlotLib/utils/generateColor';
-import { isNaN } from 'lodash-es';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { QueryData, QueryDataV3 } from 'types/api/widgets/getQuery';
-
-export interface PieChartSlice {
-	label: string;
-	value: string;
-	color: string;
-	record: {
-		queryName: string;
-		legend?: string;
-		/** Group-by labels, used for drilldown; absent when the slice has no group. */
-		metric?: QueryData['metric'];
-	};
-}
-
-interface PreparePieChartDataOptions {
-	customLegendColors?: Record<string, string>;
-	colorMap: Record<string, string>;
-}
-
-const colorFor = (
-	label: string,
-	{ customLegendColors, colorMap }: PreparePieChartDataOptions,
-): string => customLegendColors?.[label] || generateColor(label, colorMap);
-
-const isPositive = (value: string): boolean =>
-	!!value && !isNaN(parseFloat(value)) && parseFloat(value) > 0;
-
-/**
- * Time-series result: one slice per series, value = first datapoint. This is the
- * original pie behaviour — kept verbatim (same label/value/colour/record) so
- * single-value and grouped panels are unaffected.
- */
-function slicesFromSeries(
-	result: QueryData[],
-	options: PreparePieChartDataOptions,
-): PieChartSlice[] {
-	return result
-		.filter((d) => d?.values?.[0]?.[1] !== undefined)
-		.map((d) => {
-			const label = getLabelName(d.metric, d.queryName || '', d.legend || '');
-			return {
-				label,
-				value: d.values[0][1],
-				color: colorFor(label, options),
-				record: d,
-			};
-		});
-}
-
-/**
- * V5 scalar table: one slice per (row × value column). With more than one value
- * column the column name keeps the slices distinct, so a ClickHouse query like
- * `count() AS col1, sum() AS col2` renders a slice per column instead of
- * collapsing onto the first; group-by columns become the slice label.
- */
-function slicesFromTables(
-	tables: QueryDataV3[],
-	options: PreparePieChartDataOptions,
-): PieChartSlice[] {
-	const slices: PieChartSlice[] = [];
-
-	tables.forEach((entry) => {
-		const { table } = entry;
-		if (!table?.columns?.length || !table?.rows?.length) {
-			return;
-		}
-
-		const valueColumns = table.columns.filter((column) => column.isValueColumn);
-		if (valueColumns.length === 0) {
-			return;
-		}
-		const labelColumns = table.columns.filter((column) => !column.isValueColumn);
-		const hasMultipleValueColumns = valueColumns.length > 1;
-
-		table.rows.forEach((row) => {
-			const groupLabel = labelColumns
-				.map((column) => row.data[column.id || column.name])
-				.filter((part) => part != null)
-				.map(String)
-				.join(', ');
-			// Drilldown filters by group-by labels; leave it undefined when there
-			// are none (e.g. a ClickHouse query) so no filterless menu is offered.
-			const metric = labelColumns.length
-				? labelColumns.reduce<Record<string, string>>((acc, column) => {
-						acc[column.name] = String(row.data[column.id || column.name]);
-						return acc;
-					}, {})
-				: undefined;
-
-			valueColumns.forEach((column) => {
-				let label: string;
-				if (hasMultipleValueColumns) {
-					label = groupLabel ? `${groupLabel} · ${column.name}` : column.name;
-				} else {
-					label = groupLabel || entry.legend || entry.queryName || '';
-				}
-
-				slices.push({
-					label,
-					value: String(row.data[column.id || column.name]),
-					color: colorFor(label, options),
-					record: { queryName: entry.queryName, legend: entry.legend, metric },
-				});
-			});
-		});
-	});
-
-	return slices;
-}
-
-/**
- * Builds pie slices from a query-range payload, dropping non-positive/non-numeric
- * values.
- *
- * A scalar response with several value columns (e.g. a ClickHouse
- * `count() AS col1, sum() AS col2`) collapses to a single series in
- * `data.result` — only the first value column survives. The full data is kept in
- * the scalar table under `newResult`, so in that case slices are built from the
- * table (one per value column). Otherwise the legacy time-series result is used,
- * preserving existing behaviour for single-value and grouped panels.
- */
-export function preparePieChartData(
-	payload: MetricRangePayloadProps | undefined,
-	options: PreparePieChartDataOptions,
-): PieChartSlice[] {
-	const tables = (payload?.data?.newResult?.data?.result || []).filter(
-		(entry) => entry?.table?.rows?.length,
-	);
-	const hasMultipleValueColumns = tables.some(
-		(entry) =>
-			(entry.table?.columns || []).filter((column) => column.isValueColumn)
-				.length > 1,
-	);
-
-	const slices = hasMultipleValueColumns
-		? slicesFromTables(tables, options)
-		: slicesFromSeries(payload?.data?.result || [], options);
-
-	return slices.filter((slice) => isPositive(slice.value));
-}

frontend/src/container/RolesSettings/RolesComponents/RolesListingTable.module.scss

@@ -1,6 +1,7 @@
 .rolesListingTable {
 	margin-top: 12px;
 	border-radius: 4px;
+	overflow: hidden;
 }
 
 .scrollContainer {

frontend/src/container/RolesSettings/RolesSettings.module.scss

@@ -40,7 +40,6 @@
 
 .rolesSettingsContent {
 	padding: 0 16px;
-	padding-bottom: 16px;
 }
 
 .rolesSettingsToolbar {

frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/MissingSpansBanner.module.scss

@@ -1,25 +0,0 @@
-.container {
-	// Gutter matches the header/subHeader 16px; bottom gap before the panels.
-	padding: 0 16px 12px;
-}
-
-.title {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	gap: 8px;
-	width: 100%;
-}
-
-.link {
-	display: inline-flex;
-	align-items: center;
-	gap: 4px;
-	color: inherit;
-	font-weight: 500;
-	white-space: nowrap;
-
-	&:hover {
-		opacity: 0.85;
-	}
-}

frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/MissingSpansBanner.tsx

@@ -1,47 +0,0 @@
-import { useState } from 'react';
-import { Callout } from '@signozhq/ui/callout';
-import { ArrowUpRight } from '@signozhq/icons';
-
-import styles from './MissingSpansBanner.module.scss';
-
-const MISSING_SPANS_DOCS_URL =
-	'https://signoz.io/docs/userguide/traces/#missing-spans';
-
-function MissingSpansBanner(): JSX.Element | null {
-	// Session-only dismissal — not persisted, so the banner returns on reload.
-	const [isDismissed, setIsDismissed] = useState(false);
-
-	if (isDismissed) {
-		return null;
-	}
-
-	// Wrapper owns the gutter: Callout is width:100%, so putting the gutter as a
-	// margin on it would overflow the parent by the margin width. Pad instead.
-	return (
-		<div className={styles.container}>
-			<Callout
-				type="info"
-				size="small"
-				showIcon
-				action="dismissible"
-				onClick={(): void => setIsDismissed(true)}
-				testId="missing-spans-banner"
-				title={
-					<span className={styles.title}>
-						This trace has missing spans
-						<a
-							className={styles.link}
-							href={MISSING_SPANS_DOCS_URL}
-							target="_blank"
-							rel="noopener noreferrer"
-						>
-							Learn More <ArrowUpRight size={14} />
-						</a>
-					</span>
-				}
-			/>
-		</div>
-	);
-}
-
-export default MissingSpansBanner;

frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx

@@ -31,7 +31,6 @@ import { useTraceDetailLogEvent } from '../hooks/useTraceDetailLogEvent';
 import { useTraceStore } from '../stores/traceStore';
 import AnalyticsPanel from '../SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel';
 import Filters from '../TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters';
-import MissingSpansBanner from './MissingSpansBanner';
 import TraceOptionsMenu from './TraceOptionsMenu';
 
 import styles from './TraceDetailsHeader.module.scss';
@@ -49,7 +48,6 @@ export interface TraceMetadataForHeader {
 	rootServiceName: string;
 	rootServiceEntryPoint: string;
 	rootSpanStatusCode: string;
-	hasMissingSpans: boolean;
 }
 
 interface TraceDetailsHeaderProps {
@@ -231,8 +229,6 @@ function TraceDetailsHeader({
 				</div>
 			)}
 
-			{traceMetadata?.hasMissingSpans && <MissingSpansBanner />}
-
 			<FieldsSelector
 				isOpen={isPreviewFieldsOpen}
 				title="Preview fields"

frontend/src/pages/TraceDetailsV3/TraceDetailsV3.module.scss

@@ -41,7 +41,6 @@
 	:global(.ant-collapse-header) {
 		border-top: 1px solid var(--l2-border);
 		border-bottom: 1px solid var(--l2-border);
-		border-radius: 0 !important;
 	}
 
 	:global(.ant-collapse-content) {
@@ -99,13 +98,6 @@
 	flex-direction: column;
 	overflow: hidden;
 
-	// The flamegraph's ResizableBox above renders a 1px resize handle at its
-	// bottom edge; drop the header's own top border so the two don't stack
-	// into a double border at the flamegraph/waterfall juncture.
-	:global(.ant-collapse-header) {
-		border-top: none;
-	}
-
 	:global(.ant-collapse-item) {
 		flex: 1;
 		display: flex;

frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.module.scss

@@ -49,6 +49,59 @@
 	flex-direction: column;
 }
 
+.missingSpans {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 44px;
+	margin: 16px;
+	padding: 12px;
+	border-radius: 4px;
+	background: rgba(69, 104, 220, 0.1);
+}
+
+.leftInfo {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	color: var(--bg-robin-400);
+	font-family: Inter;
+	font-size: 14px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 20px;
+	letter-spacing: -0.07px;
+}
+
+.text {
+	color: var(--bg-robin-400);
+	font-family: Inter;
+	font-size: 14px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 20px;
+	letter-spacing: -0.07px;
+}
+
+.rightInfo {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 8px;
+	color: var(--bg-robin-400);
+	font-family: Inter;
+	font-size: 14px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 20px;
+	letter-spacing: -0.07px;
+
+	&:hover {
+		background-color: unset;
+		color: var(--bg-robin-200);
+	}
+}
+
 .splitPanel {
 	flex: 1;
 	min-height: 0;
@@ -163,12 +216,10 @@
 
 .treeRow:hover,
 .treeRow.hoveredSpan {
-	// Left end of the row band — round only the outer (left) corners so the
-	// highlight joins the status + timeline segments into one continuous band.
-	border-radius: 4px 0 0 4px;
+	border-radius: 4px;
 	background: color-mix(
 		in srgb,
-		var(--l3-background) 60%,
+		var(--l3-background) 20%,
 		transparent
 	) !important;
 
@@ -211,22 +262,20 @@
 	--badge-border-width: 0px;
 
 	&.hoveredSpan {
-		// Middle segment of the row band — square so it butts up against the
-		// name and timeline segments (no rounded corner at the badge column).
-		border-radius: 0;
+		border-radius: 4px;
 		background: color-mix(
 			in srgb,
-			var(--l3-background) 60%,
+			var(--l3-background) 20%,
 			transparent
 		) !important;
 	}
 
 	&.isInterested,
 	&.isSelectedNonMatching {
-		border-radius: 0;
+		border-radius: 4px;
 		background: color-mix(
 			in srgb,
-			var(--l3-background) 80%,
+			var(--l3-background) 40%,
 			transparent
 		) !important;
 	}
@@ -260,21 +309,20 @@
 
 	&:hover,
 	&.hoveredSpan {
-		// Right end of the row band — round only the outer (right) corners.
-		border-radius: 0 4px 4px 0;
+		border-radius: 4px;
 		background: color-mix(
 			in srgb,
-			var(--l3-background) 60%,
+			var(--l3-background) 20%,
 			transparent
 		) !important;
 	}
 
 	&:has(.isInterested),
 	&:has(.isSelectedNonMatching) {
-		border-radius: 0 4px 4px 0;
+		border-radius: 4px;
 		background: color-mix(
 			in srgb,
-			var(--l3-background) 80%,
+			var(--l3-background) 40%,
 			transparent
 		) !important;
 	}
@@ -297,11 +345,10 @@
 
 	&.isInterested,
 	&.isSelectedNonMatching {
-		// Left end of the row band — outer (left) corners only.
-		border-radius: 4px 0 0 4px;
+		border-radius: 4px;
 		background: color-mix(
 			in srgb,
-			var(--l3-background) 80%,
+			var(--l3-background) 40%,
 			transparent
 		) !important;
 	}
@@ -424,7 +471,7 @@
 	padding-left: 8px;
 	flex-shrink: 0;
 	height: 100%;
-	background: linear-gradient(to left, var(--l2-background) 40%, transparent);
+	background: linear-gradient(to left, var(--l1-background) 60%, transparent);
 	z-index: 2;
 	opacity: 0;
 	pointer-events: none;
@@ -552,18 +599,6 @@
 	opacity: 0.15;
 }
 
-// A dimmed span must still show the full-opacity hover state when hovered.
-// These win over `.isDimmed` on specificity so brightness is restored across
-// the whole row (name column, status cell, and timeline bar) on hover.
-.treeRow:hover .isDimmed,
-.treeRow.hoveredSpan .isDimmed,
-.timelineRow:hover .isDimmed,
-.timelineRow.hoveredSpan .isDimmed,
-.statusCell:hover.isDimmed,
-.statusCell.hoveredSpan.isDimmed {
-	opacity: 1;
-}
-
 .isHighlighted {
 	opacity: 1;
 }

frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx

@@ -33,7 +33,14 @@ import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { colorToRgb } from 'lib/uPlotLib/utils/generateColor';
-import { ChevronDown, ChevronRight, Link, ListPlus } from '@signozhq/icons';
+import {
+	ArrowUpRight,
+	ChevronDown,
+	ChevronRight,
+	CircleAlert,
+	Link,
+	ListPlus,
+} from '@signozhq/icons';
 import { useTraceStore } from 'pages/TraceDetailsV3/stores/traceStore';
 import { resolveSpanColor } from 'pages/TraceDetailsV3/utils';
 import { useBoundaryPagination } from 'pages/TraceDetailsV3/TraceWaterfall/hooks/useBoundaryPagination';
@@ -847,6 +854,28 @@ function Success(props: ISuccessProps): JSX.Element {
 
 	return (
 		<div className={styles.root}>
+			{traceMetadata.hasMissingSpans && (
+				<div className={styles.missingSpans}>
+					<section className={styles.leftInfo}>
+						<CircleAlert size={14} />
+						<span className={styles.text}>This trace has missing spans</span>
+					</section>
+					<Button
+						variant="ghost"
+						color="secondary"
+						className={styles.rightInfo}
+						suffix={<ArrowUpRight size={14} />}
+						onClick={(): WindowProxy | null =>
+							window.open(
+								'https://signoz.io/docs/userguide/traces/#missing-spans',
+								'_blank',
+							)
+						}
+					>
+						Learn More
+					</Button>
+				</div>
+			)}
 			{isFetching && <div className={styles.loadingBar} />}
 			<div className={styles.splitPanel} ref={scrollContainerRef}>
 				{/* Sticky header row */}
@@ -965,8 +994,8 @@ function Success(props: ISuccessProps): JSX.Element {
 										transform: `translateY(${virtualRow.start}px)`,
 									}}
 									data-span-id={span.span_id}
-									onMouseEnter={(): void => applyHoverClass(span.span_id)}
-									onMouseLeave={(): void => applyHoverClass(null)}
+									onMouseEnter={(): void => handleRowMouseEnter(span.span_id)}
+									onMouseLeave={handleRowMouseLeave}
 									onClick={(): void => handleSpanClick(span)}
 								>
 									{span.response_status_code && (

frontend/src/pages/TraceDetailsV3/index.tsx

@@ -1,12 +1,7 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useParams } from 'react-router-dom';
-import {
-	ChartNoAxesGantt,
-	ChevronDown,
-	ChevronRight,
-	TriangleAlert,
-} from '@signozhq/icons';
+import { ChartNoAxesGantt, TriangleAlert } from '@signozhq/icons';
 import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageKey from 'api/browser/localstorage/set';
 import { Collapse } from 'antd';
@@ -39,16 +34,6 @@ import cx from 'classnames';
 
 import styles from './TraceDetailsV3.module.scss';
 
-// Lucide chevrons for the flame/waterfall accordion headers, matching the
-// span-tree chevrons in the waterfall.
-function renderPanelExpandIcon({
-	isActive,
-}: {
-	isActive?: boolean;
-}): JSX.Element {
-	return isActive ? <ChevronDown size={14} /> : <ChevronRight size={14} />;
-}
-
 function TraceDetailsV3(): JSX.Element {
 	const { id: traceId } = useParams<TraceDetailV3URLProps>();
 	const urlQuery = useUrlQuery();
@@ -344,7 +329,6 @@ function TraceDetailsV3(): JSX.Element {
 			rootServiceName: payload.rootServiceName,
 			rootServiceEntryPoint: payload.rootServiceEntryPoint,
 			rootSpanStatusCode: rootSpan?.response_status_code || '',
-			hasMissingSpans: payload.hasMissingSpans || false,
 		};
 	}, [traceData?.payload]);
 
@@ -404,7 +388,6 @@ function TraceDetailsV3(): JSX.Element {
 									activeKey={activeKeys.filter((k) => k === 'flame')}
 									onChange={(): void => handleCollapseChange('flame')}
 									size="small"
-									expandIcon={renderPanelExpandIcon}
 									className={styles.flameCollapse}
 									items={[
 										{
@@ -459,7 +442,6 @@ function TraceDetailsV3(): JSX.Element {
 									activeKey={activeKeys.filter((k) => k === 'waterfall')}
 									onChange={(): void => handleCollapseChange('waterfall')}
 									size="small"
-									expandIcon={renderPanelExpandIcon}
 									className={cx(styles.waterfallCollapse, {
 										[styles.isDocked]: isWaterfallDocked,
 									})}

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/cloudsql/assets/dashboards/overview.json

@@ -1 +0,0 @@
-{}

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/cloudsql/icon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#aecbfa;}.cls-1,.cls-2,.cls-3{fill-rule:evenodd;}.cls-2{fill:#669df6;}.cls-3{fill:#4285f4;}</style></defs><title>Icon_24px_SQL_Color</title><g data-name="Product Icons"><g ><polygon class="cls-1" points="4.67 10.44 4.67 13.45 12 17.35 12 14.34 4.67 10.44"/><polygon class="cls-1" points="4.67 15.09 4.67 18.1 12 22 12 18.99 4.67 15.09"/><polygon class="cls-2" points="12 17.35 19.33 13.45 19.33 10.44 12 14.34 12 17.35"/><polygon class="cls-2" points="12 22 19.33 18.1 19.33 15.09 12 18.99 12 22"/><polygon class="cls-3" points="19.33 8.91 19.33 5.9 12 2 12 5.01 19.33 8.91"/><polygon class="cls-2" points="12 2 4.67 5.9 4.67 8.91 12 5.01 12 2"/><polygon class="cls-1" points="4.67 5.87 4.67 8.89 12 12.79 12 9.77 4.67 5.87"/><polygon class="cls-2" points="12 12.79 19.33 8.89 19.33 5.87 12 9.77 12 12.79"/></g></g></svg>

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/cloudsql/integration.json

@@ -1,27 +0,0 @@
-{
-  "id": "cloudsql",
-  "title": "GCP Cloud SQL",
-  "icon": "file://icon.svg",
-  "overview": "file://overview.md",
-  "supportedSignals": {
-    "metrics": true,
-    "logs": true
-  },
-  "dataCollected": {
-    "metrics": [],
-    "logs": []
-  },
-  "telemetryCollectionStrategy": {
-    "gcp": {}
-  },
-  "assets": {
-    "dashboards": [
-      {
-        "id": "overview",
-        "title": "GCP Cloud SQL Overview",
-        "description": "Overview of GCP Cloud SQL metrics",
-        "definition": "file://assets/dashboards/overview.json"
-      }
-    ]
-  }
-}

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/cloudsql/overview.md

@@ -1,3 +0,0 @@
-### Monitor GCP Cloud SQL with SigNoz
-
-Collect key GCP Cloud SQL metrics and view them with an out of the box dashboard.

pkg/modules/cloudintegration/implcloudintegration/handler.go

@@ -481,7 +481,6 @@ func (handler *handler) UpdateService(rw http.ResponseWriter, r *http.Request) {
 	render.Success(rw, http.StatusNoContent, nil)
 }
 
-// TODO: Rename AgentCheckIn to just CheckIn.
 func (handler *handler) AgentCheckIn(rw http.ResponseWriter, r *http.Request) {
 	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
 	defer cancel()

pkg/transition/migrate_common.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/SigNoz/signoz/pkg/telemetrytraces"
+	"github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 )
 
 type migrateCommon struct {
@@ -23,119 +24,10 @@ func NewMigrateCommon(logger *slog.Logger) *migrateCommon {
 	}
 }
 
+// WrapInV5Envelope delegates to querybuildertypesv5.WrapInV5Envelope; the
+// transform is stateless and shared with the v1→v2 dashboard conversion.
 func (migration *migrateCommon) WrapInV5Envelope(name string, queryMap map[string]any, queryType string) map[string]any {
-	// Create a properly structured v5 query
-	v5Query := map[string]any{
-		"name":     name,
-		"disabled": queryMap["disabled"],
-		"legend":   queryMap["legend"],
-	}
-
-	if name != queryMap["expression"] {
-		// formula
-		queryType = "builder_formula"
-		v5Query["expression"] = queryMap["expression"]
-		if functions, ok := queryMap["functions"]; ok {
-			v5Query["functions"] = functions
-		}
-		return map[string]any{
-			"type": queryType,
-			"spec": v5Query,
-		}
-	}
-
-	// Add signal based on data source
-	if dataSource, ok := queryMap["dataSource"].(string); ok {
-		switch dataSource {
-		case "traces":
-			v5Query["signal"] = "traces"
-		case "logs":
-			v5Query["signal"] = "logs"
-		case "metrics":
-			v5Query["signal"] = "metrics"
-		}
-	}
-
-	if stepInterval, ok := queryMap["stepInterval"]; ok {
-		v5Query["stepInterval"] = stepInterval
-	}
-
-	if aggregations, ok := queryMap["aggregations"]; ok {
-		v5Query["aggregations"] = aggregations
-	}
-
-	if filter, ok := queryMap["filter"]; ok {
-		v5Query["filter"] = filter
-	}
-
-	// Copy groupBy with proper structure
-	if groupBy, ok := queryMap["groupBy"].([]any); ok {
-		v5GroupBy := make([]any, len(groupBy))
-		for i, gb := range groupBy {
-			if gbMap, ok := gb.(map[string]any); ok {
-				v5GroupBy[i] = map[string]any{
-					"name":          gbMap["key"],
-					"fieldDataType": gbMap["dataType"],
-					"fieldContext":  gbMap["type"],
-				}
-			}
-		}
-		v5Query["groupBy"] = v5GroupBy
-	}
-
-	// Copy orderBy with proper structure
-	if orderBy, ok := queryMap["orderBy"].([]any); ok {
-		v5OrderBy := make([]any, len(orderBy))
-		for i, ob := range orderBy {
-			if obMap, ok := ob.(map[string]any); ok {
-				v5OrderBy[i] = map[string]any{
-					"key": map[string]any{
-						"name":          obMap["columnName"],
-						"fieldDataType": obMap["dataType"],
-						"fieldContext":  obMap["type"],
-					},
-					"direction": obMap["order"],
-				}
-			}
-		}
-		v5Query["order"] = v5OrderBy
-	}
-
-	// Copy selectColumns as selectFields
-	if selectColumns, ok := queryMap["selectColumns"].([]any); ok {
-		v5SelectFields := make([]any, len(selectColumns))
-		for i, col := range selectColumns {
-			if colMap, ok := col.(map[string]any); ok {
-				v5SelectFields[i] = map[string]any{
-					"name":          colMap["key"],
-					"fieldDataType": colMap["dataType"],
-					"fieldContext":  colMap["type"],
-				}
-			}
-		}
-		v5Query["selectFields"] = v5SelectFields
-	}
-
-	// Copy limit and offset
-	if limit, ok := queryMap["limit"]; ok {
-		v5Query["limit"] = limit
-	}
-	if offset, ok := queryMap["offset"]; ok {
-		v5Query["offset"] = offset
-	}
-
-	if having, ok := queryMap["having"]; ok {
-		v5Query["having"] = having
-	}
-
-	if functions, ok := queryMap["functions"]; ok {
-		v5Query["functions"] = functions
-	}
-
-	return map[string]any{
-		"type": queryType,
-		"spec": v5Query,
-	}
+	return querybuildertypesv5.WrapInV5Envelope(name, queryMap, queryType)
 }
 
 func (mc *migrateCommon) updateQueryData(ctx context.Context, queryData map[string]any, version, widgetType string) bool {

pkg/types/cloudintegrationtypes/account.go

@@ -31,13 +31,11 @@ type AgentReport struct {
 type AccountConfig struct {
 	AWS   *AWSAccountConfig   `json:"aws,omitempty" required:"false" nullable:"false"`
 	Azure *AzureAccountConfig `json:"azure,omitempty" required:"false" nullable:"false"`
-	GCP   *GCPAccountConfig   `json:"gcp,omitempty" required:"false" nullable:"false"`
 }
 
 type UpdatableAccountConfig struct {
 	AWS   *UpdatableAWSAccountConfig   `json:"aws,omitempty" required:"false" nullable:"false"`
 	Azure *UpdatableAzureAccountConfig `json:"azure,omitempty" required:"false" nullable:"false"`
-	GCP   *UpdatableGCPAccountConfig   `json:"gcp,omitempty" required:"false" nullable:"false"`
 }
 
 type PostableAccount struct {
@@ -50,7 +48,6 @@ type PostableAccountConfig struct {
 	AgentVersion string
 	AWS          *AWSPostableAccountConfig   `json:"aws,omitempty" required:"false" nullable:"false"`
 	Azure        *AzurePostableAccountConfig `json:"azure,omitempty" required:"false" nullable:"false"`
-	GCP          *GCPPostableAccountConfig   `json:"gcp,omitempty" required:"false" nullable:"false"`
 }
 
 type Credentials struct {
@@ -69,7 +66,6 @@ type ConnectionArtifact struct {
 	// required till new providers are added
 	AWS   *AWSConnectionArtifact   `json:"aws,omitempty" required:"false" nullable:"false"`
 	Azure *AzureConnectionArtifact `json:"azure,omitempty" required:"false" nullable:"false"`
-	GCP   *GCPConnectionArtifact   `json:"gcp,omitempty" required:"false" nullable:"false"`
 }
 
 type GetConnectionArtifactRequest = PostableAccount
@@ -215,30 +211,6 @@ func NewAccountConfigFromPostable(provider CloudProviderType, config *PostableAc
 		}
 
 		return &AccountConfig{Azure: &AzureAccountConfig{DeploymentRegion: config.Azure.DeploymentRegion, ResourceGroups: config.Azure.ResourceGroups}}, nil
-	case CloudProviderTypeGCP:
-		if config.GCP == nil {
-			return nil, errors.NewInvalidInputf(ErrCodeInvalidInput, "GCP config can not be nil for GCP provider")
-		}
-
-		if config.GCP.DeploymentProjectID == "" {
-			return nil, errors.NewInvalidInputf(ErrCodeInvalidInput, "deployment project ID is required for GCP provider")
-		}
-
-		if err := validateGCPRegion(config.GCP.DeploymentRegion); err != nil {
-			return nil, err
-		}
-
-		if len(config.GCP.ProjectIDs) == 0 {
-			return nil, errors.NewInvalidInputf(ErrCodeInvalidInput, "at least one project id is required for GCP provider")
-		}
-
-		return &AccountConfig{
-			GCP: &GCPAccountConfig{
-				DeploymentProjectID: config.GCP.DeploymentProjectID,
-				ProjectIDs:          config.GCP.ProjectIDs,
-				DeploymentRegion:    config.GCP.DeploymentRegion,
-			},
-		}, nil
 	default:
 		return nil, errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "invalid cloud provider: %s", provider.StringValue())
 	}
@@ -272,30 +244,6 @@ func NewAccountConfigFromUpdatable(provider CloudProviderType, config *Updatable
 		}
 
 		return &AccountConfig{Azure: &AzureAccountConfig{ResourceGroups: config.Config.Azure.ResourceGroups}}, nil
-	case CloudProviderTypeGCP:
-		if config.Config.GCP == nil {
-			return nil, errors.NewInvalidInputf(ErrCodeInvalidInput, "GCP config can not be nil for GCP provider")
-		}
-
-		if err := validateGCPRegion(config.Config.GCP.DeploymentRegion); err != nil {
-			return nil, err
-		}
-
-		if len(config.Config.GCP.ProjectIDs) == 0 {
-			return nil, errors.NewInvalidInputf(ErrCodeInvalidInput, "at least one project id is required for GCP provider")
-		}
-
-		if config.Config.GCP.DeploymentProjectID == "" {
-			return nil, errors.NewInvalidInputf(ErrCodeInvalidInput, "deployment project ID is required for GCP provider")
-		}
-
-		return &AccountConfig{
-			GCP: &GCPAccountConfig{
-				DeploymentProjectID: config.Config.GCP.DeploymentProjectID,
-				ProjectIDs:          config.Config.GCP.ProjectIDs,
-				DeploymentRegion:    config.Config.GCP.DeploymentRegion,
-			},
-		}, nil
 	default:
 		return nil, errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "invalid cloud provider: %s", provider.StringValue())
 	}
@@ -384,16 +332,15 @@ func (config *PostableAccountConfig) SetAgentVersion(agentVersion string) {
 // thats why not naming it MarshalJSON(), as it will interfere with default JSON marshalling of AccountConfig struct.
 // NOTE: this entertains first non-null provider's config.
 func (config *AccountConfig) ToJSON() ([]byte, error) {
-	switch {
-	case config.AWS != nil:
+	if config.AWS != nil {
 		return json.Marshal(config.AWS)
-	case config.Azure != nil:
-		return json.Marshal(config.Azure)
-	case config.GCP != nil:
-		return json.Marshal(config.GCP)
-	default:
-		return nil, errors.NewInternalf(errors.CodeInternal, "no provider account config found")
 	}
+
+	if config.Azure != nil {
+		return json.Marshal(config.Azure)
+	}
+
+	return nil, errors.NewInternalf(errors.CodeInternal, "no provider account config found")
 }
 
 func NewIngestionKeyName(provider CloudProviderType) string {

pkg/types/cloudintegrationtypes/checkin.go

@@ -50,7 +50,6 @@ type IntegrationConfig struct {
 type ProviderIntegrationConfig struct {
 	AWS   *AWSIntegrationConfig   `json:"aws,omitempty" required:"false" nullable:"false"`
 	Azure *AzureIntegrationConfig `json:"azure,omitempty" required:"false" nullable:"false"`
-	GCP   *GCPIntegrationConfig   `json:"gcp,omitempty" required:"false" nullable:"false"`
 }
 
 // NewGettableAgentCheckIn constructs a backward-compatible response from an AgentCheckInResponse.

pkg/types/cloudintegrationtypes/cloudintegration.go

@@ -63,7 +63,6 @@ type StorableCloudIntegrationService struct {
 type StorableServiceConfig struct {
 	AWS   *StorableAWSServiceConfig
 	Azure *StorableAzureServiceConfig
-	GCP   *StorableGCPServiceConfig
 }
 
 type StorableAWSServiceConfig struct {
@@ -93,15 +92,6 @@ type StorableAzureMetricsServiceConfig struct {
 	Enabled bool `json:"enabled"`
 }
 
-type StorableGCPServiceConfig struct {
-	Logs    *StorableGCPServiceLogsConfig    `json:"logs,omitempty"`
-	Metrics *StorableGCPServiceMetricsConfig `json:"metrics,omitempty"`
-}
-
-type StorableGCPServiceLogsConfig = GCPServiceLogsConfig
-
-type StorableGCPServiceMetricsConfig = GCPServiceMetricsConfig
-
 // Scan scans value from DB.
 func (r *StorableAgentReport) Scan(src any) error {
 	var data []byte
@@ -235,30 +225,6 @@ func newStorableServiceConfig(provider CloudProviderType, serviceID ServiceID, s
 		}
 
 		return &StorableServiceConfig{Azure: storableAzureServiceConfig}, nil
-	case CloudProviderTypeGCP:
-		storableGCPServiceConfig := new(StorableGCPServiceConfig)
-
-		if supportedSignals.Logs {
-			if serviceConfig.GCP.Logs == nil {
-				return nil, errors.NewInvalidInputf(ErrCodeCloudIntegrationInvalidConfig, "logs config is required for GCP service: %s", serviceID.StringValue())
-			}
-
-			storableGCPServiceConfig.Logs = &StorableGCPServiceLogsConfig{
-				Enabled: serviceConfig.GCP.Logs.Enabled,
-			}
-		}
-
-		if supportedSignals.Metrics {
-			if serviceConfig.GCP.Metrics == nil {
-				return nil, errors.NewInvalidInputf(ErrCodeCloudIntegrationInvalidConfig, "metrics config is required for GCP service: %s", serviceID.StringValue())
-			}
-
-			storableGCPServiceConfig.Metrics = &StorableGCPServiceMetricsConfig{
-				Enabled: serviceConfig.GCP.Metrics.Enabled,
-			}
-		}
-
-		return &StorableServiceConfig{GCP: storableGCPServiceConfig}, nil
 	default:
 		return nil, errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "invalid cloud provider: %s", provider.StringValue())
 	}
@@ -280,13 +246,6 @@ func newStorableServiceConfigFromJSON(provider CloudProviderType, jsonStr string
 			return nil, errors.WrapInternalf(err, errors.CodeInternal, "couldn't parse Azure service config JSON")
 		}
 		return &StorableServiceConfig{Azure: azureConfig}, nil
-	case CloudProviderTypeGCP:
-		gcpConfig := new(StorableGCPServiceConfig)
-		err := json.Unmarshal([]byte(jsonStr), gcpConfig)
-		if err != nil {
-			return nil, errors.WrapInternalf(err, errors.CodeInternal, "couldn't parse GCP service config JSON")
-		}
-		return &StorableServiceConfig{GCP: gcpConfig}, nil
 	default:
 		return nil, errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "invalid cloud provider: %s", provider.StringValue())
 	}
@@ -307,13 +266,6 @@ func (config *StorableServiceConfig) toJSON(provider CloudProviderType) ([]byte,
 			return nil, errors.WrapInternalf(err, errors.CodeInternal, "couldn't serialize Azure service config to JSON")
 		}
 
-		return jsonBytes, nil
-	case CloudProviderTypeGCP:
-		jsonBytes, err := json.Marshal(config.GCP)
-		if err != nil {
-			return nil, errors.WrapInternalf(err, errors.CodeInternal, "couldn't serialize GCP service config to JSON")
-		}
-
 		return jsonBytes, nil
 	default:
 		return nil, errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "invalid cloud provider: %s", provider.StringValue())

pkg/types/cloudintegrationtypes/cloudprovider.go

@@ -11,7 +11,6 @@ var (
 	// cloud providers.
 	CloudProviderTypeAWS   = CloudProviderType{valuer.NewString("aws")}
 	CloudProviderTypeAzure = CloudProviderType{valuer.NewString("azure")}
-	CloudProviderTypeGCP   = CloudProviderType{valuer.NewString("gcp")}
 
 	ErrCodeCloudProviderInvalidInput = errors.MustNewCode("cloud_integration_invalid_cloud_provider")
 )
@@ -22,8 +21,6 @@ func NewCloudProvider(provider string) (CloudProviderType, error) {
 		return CloudProviderTypeAWS, nil
 	case CloudProviderTypeAzure.StringValue():
 		return CloudProviderTypeAzure, nil
-	case CloudProviderTypeGCP.StringValue():
-		return CloudProviderTypeGCP, nil
 	default:
 		return CloudProviderType{}, errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "invalid cloud provider: %s", provider)
 	}

pkg/types/cloudintegrationtypes/cloudprovider_gcp.go

@@ -1,40 +0,0 @@
-package cloudintegrationtypes
-
-type GCPAccountConfig struct {
-	// Project ID where central pub/sub for logs exist
-	DeploymentProjectID string `json:"deploymentProjectId" required:"true"`
-	// Project ID where otel collector will be deployed
-	DeploymentRegion string `json:"deploymentRegion" required:"true"`
-	// List of project IDs to monitor
-	ProjectIDs []string `json:"projectIds" required:"true" nullable:"false"`
-}
-
-type GCPPostableAccountConfig = GCPAccountConfig
-
-type UpdatableGCPAccountConfig struct {
-	// Project ID where central pub/sub for logs exist
-	DeploymentProjectID string `json:"deploymentProjectId" required:"true"`
-	// Compute service region where otel collector will be deployed
-	DeploymentRegion string `json:"deploymentRegion" required:"true"`
-	// List of project IDs to monitor
-	ProjectIDs []string `json:"projectIds" required:"true"`
-}
-
-type GCPConnectionArtifact struct{}
-
-type GCPIntegrationConfig struct{}
-
-type GCPTelemetryCollectionStrategy struct{}
-
-type GCPServiceConfig struct {
-	Logs    *GCPServiceLogsConfig    `json:"logs,omitempty" required:"false"`
-	Metrics *GCPServiceMetricsConfig `json:"metrics,omitempty" required:"false"`
-}
-
-type GCPServiceLogsConfig struct {
-	Enabled bool `json:"enabled" required:"true"`
-}
-
-type GCPServiceMetricsConfig struct {
-	Enabled bool `json:"enabled" required:"true"`
-}

pkg/types/cloudintegrationtypes/regions.go

@@ -102,51 +102,6 @@ var (
 	AzureRegionWestUS             = CloudProviderRegion{valuer.NewString("westus")}             // West US.
 	AzureRegionWestUS2            = CloudProviderRegion{valuer.NewString("westus2")}            // West US 2.
 	AzureRegionWestUS3            = CloudProviderRegion{valuer.NewString("westus3")}            // West US 3.
-
-	// GCP regions.
-	GCPRegionAfricaSouth1        = CloudProviderRegion{valuer.NewString("africa-south1")}        // Johannesburg, South Africa. Africa.
-	GCPRegionAsiaEast1           = CloudProviderRegion{valuer.NewString("asia-east1")}           // Changhua County, Taiwan. APAC.
-	GCPRegionAsiaEast2           = CloudProviderRegion{valuer.NewString("asia-east2")}           // Hong Kong. APAC.
-	GCPRegionAsiaNortheast1      = CloudProviderRegion{valuer.NewString("asia-northeast1")}      // Tokyo, Japan. APAC.
-	GCPRegionAsiaNortheast2      = CloudProviderRegion{valuer.NewString("asia-northeast2")}      // Osaka, Japan. APAC.
-	GCPRegionAsiaNortheast3      = CloudProviderRegion{valuer.NewString("asia-northeast3")}      // Seoul, South Korea. APAC.
-	GCPRegionAsiaSouth1          = CloudProviderRegion{valuer.NewString("asia-south1")}          // Mumbai, India. APAC.
-	GCPRegionAsiaSouth2          = CloudProviderRegion{valuer.NewString("asia-south2")}          // Delhi, India. APAC.
-	GCPRegionAsiaSoutheast1      = CloudProviderRegion{valuer.NewString("asia-southeast1")}      // Jurong West, Singapore. APAC.
-	GCPRegionAsiaSoutheast2      = CloudProviderRegion{valuer.NewString("asia-southeast2")}      // Jakarta, Indonesia. APAC.
-	GCPRegionAsiaSoutheast3      = CloudProviderRegion{valuer.NewString("asia-southeast3")}      // Bangkok, Thailand. APAC.
-	GCPRegionAustraliaSoutheast1 = CloudProviderRegion{valuer.NewString("australia-southeast1")} // Sydney, Australia. APAC.
-	GCPRegionAustraliaSoutheast2 = CloudProviderRegion{valuer.NewString("australia-southeast2")} // Melbourne, Australia. APAC.
-	GCPRegionEuropeCentral2      = CloudProviderRegion{valuer.NewString("europe-central2")}      // Warsaw, Poland. Europe.
-	GCPRegionEuropeNorth1        = CloudProviderRegion{valuer.NewString("europe-north1")}        // Hamina, Finland. Europe.
-	GCPRegionEuropeNorth2        = CloudProviderRegion{valuer.NewString("europe-north2")}        // Stockholm, Sweden. Europe.
-	GCPRegionEuropeSouthwest1    = CloudProviderRegion{valuer.NewString("europe-southwest1")}    // Madrid, Spain. Europe.
-	GCPRegionEuropeWest1         = CloudProviderRegion{valuer.NewString("europe-west1")}         // St. Ghislain, Belgium. Europe.
-	GCPRegionEuropeWest2         = CloudProviderRegion{valuer.NewString("europe-west2")}         // London, England. Europe.
-	GCPRegionEuropeWest3         = CloudProviderRegion{valuer.NewString("europe-west3")}         // Frankfurt, Germany. Europe.
-	GCPRegionEuropeWest4         = CloudProviderRegion{valuer.NewString("europe-west4")}         // Eemshaven, Netherlands. Europe.
-	GCPRegionEuropeWest6         = CloudProviderRegion{valuer.NewString("europe-west6")}         // Zurich, Switzerland. Europe.
-	GCPRegionEuropeWest8         = CloudProviderRegion{valuer.NewString("europe-west8")}         // Milan, Italy. Europe.
-	GCPRegionEuropeWest9         = CloudProviderRegion{valuer.NewString("europe-west9")}         // Paris, France. Europe.
-	GCPRegionEuropeWest10        = CloudProviderRegion{valuer.NewString("europe-west10")}        // Berlin, Germany. Europe.
-	GCPRegionEuropeWest12        = CloudProviderRegion{valuer.NewString("europe-west12")}        // Turin, Italy. Europe.
-	GCPRegionMECentral1          = CloudProviderRegion{valuer.NewString("me-central1")}          // Doha, Qatar. Middle East.
-	GCPRegionMECentral2          = CloudProviderRegion{valuer.NewString("me-central2")}          // Dammam, Saudi Arabia. Middle East.
-	GCPRegionMEWest1             = CloudProviderRegion{valuer.NewString("me-west1")}             // Tel Aviv, Israel. Middle East.
-	GCPRegionNorthamericaNortheast1 = CloudProviderRegion{valuer.NewString("northamerica-northeast1")} // Montréal, Québec, Canada. North America.
-	GCPRegionNorthamericaNortheast2 = CloudProviderRegion{valuer.NewString("northamerica-northeast2")} // Toronto, Ontario, Canada. North America.
-	GCPRegionNorthamericaSouth1     = CloudProviderRegion{valuer.NewString("northamerica-south1")}     // Querétaro, Mexico. North America.
-	GCPRegionSouthamericaEast1   = CloudProviderRegion{valuer.NewString("southamerica-east1")}   // Osasco, São Paulo, Brazil. South America.
-	GCPRegionSouthamericaWest1   = CloudProviderRegion{valuer.NewString("southamerica-west1")}   // Santiago, Chile. South America.
-	GCPRegionUSCentral1          = CloudProviderRegion{valuer.NewString("us-central1")}          // Council Bluffs, Iowa. North America.
-	GCPRegionUSEast1             = CloudProviderRegion{valuer.NewString("us-east1")}             // Moncks Corner, South Carolina. North America.
-	GCPRegionUSEast4             = CloudProviderRegion{valuer.NewString("us-east4")}             // Ashburn, Virginia. North America.
-	GCPRegionUSEast5             = CloudProviderRegion{valuer.NewString("us-east5")}             // Columbus, Ohio. North America.
-	GCPRegionUSSouth1            = CloudProviderRegion{valuer.NewString("us-south1")}            // Dallas, Texas. North America.
-	GCPRegionUSWest1             = CloudProviderRegion{valuer.NewString("us-west1")}             // The Dalles, Oregon. North America.
-	GCPRegionUSWest2             = CloudProviderRegion{valuer.NewString("us-west2")}             // Los Angeles, California. North America.
-	GCPRegionUSWest3             = CloudProviderRegion{valuer.NewString("us-west3")}             // Salt Lake City, Utah. North America.
-	GCPRegionUSWest4             = CloudProviderRegion{valuer.NewString("us-west4")}             // Las Vegas, Nevada. North America.
 )
 
 func Enum() []any {
@@ -172,18 +127,6 @@ func Enum() []any {
 		AzureRegionSwedenCentral, AzureRegionSwitzerlandNorth, AzureRegionSwitzerlandWest,
 		AzureRegionUAECentral, AzureRegionUAENorth, AzureRegionUKSouth, AzureRegionUKWest,
 		AzureRegionWestCentralUS, AzureRegionWestEurope, AzureRegionWestIndia, AzureRegionWestUS, AzureRegionWestUS2, AzureRegionWestUS3,
-		// GCP regions.
-		GCPRegionAfricaSouth1, GCPRegionAsiaEast1, GCPRegionAsiaEast2, GCPRegionAsiaNortheast1, GCPRegionAsiaNortheast2, GCPRegionAsiaNortheast3,
-		GCPRegionAsiaSouth1, GCPRegionAsiaSouth2, GCPRegionAsiaSoutheast1, GCPRegionAsiaSoutheast2, GCPRegionAsiaSoutheast3,
-		GCPRegionAustraliaSoutheast1, GCPRegionAustraliaSoutheast2,
-		GCPRegionEuropeCentral2, GCPRegionEuropeNorth1, GCPRegionEuropeNorth2, GCPRegionEuropeSouthwest1,
-		GCPRegionEuropeWest1, GCPRegionEuropeWest2, GCPRegionEuropeWest3, GCPRegionEuropeWest4, GCPRegionEuropeWest6,
-		GCPRegionEuropeWest8, GCPRegionEuropeWest9, GCPRegionEuropeWest10, GCPRegionEuropeWest12,
-		GCPRegionMECentral1, GCPRegionMECentral2, GCPRegionMEWest1,
-		GCPRegionNorthamericaNortheast1, GCPRegionNorthamericaNortheast2, GCPRegionNorthamericaSouth1,
-		GCPRegionSouthamericaEast1, GCPRegionSouthamericaWest1,
-		GCPRegionUSCentral1, GCPRegionUSEast1, GCPRegionUSEast4, GCPRegionUSEast5, GCPRegionUSSouth1,
-		GCPRegionUSWest1, GCPRegionUSWest2, GCPRegionUSWest3, GCPRegionUSWest4,
 	}
 }
 
@@ -211,19 +154,6 @@ var SupportedRegions = map[CloudProviderType][]CloudProviderRegion{
 		AzureRegionUAECentral, AzureRegionUAENorth, AzureRegionUKSouth, AzureRegionUKWest,
 		AzureRegionWestCentralUS, AzureRegionWestEurope, AzureRegionWestIndia, AzureRegionWestUS, AzureRegionWestUS2, AzureRegionWestUS3,
 	},
-	CloudProviderTypeGCP: {
-		GCPRegionAfricaSouth1, GCPRegionAsiaEast1, GCPRegionAsiaEast2, GCPRegionAsiaNortheast1, GCPRegionAsiaNortheast2, GCPRegionAsiaNortheast3,
-		GCPRegionAsiaSouth1, GCPRegionAsiaSouth2, GCPRegionAsiaSoutheast1, GCPRegionAsiaSoutheast2, GCPRegionAsiaSoutheast3,
-		GCPRegionAustraliaSoutheast1, GCPRegionAustraliaSoutheast2,
-		GCPRegionEuropeCentral2, GCPRegionEuropeNorth1, GCPRegionEuropeNorth2, GCPRegionEuropeSouthwest1,
-		GCPRegionEuropeWest1, GCPRegionEuropeWest2, GCPRegionEuropeWest3, GCPRegionEuropeWest4, GCPRegionEuropeWest6,
-		GCPRegionEuropeWest8, GCPRegionEuropeWest9, GCPRegionEuropeWest10, GCPRegionEuropeWest12,
-		GCPRegionMECentral1, GCPRegionMECentral2, GCPRegionMEWest1,
-		GCPRegionNorthamericaNortheast1, GCPRegionNorthamericaNortheast2, GCPRegionNorthamericaSouth1,
-		GCPRegionSouthamericaEast1, GCPRegionSouthamericaWest1,
-		GCPRegionUSCentral1, GCPRegionUSEast1, GCPRegionUSEast4, GCPRegionUSEast5, GCPRegionUSSouth1,
-		GCPRegionUSWest1, GCPRegionUSWest2, GCPRegionUSWest3, GCPRegionUSWest4,
-	},
 }
 
 func validateAWSRegion(region string) error {
@@ -245,13 +175,3 @@ func validateAzureRegion(region string) error {
 
 	return errors.NewInvalidInputf(ErrCodeInvalidCloudRegion, "invalid Azure region: %s", region)
 }
-
-func validateGCPRegion(region string) error {
-	for _, r := range SupportedRegions[CloudProviderTypeGCP] {
-		if r.StringValue() == region {
-			return nil
-		}
-	}
-
-	return errors.NewInvalidInputf(ErrCodeInvalidCloudRegion, "invalid GCP region: %s", region)
-}

pkg/types/cloudintegrationtypes/service.go

@@ -21,7 +21,6 @@ type CloudIntegrationService struct {
 type ServiceConfig struct {
 	AWS   *AWSServiceConfig   `json:"aws,omitempty" required:"false" nullable:"false"`
 	Azure *AzureServiceConfig `json:"azure,omitempty" required:"false" nullable:"false"`
-	GCP   *GCPServiceConfig   `json:"gcp,omitempty" required:"false" nullable:"false"`
 }
 
 // ServiceMetadata helps to quickly list available services and whether it is enabled or not.
@@ -97,7 +96,6 @@ type DataCollected struct {
 type TelemetryCollectionStrategy struct {
 	AWS   *AWSTelemetryCollectionStrategy   `json:"aws,omitempty" required:"false" nullable:"false"`
 	Azure *AzureTelemetryCollectionStrategy `json:"azure,omitempty" required:"false" nullable:"false"`
-	GCP   *GCPTelemetryCollectionStrategy   `json:"gcp,omitempty" required:"false" nullable:"false"`
 }
 
 // Assets represents the collection of dashboards.
@@ -147,10 +145,6 @@ func NewCloudIntegrationService(serviceID ServiceID, cloudIntegrationID valuer.U
 		if config.Azure == nil {
 			return nil, errors.NewInvalidInputf(ErrCodeInvalidInput, "Azure config is required for Azure service")
 		}
-	case CloudProviderTypeGCP:
-		if config.GCP == nil {
-			return nil, errors.NewInvalidInputf(ErrCodeInvalidInput, "GCP config is required for GCP service")
-		}
 	}
 
 	return &CloudIntegrationService{
@@ -267,22 +261,6 @@ func NewServiceConfigFromJSON(provider CloudProviderType, jsonString string) (*S
 		}
 
 		return &ServiceConfig{Azure: azureServiceConfig}, nil
-	case CloudProviderTypeGCP:
-		gcpServiceConfig := new(GCPServiceConfig)
-
-		if storableServiceConfig.GCP.Logs != nil {
-			gcpServiceConfig.Logs = &GCPServiceLogsConfig{
-				Enabled: storableServiceConfig.GCP.Logs.Enabled,
-			}
-		}
-
-		if storableServiceConfig.GCP.Metrics != nil {
-			gcpServiceConfig.Metrics = &GCPServiceMetricsConfig{
-				Enabled: storableServiceConfig.GCP.Metrics.Enabled,
-			}
-		}
-
-		return &ServiceConfig{GCP: gcpServiceConfig}, nil
 	default:
 		return nil, errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "invalid cloud provider: %s", provider.StringValue())
 	}
@@ -307,10 +285,6 @@ func (service *CloudIntegrationService) Update(provider CloudProviderType, servi
 		if config.Azure == nil {
 			return errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "Azure config is required for Azure service")
 		}
-	case CloudProviderTypeGCP:
-		if config.GCP == nil {
-			return errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "GCP config is required for GCP service")
-		}
 	default:
 		return errors.NewInvalidInputf(ErrCodeCloudProviderInvalidInput, "invalid cloud provider: %s", provider.StringValue())
 	}
@@ -332,10 +306,6 @@ func (config *ServiceConfig) IsServiceEnabled(provider CloudProviderType) bool {
 		logsEnabled := config.Azure.Logs != nil && config.Azure.Logs.Enabled
 		metricsEnabled := config.Azure.Metrics != nil && config.Azure.Metrics.Enabled
 		return logsEnabled || metricsEnabled
-	case CloudProviderTypeGCP:
-		logsEnabled := config.GCP.Logs != nil && config.GCP.Logs.Enabled
-		metricsEnabled := config.GCP.Metrics != nil && config.GCP.Metrics.Enabled
-		return logsEnabled || metricsEnabled
 	default:
 		return false
 	}
@@ -349,8 +319,6 @@ func (config *ServiceConfig) IsMetricsEnabled(provider CloudProviderType) bool {
 		return config.AWS.Metrics != nil && config.AWS.Metrics.Enabled
 	case CloudProviderTypeAzure:
 		return config.Azure.Metrics != nil && config.Azure.Metrics.Enabled
-	case CloudProviderTypeGCP:
-		return config.GCP.Metrics != nil && config.GCP.Metrics.Enabled
 	default:
 		return false
 	}
@@ -363,8 +331,6 @@ func (config *ServiceConfig) IsLogsEnabled(provider CloudProviderType) bool {
 		return config.AWS.Logs != nil && config.AWS.Logs.Enabled
 	case CloudProviderTypeAzure:
 		return config.Azure.Logs != nil && config.Azure.Logs.Enabled
-	case CloudProviderTypeGCP:
-		return config.GCP.Logs != nil && config.GCP.Logs.Enabled
 	default:
 		return false
 	}

pkg/types/cloudintegrationtypes/serviceid.go

@@ -39,9 +39,6 @@ var (
 	AzureServiceCosmosDB                   = ServiceID{valuer.NewString("cosmosdb")}
 	AzureServiceCassandraDB                = ServiceID{valuer.NewString("cassandradb")}
 	AzureServiceRedis                      = ServiceID{valuer.NewString("redis")}
-
-	// GCP services.
-	GCPServiceCloudSQL = ServiceID{valuer.NewString("cloudsql")}
 )
 
 func (ServiceID) Enum() []any {
@@ -73,7 +70,6 @@ func (ServiceID) Enum() []any {
 		AzureServiceCosmosDB,
 		AzureServiceCassandraDB,
 		AzureServiceRedis,
-		GCPServiceCloudSQL,
 	}
 }
 
@@ -110,9 +106,6 @@ var SupportedServices = map[CloudProviderType][]ServiceID{
 		AzureServiceCassandraDB,
 		AzureServiceRedis,
 	},
-	CloudProviderTypeGCP: {
-		GCPServiceCloudSQL,
-	},
 }
 
 func NewServiceID(provider CloudProviderType, service string) (ServiceID, error) {

pkg/types/dashboardtypes/dashboard.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/transition"
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/valuer"
@@ -406,27 +405,34 @@ func (dashboard *Dashboard) GetWidgetQuery(startTime, endTime, widgetIndex uint6
 	widgetData := data.Widgets[widgetIndex]
 	switch widgetData.Query.QueryType {
 	case "builder":
-		migrate := transition.NewMigrateCommon(logger)
+		isRawRequest := dashboard.getQueryRequestTypeFromPanelType(widgetData.PanelTypes) == querybuildertypesv5.RequestTypeRaw
 		for _, query := range widgetData.Query.Builder.QueryData {
 			queryName, ok := query["queryName"].(string)
 			if !ok {
 				return nil, errors.New(errors.TypeInvalidInput, ErrCodeDashboardInvalidWidgetQuery, "cannot type cast query name as string")
 			}
-			compositeQueries = append(compositeQueries, migrate.WrapInV5Envelope(queryName, query, "builder_query"))
+			// build aggregations the same way the frontend does before hitting the query
+			// range API; raw requests carry no aggregations.
+			if isRawRequest {
+				delete(query, "aggregations")
+			} else {
+				query["aggregations"] = querybuildertypesv5.CreateAggregation(query, widgetData.PanelTypes)
+			}
+			compositeQueries = append(compositeQueries, querybuildertypesv5.WrapInV5Envelope(queryName, query, "builder_query"))
 		}
 		for _, query := range widgetData.Query.Builder.QueryFormulas {
 			queryName, ok := query["queryName"].(string)
 			if !ok {
 				return nil, errors.New(errors.TypeInvalidInput, ErrCodeDashboardInvalidWidgetQuery, "cannot type cast query name as string")
 			}
-			compositeQueries = append(compositeQueries, migrate.WrapInV5Envelope(queryName, query, "builder_formula"))
+			compositeQueries = append(compositeQueries, querybuildertypesv5.WrapInV5Envelope(queryName, query, "builder_formula"))
 		}
 		for _, query := range widgetData.Query.Builder.QueryTraceOperator {
 			queryName, ok := query["queryName"].(string)
 			if !ok {
 				return nil, errors.New(errors.TypeInvalidInput, ErrCodeDashboardInvalidWidgetQuery, "cannot type cast query name as string")
 			}
-			compositeQueries = append(compositeQueries, migrate.WrapInV5Envelope(queryName, query, "builder_trace_operator"))
+			compositeQueries = append(compositeQueries, querybuildertypesv5.WrapInV5Envelope(queryName, query, "builder_trace_operator"))
 		}
 	case "clickhouse_sql":
 		for _, query := range widgetData.Query.ClickhouseSQL {

pkg/types/querybuildertypes/querybuildertypesv5/migrate_envelope.go

@@ -0,0 +1,214 @@
+package querybuildertypesv5
+
+import (
+	"regexp"
+	"strings"
+)
+
+// WrapInV5Envelope translates a single v4 builder query/formula map into a
+// v5 query envelope ({"type": ..., "spec": ...}). It is a pure shape transform
+// over untyped maps: v4 builder field names (groupBy/orderBy/selectColumns/
+// dataSource) are rewritten to their v5 equivalents and a `signal` is derived
+// from the data source. queryType selects the envelope type, except a formula
+// (detected when name != queryMap["expression"]) is always emitted as
+// "builder_formula".
+//
+// Migration code (pkg/transition) and the v1→v2 dashboard conversion both
+// produce v5 envelopes, so this lives here with the v5 query types rather than
+// in an infra-level package.
+func WrapInV5Envelope(name string, queryMap map[string]any, queryType string) map[string]any {
+	// Create a properly structured v5 query
+	v5Query := map[string]any{
+		"name":     name,
+		"disabled": queryMap["disabled"],
+		"legend":   queryMap["legend"],
+	}
+
+	if name != queryMap["expression"] {
+		// formula
+		queryType = "builder_formula"
+		v5Query["expression"] = queryMap["expression"]
+		if functions, ok := queryMap["functions"]; ok {
+			v5Query["functions"] = functions
+		}
+		return map[string]any{
+			"type": queryType,
+			"spec": v5Query,
+		}
+	}
+
+	// Add signal based on data source
+	if dataSource, ok := queryMap["dataSource"].(string); ok {
+		switch dataSource {
+		case "traces":
+			v5Query["signal"] = "traces"
+		case "logs":
+			v5Query["signal"] = "logs"
+		case "metrics":
+			v5Query["signal"] = "metrics"
+		}
+	}
+
+	if stepInterval, ok := queryMap["stepInterval"]; ok {
+		v5Query["stepInterval"] = stepInterval
+	}
+
+	if aggregations, ok := queryMap["aggregations"]; ok {
+		v5Query["aggregations"] = aggregations
+	}
+
+	if filter, ok := queryMap["filter"]; ok {
+		v5Query["filter"] = filter
+	}
+
+	// Copy groupBy with proper structure
+	if groupBy, ok := queryMap["groupBy"].([]any); ok {
+		v5GroupBy := make([]any, len(groupBy))
+		for i, gb := range groupBy {
+			if gbMap, ok := gb.(map[string]any); ok {
+				v5GroupBy[i] = map[string]any{
+					"name":          gbMap["key"],
+					"fieldDataType": gbMap["dataType"],
+					"fieldContext":  gbMap["type"],
+				}
+			}
+		}
+		v5Query["groupBy"] = v5GroupBy
+	}
+
+	// Copy orderBy with proper structure
+	if orderBy, ok := queryMap["orderBy"].([]any); ok {
+		v5OrderBy := make([]any, len(orderBy))
+		for i, ob := range orderBy {
+			if obMap, ok := ob.(map[string]any); ok {
+				v5OrderBy[i] = map[string]any{
+					"key": map[string]any{
+						"name":          obMap["columnName"],
+						"fieldDataType": obMap["dataType"],
+						"fieldContext":  obMap["type"],
+					},
+					"direction": obMap["order"],
+				}
+			}
+		}
+		v5Query["order"] = v5OrderBy
+	}
+
+	// Copy selectColumns as selectFields
+	if selectColumns, ok := queryMap["selectColumns"].([]any); ok {
+		v5SelectFields := make([]any, len(selectColumns))
+		for i, col := range selectColumns {
+			if colMap, ok := col.(map[string]any); ok {
+				v5SelectFields[i] = map[string]any{
+					"name":          colMap["key"],
+					"fieldDataType": colMap["dataType"],
+					"fieldContext":  colMap["type"],
+				}
+			}
+		}
+		v5Query["selectFields"] = v5SelectFields
+	}
+
+	// Copy limit and offset
+	if limit, ok := queryMap["limit"]; ok {
+		v5Query["limit"] = limit
+	}
+	if offset, ok := queryMap["offset"]; ok {
+		v5Query["offset"] = offset
+	}
+
+	if having, ok := queryMap["having"]; ok {
+		v5Query["having"] = having
+	}
+
+	if functions, ok := queryMap["functions"]; ok {
+		v5Query["functions"] = functions
+	}
+
+	return map[string]any{
+		"type": queryType,
+		"spec": v5Query,
+	}
+}
+
+// aggregationExprRegexp matches a function-style aggregation like `count()` or
+// `sum(field)` with an optional `as <alias>`, as the frontend's parseAggregations does.
+var aggregationExprRegexp = regexp.MustCompile(`([a-zA-Z0-9_]+\([^)]*\))(?:\s*as\s+((?:'[^']*'|"[^"]*"|[a-zA-Z0-9_-]+)))?`)
+
+// CreateAggregation builds the v5 aggregations for a stored builder query, mirroring
+// createAggregation in the frontend's prepareQueryRangePayloadV5.ts. Metrics yield a
+// single structured aggregation; logs/traces split their comma-separated expression into
+// one aggregation per call, defaulting to count() when nothing parses.
+func CreateAggregation(queryData map[string]any, panelType string) []any {
+	if queryData == nil {
+		return []any{}
+	}
+
+	if dataSource, _ := queryData["dataSource"].(string); dataSource == "metrics" {
+		var first map[string]any
+		if aggs, ok := queryData["aggregations"].([]any); ok && len(aggs) > 0 {
+			first, _ = aggs[0].(map[string]any)
+		}
+		attribute, _ := queryData["aggregateAttribute"].(map[string]any)
+
+		metric := map[string]any{}
+		setFirstNonEmpty(metric, "metricName", first["metricName"], attribute["key"])
+		setFirstNonEmpty(metric, "temporality", first["temporality"], attribute["temporality"])
+		setFirstNonEmpty(metric, "timeAggregation", first["timeAggregation"], queryData["timeAggregation"])
+		setFirstNonEmpty(metric, "spaceAggregation", first["spaceAggregation"], queryData["spaceAggregation"])
+		if panelType == "table" || panelType == "pie" || panelType == "value" {
+			setFirstNonEmpty(metric, "reduceTo", first["reduceTo"], queryData["reduceTo"])
+		}
+		return []any{metric}
+	}
+
+	aggs, ok := queryData["aggregations"].([]any)
+	if !ok || len(aggs) == 0 {
+		return []any{map[string]any{"expression": "count()"}}
+	}
+
+	result := []any{}
+	for _, agg := range aggs {
+		aggMap, _ := agg.(map[string]any)
+		expression, _ := aggMap["expression"].(string)
+		alias, _ := aggMap["alias"].(string)
+		parsed := parseAggregations(expression, alias)
+		if len(parsed) == 0 {
+			result = append(result, map[string]any{"expression": "count()"})
+			continue
+		}
+		result = append(result, parsed...)
+	}
+	return result
+}
+
+// parseAggregations extracts each function-style call from a (possibly comma-separated)
+// aggregation expression, attaching the inline `as` alias or the fallback alias.
+func parseAggregations(expression, fallbackAlias string) []any {
+	result := []any{}
+	for _, match := range aggregationExprRegexp.FindAllStringSubmatch(expression, -1) {
+		agg := map[string]any{"expression": match[1]}
+		if alias := match[2]; alias != "" {
+			agg["alias"] = strings.Trim(alias, `'"`)
+		} else if fallbackAlias != "" {
+			agg["alias"] = fallbackAlias
+		}
+		result = append(result, agg)
+	}
+	return result
+}
+
+// setFirstNonEmpty sets key to the first value that is neither nil nor "", mirroring the
+// JS `a || b` fallback the frontend uses for the metric aggregation fields.
+func setFirstNonEmpty(target map[string]any, key string, values ...any) {
+	for _, v := range values {
+		if v == nil {
+			continue
+		}
+		if s, ok := v.(string); ok && s == "" {
+			continue
+		}
+		target[key] = v
+		return
+	}
+}

pkg/types/querybuildertypes/querybuildertypesv5/migrate_envelope_test.go

@@ -0,0 +1,176 @@
+package querybuildertypesv5
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCreateAggregation(t *testing.T) {
+	testCases := []struct {
+		description    string
+		queryData      map[string]any
+		panelType      string
+		expectedOutput []any
+	}{
+		{
+			description:    "nil query data yields no aggregations",
+			queryData:      nil,
+			expectedOutput: []any{},
+		},
+		{
+			description:    "single logs expression is left untouched",
+			queryData:      map[string]any{"dataSource": "logs", "aggregations": []any{map[string]any{"expression": "count()"}}},
+			expectedOutput: []any{map[string]any{"expression": "count()"}},
+		},
+		{
+			description: "comma separated trace expressions are split into one object each",
+			queryData:   map[string]any{"dataSource": "traces", "aggregations": []any{map[string]any{"expression": "count(), sum(price)"}}},
+			expectedOutput: []any{
+				map[string]any{"expression": "count()"},
+				map[string]any{"expression": "sum(price)"},
+			},
+		},
+		{
+			description: "inline alias is preserved and unquoted",
+			queryData:   map[string]any{"dataSource": "logs", "aggregations": []any{map[string]any{"expression": "count() as 'total', sum(price) as revenue"}}},
+			expectedOutput: []any{
+				map[string]any{"expression": "count()", "alias": "total"},
+				map[string]any{"expression": "sum(price)", "alias": "revenue"},
+			},
+		},
+		{
+			description: "space separated expressions split with an unquoted alias on the first only",
+			queryData:   map[string]any{"dataSource": "logs", "aggregations": []any{map[string]any{"expression": "count() as cnt avg(code.lineno) "}}},
+			expectedOutput: []any{
+				map[string]any{"expression": "count()", "alias": "cnt"},
+				map[string]any{"expression": "avg(code.lineno)"},
+			},
+		},
+		{
+			description:    "fallback alias is applied when expression has no inline alias",
+			queryData:      map[string]any{"dataSource": "logs", "aggregations": []any{map[string]any{"expression": "count()", "alias": "hits"}}},
+			expectedOutput: []any{map[string]any{"expression": "count()", "alias": "hits"}},
+		},
+		{
+			description:    "commas inside function arguments do not split the expression",
+			queryData:      map[string]any{"dataSource": "traces", "aggregations": []any{map[string]any{"expression": "countIf(day > 10, status)"}}},
+			expectedOutput: []any{map[string]any{"expression": "countIf(day > 10, status)"}},
+		},
+		{
+			description:    "unparseable expression falls back to count()",
+			queryData:      map[string]any{"dataSource": "logs", "aggregations": []any{map[string]any{"expression": "not-an-aggregation"}}},
+			expectedOutput: []any{map[string]any{"expression": "count()"}},
+		},
+		{
+			description:    "empty aggregations fall back to count()",
+			queryData:      map[string]any{"dataSource": "logs", "aggregations": []any{}},
+			expectedOutput: []any{map[string]any{"expression": "count()"}},
+		},
+		{
+			description:    "missing aggregations fall back to count()",
+			queryData:      map[string]any{"dataSource": "traces"},
+			expectedOutput: []any{map[string]any{"expression": "count()"}},
+		},
+		{
+			description: "metric aggregation is built from the first aggregation",
+			queryData: map[string]any{
+				"dataSource": "metrics",
+				"aggregations": []any{map[string]any{
+					"metricName":       "http_requests_total",
+					"temporality":      "delta",
+					"timeAggregation":  "rate",
+					"spaceAggregation": "sum",
+				}},
+			},
+			expectedOutput: []any{map[string]any{
+				"metricName":       "http_requests_total",
+				"temporality":      "delta",
+				"timeAggregation":  "rate",
+				"spaceAggregation": "sum",
+			}},
+		},
+		{
+			description: "metric omits temporality when empty, matching the frontend `|| undefined`",
+			panelType:   "table",
+			queryData: map[string]any{
+				"dataSource":       "metrics",
+				"timeAggregation":  "sum",
+				"spaceAggregation": "avg",
+				"temporality":      "",
+				"reduceTo":         "avg",
+				"aggregations": []any{map[string]any{
+					"metricName":       "cpu_usage",
+					"temporality":      "",
+					"timeAggregation":  "sum",
+					"spaceAggregation": "avg",
+					"reduceTo":         "avg",
+				}},
+			},
+			expectedOutput: []any{map[string]any{
+				"metricName":       "cpu_usage",
+				"timeAggregation":  "sum",
+				"spaceAggregation": "avg",
+				"reduceTo":         "avg",
+			}},
+		},
+		{
+			description: "metric includes reduceTo for table/pie/value panels",
+			panelType:   "table",
+			queryData: map[string]any{
+				"dataSource": "metrics",
+				"aggregations": []any{map[string]any{
+					"metricName":       "http_requests_total",
+					"timeAggregation":  "rate",
+					"spaceAggregation": "sum",
+					"reduceTo":         "avg",
+				}},
+			},
+			expectedOutput: []any{map[string]any{
+				"metricName":       "http_requests_total",
+				"timeAggregation":  "rate",
+				"spaceAggregation": "sum",
+				"reduceTo":         "avg",
+			}},
+		},
+		{
+			description: "metric drops reduceTo for other panels even when query data has it",
+			panelType:   "graph",
+			queryData: map[string]any{
+				"dataSource": "metrics",
+				"aggregations": []any{map[string]any{
+					"metricName":       "http_requests_total",
+					"timeAggregation":  "rate",
+					"spaceAggregation": "sum",
+					"reduceTo":         "avg",
+				}},
+			},
+			expectedOutput: []any{map[string]any{
+				"metricName":       "http_requests_total",
+				"timeAggregation":  "rate",
+				"spaceAggregation": "sum",
+			}},
+		},
+		{
+			description: "metric falls back to legacy aggregateAttribute and top-level fields",
+			queryData: map[string]any{
+				"dataSource":         "metrics",
+				"aggregateAttribute": map[string]any{"key": "legacy_metric", "temporality": "cumulative"},
+				"timeAggregation":    "avg",
+				"spaceAggregation":   "max",
+			},
+			expectedOutput: []any{map[string]any{
+				"metricName":       "legacy_metric",
+				"temporality":      "cumulative",
+				"timeAggregation":  "avg",
+				"spaceAggregation": "max",
+			}},
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.description, func(t *testing.T) {
+			assert.Equal(t, testCase.expectedOutput, CreateAggregation(testCase.queryData, testCase.panelType))
+		})
+	}
+}

tests/integration/tests/cloudintegrations/01_credentials.py

@@ -143,7 +143,7 @@ def test_get_credentials_unsupported_provider(
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
     response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v1/cloud_integrations/unknown/credentials"),
+        signoz.self.host_configs["8080"].get("/api/v1/cloud_integrations/gcp/credentials"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )

tests/integration/tests/cloudintegrations/02_create_account.py

@@ -56,14 +56,14 @@ def test_create_account_unsupported_provider(
 ) -> None:
     """Test that creating an account with an unsupported cloud provider returns 400."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    cloud_provider = "unknown"
+    cloud_provider = "gcp"
     endpoint = f"/api/v1/cloud_integrations/{cloud_provider}/accounts"
 
     response = requests.post(
         signoz.self.host_configs["8080"].get(endpoint),
         headers={"Authorization": f"Bearer {admin_token}"},
         json={
-            "config": {"unknown": {"deploymentRegion": "us-central1", "regions": ["us-central1"]}},
+            "config": {"gcp": {"deploymentRegion": "us-central1", "regions": ["us-central1"]}},
             "credentials": {
                 "sigNozApiURL": "https://test.signoz.cloud",
                 "sigNozApiKey": "test-key",

tests/integration/tests/cloudintegrations/05_services.py

@@ -341,7 +341,7 @@ def test_list_services_unsupported_provider(
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
     response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v1/cloud_integrations/unknown/services"),
+        signoz.self.host_configs["8080"].get("/api/v1/cloud_integrations/gcp/services"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )

tests/integration/tests/dashboard/02_public_dashboard.py

@@ -1,3 +1,4 @@
+import uuid
 from collections.abc import Callable
 from datetime import UTC, datetime, timedelta
 from http import HTTPStatus
@@ -8,6 +9,7 @@ from sqlalchemy import sql
 from wiremock.resources.mappings import Mapping
 
 from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, add_license
+from fixtures.logs import Logs
 from fixtures.metrics import Metrics
 from fixtures.types import Operation, SigNoz, TestContainerDocker
 
@@ -205,6 +207,147 @@ def test_public_dashboard_widget_query_range(
     assert resp.status_code == HTTPStatus.BAD_REQUEST
 
 
+def test_public_dashboard_widget_query_range_multi_aggregation(
+    signoz: SigNoz,
+    create_user_admin: Operation,  # pylint: disable=unused-argument
+    make_http_mocks: Callable[[TestContainerDocker, list[Mapping]], None],
+    get_token: Callable[[str, str], str],
+    insert_logs: Callable[[list[Logs]], None],
+):
+    """
+    A logs/traces widget stores several aggregations as one comma-separated expression
+    (e.g. "count(), sum(latency_ms)"). The public widget query path must split it into
+    one aggregation per call, mirroring the frontend, before handing it to the querier.
+    If the split does not happen the querier receives a single malformed aggregation and
+    the request fails - so a successful response with two aggregations proves the split.
+    """
+    add_license(signoz, make_http_mocks, get_token)
+
+    admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    # Unique per-run service so the widget query only sees this run's logs.
+    service_name = f"multiagg-public-{uuid.uuid4()}"
+
+    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
+    insert_logs(
+        [
+            Logs(
+                timestamp=now - timedelta(minutes=5),
+                resources={"service.name": service_name},
+                attributes={"latency_ms": 100},
+                body="multi-agg log 1",
+            ),
+            Logs(
+                timestamp=now - timedelta(minutes=3),
+                resources={"service.name": service_name},
+                attributes={"latency_ms": 200},
+                body="multi-agg log 2",
+            ),
+            Logs(
+                timestamp=now - timedelta(minutes=1),
+                resources={"service.name": service_name},
+                attributes={"latency_ms": 300},
+                body="multi-agg log 3",
+            ),
+        ]
+    )
+
+    dashboard_req = {
+        "title": "Multi Aggregation Public Widget",
+        "description": "Comma-separated aggregations must be split on the public query path",
+        "version": "v5",
+        "widgets": [
+            {
+                "id": "b2c0a1d4-9f3e-4c2a-8a7b-1e2f3a4b5c6d",
+                "panelTypes": "graph",
+                "query": {
+                    "builder": {
+                        "queryData": [
+                            {
+                                "aggregations": [{"expression": "count(), sum(latency_ms)"}],
+                                "dataSource": "logs",
+                                "disabled": False,
+                                "expression": "A",
+                                "filter": {"expression": f"service.name = '{service_name}'"},
+                                "functions": [],
+                                "groupBy": [],
+                                "having": {"expression": ""},
+                                "legend": "",
+                                "limit": 10,
+                                "orderBy": [],
+                                "queryName": "A",
+                                "source": "",
+                                "stepInterval": 60,
+                            }
+                        ],
+                        "queryFormulas": [],
+                        "queryTraceOperator": [],
+                    },
+                    "clickhouse_sql": [{"disabled": False, "legend": "", "name": "A", "query": ""}],
+                    "id": "c3d1b2e5-0a4f-4d3b-9b8c-2f3a4b5c6d7e",
+                    "promql": [{"disabled": False, "legend": "", "name": "A", "query": ""}],
+                    "queryType": "builder",
+                },
+            }
+        ],
+    }
+    create_response = requests.post(
+        signoz.self.host_configs["8080"].get("/api/v1/dashboards"),
+        json=dashboard_req,
+        headers={"Authorization": f"Bearer {admin_token}"},
+        timeout=2,
+    )
+    assert create_response.status_code == HTTPStatus.CREATED
+    dashboard_id = create_response.json()["data"]["id"]
+
+    response = requests.post(
+        signoz.self.host_configs["8080"].get(f"/api/v1/dashboards/{dashboard_id}/public"),
+        json={"timeRangeEnabled": False, "defaultTimeRange": "30m"},
+        headers={"Authorization": f"Bearer {admin_token}"},
+        timeout=2,
+    )
+    assert response.status_code == HTTPStatus.CREATED
+
+    response = requests.get(
+        signoz.self.host_configs["8080"].get(f"/api/v1/dashboards/{dashboard_id}/public"),
+        headers={"Authorization": f"Bearer {admin_token}"},
+        timeout=2,
+    )
+    assert response.status_code == HTTPStatus.OK
+    public_path = response.json()["data"]["publicPath"]
+    public_dashboard_id = public_path.split("/public/dashboard/")[-1]
+
+    resp = requests.get(
+        signoz.self.host_configs["8080"].get(f"/api/v1/public/dashboards/{public_dashboard_id}/widgets/0/query_range"),
+        timeout=5,
+    )
+    assert resp.status_code == HTTPStatus.OK
+    body = resp.json()
+    assert body["status"] == "success"
+
+    # The single "count(), sum(latency_ms)" expression must have been split into two
+    # separate aggregations on the way to the querier.
+    results = body["data"]["data"]["results"]
+    assert len(results) == 1
+
+    aggregations = results[0]["aggregations"]
+    assert len(aggregations) == 2
+
+    # With no group-by each aggregation produces a single series.
+    for aggregation in aggregations:
+        assert len(aggregation["series"]) == 1
+        assert len(aggregation["series"][0]["values"]) > 0
+
+    # Each aggregation is computed independently over the three logs: count() totals 3,
+    # sum(latency_ms) totals 100 + 200 + 300 = 600. Summing each aggregation's points is
+    # robust to step bucketing and to the order the aggregations come back in.
+    aggregation_totals = sorted(
+        sum(point["value"] for series in aggregation["series"] for point in series["values"])
+        for aggregation in aggregations
+    )
+    assert aggregation_totals == [3, 600]
+
+
 def test_anonymous_role_has_public_dashboard_permission(
     request: pytest.FixtureRequest,
     signoz: SigNoz,