Merge branch 'main' into nv/functional-unique-index

* fix: mark numeric columns as aggregation in scalar query response

* fix: make py-fmt

* fix: comments

docs/api/openapi.yml

@@ -7185,39 +7185,6 @@ components:
       - operation
       - priority
       type: object
-    SpantypesSpanMappingPreviewRequest:
-      properties:
-        attributes:
-          $ref: '#/components/schemas/SpantypesSpanMappingPreviewSpan'
-        groupId:
-          nullable: true
-          type: string
-        otlpTraces:
-          additionalProperties: {}
-          nullable: true
-          type: object
-      type: object
-    SpantypesSpanMappingPreviewResponse:
-      properties:
-        attributes:
-          $ref: '#/components/schemas/SpantypesSpanMappingPreviewSpan'
-        otlpTraces:
-          additionalProperties: {}
-          nullable: true
-          type: object
-      type: object
-    SpantypesSpanMappingPreviewSpan:
-      nullable: true
-      properties:
-        resourceAttributes:
-          additionalProperties: {}
-          nullable: true
-          type: object
-        spanAttributes:
-          additionalProperties: {}
-          nullable: true
-          type: object
-      type: object
     SpantypesUpdatableSpanMapper:
       properties:
         config:
@@ -12823,70 +12790,6 @@ paths:
       summary: Update a span mapper
       tags:
       - spanmapper
-  /api/v1/span_mapper_groups/preview:
-    post:
-      deprecated: false
-      description: Previews how the org's saved attribute mappings would transform
-        a sample span.
-      operationId: PreviewSpanMapping
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/SpantypesSpanMappingPreviewRequest'
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/SpantypesSpanMappingPreviewResponse'
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Not Found
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - VIEWER
-      - tokenizer:
-        - VIEWER
-      summary: Preview span attribute mapping against a sample span
-      tags:
-      - spanmapper
   /api/v1/testChannel:
     post:
       deprecated: true

ee/sqlschema/postgressqlschema/signozdb_index_test.go

@@ -0,0 +1,101 @@
+package postgressqlschema
+
+import (
+	"context"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/SigNoz/signoz/ee/sqlstore/postgressqlstore"
+	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
+	"github.com/SigNoz/signoz/pkg/sqlschema"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/stretchr/testify/require"
+)
+
+// devenvPostgresDSN is the DSN for the postgres started by `make devenv-postgres`.
+// Override with TEST_POSTGRES_DSN to point at a different instance.
+const devenvPostgresDSN = "postgres://postgres:password@localhost:5432/signoz?sslmode=disable"
+
+// TestSignozDBTagUniqueIndex inspects the real postgres database the enterprise
+// server migrates and verifies the functional unique index added by migration
+// 094 on the "tag" table.
+//
+//   - "MigrationCreatedIndex" is the ground-truth check: it reads the index
+//     definition straight out of pg_indexes and confirms the functional unique
+//     index physically exists. This proves the migration ran and postgres
+//     accepted it.
+//   - "GetIndicesRoundTrip" exercises the engine's GetIndices read-back path and
+//     checks it reconstructs the same index. This is the part your colleague
+//     asked about.
+//
+// It mirrors the sqlite signoz.db test, but talks to the devenv postgres
+// container instead of a local file. The test skips if postgres is unreachable
+// (run `make devenv-postgres` and the enterprise server first).
+func TestSignozDBTagUniqueIndex(t *testing.T) {
+	dsn := os.Getenv("TEST_POSTGRES_DSN")
+	if dsn == "" {
+		dsn = devenvPostgresDSN
+	}
+
+	ctx := context.Background()
+	cfg := sqlstore.Config{
+		Provider:   "postgres",
+		Postgres:   sqlstore.PostgresConfig{DSN: dsn},
+		Connection: sqlstore.ConnectionConfig{MaxOpenConns: 10, MaxConnLifetime: time.Minute},
+	}
+
+	providerSettings := instrumentationtest.New().ToProviderSettings()
+	store, err := postgressqlstore.New(ctx, providerSettings, cfg)
+	if err != nil {
+		t.Skipf("postgres unreachable at %s (run `make devenv-postgres` and the enterprise server): %v", dsn, err)
+	}
+
+	pingCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
+	defer cancel()
+	if err := store.SQLDB().PingContext(pingCtx); err != nil {
+		t.Skipf("postgres unreachable at %s (run `make devenv-postgres` and the enterprise server): %v", dsn, err)
+	}
+	t.Logf("using postgres at %s", dsn)
+
+	schema, err := New(ctx, providerSettings, sqlschema.Config{}, store)
+	require.NoError(t, err)
+
+	expected := &sqlschema.UniqueIndex{
+		TableName:   "tag",
+		ColumnNames: []sqlschema.ColumnName{"org_id", "kind", "key", "value"},
+		Expressions: []string{"org_id", "kind", "LOWER(key)", "LOWER(value)"},
+	}
+
+	t.Run("MigrationCreatedIndex", func(t *testing.T) {
+		var def string
+		err := store.
+			BunDB().
+			NewRaw("SELECT indexdef FROM pg_indexes WHERE tablename = 'tag' AND indexname = ?", expected.Name()).
+			Scan(ctx, &def)
+		require.NoError(t, err, "expected unique index %q to exist in postgres", expected.Name())
+		t.Logf("stored indexdef: %s", def)
+
+		require.Contains(t, def, "UNIQUE")
+		// postgres normalizes function names to lowercase.
+		require.Contains(t, def, "lower(key)")
+		require.Contains(t, def, "lower(value)")
+	})
+
+	t.Run("GetIndicesRoundTrip", func(t *testing.T) {
+		indices, err := schema.GetIndices(ctx, "tag")
+		require.NoError(t, err)
+
+		t.Logf("GetIndices returned %d indices", len(indices))
+		var got sqlschema.Index
+		for _, idx := range indices {
+			t.Logf("  name=%q type=%s columns=%v create=%s", idx.Name(), idx.Type(), idx.Columns(), string(idx.ToCreateSQL(schema.Formatter())))
+			if idx.Name() == expected.Name() {
+				got = idx
+			}
+		}
+
+		require.NotNil(t, got, "GetIndices did not return the functional unique index %q", expected.Name())
+		require.True(t, expected.Equals(got), "round-tripped index should equal the original definition")
+	})
+}

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

@@ -8440,83 +8440,6 @@ export interface SpantypesSpanMapperDTO {
 	updatedBy?: string;
 }
 
-export type SpantypesSpanMappingPreviewRequestDTOOtlpTracesAnyOf = {
-	[key: string]: unknown;
-};
-
-/**
- * @nullable
- */
-export type SpantypesSpanMappingPreviewRequestDTOOtlpTraces =
-	SpantypesSpanMappingPreviewRequestDTOOtlpTracesAnyOf | null;
-
-export type SpantypesSpanMappingPreviewSpanDTOAnyOfResourceAttributesAnyOf = {
-	[key: string]: unknown;
-};
-
-/**
- * @nullable
- */
-export type SpantypesSpanMappingPreviewSpanDTOAnyOfResourceAttributes =
-	SpantypesSpanMappingPreviewSpanDTOAnyOfResourceAttributesAnyOf | null;
-
-export type SpantypesSpanMappingPreviewSpanDTOAnyOfSpanAttributesAnyOf = {
-	[key: string]: unknown;
-};
-
-/**
- * @nullable
- */
-export type SpantypesSpanMappingPreviewSpanDTOAnyOfSpanAttributes =
-	SpantypesSpanMappingPreviewSpanDTOAnyOfSpanAttributesAnyOf | null;
-
-export type SpantypesSpanMappingPreviewSpanDTOAnyOf = {
-	/**
-	 * @type object,null
-	 */
-	resourceAttributes?: SpantypesSpanMappingPreviewSpanDTOAnyOfResourceAttributes;
-	/**
-	 * @type object,null
-	 */
-	spanAttributes?: SpantypesSpanMappingPreviewSpanDTOAnyOfSpanAttributes;
-};
-
-/**
- * @nullable
- */
-export type SpantypesSpanMappingPreviewSpanDTO =
-	SpantypesSpanMappingPreviewSpanDTOAnyOf | null;
-
-export interface SpantypesSpanMappingPreviewRequestDTO {
-	attributes?: SpantypesSpanMappingPreviewSpanDTO | null;
-	/**
-	 * @type string,null
-	 */
-	groupId?: string | null;
-	/**
-	 * @type object,null
-	 */
-	otlpTraces?: SpantypesSpanMappingPreviewRequestDTOOtlpTraces;
-}
-
-export type SpantypesSpanMappingPreviewResponseDTOOtlpTracesAnyOf = {
-	[key: string]: unknown;
-};
-
-/**
- * @nullable
- */
-export type SpantypesSpanMappingPreviewResponseDTOOtlpTraces =
-	SpantypesSpanMappingPreviewResponseDTOOtlpTracesAnyOf | null;
-
-export interface SpantypesSpanMappingPreviewResponseDTO {
-	attributes?: SpantypesSpanMappingPreviewSpanDTO | null;
-	/**
-	 * @type object,null
-	 */
-	otlpTraces?: SpantypesSpanMappingPreviewResponseDTOOtlpTraces;
-}
-
 export interface SpantypesUpdatableSpanMapperDTO {
 	config?: SpantypesSpanMapperConfigDTO;
 	/**
@@ -9823,14 +9746,6 @@ export type UpdateSpanMapperPathParameters = {
 	groupId: string;
 	mapperId: string;
 };
-export type PreviewSpanMapping200 = {
-	data: SpantypesSpanMappingPreviewResponseDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
 export type GetTraceAggregationsPathParameters = {
 	traceID: string;
 };

frontend/src/api/generated/services/spanmapper/index.ts

@@ -27,11 +27,9 @@ import type {
 	ListSpanMapperGroupsParams,
 	ListSpanMappers200,
 	ListSpanMappersPathParameters,
-	PreviewSpanMapping200,
 	RenderErrorResponseDTO,
 	SpantypesPostableSpanMapperDTO,
 	SpantypesPostableSpanMapperGroupDTO,
-	SpantypesSpanMappingPreviewRequestDTO,
 	SpantypesUpdatableSpanMapperDTO,
 	SpantypesUpdatableSpanMapperGroupDTO,
 	UpdateSpanMapperGroupPathParameters,
@@ -782,86 +780,3 @@ export const useUpdateSpanMapper = <
 > => {
 	return useMutation(getUpdateSpanMapperMutationOptions(options));
 };
-/**
- * Previews how the org's saved attribute mappings would transform a sample span.
- * @summary Preview span attribute mapping against a sample span
- */
-export const previewSpanMapping = (
-	spantypesSpanMappingPreviewRequestDTO?: BodyType<SpantypesSpanMappingPreviewRequestDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<PreviewSpanMapping200>({
-		url: `/api/v1/span_mapper_groups/preview`,
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json' },
-		data: spantypesSpanMappingPreviewRequestDTO,
-		signal,
-	});
-};
-
-export const getPreviewSpanMappingMutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof previewSpanMapping>>,
-		TError,
-		{ data?: BodyType<SpantypesSpanMappingPreviewRequestDTO> },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof previewSpanMapping>>,
-	TError,
-	{ data?: BodyType<SpantypesSpanMappingPreviewRequestDTO> },
-	TContext
-> => {
-	const mutationKey = ['previewSpanMapping'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof previewSpanMapping>>,
-		{ data?: BodyType<SpantypesSpanMappingPreviewRequestDTO> }
-	> = (props) => {
-		const { data } = props ?? {};
-
-		return previewSpanMapping(data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type PreviewSpanMappingMutationResult = NonNullable<
-	Awaited<ReturnType<typeof previewSpanMapping>>
->;
-export type PreviewSpanMappingMutationBody =
-	| BodyType<SpantypesSpanMappingPreviewRequestDTO>
-	| undefined;
-export type PreviewSpanMappingMutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Preview span attribute mapping against a sample span
- */
-export const usePreviewSpanMapping = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof previewSpanMapping>>,
-		TError,
-		{ data?: BodyType<SpantypesSpanMappingPreviewRequestDTO> },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof previewSpanMapping>>,
-	TError,
-	{ data?: BodyType<SpantypesSpanMappingPreviewRequestDTO> },
-	TContext
-> => {
-	return useMutation(getPreviewSpanMappingMutationOptions(options));
-};

frontend/src/container/InfraMonitoringK8s/Clusters/constants.ts

@@ -796,7 +796,7 @@ export const getClusterMetricsQueryPayload = (
 								key: k8sDeploymentDesiredKey,
 								type: 'Gauge',
 							},
-							aggregateOperator: 'avg',
+							aggregateOperator: 'latest',
 							dataSource: DataSource.METRICS,
 							disabled: false,
 							expression: 'B',
@@ -839,7 +839,7 @@ export const getClusterMetricsQueryPayload = (
 							reduceTo: ReduceOperators.LAST,
 							spaceAggregation: 'sum',
 							stepInterval: 60,
-							timeAggregation: 'avg',
+							timeAggregation: 'latest',
 						},
 					],
 					queryFormulas: [],

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityEvents/EntityEvents.tsx

@@ -40,6 +40,7 @@ import { K8S_ENTITY_EVENTS_EXPRESSION_KEY, useEntityEvents } from './hooks';
 import { getEntityEventsQueryPayload, isEventsKeyNotFoundError } from './utils';
 
 import styles from './EntityEvents.module.scss';
+import { useTimezone } from 'providers/Timezone';
 
 interface EventDataType {
 	key: string;
@@ -167,17 +168,25 @@ function EntityEventsContent({
 		[events],
 	);
 
-	const columns: TableColumnsType<EventDataType> = [
-		{ title: 'Severity', dataIndex: 'severity', key: 'severity', width: 100 },
-		{
-			title: 'Timestamp',
-			dataIndex: 'timestamp',
-			width: 240,
-			ellipsis: true,
-			key: 'timestamp',
-		},
-		{ title: 'Body', dataIndex: 'body', key: 'body' },
-	];
+	const { formatTimezoneAdjustedTimestamp } = useTimezone();
+	const columns: TableColumnsType<EventDataType> = useMemo(
+		() => [
+			{ title: 'Severity', dataIndex: 'severity', key: 'severity', width: 100 },
+			{
+				title: 'Timestamp',
+				dataIndex: 'timestamp',
+				width: 240,
+				ellipsis: true,
+				key: 'timestamp',
+				render: (value: string | number): string =>
+					formatTimezoneAdjustedTimestamp(
+						typeof value === 'string' ? value : value / 1e6,
+					),
+			},
+			{ title: 'Body', dataIndex: 'body', key: 'body' },
+		],
+		[formatTimezoneAdjustedTimestamp],
+	);
 
 	const handleExpandRowIcon = ({
 		expanded,

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityTraces/EntityTraces.tsx

@@ -41,6 +41,7 @@ import { getTraceListColumns } from './traceListColumns';
 import { getEntityTracesQueryPayload } from './utils';
 
 import styles from './EntityTraces.module.scss';
+import { useTimezone } from 'providers/Timezone';
 
 interface Props {
 	timeRange: {
@@ -136,7 +137,11 @@ function EntityTracesContent({
 		[timeRange.startTime, timeRange.endTime, userExpression],
 	);
 
-	const traceListColumns = getTraceListColumns(selectedEntityTracesColumns);
+	const { formatTimezoneAdjustedTimestamp } = useTimezone();
+	const traceListColumns = getTraceListColumns(
+		selectedEntityTracesColumns,
+		formatTimezoneAdjustedTimestamp,
+	);
 
 	const isKeyNotFound = isKeyNotFoundError(error);
 	const isDataEmpty =

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityTraces/traceListColumns.tsx

@@ -1,15 +1,14 @@
 import { TableColumnsType as ColumnsType } from 'antd';
 import { Badge } from '@signozhq/ui/badge';
 import { Typography } from '@signozhq/ui/typography';
-import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';
 import {
 	BlockLink,
 	getTraceLink,
 } from 'container/TracesExplorer/ListView/utils';
-import dayjs from 'dayjs';
 import { RowData } from 'lib/query/createTableColumnsFromQuery';
 import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { FormatTimezoneAdjustedTimestamp } from 'hooks/useTimezoneFormatter/useTimezoneFormatter';
 
 const keyToLabelMap: Record<string, string> = {
 	timestamp: 'Timestamp',
@@ -59,6 +58,7 @@ const getValueForKey = (data: Record<string, any>, key: string): any => {
 
 export const getTraceListColumns = (
 	selectedColumns: BaseAutocompleteData[],
+	formatTimezoneAdjustedTimestamp: FormatTimezoneAdjustedTimestamp,
 ): ColumnsType<RowData> => {
 	const columns: ColumnsType<RowData> =
 		selectedColumns.map(({ dataType, key, type }) => ({
@@ -73,8 +73,8 @@ export const getTraceListColumns = (
 				if (primaryKey === 'timestamp') {
 					const date =
 						typeof value === 'string'
-							? dayjs(value).format(DATE_TIME_FORMATS.ISO_DATETIME_MS)
-							: dayjs(value / 1e6).format(DATE_TIME_FORMATS.ISO_DATETIME_MS);
+							? formatTimezoneAdjustedTimestamp(value)
+							: formatTimezoneAdjustedTimestamp(value / 1e6);
 
 					return (
 						<BlockLink to={getTraceLink(itemData)} openInNewTab>

frontend/src/container/InfraMonitoringK8s/Pods/constants.ts

@@ -1366,7 +1366,7 @@ export const getPodMetricsQueryPayload = (
 							orderBy: [],
 							queryName: 'B',
 							reduceTo: ReduceOperators.AVG,
-							spaceAggregation: 'avg',
+							spaceAggregation: 'sum',
 							stepInterval: 60,
 							timeAggregation: 'avg',
 						},

frontend/src/hooks/useTimezoneFormatter/useTimezoneFormatter.ts

@@ -22,11 +22,13 @@ interface CacheEntry {
 const CACHE_SIZE_LIMIT = 1000;
 const CACHE_CLEANUP_PERCENTAGE = 0.5; // Remove 50% when limit is reached
 
+export type FormatTimezoneAdjustedTimestamp = (
+	input: TimestampInput,
+	format?: string,
+) => string;
+
 function useTimezoneFormatter({ userTimezone }: { userTimezone: Timezone }): {
-	formatTimezoneAdjustedTimestamp: (
-		input: TimestampInput,
-		format?: string,
-	) => string;
+	formatTimezoneAdjustedTimestamp: FormatTimezoneAdjustedTimestamp;
 } {
 	// Initialize cache using useMemo to persist between renders
 	const cache = useMemo(() => new Map<string, CacheEntry>(), []);

frontend/src/providers/Timezone.tsx

@@ -19,17 +19,14 @@ import {
 } from 'components/CustomTimePicker/timezoneUtils';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import useTimezoneFormatter, {
-	TimestampInput,
+	FormatTimezoneAdjustedTimestamp,
 } from 'hooks/useTimezoneFormatter/useTimezoneFormatter';
 
 export interface TimezoneContextType {
 	timezone: Timezone;
 	browserTimezone: Timezone;
 	updateTimezone: (timezone: Timezone) => void;
-	formatTimezoneAdjustedTimestamp: (
-		input: TimestampInput,
-		format?: string,
-	) => string;
+	formatTimezoneAdjustedTimestamp: FormatTimezoneAdjustedTimestamp;
 	isAdaptationEnabled: boolean;
 	setIsAdaptationEnabled: Dispatch<SetStateAction<boolean>>;
 }

pkg/apiserver/signozapiserver/spanmapper.go

@@ -51,26 +51,6 @@ func (provider *provider) addSpanMapperRoutes(router *mux.Router) error {
 		return err
 	}
 
-	if err := router.Handle("/api/v1/span_mapper_groups/preview", handler.New(
-		provider.authzMiddleware.ViewAccess(provider.spanMapperHandler.PreviewMapping),
-		handler.OpenAPIDef{
-			ID:                  "PreviewSpanMapping",
-			Tags:                []string{"spanmapper"},
-			Summary:             "Preview span attribute mapping against a sample span",
-			Description:         "Previews how the org's saved attribute mappings would transform a sample span.",
-			Request:             new(spantypes.SpanMappingPreviewRequest),
-			RequestContentType:  "application/json",
-			Response:            new(spantypes.SpanMappingPreviewResponse),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
-		},
-	)).Methods(http.MethodPost).GetError(); err != nil {
-		return err
-	}
-
 	if err := router.Handle("/api/v1/span_mapper_groups/{groupId}", handler.New(
 		provider.authzMiddleware.AdminAccess(provider.spanMapperHandler.UpdateGroup),
 		handler.OpenAPIDef{

pkg/modules/spanmapper/implspanmapper/handler.go

@@ -273,35 +273,6 @@ func (h *handler) DeleteMapper(rw http.ResponseWriter, r *http.Request) {
 	render.Success(rw, http.StatusNoContent, nil)
 }
 
-// PreviewMapping handles POST /api/v1/span_mapper_groups/preview.
-// used to get preview of attributes after remapping.
-func (h *handler) PreviewMapping(rw http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
-	defer cancel()
-
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	orgID := valuer.MustNewUUID(claims.OrgID)
-
-	req := new(spantypes.SpanMappingPreviewRequest)
-	if err := binding.JSON.BindBody(r.Body, req); err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	result, err := h.module.PreviewMapping(ctx, orgID, req)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	render.Success(rw, http.StatusOK, result)
-}
-
 // groupIDFromPath extracts and validates the {id} or {groupId} path variable.
 func groupIDFromPath(r *http.Request) (valuer.UUID, error) {
 	vars := mux.Vars(r)

pkg/modules/spanmapper/implspanmapper/module.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/modules/spanmapper"
 	"github.com/SigNoz/signoz/pkg/query-service/agentConf"
 	"github.com/SigNoz/signoz/pkg/types/opamptypes"
@@ -103,64 +102,6 @@ func (module *module) DeleteMapper(ctx context.Context, orgID, groupID, id value
 	return nil
 }
 
-// PreviewMapping resolves the org's saved mappings for a sample input
-// and returns the transformed result.
-func (module *module) PreviewMapping(ctx context.Context, orgID valuer.UUID, req *spantypes.SpanMappingPreviewRequest) (*spantypes.SpanMappingPreviewResponse, error) {
-	groups, err := module.resolvePreviewGroups(ctx, orgID, req)
-	if err != nil {
-		return nil, err
-	}
-
-	hasAttrs := req.Attributes != nil
-	hasOTLP := len(req.OtlpTraces) > 0
-	if hasAttrs == hasOTLP {
-		return nil, errors.New(errors.TypeInvalidInput, spantypes.ErrCodeMappingInvalidInput, "exactly one of 'attributes' or 'otlpTraces' must be provided")
-	}
-
-	if hasAttrs {
-		outResource, outSpan := spantypes.SimulateSpanMapping(groups, req.Attributes.ResourceAttributes, req.Attributes.SpanAttributes)
-		return &spantypes.SpanMappingPreviewResponse{
-			Attributes: &spantypes.SpanMappingPreviewSpan{ResourceAttributes: outResource, SpanAttributes: outSpan},
-		}, nil
-	}
-
-	in, err := json.Marshal(req.OtlpTraces)
-	if err != nil {
-		return nil, errors.Wrapf(err, errors.TypeInvalidInput, spantypes.ErrCodeMappingInvalidInput, "could not serialize otlpTraces payload")
-	}
-	out, err := spantypes.SimulateSpanMappingOTLP(groups, in)
-	if err != nil {
-		return nil, err
-	}
-	var transformed map[string]any
-	if err := json.Unmarshal(out, &transformed); err != nil {
-		return nil, errors.WrapInternalf(err, spantypes.ErrCodeMappingPreviewFailed, "could not deserialize transformed traces")
-	}
-	return &spantypes.SpanMappingPreviewResponse{OtlpTraces: transformed}, nil
-}
-
-// resolvePreviewGroups resolves the config to preview against a specific saved
-// group when GroupID is set, otherwise all the org's enabled saved mappings.
-func (module *module) resolvePreviewGroups(ctx context.Context, orgID valuer.UUID, req *spantypes.SpanMappingPreviewRequest) ([]*spantypes.SpanMapperGroupWithMappers, error) {
-	if req.GroupID != nil && *req.GroupID != "" {
-		id, err := valuer.NewUUID(*req.GroupID)
-		if err != nil {
-			return nil, errors.Wrapf(err, errors.TypeInvalidInput, spantypes.ErrCodeMappingInvalidInput, "group id is not a valid uuid")
-		}
-		group, err := module.store.GetGroup(ctx, orgID, id)
-		if err != nil {
-			return nil, err
-		}
-		mappers, err := module.store.ListMappers(ctx, orgID, id)
-		if err != nil {
-			return nil, err
-		}
-		return []*spantypes.SpanMapperGroupWithMappers{{Group: group, Mappers: mappers}}, nil
-	}
-
-	return module.listEnabledGroupsWithMappers(ctx, orgID)
-}
-
 func (module *module) AgentFeatureType() agentConf.AgentFeatureType {
 	return spantypes.SpanAttrMappingFeatureType
 }

pkg/modules/spanmapper/spanmapper.go

@@ -27,7 +27,6 @@ type Module interface {
 	CreateMapper(ctx context.Context, orgID, groupID valuer.UUID, mapper *spantypes.SpanMapper) error
 	UpdateMapper(ctx context.Context, orgID, groupID, id valuer.UUID, fieldContext spantypes.FieldContext, config *spantypes.SpanMapperConfig, enabled *bool, updatedBy string) error
 	DeleteMapper(ctx context.Context, orgID, groupID, id valuer.UUID) error
-	PreviewMapping(ctx context.Context, orgID valuer.UUID, req *spantypes.SpanMappingPreviewRequest) (*spantypes.SpanMappingPreviewResponse, error)
 }
 
 // Handler defines the HTTP handler interface for mapping group and mapper endpoints.
@@ -43,5 +42,4 @@ type Handler interface {
 	CreateMapper(rw http.ResponseWriter, r *http.Request)
 	UpdateMapper(rw http.ResponseWriter, r *http.Request)
 	DeleteMapper(rw http.ResponseWriter, r *http.Request)
-	PreviewMapping(rw http.ResponseWriter, r *http.Request)
 }

pkg/querier/consume.go

@@ -62,7 +62,7 @@ func readAsTimeSeries(rows driver.Rows, queryWindow *qbtypes.TimeRange, step qbt
 	numericColsCount := 0
 	for i, ct := range colTypes {
 		slots[i] = reflect.New(ct.ScanType()).Interface()
-		if numericKind(ct.ScanType().Kind()) {
+		if isNumericKind(ct.ScanType()) {
 			numericColsCount++
 		}
 	}
@@ -270,8 +270,14 @@ func readAsTimeSeries(rows driver.Rows, queryWindow *qbtypes.TimeRange, step qbt
 	}, nil
 }
 
-func numericKind(k reflect.Kind) bool {
-	switch k {
+func isNumericKind(t reflect.Type) bool {
+	if t == nil {
+		return false
+	}
+	for t.Kind() == reflect.Ptr || t.Kind() == reflect.UnsafePointer {
+		t = t.Elem()
+	}
+	switch t.Kind() {
 	case reflect.Float32, reflect.Float64,
 		reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
 		reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
@@ -290,7 +296,13 @@ func readAsScalar(rows driver.Rows, queryName string) (*qbtypes.ScalarData, erro
 	var aggIndex int64
 	for i, name := range colNames {
 		colType := qbtypes.ColumnTypeGroup
-		if aggRe.MatchString(name) {
+		// Builder queries aliases aggregation columns as __result_N (always numeric) and wraps group-by keys with toString (always string);
+		// Raw ClickHouse queries may use any aliases.
+		// Handling Builder queries, If name like __result_N -> aggregation, otherwise group-by column
+		// Handling Raw ClickHouse queries, If type is numeric -> aggregation, otherwise group-by column
+		// NOTE: For clickhouse queries, its wrong to assume that numeric columns are always aggregations, user might be grouping by on integer status_code.
+		// However, we are fine with this for now. If need arises, simplest way would be to solve this on the frontend side by asking user a mapping of column names to column types.
+		if aggRe.MatchString(name) || isNumericKind(colTypes[i].ScanType()) {
 			colType = qbtypes.ColumnTypeAggregation
 		}
 		cd[i] = &qbtypes.ColumnDescriptor{

pkg/signoz/provider.go

@@ -213,6 +213,7 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewCloudIntegrationRemoveCascadeDeleteFactory(sqlschema),
 		sqlmigration.NewAddUserDashboardPreferenceFactory(sqlstore, sqlschema),
 		sqlmigration.NewRecreateUserDashboardPreferenceFactory(sqlstore, sqlschema),
+		sqlmigration.NewAddTagUniqueIndexFactory(sqlstore, sqlschema),
 	)
 }
 

pkg/sqlmigration/082_add_tags.go

@@ -62,8 +62,6 @@ func (migration *addTags) Up(ctx context.Context, db *bun.DB) error {
 	})
 	sqls = append(sqls, tagTableSQLs...)
 
-	// TODO (@namanverma): add a unique index for tags: (org_id, kind, (LOWER(key)), (LOWER(value)))
-
 	tagRelationsTableSQLs := migration.sqlschema.Operator().CreateTable(&sqlschema.Table{
 		Name: "tag_relation",
 		Columns: []*sqlschema.Column{

pkg/sqlmigration/094_add_tag_unique_index.go

@@ -0,0 +1,60 @@
+package sqlmigration
+
+import (
+	"context"
+
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/sqlschema"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/uptrace/bun"
+	"github.com/uptrace/bun/migrate"
+)
+
+type addTagUniqueIndex struct {
+	sqlstore  sqlstore.SQLStore
+	sqlschema sqlschema.SQLSchema
+}
+
+func NewAddTagUniqueIndexFactory(sqlstore sqlstore.SQLStore, sqlschema sqlschema.SQLSchema) factory.ProviderFactory[SQLMigration, Config] {
+	return factory.NewProviderFactory(factory.MustNewName("add_tag_unique_index"), func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
+		return &addTagUniqueIndex{
+			sqlstore:  sqlstore,
+			sqlschema: sqlschema,
+		}, nil
+	})
+}
+
+func (migration *addTagUniqueIndex) Register(migrations *migrate.Migrations) error {
+	return migrations.Register(migration.Up, migration.Down)
+}
+
+func (migration *addTagUniqueIndex) Up(ctx context.Context, db *bun.DB) error {
+	tx, err := db.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		_ = tx.Rollback()
+	}()
+
+	sqls := migration.sqlschema.Operator().CreateIndex(
+		&sqlschema.UniqueIndex{
+			TableName:   "tag",
+			ColumnNames: []sqlschema.ColumnName{"org_id", "kind", "key", "value"},
+			Expressions: []string{"org_id", "kind", "LOWER(key)", "LOWER(value)"},
+		},
+	)
+
+	for _, sql := range sqls {
+		if _, err := tx.ExecContext(ctx, string(sql)); err != nil {
+			return err
+		}
+	}
+
+	return tx.Commit()
+}
+
+func (migration *addTagUniqueIndex) Down(_ context.Context, _ *bun.DB) error {
+	return nil
+}

pkg/sqlschema/index.go

@@ -1,6 +1,8 @@
 package sqlschema
 
 import (
+	"fmt"
+	"hash/fnv"
 	"slices"
 	"strings"
 
@@ -49,9 +51,23 @@ type Index interface {
 	ToDropSQL(fmter SQLFormatter) []byte
 }
 
+// UniqueIndex models a unique index on a table.
+//
+// In the common case the index keys on plain columns: set only ColumnNames and
+// the SQL is emitted with each column identifier-quoted by the formatter
+// (`CREATE UNIQUE INDEX uq_t_a_b ON t (a, b)`).
+//
+// For functional indexes (e.g. case-insensitive uniqueness on `LOWER(col)`),
+// set Expressions to the raw SQL parts and use ColumnNames as metadata for
+// "which columns does this index touch". When Expressions is non-empty, it
+// overrides ColumnNames for SQL emission — each entry is written verbatim, so
+// the caller owns well-formedness — and the auto-generated name uses a hash
+// suffix instead of a readable column join because expressions aren't valid
+// identifier fragments.
 type UniqueIndex struct {
 	TableName   TableName
 	ColumnNames []ColumnName
+	Expressions []string
 	name        string
 }
 
@@ -71,16 +87,28 @@ func (index *UniqueIndex) Name() string {
 		}
 		b.WriteString(string(column))
 	}
+
+	if len(index.Expressions) > 0 {
+		if len(index.ColumnNames) > 0 {
+			b.WriteString("_")
+		}
+		hasher := fnv.New32a()
+		_, _ = hasher.Write([]byte(strings.Join(index.Expressions, "\x00")))
+		fmt.Fprintf(&b, "%08x", hasher.Sum32())
+	}
 	return b.String()
 }
 
 func (index *UniqueIndex) Named(name string) Index {
 	copyOfColumnNames := make([]ColumnName, len(index.ColumnNames))
 	copy(copyOfColumnNames, index.ColumnNames)
+	copyOfExpressions := make([]string, len(index.Expressions))
+	copy(copyOfExpressions, index.Expressions)
 
 	return &UniqueIndex{
 		TableName:   index.TableName,
 		ColumnNames: copyOfColumnNames,
+		Expressions: copyOfExpressions,
 		name:        name,
 	}
 }
@@ -101,7 +129,18 @@ func (index *UniqueIndex) Equals(other Index) bool {
 	if other.Type() != IndexTypeUnique {
 		return false
 	}
-
+	otherUnique, ok := other.(*UniqueIndex)
+	if !ok {
+		return false
+	}
+	// Plain and functional indexes produce different SQL even if their column
+	// sets overlap; require both shapes to match.
+	if (len(index.Expressions) == 0) != (len(otherUnique.Expressions) == 0) {
+		return false
+	}
+	if len(index.Expressions) > 0 && !slices.Equal(index.Expressions, otherUnique.Expressions) {
+		return false
+	}
 	return index.Name() == other.Name() && slices.Equal(index.Columns(), other.Columns())
 }
 
@@ -114,12 +153,20 @@ func (index *UniqueIndex) ToCreateSQL(fmter SQLFormatter) []byte {
 	sql = fmter.AppendIdent(sql, string(index.TableName))
 	sql = append(sql, " ("...)
 
-	for i, column := range index.ColumnNames {
-		if i > 0 {
-			sql = append(sql, ", "...)
+	if len(index.Expressions) > 0 {
+		for i, expr := range index.Expressions {
+			if i > 0 {
+				sql = append(sql, ", "...)
+			}
+			sql = append(sql, expr...)
+		}
+	} else {
+		for i, column := range index.ColumnNames {
+			if i > 0 {
+				sql = append(sql, ", "...)
+			}
+			sql = fmter.AppendIdent(sql, string(column))
 		}
-
-		sql = fmter.AppendIdent(sql, string(column))
 	}
 
 	sql = append(sql, ")"...)

pkg/sqlschema/index_test.go

@@ -38,6 +38,43 @@ func TestIndexToCreateSQL(t *testing.T) {
 			},
 			sql: `CREATE UNIQUE INDEX IF NOT EXISTS "my_index" ON "users" ("id", "name", "email")`,
 		},
+		{
+			name: "Unique_Functional_SingleExpression",
+			index: &UniqueIndex{
+				TableName:   "users",
+				ColumnNames: []ColumnName{"email"},
+				Expressions: []string{"LOWER(email)"},
+			},
+			sql: `CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_email_1e5a87f1" ON "users" (LOWER(email))`,
+		},
+		{
+			name: "Unique_Functional_MixedColumnsAndExpressions",
+			index: &UniqueIndex{
+				TableName:   "tag",
+				ColumnNames: []ColumnName{"org_id", "kind", "key", "value"},
+				Expressions: []string{"org_id", "kind", "LOWER(key)", "LOWER(value)"},
+			},
+			sql: `CREATE UNIQUE INDEX IF NOT EXISTS "uq_tag_org_id_kind_key_value_57e8f81f" ON "tag" (org_id, kind, LOWER(key), LOWER(value))`,
+		},
+		{
+			name: "Unique_Functional_ComplexExpression",
+			index: &UniqueIndex{
+				TableName:   "users",
+				ColumnNames: []ColumnName{"first_name", "last_name"},
+				Expressions: []string{"LOWER(TRIM(first_name) || ' ' || TRIM(last_name))"},
+			},
+			sql: `CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_first_name_last_name_adb1ff53" ON "users" (LOWER(TRIM(first_name) || ' ' || TRIM(last_name)))`,
+		},
+		{
+			name: "Unique_Functional_Named",
+			index: &UniqueIndex{
+				TableName:   "tag",
+				ColumnNames: []ColumnName{"org_id", "kind", "key", "value"},
+				Expressions: []string{"org_id", "kind", "LOWER(key)", "LOWER(value)"},
+				name:        "uq_tag_org_kind_lower_key_lower_value",
+			},
+			sql: `CREATE UNIQUE INDEX IF NOT EXISTS "uq_tag_org_kind_lower_key_lower_value" ON "tag" (org_id, kind, LOWER(key), LOWER(value))`,
+		},
 		{
 			name: "PartialUnique_1Column",
 			index: &PartialUniqueIndex{
@@ -229,6 +266,47 @@ func TestIndexEquals(t *testing.T) {
 			},
 			equals: false,
 		},
+		{
+			name: "Unique_Functional_Same",
+			a: &UniqueIndex{
+				TableName:   "users",
+				ColumnNames: []ColumnName{"email"},
+				Expressions: []string{"LOWER(email)"},
+			},
+			b: &UniqueIndex{
+				TableName:   "users",
+				ColumnNames: []ColumnName{"email"},
+				Expressions: []string{"LOWER(email)"},
+			},
+			equals: true,
+		},
+		{
+			name: "Unique_Functional_DifferentExpressions",
+			a: &UniqueIndex{
+				TableName:   "users",
+				ColumnNames: []ColumnName{"email"},
+				Expressions: []string{"LOWER(email)"},
+			},
+			b: &UniqueIndex{
+				TableName:   "users",
+				ColumnNames: []ColumnName{"email"},
+				Expressions: []string{"UPPER(email)"},
+			},
+			equals: false,
+		},
+		{
+			name: "Unique_Functional_NotEqualToPlainSameColumns",
+			a: &UniqueIndex{
+				TableName:   "users",
+				ColumnNames: []ColumnName{"email"},
+				Expressions: []string{"LOWER(email)"},
+			},
+			b: &UniqueIndex{
+				TableName:   "users",
+				ColumnNames: []ColumnName{"email"},
+			},
+			equals: false,
+		},
 	}
 
 	for _, testCase := range testCases {
@@ -238,6 +316,75 @@ func TestIndexEquals(t *testing.T) {
 	}
 }
 
+func TestUniqueIndexFunctionalName(t *testing.T) {
+	t.Run("autogen uses uq_<table>_<hash>", func(t *testing.T) {
+		idx := &UniqueIndex{
+			TableName:   "tag",
+			ColumnNames: []ColumnName{"org_id", "kind", "key", "value"},
+			Expressions: []string{"org_id", "kind", "LOWER(key)", "LOWER(value)"},
+		}
+		assert.Equal(t, "uq_tag_org_id_kind_key_value_57e8f81f", idx.Name())
+	})
+
+	t.Run("same expressions produce the same name", func(t *testing.T) {
+		a := &UniqueIndex{
+			TableName:   "users",
+			Expressions: []string{"LOWER(email)"},
+		}
+		b := &UniqueIndex{
+			TableName:   "users",
+			Expressions: []string{"LOWER(email)"},
+		}
+		assert.Equal(t, a.Name(), b.Name())
+	})
+
+	t.Run("different expressions produce different names", func(t *testing.T) {
+		a := &UniqueIndex{
+			TableName:   "users",
+			Expressions: []string{"LOWER(email)"},
+		}
+		b := &UniqueIndex{
+			TableName:   "users",
+			Expressions: []string{"UPPER(email)"},
+		}
+		assert.NotEqual(t, a.Name(), b.Name())
+	})
+
+	t.Run("expressions in different order produce different names", func(t *testing.T) {
+		a := &UniqueIndex{
+			TableName:   "tag",
+			Expressions: []string{"org_id", "LOWER(key)"},
+		}
+		b := &UniqueIndex{
+			TableName:   "tag",
+			Expressions: []string{"LOWER(key)", "org_id"},
+		}
+		assert.NotEqual(t, a.Name(), b.Name())
+	})
+
+	t.Run("functional autogen differs from plain autogen for same columns", func(t *testing.T) {
+		plain := &UniqueIndex{
+			TableName:   "users",
+			ColumnNames: []ColumnName{"email"},
+		}
+		functional := &UniqueIndex{
+			TableName:   "users",
+			ColumnNames: []ColumnName{"email"},
+			Expressions: []string{"LOWER(email)"},
+		}
+		assert.Equal(t, "uq_users_email", plain.Name())
+		assert.NotEqual(t, plain.Name(), functional.Name())
+	})
+
+	t.Run("Named() override wins over hash", func(t *testing.T) {
+		idx := (&UniqueIndex{
+			TableName:   "tag",
+			Expressions: []string{"org_id", "LOWER(key)"},
+		}).Named("my_functional_index")
+		assert.Equal(t, "my_functional_index", idx.Name())
+	})
+}
+
 func TestPartialUniqueIndexName(t *testing.T) {
 	a := &PartialUniqueIndex{
 		TableName:   "users",

pkg/sqlschema/sqlitesqlschema/signozdb_index_test.go

@@ -0,0 +1,111 @@
+package sqlitesqlschema
+
+import (
+	"context"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
+	"github.com/SigNoz/signoz/pkg/sqlschema"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/SigNoz/signoz/pkg/sqlstore/sqlitesqlstore"
+	"github.com/stretchr/testify/require"
+)
+
+// findSignozDB walks up from the test's working directory looking for a
+// signoz.db file (the one the community server creates at the repo root).
+func findSignozDB(t *testing.T) string {
+	t.Helper()
+
+	dir, err := os.Getwd()
+	require.NoError(t, err)
+
+	for {
+		candidate := filepath.Join(dir, "signoz.db")
+		if _, err := os.Stat(candidate); err == nil {
+			return candidate
+		}
+
+		parent := filepath.Dir(dir)
+		if parent == dir {
+			return ""
+		}
+		dir = parent
+	}
+}
+
+// TestSignozDBTagUniqueIndex inspects the real signoz.db produced by running the
+// community server and verifies the functional unique index added by migration
+// 094 on the "tag" table.
+//
+//   - "MigrationCreatedIndex" is the ground-truth check: it reads the index DDL
+//     straight out of sqlite_master and confirms the functional unique index
+//     physically exists. This proves the migration ran and sqlite accepted it.
+//   - "GetIndicesRoundTrip" exercises the engine's GetIndices read-back path and
+//     checks it reconstructs the same index. This is the part your colleague
+//     asked about.
+func TestSignozDBTagUniqueIndex(t *testing.T) {
+	dbPath := findSignozDB(t)
+	if dbPath == "" {
+		t.Skip("signoz.db not found; start the community server first so it creates the file and runs migrations")
+	}
+	t.Logf("using signoz.db at %s", dbPath)
+
+	ctx := context.Background()
+	cfg := sqlstore.Config{
+		Provider: "sqlite",
+		Sqlite: sqlstore.SqliteConfig{
+			Path:            dbPath,
+			Mode:            "wal",
+			BusyTimeout:     10 * time.Second,
+			TransactionMode: "deferred",
+		},
+		Connection: sqlstore.ConnectionConfig{MaxOpenConns: 10},
+	}
+
+	providerSettings := instrumentationtest.New().ToProviderSettings()
+	store, err := sqlitesqlstore.New(ctx, providerSettings, cfg)
+	require.NoError(t, err)
+
+	schema, err := New(ctx, providerSettings, sqlschema.Config{}, store)
+	require.NoError(t, err)
+
+	expected := &sqlschema.UniqueIndex{
+		TableName:   "tag",
+		ColumnNames: []sqlschema.ColumnName{"org_id", "kind", "key", "value"},
+		Expressions: []string{"org_id", "kind", "LOWER(key)", "LOWER(value)"},
+	}
+
+	t.Run("MigrationCreatedIndex", func(t *testing.T) {
+		var ddl string
+		err := store.
+			BunDB().
+			NewRaw("SELECT sql FROM sqlite_master WHERE type = 'index' AND tbl_name = 'tag' AND name = ?", expected.Name()).
+			Scan(ctx, &ddl)
+		require.NoError(t, err, "expected unique index %q to exist in signoz.db", expected.Name())
+		t.Logf("stored DDL: %s", ddl)
+
+		require.Contains(t, ddl, "UNIQUE")
+		require.Contains(t, ddl, "LOWER(key)")
+		require.Contains(t, ddl, "LOWER(value)")
+	})
+
+	t.Run("GetIndicesRoundTrip", func(t *testing.T) {
+		indices, err := schema.GetIndices(ctx, "tag")
+		require.NoError(t, err)
+
+		t.Logf("GetIndices returned %d indices", len(indices))
+		var got sqlschema.Index
+		for _, idx := range indices {
+			t.Logf("  name=%q type=%s columns=%v create=%s", idx.Name(), idx.Type(), idx.Columns(), string(idx.ToCreateSQL(schema.Formatter())))
+			if idx.Name() == expected.Name() {
+				got = idx
+			}
+		}
+
+		require.NotNil(t, got, "GetIndices did not return the functional unique index %q", expected.Name())
+		require.True(t, expected.Equals(got), "round-tripped index should equal the original definition")
+	})
+}

pkg/types/spantypes/spanmappersimulator.go

@@ -1,160 +0,0 @@
-package spantypes
-
-import (
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"go.opentelemetry.io/collector/pdata/ptrace"
-)
-
-var resourceSourcePrefix = FieldContextResource.StringValue() + "."
-
-var ErrCodeMappingPreviewFailed = errors.MustNewCode("span_attribute_mapping_preview_failed")
-
-type SpanMappingPreviewSpan struct {
-	ResourceAttributes map[string]any `json:"resourceAttributes" nullable:"true"`
-	SpanAttributes     map[string]any `json:"spanAttributes" nullable:"true"`
-}
-
-type SpanMappingPreviewRequest struct {
-	Attributes *SpanMappingPreviewSpan `json:"attributes" nullable:"true"`
-	OtlpTraces map[string]any          `json:"otlpTraces" nullable:"true"`
-	GroupID    *string                 `json:"groupId" nullable:"true"`
-}
-
-type SpanMappingPreviewResponse struct {
-	Attributes *SpanMappingPreviewSpan `json:"attributes,omitempty" nullable:"true"`
-	OtlpTraces map[string]any          `json:"otlpTraces,omitempty" nullable:"true"`
-}
-
-func SimulateSpanMapping(groups []*SpanMapperGroupWithMappers, resourceAttrs, spanAttrs map[string]any) (outResource, outSpan map[string]any) {
-	cfg := buildProcessorConfig(filterEnabledGroupsWithMappers(groups))
-
-	outResource = cloneAttrs(resourceAttrs)
-	outSpan = cloneAttrs(spanAttrs)
-
-	applyEnabledGroups(cfg, outSpan, outResource)
-	return outResource, outSpan
-}
-
-func SimulateSpanMappingOTLP(groups []*SpanMapperGroupWithMappers, otlp []byte) ([]byte, error) {
-	td, err := (&ptrace.JSONUnmarshaler{}).UnmarshalTraces(otlp)
-	if err != nil {
-		return nil, errors.WrapInvalidInputf(err, ErrCodeMappingInvalidInput, "invalid OTLP traces payload")
-	}
-
-	cfg := buildProcessorConfig(filterEnabledGroupsWithMappers(groups))
-
-	rss := td.ResourceSpans()
-	for i := 0; i < rss.Len(); i++ {
-		rs := rss.At(i)
-		resourceAttrs := rs.Resource().Attributes().AsRaw()
-
-		scopeSpans := rs.ScopeSpans()
-		for j := 0; j < scopeSpans.Len(); j++ {
-			spans := scopeSpans.At(j).Spans()
-			for k := 0; k < spans.Len(); k++ {
-				span := spans.At(k)
-				spanAttrs := span.Attributes().AsRaw()
-				applyEnabledGroups(cfg, spanAttrs, resourceAttrs)
-				if err := span.Attributes().FromRaw(spanAttrs); err != nil {
-					return nil, errors.WrapInternalf(err, ErrCodeMappingPreviewFailed, "could not write transformed span attributes")
-				}
-			}
-		}
-
-		if err := rs.Resource().Attributes().FromRaw(resourceAttrs); err != nil {
-			return nil, errors.WrapInternalf(err, ErrCodeMappingPreviewFailed, "could not write transformed resource attributes")
-		}
-	}
-
-	out, err := (&ptrace.JSONMarshaler{}).MarshalTraces(td)
-	if err != nil {
-		return nil, errors.WrapInternalf(err, ErrCodeMappingPreviewFailed, "could not marshal transformed traces")
-	}
-	return out, nil
-}
-
-// TODO(spanmapper-preview): the apply logic below is a temporary copy of the signozspanmapper processor — remove it and call the real processor once signoz-otel-collector#796 is merged.
-func applyEnabledGroups(cfg *spanMapperProcessorConfig, spanAttrs, resourceAttrs map[string]any) {
-	for i := range cfg.Groups {
-		g := &cfg.Groups[i]
-		if !spanMapperConditionMet(g.ExistsAny, spanAttrs, resourceAttrs) {
-			continue
-		}
-		for j := range g.Attributes {
-			applySpanMapperRule(&g.Attributes[j], spanAttrs, resourceAttrs)
-		}
-	}
-}
-
-// filterEnabledGroupsWithMappers keeps only enabled groups and their enabled
-// mappers, dropping groups left with no enabled mappers.
-func filterEnabledGroupsWithMappers(groups []*SpanMapperGroupWithMappers) []*SpanMapperGroupWithMappers {
-	out := make([]*SpanMapperGroupWithMappers, 0, len(groups))
-	for _, gm := range groups {
-		if gm == nil || gm.Group == nil || !gm.Group.Enabled {
-			continue
-		}
-		enabled := make([]*SpanMapper, 0, len(gm.Mappers))
-		for _, m := range gm.Mappers {
-			if m != nil && m.Enabled {
-				enabled = append(enabled, m)
-			}
-		}
-		if len(enabled) > 0 {
-			out = append(out, &SpanMapperGroupWithMappers{Group: gm.Group, Mappers: enabled})
-		}
-	}
-	return out
-}
-
-func spanMapperConditionMet(cond spanMapperProcessorExistsAny, spanAttrs, resourceAttrs map[string]any) bool {
-	return anyKeyContains(spanAttrs, cond.Attributes) || anyKeyContains(resourceAttrs, cond.Resource)
-}
-
-func anyKeyContains(attrs map[string]any, patterns []string) bool {
-	for k := range attrs {
-		for _, p := range patterns {
-			if strings.Contains(k, p) {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-func applySpanMapperRule(rule *spanMapperProcessorAttribute, spanAttrs, resourceAttrs map[string]any) {
-	dst := spanAttrs
-	if rule.Context == FieldContextResource.StringValue() {
-		dst = resourceAttrs
-	}
-
-	for i := range rule.Sources {
-		src := &rule.Sources[i]
-		bare, isResource := strings.CutPrefix(src.Key, resourceSourcePrefix)
-
-		from := spanAttrs
-		if isResource {
-			from = resourceAttrs
-		}
-		val, ok := from[bare]
-		if !ok {
-			continue
-		}
-
-		dst[rule.Target] = val
-		if src.Action == SpanMapperOperationMove.StringValue() {
-			delete(from, bare)
-		}
-		return
-	}
-}
-
-func cloneAttrs(in map[string]any) map[string]any {
-	out := make(map[string]any, len(in))
-	for k, v := range in {
-		out[k] = v
-	}
-	return out
-}

pkg/types/spantypes/spanmappersimulator_test.go

@@ -1,192 +0,0 @@
-package spantypes
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/pdata/ptrace"
-)
-
-func simGroup(name string, attrCond, resCond []string, mappers ...*SpanMapper) *SpanMapperGroupWithMappers {
-	return &SpanMapperGroupWithMappers{
-		Group: &SpanMapperGroup{
-			Name:      name,
-			Condition: SpanMapperGroupCondition{Attributes: attrCond, Resource: resCond},
-			Enabled:   true,
-		},
-		Mappers: mappers,
-	}
-}
-
-func simMapper(target string, ctx FieldContext, sources ...SpanMapperSource) *SpanMapper {
-	return &SpanMapper{
-		Name:         target,
-		FieldContext: ctx,
-		Config:       SpanMapperConfig{Sources: sources},
-		Enabled:      true,
-	}
-}
-
-func simAttrSrc(key string, op SpanMapperOperation, priority int) SpanMapperSource {
-	return SpanMapperSource{Key: key, Context: FieldContextSpanAttribute, Operation: op, Priority: priority}
-}
-
-func simResSrc(key string, op SpanMapperOperation, priority int) SpanMapperSource {
-	return SpanMapperSource{Key: key, Context: FieldContextResource, Operation: op, Priority: priority}
-}
-
-func TestSimulate_MatchInSpanAttrs(t *testing.T) {
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("llm", []string{"model"}, nil,
-			simMapper("gen_ai.request.model", FieldContextSpanAttribute,
-				simAttrSrc("llm.model", SpanMapperOperationCopy, 1)),
-		),
-	}
-	_, outSpan := SimulateSpanMapping(groups, nil, map[string]any{"llm.model": "gpt-4", "gen_ai.llm.model": "gpt-40"})
-
-	assert.Equal(t, "gpt-4", outSpan["gen_ai.request.model"])
-}
-
-func TestSimulate_MatchInResourceAttrs(t *testing.T) {
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("llm", nil, []string{"service.name"},
-			simMapper("gen_ai.request.model", FieldContextSpanAttribute,
-				simResSrc("service.name", SpanMapperOperationCopy, 1)),
-		),
-	}
-	_, outSpan := SimulateSpanMapping(groups, map[string]any{"service.name": "my-llm-service"}, nil)
-
-	assert.Equal(t, "my-llm-service", outSpan["gen_ai.request.model"])
-}
-
-func TestSimulate_NoMatchSkipsGroup(t *testing.T) {
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("llm", []string{"model"}, nil,
-			simMapper("gen_ai.request.model", FieldContextSpanAttribute,
-				simAttrSrc("llm.model", SpanMapperOperationCopy, 1)),
-		),
-	}
-	_, outSpan := SimulateSpanMapping(groups, nil, map[string]any{"some.other.key": "value"})
-
-	_, ok := outSpan["gen_ai.request.model"]
-	assert.False(t, ok, "target must not be set when condition is not met")
-}
-
-func TestSimulate_SourceFirstMatchWins(t *testing.T) {
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("tokens", []string{"llm"}, nil,
-			simMapper("gen_ai.request.tokens", FieldContextSpanAttribute,
-				simAttrSrc("gen_ai.request_tokens", SpanMapperOperationCopy, 2),
-				simAttrSrc("llm.tokens", SpanMapperOperationCopy, 1)),
-		),
-	}
-	_, outSpan := SimulateSpanMapping(groups, nil, map[string]any{"gen_ai.request_tokens": "100", "llm.tokens": "200"})
-
-	assert.Equal(t, "100", outSpan["gen_ai.request.tokens"])
-}
-
-func TestSimulate_SourceFallsBackToSecond(t *testing.T) {
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("tokens", []string{"llm"}, nil,
-			simMapper("gen_ai.request.tokens", FieldContextSpanAttribute,
-				simAttrSrc("gen_ai.request_tokens", SpanMapperOperationCopy, 2),
-				simAttrSrc("llm.tokens", SpanMapperOperationCopy, 1)),
-		),
-	}
-	_, outSpan := SimulateSpanMapping(groups, nil, map[string]any{"llm.tokens": "200"})
-
-	assert.Equal(t, "200", outSpan["gen_ai.request.tokens"])
-}
-
-func TestSimulate_ActionMove(t *testing.T) {
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("input", []string{"gen_ai"}, nil,
-			simMapper("gen_ai.request.input", FieldContextSpanAttribute,
-				simAttrSrc("gen_ai.input", SpanMapperOperationMove, 1)),
-		),
-	}
-	_, outSpan := SimulateSpanMapping(groups, nil, map[string]any{"gen_ai.input": "hello"})
-
-	assert.Equal(t, "hello", outSpan["gen_ai.request.input"])
-	_, srcPresent := outSpan["gen_ai.input"]
-	assert.False(t, srcPresent, "source key must be deleted when action=move")
-}
-
-func TestSimulate_WriteToResourceContext(t *testing.T) {
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("llm", []string{"llm"}, nil,
-			simMapper("gen_ai.request.model", FieldContextResource,
-				simAttrSrc("llm.model", SpanMapperOperationCopy, 1)),
-		),
-	}
-	outResource, outSpan := SimulateSpanMapping(groups, nil, map[string]any{"llm.model": "gpt-4"})
-
-	assert.Equal(t, "gpt-4", outResource["gen_ai.request.model"], "target must be written to resource attributes")
-	_, inSpan := outSpan["gen_ai.request.model"]
-	assert.False(t, inSpan)
-}
-
-func TestSimulate_DisabledGroupsAndMappersSkipped(t *testing.T) {
-	disabledGroup := simGroup("g1", []string{"llm"}, nil,
-		simMapper("gen_ai.request.model", FieldContextSpanAttribute,
-			simAttrSrc("llm.model", SpanMapperOperationCopy, 1)))
-	disabledGroup.Group.Enabled = false
-
-	_, outSpan := SimulateSpanMapping([]*SpanMapperGroupWithMappers{disabledGroup}, nil, map[string]any{"llm.model": "gpt-4"})
-
-	_, ok := outSpan["gen_ai.request.model"]
-	assert.False(t, ok, "disabled groups must not be evaluated")
-}
-
-func TestSimulate_DoesNotMutateInput(t *testing.T) {
-	input := map[string]any{"gen_ai.input": "hi"}
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("input", []string{"gen_ai"}, nil,
-			simMapper("gen_ai.request.input", FieldContextSpanAttribute,
-				simAttrSrc("gen_ai.input", SpanMapperOperationMove, 1))),
-	}
-	_, _ = SimulateSpanMapping(groups, nil, input)
-
-	// Original input map must be untouched (move would have deleted the key).
-	_, ok := input["gen_ai.input"]
-	assert.True(t, ok, "input map must not be mutated by the preview")
-}
-
-func TestSimulateOTLP_TransformsSpan(t *testing.T) {
-	groups := []*SpanMapperGroupWithMappers{
-		simGroup("llm", []string{"model"}, nil,
-			simMapper("gen_ai.request.model", FieldContextSpanAttribute,
-				simAttrSrc("llm.model", SpanMapperOperationMove, 1)),
-		),
-	}
-
-	otlp := []byte(`{
-		"resourceSpans": [{
-			"resource": {"attributes": [{"key": "service.name", "value": {"stringValue": "checkout"}}]},
-			"scopeSpans": [{
-				"spans": [{"attributes": [{"key": "llm.model", "value": {"stringValue": "gpt-4"}}]}]
-			}]
-		}]
-	}`)
-
-	out, err := SimulateSpanMappingOTLP(groups, otlp)
-	require.NoError(t, err)
-
-	td, err := (&ptrace.JSONUnmarshaler{}).UnmarshalTraces(out)
-	require.NoError(t, err)
-
-	span := td.ResourceSpans().At(0).ScopeSpans().At(0).Spans().At(0)
-	v, ok := span.Attributes().Get("gen_ai.request.model")
-	require.True(t, ok)
-	assert.Equal(t, "gpt-4", v.Str())
-
-	// move must have deleted the source.
-	_, srcPresent := span.Attributes().Get("llm.model")
-	assert.False(t, srcPresent)
-}
-
-func TestSimulateOTLP_Invalid(t *testing.T) {
-	_, err := SimulateSpanMappingOTLP(nil, []byte(`{ not json`))
-	assert.Error(t, err)
-}

tests/integration/tests/querier/17_clickhouse_queries.py

@@ -0,0 +1,74 @@
+"""
+Integration tests for raw ClickHouse SQL queries in the querier.
+"""
+
+from collections.abc import Callable
+from datetime import UTC, datetime, timedelta
+from http import HTTPStatus
+
+from fixtures import querier, types
+from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
+
+
+def test_clickhouse_scalar_numeric_result_alias_classified_as_aggregation(
+    signoz: types.SigNoz,
+    create_user_admin: None,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+) -> None:
+    """A numeric column aliased ``__result_0`` is classified as an aggregation."""
+    now = datetime.now(tz=UTC).replace(second=0, microsecond=0)
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+
+    response = querier.make_query_request(
+        signoz,
+        token,
+        int((now - timedelta(hours=1)).timestamp() * 1000),
+        int(now.timestamp() * 1000),
+        [
+            {
+                "type": "clickhouse_sql",
+                "spec": {
+                    "name": "A",
+                    "query": "SELECT toFloat64(1.5) AS `__result_0`",
+                    "disabled": False,
+                },
+            }
+        ],
+        request_type=querier.RequestType.SCALAR,
+    )
+
+    assert response.status_code == HTTPStatus.OK
+    assert response.json()["status"] == "success"
+
+    columns = querier.get_scalar_columns(response.json())
+    assert len(columns) == 1
+    assert columns[0]["name"] == "__result_0"
+    assert columns[0]["columnType"] == "aggregation"
+    assert columns[0]["aggregationIndex"] == 0
+
+    response = querier.make_query_request(
+        signoz,
+        token,
+        int((now - timedelta(hours=1)).timestamp() * 1000),
+        int(now.timestamp() * 1000),
+        [
+            {
+                "type": "clickhouse_sql",
+                "spec": {
+                    "name": "A",
+                    "query": "SELECT toNullable(toFloat64(1.5)) AS value",
+                    "disabled": False,
+                },
+            }
+        ],
+        request_type=querier.RequestType.SCALAR,
+    )
+
+    assert response.status_code == HTTPStatus.OK
+    assert response.json()["status"] == "success"
+
+    columns = querier.get_scalar_columns(response.json())
+    assert len(columns) == 1
+    assert columns[0]["name"] == "value"
+    assert columns[0]["columnType"] == "aggregation"
+    assert columns[0]["aggregationIndex"] == 0