feat(authn): add support for enabling identNs

* feat(authn): introduce identity resolvers

* feat(authn): clean the interface DI

* feat(authn): renmae the interface to identN

* feat(authn): pending identN rename

* feat(authn): still handling renames

* feat(authn): deprecate authtype

* feat(authn): clean the rotate handling

* feat(authn): still handling renames

conf/example.yaml

@@ -321,3 +321,19 @@ user:
     org:
       name: default
       id: 00000000-0000-0000-0000-000000000000
+
+##################### IdentN #####################
+identn:
+  tokenizer:
+    # toggle the identN resolver
+    enabled: true
+    # headers to use for tokenizer identN resolver
+    headers:
+      - Authorization
+      - Sec-WebSocket-Protocol
+  apikey:
+    # toggle the identN resolver
+    enabled: true
+    # headers to use for apikey identN resolver
+    headers:
+      - SIGNOZ-API-KEY

ee/query-service/app/server.go

@@ -217,8 +217,7 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler, web web.Web) (*h
 		}),
 		otelmux.WithPublicEndpoint(),
 	))
-	r.Use(middleware.NewAuthN([]string{"Authorization", "Sec-WebSocket-Protocol"}, s.signoz.Sharder, s.signoz.Tokenizer, s.signoz.Instrumentation.Logger()).Wrap)
-	r.Use(middleware.NewAPIKey(s.signoz.SQLStore, []string{"SIGNOZ-API-KEY"}, s.signoz.Instrumentation.Logger(), s.signoz.Sharder).Wrap)
+	r.Use(middleware.NewIdentN(s.signoz.IdentNResolver, s.signoz.Sharder, s.signoz.Instrumentation.Logger()).Wrap)
 	r.Use(middleware.NewTimeout(s.signoz.Instrumentation.Logger(),
 		s.config.APIServer.Timeout.ExcludedRoutes,
 		s.config.APIServer.Timeout.Default,

ee/sqlschema/postgressqlschema/provider.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 
+	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/sqlschema"
 	"github.com/SigNoz/signoz/pkg/sqlstore"
@@ -32,9 +33,9 @@ func New(ctx context.Context, providerSettings factory.ProviderSettings, config
 		fmter:    fmter,
 		settings: settings,
 		operator: sqlschema.NewOperator(fmter, sqlschema.OperatorSupport{
-			DropConstraint:          true,
-			ColumnIfNotExistsExists: true,
-			AlterColumnSetNotNull:   true,
+			SCreateAndDropConstraint:                        true,
+			SAlterTableAddAndDropColumnIfNotExistsAndExists: true,
+			SAlterTableAlterColumnSetAndDrop:                true,
 		}),
 	}, nil
 }
@@ -72,8 +73,9 @@ WHERE
 	if err != nil {
 		return nil, nil, err
 	}
+
 	if len(columns) == 0 {
-		return nil, nil, sql.ErrNoRows
+		return nil, nil, provider.sqlstore.WrapNotFoundErrf(sql.ErrNoRows, errors.CodeNotFound, "table (%s) not found", tableName)
 	}
 
 	sqlschemaColumns := make([]*sqlschema.Column, 0)
@@ -220,7 +222,8 @@ SELECT
     ci.relname AS index_name,
     i.indisunique AS unique,
     i.indisprimary AS primary,
-    a.attname AS column_name
+    a.attname AS column_name,
+    array_position(i.indkey, a.attnum) AS column_position
 FROM
     pg_index i
     LEFT JOIN pg_class ct ON ct.oid = i.indrelid
@@ -231,9 +234,10 @@ WHERE
     a.attnum = ANY(i.indkey)
     AND con.oid IS NULL
     AND ct.relkind = 'r'
-    AND ct.relname = ?`, string(name))
+    AND ct.relname = ?
+ORDER BY index_name, column_position`, string(name))
 	if err != nil {
-		return nil, err
+		return nil, provider.sqlstore.WrapNotFoundErrf(err, errors.CodeNotFound, "no indices for table (%s) found", name)
 	}
 
 	defer func() {
@@ -250,9 +254,11 @@ WHERE
 			unique     bool
 			primary    bool
 			columnName string
+			// starts from 0 and is unused in this function, this is to ensure that the column names are in the correct order
+			columnPosition int
 		)
 
-		if err := rows.Scan(&tableName, &indexName, &unique, &primary, &columnName); err != nil {
+		if err := rows.Scan(&tableName, &indexName, &unique, &primary, &columnName, &columnPosition); err != nil {
 			return nil, err
 		}
 
@@ -269,8 +275,12 @@ WHERE
 	}
 
 	indices := make([]sqlschema.Index, 0)
-	for _, index := range uniqueIndicesMap {
-		indices = append(indices, index)
+	for indexName, index := range uniqueIndicesMap {
+		if index.Name() == indexName {
+			indices = append(indices, index)
+		} else {
+			indices = append(indices, index.Named(indexName))
+		}
 	}
 
 	return indices, nil

frontend/src/container/NewWidget/RightContainer/RightContainer.styles.scss

@@ -5,6 +5,7 @@
 	padding-bottom: 48px;
 
 	.section-heading {
+		font-family: 'Space Mono';
 		color: var(--bg-vanilla-400);
 		font-size: 13px;
 		font-style: normal;
@@ -25,6 +26,10 @@
 		letter-spacing: 0.48px;
 	}
 
+	.panel-type-select {
+		width: 100%;
+	}
+
 	.header {
 		display: flex;
 		padding: 14px 14px 14px 12px;
@@ -53,50 +58,6 @@
 		gap: 8px;
 	}
 
-	.name-description {
-		padding: 0 0 4px 0;
-
-		.name-input {
-			display: flex;
-			padding: 6px 6px 6px 8px;
-			align-items: center;
-			gap: 4px;
-			flex: 1 0 0;
-			align-self: stretch;
-			border-radius: 2px;
-			border: 1px solid var(--bg-slate-400);
-			background: var(--bg-ink-300);
-			color: var(--bg-vanilla-100);
-			font-family: Inter;
-			font-size: 14px;
-			font-style: normal;
-			font-weight: 400;
-			line-height: 18px; /* 128.571% */
-			letter-spacing: -0.07px;
-		}
-
-		.description-input {
-			border-style: unset;
-			.ant-input {
-				display: flex;
-				height: 80px;
-				padding: 6px 6px 6px 8px;
-				align-items: flex-start;
-				gap: 4px;
-				border-radius: 2px;
-				border: 1px solid var(--bg-slate-400);
-				background: var(--bg-ink-300);
-				color: var(--bg-vanilla-100);
-				font-family: Inter;
-				font-size: 14px;
-				font-style: normal;
-				font-weight: 400;
-				line-height: 18px; /* 128.571% */
-				letter-spacing: -0.07px;
-			}
-		}
-	}
-
 	.panel-config {
 		display: flex;
 		flex-direction: column;
@@ -230,87 +191,6 @@
 			flex-direction: row;
 			justify-content: space-between;
 		}
-
-		.bucket-config {
-			.bucket-size-label {
-				margin-top: 8px;
-			}
-
-			.bucket-input {
-				display: flex;
-				width: 100%;
-				height: 32px;
-				padding: 6px 6px 6px 8px;
-				align-items: center;
-				gap: 4px;
-				align-self: stretch;
-				border-radius: 2px;
-				border: 1px solid var(--bg-slate-400);
-				background: var(--bg-ink-300);
-
-				.ant-input {
-					background: var(--bg-ink-300);
-				}
-			}
-
-			.combine-hist {
-				display: flex;
-				justify-content: space-between;
-				margin-top: 8px;
-
-				.label {
-					color: var(--bg-vanilla-400);
-					font-size: 13px;
-					font-style: normal;
-					font-weight: 400;
-					line-height: 18px; /* 138.462% */
-					letter-spacing: 0.52px;
-					text-transform: uppercase;
-				}
-			}
-		}
-	}
-
-	.alerts {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 12px;
-		min-height: 44px;
-		border-top: 1px solid var(--bg-slate-500);
-		cursor: pointer;
-
-		.left-section {
-			display: flex;
-			align-items: center;
-			gap: 8px;
-
-			.bell-icon {
-				color: var(--bg-vanilla-400);
-			}
-
-			.alerts-text {
-				color: var(--bg-vanilla-400);
-				font-size: 14px;
-				font-style: normal;
-				font-weight: 400;
-				line-height: 20px; /* 142.857% */
-				letter-spacing: 0.14px;
-			}
-		}
-		.plus-icon {
-			color: var(--bg-vanilla-400);
-		}
-	}
-
-	.context-links {
-		padding: 12px 12px 16px 12px;
-		border-bottom: 1px solid var(--bg-slate-500);
-	}
-
-	.thresholds-section {
-		padding: 12px 12px 16px 12px;
-		border-top: 1px solid var(--bg-slate-500);
 	}
 }
 
@@ -345,26 +225,6 @@
 			}
 		}
 
-		.name-description {
-			.typography {
-				color: var(--bg-ink-400);
-			}
-
-			.name-input {
-				border: 1px solid var(--bg-vanilla-300);
-				background: var(--bg-vanilla-300);
-				color: var(--bg-ink-300);
-			}
-
-			.description-input {
-				.ant-input {
-					border: 1px solid var(--bg-vanilla-300);
-					background: var(--bg-vanilla-300);
-					color: var(--bg-ink-300);
-				}
-			}
-		}
-
 		.panel-config {
 			.panel-type-select {
 				.ant-select-selector {
@@ -402,21 +262,6 @@
 				}
 			}
 
-			.bucket-config {
-				.label {
-					color: var(--bg-ink-400);
-				}
-
-				.bucket-input {
-					border: 1px solid var(--bg-vanilla-300);
-					background: var(--bg-vanilla-300);
-
-					.ant-input {
-						background: var(--bg-vanilla-300);
-					}
-				}
-			}
-
 			.panel-time-text {
 				color: var(--bg-ink-400);
 			}
@@ -450,31 +295,6 @@
 				}
 			}
 		}
-
-		.alerts {
-			border-top: 1px solid var(--bg-vanilla-300);
-
-			.left-section {
-				.bell-icon {
-					color: var(--bg-ink-300);
-				}
-
-				.alerts-text {
-					color: var(--bg-ink-300);
-				}
-			}
-			.plus-icon {
-				color: var(--bg-ink-300);
-			}
-		}
-
-		.context-links {
-			border-bottom: 1px solid var(--bg-vanilla-300);
-		}
-
-		.thresholds-section {
-			border-top: 1px solid var(--bg-vanilla-300);
-		}
 	}
 
 	.select-option {

frontend/src/container/NewWidget/RightContainer/SettingSections/AlertsSection/AlertsSection.styles.scss

@@ -0,0 +1,50 @@
+.alerts-section {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 12px;
+	min-height: 44px;
+	border-top: 1px solid var(--bg-slate-500);
+	cursor: pointer;
+
+	.alerts-section__left {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+
+		.alerts-section__bell-icon {
+			color: var(--bg-vanilla-400);
+		}
+
+		.alerts-section__text {
+			color: var(--bg-vanilla-400);
+			font-size: 14px;
+			font-style: normal;
+			font-weight: 400;
+			line-height: 20px; /* 142.857% */
+			letter-spacing: 0.14px;
+		}
+	}
+	.alerts-section__plus-icon {
+		color: var(--bg-vanilla-400);
+	}
+}
+
+.lightMode {
+	.alerts-section {
+		border-top: 1px solid var(--bg-vanilla-300);
+
+		.alerts-section__left {
+			.alerts-section__bell-icon {
+				color: var(--bg-ink-300);
+			}
+
+			.alerts-section__text {
+				color: var(--bg-ink-300);
+			}
+		}
+		.alerts-section__plus-icon {
+			color: var(--bg-ink-300);
+		}
+	}
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/AlertsSection/AlertsSection.tsx

@@ -0,0 +1,23 @@
+import { Typography } from 'antd';
+import { ConciergeBell, Plus, SquareArrowOutUpRight } from 'lucide-react';
+
+import './AlertsSection.styles.scss';
+
+interface AlertsSectionProps {
+	onCreateAlertsHandler: () => void;
+}
+
+export default function AlertsSection({
+	onCreateAlertsHandler,
+}: AlertsSectionProps): JSX.Element {
+	return (
+		<section className="alerts-section" onClick={onCreateAlertsHandler}>
+			<div className="alerts-section__left">
+				<ConciergeBell size={14} className="alerts-section__bell-icon" />
+				<Typography.Text className="alerts-section__text">Alerts</Typography.Text>
+				<SquareArrowOutUpRight size={10} className="info-icon" />
+			</div>
+			<Plus size={14} className="alerts-section__plus-icon" />
+		</section>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/AxesSection/AxesSection.tsx

@@ -0,0 +1,98 @@
+import { Dispatch, SetStateAction } from 'react';
+import { InputNumber, Select, Typography } from 'antd';
+import { Axis3D, LineChart, Spline } from 'lucide-react';
+
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+
+enum LogScale {
+	LINEAR = 'linear',
+	LOGARITHMIC = 'logarithmic',
+}
+
+const { Option } = Select;
+
+interface AxesSectionProps {
+	allowSoftMinMax: boolean;
+	allowLogScale: boolean;
+	softMin: number | null;
+	softMax: number | null;
+	setSoftMin: Dispatch<SetStateAction<number | null>>;
+	setSoftMax: Dispatch<SetStateAction<number | null>>;
+	isLogScale: boolean;
+	setIsLogScale: Dispatch<SetStateAction<boolean>>;
+}
+
+export default function AxesSection({
+	allowSoftMinMax,
+	allowLogScale,
+	softMin,
+	softMax,
+	setSoftMin,
+	setSoftMax,
+	isLogScale,
+	setIsLogScale,
+}: AxesSectionProps): JSX.Element {
+	const softMinHandler = (value: number | null): void => {
+		setSoftMin(value);
+	};
+
+	const softMaxHandler = (value: number | null): void => {
+		setSoftMax(value);
+	};
+
+	return (
+		<SettingsSection title="Axes" icon={<Axis3D size={14} />}>
+			{allowSoftMinMax && (
+				<section className="soft-min-max">
+					<section className="container">
+						<Typography.Text className="text">Soft Min</Typography.Text>
+						<InputNumber
+							type="number"
+							value={softMin}
+							onChange={softMinHandler}
+							rootClassName="input"
+						/>
+					</section>
+					<section className="container">
+						<Typography.Text className="text">Soft Max</Typography.Text>
+						<InputNumber
+							value={softMax}
+							type="number"
+							rootClassName="input"
+							onChange={softMaxHandler}
+						/>
+					</section>
+				</section>
+			)}
+
+			{allowLogScale && (
+				<section className="log-scale control-container">
+					<Typography.Text className="section-heading">Y Axis Scale</Typography.Text>
+					<Select
+						onChange={(value): void => setIsLogScale(value === LogScale.LOGARITHMIC)}
+						value={isLogScale ? LogScale.LOGARITHMIC : LogScale.LINEAR}
+						className="panel-type-select"
+						defaultValue={LogScale.LINEAR}
+					>
+						<Option value={LogScale.LINEAR}>
+							<div className="select-option">
+								<div className="icon">
+									<LineChart size={16} />
+								</div>
+								<Typography.Text className="display">Linear</Typography.Text>
+							</div>
+						</Option>
+						<Option value={LogScale.LOGARITHMIC}>
+							<div className="select-option">
+								<div className="icon">
+									<Spline size={16} />
+								</div>
+								<Typography.Text className="display">Logarithmic</Typography.Text>
+							</div>
+						</Option>
+					</Select>
+				</section>
+			)}
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/ChartAppearanceSection/ChartAppearanceSection.tsx

@@ -0,0 +1,71 @@
+import { Dispatch, SetStateAction } from 'react';
+import { Switch, Typography } from 'antd';
+import {
+	FillMode,
+	LineInterpolation,
+	LineStyle,
+} from 'lib/uPlotV2/config/types';
+import { Paintbrush } from 'lucide-react';
+
+import { FillModeSelector } from '../../components/FillModeSelector/FillModeSelector';
+import { LineInterpolationSelector } from '../../components/LineInterpolationSelector/LineInterpolationSelector';
+import { LineStyleSelector } from '../../components/LineStyleSelector/LineStyleSelector';
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+
+interface ChartAppearanceSectionProps {
+	fillMode: FillMode;
+	setFillMode: Dispatch<SetStateAction<FillMode>>;
+	lineStyle: LineStyle;
+	setLineStyle: Dispatch<SetStateAction<LineStyle>>;
+	lineInterpolation: LineInterpolation;
+	setLineInterpolation: Dispatch<SetStateAction<LineInterpolation>>;
+	showPoints: boolean;
+	setShowPoints: Dispatch<SetStateAction<boolean>>;
+	allowFillMode: boolean;
+	allowLineStyle: boolean;
+	allowLineInterpolation: boolean;
+	allowShowPoints: boolean;
+}
+
+export default function ChartAppearanceSection({
+	fillMode,
+	setFillMode,
+	lineStyle,
+	setLineStyle,
+	lineInterpolation,
+	setLineInterpolation,
+	showPoints,
+	setShowPoints,
+	allowFillMode,
+	allowLineStyle,
+	allowLineInterpolation,
+	allowShowPoints,
+}: ChartAppearanceSectionProps): JSX.Element {
+	return (
+		<SettingsSection title="Chart Appearance" icon={<Paintbrush size={14} />}>
+			{allowFillMode && (
+				<FillModeSelector value={fillMode} onChange={setFillMode} />
+			)}
+			{allowLineStyle && (
+				<LineStyleSelector value={lineStyle} onChange={setLineStyle} />
+			)}
+			{allowLineInterpolation && (
+				<LineInterpolationSelector
+					value={lineInterpolation}
+					onChange={setLineInterpolation}
+				/>
+			)}
+			{allowShowPoints && (
+				<section className="show-points toggle-card">
+					<div className="toggle-card-text-container">
+						<Typography.Text className="section-heading">Show points</Typography.Text>
+						<Typography.Text className="toggle-card-description">
+							Display individual data points on the chart
+						</Typography.Text>
+					</div>
+					<Switch size="small" checked={showPoints} onChange={setShowPoints} />
+				</section>
+			)}
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/ContextLinksSection/ContextLinksSection.styles.scss

@@ -0,0 +1,10 @@
+.context-links-section {
+	padding: 12px 12px 16px 12px;
+	border-bottom: 1px solid var(--bg-slate-500);
+}
+
+.lightMode {
+	.context-links-section {
+		border-bottom: 1px solid var(--bg-vanilla-300);
+	}
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/ContextLinksSection/ContextLinksSection.tsx

@@ -0,0 +1,36 @@
+import { Dispatch, SetStateAction } from 'react';
+import { Link as LinkIcon } from 'lucide-react';
+import { ContextLinksData, Widgets } from 'types/api/dashboard/getAll';
+
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+import ContextLinks from '../../ContextLinks';
+
+import './ContextLinksSection.styles.scss';
+
+interface ContextLinksSectionProps {
+	contextLinks: ContextLinksData;
+	setContextLinks: Dispatch<SetStateAction<ContextLinksData>>;
+	selectedWidget?: Widgets;
+}
+
+export default function ContextLinksSection({
+	contextLinks,
+	setContextLinks,
+	selectedWidget,
+}: ContextLinksSectionProps): JSX.Element {
+	return (
+		<SettingsSection
+			title="Context Links"
+			icon={<LinkIcon size={14} />}
+			defaultOpen={!!contextLinks.linksData.length}
+		>
+			<div className="context-links-section">
+				<ContextLinks
+					contextLinks={contextLinks}
+					setContextLinks={setContextLinks}
+					selectedWidget={selectedWidget}
+				/>
+			</div>
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/FormattingUnitsSection/FormattingUnitsSection.tsx

@@ -0,0 +1,84 @@
+import { Dispatch, SetStateAction } from 'react';
+import { Select, Typography } from 'antd';
+import { PrecisionOption } from 'components/Graph/types';
+import { PanelDisplay } from 'constants/queryBuilder';
+import { SlidersHorizontal } from 'lucide-react';
+import { ColumnUnit } from 'types/api/dashboard/getAll';
+
+import { ColumnUnitSelector } from '../../ColumnUnitSelector/ColumnUnitSelector';
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+import DashboardYAxisUnitSelectorWrapper from '../../DashboardYAxisUnitSelectorWrapper';
+
+interface FormattingUnitsSectionProps {
+	selectedPanelDisplay: PanelDisplay | '';
+	yAxisUnit: string;
+	setYAxisUnit: Dispatch<SetStateAction<string>>;
+	isNewDashboard: boolean;
+	decimalPrecision: PrecisionOption;
+	setDecimalPrecision: Dispatch<SetStateAction<PrecisionOption>>;
+	columnUnits: ColumnUnit;
+	setColumnUnits: Dispatch<SetStateAction<ColumnUnit>>;
+	allowYAxisUnit: boolean;
+	allowDecimalPrecision: boolean;
+	allowPanelColumnPreference: boolean;
+	decimapPrecisionOptions: { label: string; value: PrecisionOption }[];
+}
+
+export default function FormattingUnitsSection({
+	selectedPanelDisplay,
+	yAxisUnit,
+	setYAxisUnit,
+	isNewDashboard,
+	decimalPrecision,
+	setDecimalPrecision,
+	columnUnits,
+	setColumnUnits,
+	allowYAxisUnit,
+	allowDecimalPrecision,
+	allowPanelColumnPreference,
+	decimapPrecisionOptions,
+}: FormattingUnitsSectionProps): JSX.Element {
+	return (
+		<SettingsSection
+			title="Formatting & Units"
+			icon={<SlidersHorizontal size={14} />}
+		>
+			{allowYAxisUnit && (
+				<DashboardYAxisUnitSelectorWrapper
+					onSelect={setYAxisUnit}
+					value={yAxisUnit || ''}
+					fieldLabel={
+						selectedPanelDisplay === PanelDisplay.VALUE ||
+						selectedPanelDisplay === PanelDisplay.PIE
+							? 'Unit'
+							: 'Y Axis Unit'
+					}
+					shouldUpdateYAxisUnit={isNewDashboard}
+				/>
+			)}
+
+			{allowDecimalPrecision && (
+				<section className="decimal-precision-selector control-container">
+					<Typography.Text className="section-heading">
+						Decimal Precision
+					</Typography.Text>
+					<Select
+						options={decimapPrecisionOptions}
+						value={decimalPrecision}
+						className="panel-type-select"
+						defaultValue={decimapPrecisionOptions[0]?.value}
+						onChange={(val: PrecisionOption): void => setDecimalPrecision(val)}
+					/>
+				</section>
+			)}
+
+			{allowPanelColumnPreference && (
+				<ColumnUnitSelector
+					columnUnits={columnUnits}
+					setColumnUnits={setColumnUnits}
+					isNewDashboard={isNewDashboard}
+				/>
+			)}
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/GeneralSettingsSection/GeneralSettingsSection.styles.scss

@@ -0,0 +1,64 @@
+.general-settings__name-description {
+	padding: 0 0 4px 0;
+
+	.general-settings__name-input {
+		display: flex;
+		padding: 6px 6px 6px 8px;
+		align-items: center;
+		gap: 4px;
+		flex: 1 0 0;
+		align-self: stretch;
+		border-radius: 2px;
+		border: 1px solid var(--bg-slate-400);
+		background: var(--bg-ink-300);
+		color: var(--bg-vanilla-100);
+		font-family: Inter;
+		font-size: 14px;
+		font-style: normal;
+		font-weight: 400;
+		line-height: 18px; /* 128.571% */
+		letter-spacing: -0.07px;
+	}
+
+	.general-settings__description-input {
+		border-style: unset;
+		.ant-input {
+			display: flex;
+			height: 80px;
+			padding: 6px 6px 6px 8px;
+			align-items: flex-start;
+			gap: 4px;
+			border-radius: 2px;
+			border: 1px solid var(--bg-slate-400);
+			background: var(--bg-ink-300);
+			color: var(--bg-vanilla-100);
+			font-family: Inter;
+			font-size: 14px;
+			font-style: normal;
+			font-weight: 400;
+			line-height: 18px; /* 128.571% */
+			letter-spacing: -0.07px;
+		}
+	}
+}
+
+.lightMode {
+	.general-settings__name-description {
+		border-top: 1px solid var(--bg-vanilla-300);
+		border-bottom: 1px solid var(--bg-vanilla-300);
+
+		.general-settings__name-input {
+			border: 1px solid var(--bg-vanilla-300);
+			background: var(--bg-vanilla-300);
+			color: var(--bg-ink-300);
+		}
+
+		.general-settings__description-input {
+			.ant-input {
+				border: 1px solid var(--bg-vanilla-300);
+				background: var(--bg-vanilla-300);
+				color: var(--bg-ink-300);
+			}
+		}
+	}
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/GeneralSettingsSection/GeneralSettingsSection.tsx

@@ -0,0 +1,156 @@
+import {
+	Dispatch,
+	SetStateAction,
+	useCallback,
+	useMemo,
+	useRef,
+	useState,
+} from 'react';
+import type { InputRef } from 'antd';
+import { AutoComplete, Input, Typography } from 'antd';
+import { popupContainer } from 'utils/selectPopupContainer';
+
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+
+import './GeneralSettingsSection.styles.scss';
+
+const { TextArea } = Input;
+
+interface VariableOption {
+	value: string;
+	label: string;
+}
+
+interface GeneralSettingsSectionProps {
+	title: string;
+	setTitle: Dispatch<SetStateAction<string>>;
+	description: string;
+	setDescription: Dispatch<SetStateAction<string>>;
+	dashboardVariables: Record<string, { name?: string }>;
+}
+
+export default function GeneralSettingsSection({
+	title,
+	setTitle,
+	description,
+	setDescription,
+	dashboardVariables,
+}: GeneralSettingsSectionProps): JSX.Element {
+	const [inputValue, setInputValue] = useState(title);
+	const [autoCompleteOpen, setAutoCompleteOpen] = useState(false);
+	const [cursorPos, setCursorPos] = useState(0);
+	const inputRef = useRef<InputRef>(null);
+
+	const onChangeHandler = (
+		setFunc: Dispatch<SetStateAction<string>>,
+		value: string,
+	): void => {
+		setFunc(value);
+	};
+
+	const dashboardVariableOptions = useMemo<VariableOption[]>(() => {
+		return Object.entries(dashboardVariables).map(([, value]) => ({
+			value: value.name || '',
+			label: value.name || '',
+		}));
+	}, [dashboardVariables]);
+
+	const updateCursorAndDropdown = useCallback(
+		(value: string, pos: number): void => {
+			setCursorPos(pos);
+			const lastDollar = value.lastIndexOf('$', pos - 1);
+			setAutoCompleteOpen(lastDollar !== -1 && pos >= lastDollar + 1);
+		},
+		[],
+	);
+
+	const onInputChange = useCallback(
+		(value: string): void => {
+			setInputValue(value);
+			onChangeHandler(setTitle, value);
+			setTimeout(() => {
+				const pos = inputRef.current?.input?.selectionStart ?? 0;
+				updateCursorAndDropdown(value, pos);
+			}, 0);
+		},
+		[setTitle, updateCursorAndDropdown],
+	);
+
+	const onSelect = useCallback(
+		(selectedValue: string): void => {
+			const pos = cursorPos;
+			const value = inputValue;
+			const lastDollar = value.lastIndexOf('$', pos - 1);
+			const textBeforeDollar = value.substring(0, lastDollar);
+			const textAfterDollar = value.substring(lastDollar + 1);
+			const match = textAfterDollar.match(/^([a-zA-Z0-9_.]*)/);
+			const rest = textAfterDollar.substring(match ? match[1].length : 0);
+			const newValue = `${textBeforeDollar}$${selectedValue}${rest}`;
+			setInputValue(newValue);
+			onChangeHandler(setTitle, newValue);
+			setAutoCompleteOpen(false);
+			setTimeout(() => {
+				const newCursor = `${textBeforeDollar}$${selectedValue}`.length;
+				inputRef.current?.input?.setSelectionRange(newCursor, newCursor);
+				setCursorPos(newCursor);
+			}, 0);
+		},
+		[cursorPos, inputValue, setTitle],
+	);
+
+	const filterOption = useCallback(
+		(currentInputValue: string, option?: VariableOption): boolean => {
+			const pos = cursorPos;
+			const value = currentInputValue;
+			const lastDollar = value.lastIndexOf('$', pos - 1);
+			if (lastDollar === -1) {
+				return false;
+			}
+			const afterDollar = value.substring(lastDollar + 1, pos).toLowerCase();
+			return option?.value.toLowerCase().startsWith(afterDollar) || false;
+		},
+		[cursorPos],
+	);
+
+	const handleInputCursor = useCallback((): void => {
+		const pos = inputRef.current?.input?.selectionStart ?? 0;
+		updateCursorAndDropdown(inputValue, pos);
+	}, [inputValue, updateCursorAndDropdown]);
+
+	return (
+		<SettingsSection title="General" defaultOpen icon={null}>
+			<section className="general-settings__name-description control-container">
+				<Typography.Text className="section-heading">Name</Typography.Text>
+				<AutoComplete
+					options={dashboardVariableOptions}
+					value={inputValue}
+					onChange={onInputChange}
+					onSelect={onSelect}
+					filterOption={filterOption}
+					getPopupContainer={popupContainer}
+					placeholder="Enter the panel name here..."
+					open={autoCompleteOpen}
+				>
+					<Input
+						rootClassName="general-settings__name-input"
+						ref={inputRef}
+						onSelect={handleInputCursor}
+						onClick={handleInputCursor}
+						onBlur={(): void => setAutoCompleteOpen(false)}
+					/>
+				</AutoComplete>
+				<Typography.Text className="section-heading">Description</Typography.Text>
+				<TextArea
+					placeholder="Enter the panel description here..."
+					bordered
+					allowClear
+					value={description}
+					onChange={(event): void =>
+						onChangeHandler(setDescription, event.target.value)
+					}
+					rootClassName="general-settings__description-input"
+				/>
+			</section>
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/HistogramBucketsSection/HistogramBucketsSection.styles.scss

@@ -0,0 +1,55 @@
+.histogram-settings__bucket-config {
+	.histogram-settings__bucket-size-label {
+		margin-top: 8px;
+	}
+
+	.histogram-settings__bucket-input {
+		display: flex;
+		width: 100%;
+		height: 32px;
+		padding: 6px 6px 6px 8px;
+		align-items: center;
+		gap: 4px;
+		align-self: stretch;
+		border-radius: 2px;
+		border: 1px solid var(--bg-slate-400);
+		background: var(--bg-ink-300);
+
+		.ant-input {
+			background: var(--bg-ink-300);
+		}
+	}
+
+	.histogram-settings__combine-hist {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 8px;
+
+		.histogram-settings__merge-label {
+			color: var(--bg-vanilla-400);
+			font-size: 13px;
+			font-style: normal;
+			font-weight: 400;
+			line-height: 18px; /* 138.462% */
+			letter-spacing: 0.52px;
+			text-transform: uppercase;
+		}
+	}
+}
+
+.lightMode {
+	.histogram-settings__bucket-config {
+		.histogram-settings__merge-label {
+			color: var(--bg-ink-400);
+		}
+
+		.histogram-settings__bucket-input {
+			border: 1px solid var(--bg-vanilla-300);
+			background: var(--bg-vanilla-300);
+
+			.ant-input {
+				background: var(--bg-vanilla-300);
+			}
+		}
+	}
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/HistogramBucketsSection/HistogramBucketsSection.tsx

@@ -0,0 +1,71 @@
+import { Dispatch, SetStateAction } from 'react';
+import { InputNumber, Switch, Typography } from 'antd';
+
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+
+import './HistogramBucketsSection.styles.scss';
+
+interface HistogramBucketsSectionProps {
+	bucketCount: number;
+	setBucketCount: Dispatch<SetStateAction<number>>;
+	bucketWidth: number;
+	setBucketWidth: Dispatch<SetStateAction<number>>;
+	combineHistogram: boolean;
+	setCombineHistogram: Dispatch<SetStateAction<boolean>>;
+}
+
+export default function HistogramBucketsSection({
+	bucketCount,
+	setBucketCount,
+	bucketWidth,
+	setBucketWidth,
+	combineHistogram,
+	setCombineHistogram,
+}: HistogramBucketsSectionProps): JSX.Element {
+	return (
+		<SettingsSection title="Histogram / Buckets">
+			<section className="histogram-settings__bucket-config control-container">
+				<Typography.Text className="section-heading">
+					Number of buckets
+				</Typography.Text>
+				<InputNumber
+					value={bucketCount || null}
+					type="number"
+					min={0}
+					rootClassName="bucket-input"
+					placeholder="Default: 30"
+					onChange={(val): void => {
+						setBucketCount(val || 0);
+					}}
+				/>
+				<Typography.Text className="section-heading histogram-settings__bucket-size-label">
+					Bucket width
+				</Typography.Text>
+				<InputNumber
+					value={bucketWidth || null}
+					type="number"
+					precision={2}
+					placeholder="Default: Auto"
+					step={0.1}
+					min={0.0}
+					rootClassName="histogram-settings__bucket-input"
+					onChange={(val): void => {
+						setBucketWidth(val || 0);
+					}}
+				/>
+				<section className="histogram-settings__combine-hist">
+					<Typography.Text className="section-heading">
+						<span className="histogram-settings__merge-label">
+							Merge all series into one
+						</span>
+					</Typography.Text>
+					<Switch
+						checked={combineHistogram}
+						size="small"
+						onChange={(checked): void => setCombineHistogram(checked)}
+					/>
+				</section>
+			</section>
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/LegendSection/LegendSection.tsx

@@ -0,0 +1,72 @@
+import { Dispatch, SetStateAction } from 'react';
+import type { UseQueryResult } from 'react-query';
+import { Select, Typography } from 'antd';
+import { Layers } from 'lucide-react';
+import { SuccessResponse } from 'types/api';
+import { LegendPosition } from 'types/api/dashboard/getAll';
+import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+import LegendColors from '../../LegendColors/LegendColors';
+
+const { Option } = Select;
+
+interface LegendSectionProps {
+	allowLegendPosition: boolean;
+	allowLegendColors: boolean;
+	legendPosition: LegendPosition;
+	setLegendPosition: Dispatch<SetStateAction<LegendPosition>>;
+	customLegendColors: Record<string, string>;
+	setCustomLegendColors: Dispatch<SetStateAction<Record<string, string>>>;
+	queryResponse?: UseQueryResult<
+		SuccessResponse<MetricRangePayloadProps, unknown>,
+		Error
+	>;
+}
+
+export default function LegendSection({
+	allowLegendPosition,
+	allowLegendColors,
+	legendPosition,
+	setLegendPosition,
+	customLegendColors,
+	setCustomLegendColors,
+	queryResponse,
+}: LegendSectionProps): JSX.Element {
+	return (
+		<SettingsSection title="Legend" icon={<Layers size={14} />}>
+			{allowLegendPosition && (
+				<section className="legend-position control-container">
+					<Typography.Text className="section-heading">Position</Typography.Text>
+					<Select
+						onChange={(value: LegendPosition): void => setLegendPosition(value)}
+						value={legendPosition}
+						className="panel-type-select"
+						defaultValue={LegendPosition.BOTTOM}
+					>
+						<Option value={LegendPosition.BOTTOM}>
+							<div className="select-option">
+								<Typography.Text className="display">Bottom</Typography.Text>
+							</div>
+						</Option>
+						<Option value={LegendPosition.RIGHT}>
+							<div className="select-option">
+								<Typography.Text className="display">Right</Typography.Text>
+							</div>
+						</Option>
+					</Select>
+				</section>
+			)}
+
+			{allowLegendColors && (
+				<section className="legend-colors">
+					<LegendColors
+						customLegendColors={customLegendColors}
+						setCustomLegendColors={setCustomLegendColors}
+						queryResponse={queryResponse}
+					/>
+				</section>
+			)}
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/ThresholdsSection/ThresholdsSection.styles.scss

@@ -0,0 +1,10 @@
+.thresholds-section {
+	padding: 12px 12px 16px 12px;
+	border-top: 1px solid var(--bg-slate-500);
+}
+
+.lightMode {
+	.thresholds-section {
+		border-top: 1px solid var(--bg-vanilla-300);
+	}
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/ThresholdsSection/ThresholdsSection.tsx

@@ -0,0 +1,42 @@
+import { Dispatch, SetStateAction } from 'react';
+import { PANEL_TYPES } from 'constants/queryBuilder';
+import { Antenna } from 'lucide-react';
+import { ColumnUnit } from 'types/api/dashboard/getAll';
+
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+import ThresholdSelector from '../../Threshold/ThresholdSelector';
+import { ThresholdProps } from '../../Threshold/types';
+
+import './ThresholdsSection.styles.scss';
+
+interface ThresholdsSectionProps {
+	thresholds: ThresholdProps[];
+	setThresholds: Dispatch<SetStateAction<ThresholdProps[]>>;
+	yAxisUnit: string;
+	selectedGraph: PANEL_TYPES;
+	columnUnits: ColumnUnit;
+}
+
+export default function ThresholdsSection({
+	thresholds,
+	setThresholds,
+	yAxisUnit,
+	selectedGraph,
+	columnUnits,
+}: ThresholdsSectionProps): JSX.Element {
+	return (
+		<SettingsSection
+			title="Thresholds"
+			icon={<Antenna size={14} />}
+			defaultOpen={!!thresholds.length}
+		>
+			<ThresholdSelector
+				thresholds={thresholds}
+				setThresholds={setThresholds}
+				yAxisUnit={yAxisUnit}
+				selectedGraph={selectedGraph}
+				columnUnits={columnUnits}
+			/>
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/SettingSections/VisualizationSettingsSection/VisualizationSettingsSection.tsx

@@ -0,0 +1,130 @@
+import { Dispatch, SetStateAction, useEffect, useState } from 'react';
+import { Select, Switch, Typography } from 'antd';
+import TimePreference from 'components/TimePreferenceDropDown';
+import { PANEL_TYPES } from 'constants/queryBuilder';
+import {
+	ItemsProps,
+	PanelTypesWithData,
+} from 'container/DashboardContainer/PanelTypeSelectionModal/menuItems';
+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { LayoutDashboard } from 'lucide-react';
+import { DataSource } from 'types/common/queryBuilder';
+
+import SettingsSection from '../../components/SettingsSection/SettingsSection';
+import { timePreferance } from '../../timeItems';
+
+const { Option } = Select;
+
+interface VisualizationSettingsSectionProps {
+	selectedGraph: PANEL_TYPES;
+	setGraphHandler: (type: PANEL_TYPES) => void;
+	selectedTime: timePreferance;
+	setSelectedTime: Dispatch<SetStateAction<timePreferance>>;
+	stackedBarChart: boolean;
+	setStackedBarChart: Dispatch<SetStateAction<boolean>>;
+	isFillSpans: boolean;
+	setIsFillSpans: Dispatch<SetStateAction<boolean>>;
+	allowPanelTimePreference: boolean;
+	allowStackingBarChart: boolean;
+	allowFillSpans: boolean;
+}
+
+export default function VisualizationSettingsSection({
+	selectedGraph,
+	setGraphHandler,
+	selectedTime,
+	setSelectedTime,
+	stackedBarChart,
+	setStackedBarChart,
+	isFillSpans,
+	setIsFillSpans,
+	allowPanelTimePreference,
+	allowStackingBarChart,
+	allowFillSpans,
+}: VisualizationSettingsSectionProps): JSX.Element {
+	const { currentQuery } = useQueryBuilder();
+	const [graphTypes, setGraphTypes] = useState<ItemsProps[]>(PanelTypesWithData);
+
+	useEffect(() => {
+		const queryContainsMetricsDataSource = currentQuery.builder.queryData.some(
+			(query) => query.dataSource === DataSource.METRICS,
+		);
+
+		if (queryContainsMetricsDataSource) {
+			setGraphTypes((prev) =>
+				prev.filter((graph) => graph.name !== PANEL_TYPES.LIST),
+			);
+		} else {
+			setGraphTypes(PanelTypesWithData);
+		}
+	}, [currentQuery]);
+
+	return (
+		<SettingsSection
+			title="Visualization"
+			defaultOpen
+			icon={<LayoutDashboard size={14} />}
+		>
+			<section className="panel-type control-container">
+				<Typography.Text className="section-heading">Panel Type</Typography.Text>
+				<Select
+					onChange={setGraphHandler}
+					value={selectedGraph}
+					className="panel-type-select"
+					data-testid="panel-change-select"
+					data-stacking-state={stackedBarChart ? 'true' : 'false'}
+				>
+					{graphTypes.map((item) => (
+						<Option key={item.name} value={item.name}>
+							<div className="select-option">
+								<div className="icon">{item.icon}</div>
+								<Typography.Text className="display">{item.display}</Typography.Text>
+							</div>
+						</Option>
+					))}
+				</Select>
+			</section>
+
+			{allowPanelTimePreference && (
+				<section className="panel-time-preference control-container">
+					<Typography.Text className="section-heading">
+						Panel Time Preference
+					</Typography.Text>
+					<TimePreference
+						{...{
+							selectedTime,
+							setSelectedTime,
+						}}
+					/>
+				</section>
+			)}
+
+			{allowStackingBarChart && (
+				<section className="stack-chart control-container">
+					<Typography.Text className="section-heading">Stack series</Typography.Text>
+					<Switch
+						checked={stackedBarChart}
+						size="small"
+						onChange={(checked): void => setStackedBarChart(checked)}
+					/>
+				</section>
+			)}
+
+			{allowFillSpans && (
+				<section className="fill-gaps toggle-card">
+					<div className="toggle-card-text-container">
+						<Typography className="section-heading">Fill gaps</Typography>
+						<Typography.Text className="toggle-card-description">
+							Fill gaps in data with 0 for continuity
+						</Typography.Text>
+					</div>
+					<Switch
+						checked={isFillSpans}
+						size="small"
+						onChange={(checked): void => setIsFillSpans(checked)}
+					/>
+				</section>
+			)}
+		</SettingsSection>
+	);
+}

frontend/src/container/NewWidget/RightContainer/__tests__/RightContainer.test.tsx

@@ -189,7 +189,7 @@ describe('RightContainer - Alerts Section', () => {
 
 		const alertsSection = screen.getByText('Alerts').closest('section');
 		expect(alertsSection).toBeInTheDocument();
-		expect(alertsSection).toHaveClass('alerts');
+		expect(alertsSection).toHaveClass('alerts-section');
 	});
 
 	it('renders alerts section with correct text and SquareArrowOutUpRight icon', () => {

frontend/src/container/NewWidget/RightContainer/components/FillModeSelector/FillModeSelector.styles.scss

@@ -0,0 +1,21 @@
+.fill-mode-selector {
+	.fill-mode-icon {
+		width: 24px;
+		height: 24px;
+	}
+
+	.fill-mode-label {
+		text-transform: uppercase;
+		font-size: 12px;
+		font-weight: 500;
+		color: var(--bg-vanilla-400);
+	}
+}
+
+.lightMode {
+	.fill-mode-selector {
+		.fill-mode-label {
+			color: var(--bg-ink-400);
+		}
+	}
+}

frontend/src/container/NewWidget/RightContainer/components/FillModeSelector/FillModeSelector.tsx

@@ -0,0 +1,94 @@
+import { ToggleGroup, ToggleGroupItem } from '@signozhq/toggle-group';
+import { Typography } from 'antd';
+import { FillMode } from 'lib/uPlotV2/config/types';
+
+import './FillModeSelector.styles.scss';
+
+interface FillModeSelectorProps {
+	value: FillMode;
+	onChange: (value: FillMode) => void;
+}
+
+export function FillModeSelector({
+	value,
+	onChange,
+}: FillModeSelectorProps): JSX.Element {
+	return (
+		<section className="fill-mode-selector control-container">
+			<Typography.Text className="section-heading">Fill mode</Typography.Text>
+			<ToggleGroup
+				type="single"
+				value={value}
+				variant="outline"
+				size="lg"
+				onValueChange={(newValue): void => {
+					if (newValue) {
+						onChange(newValue as FillMode);
+					}
+				}}
+			>
+				<ToggleGroupItem value={FillMode.None} aria-label="None" title="None">
+					<svg
+						className="fill-mode-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<rect x="8" y="16" width="32" height="16" stroke="#888" fill="none" />
+					</svg>
+					<Typography.Text className="section-heading-small">None</Typography.Text>
+				</ToggleGroupItem>
+				<ToggleGroupItem value={FillMode.Solid} aria-label="Solid" title="Solid">
+					<svg
+						className="fill-mode-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<rect x="8" y="16" width="32" height="16" fill="#888" />
+					</svg>
+					<Typography.Text className="section-heading-small">Solid</Typography.Text>
+				</ToggleGroupItem>
+				<ToggleGroupItem
+					value={FillMode.Gradient}
+					aria-label="Gradient"
+					title="Gradient"
+				>
+					<svg
+						className="fill-mode-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<defs>
+							<linearGradient id="fill-gradient" x1="0" y1="0" x2="1" y2="0">
+								<stop offset="0%" stopColor="#888" stopOpacity="0.2" />
+								<stop offset="100%" stopColor="#888" stopOpacity="0.8" />
+							</linearGradient>
+						</defs>
+						<rect
+							x="8"
+							y="16"
+							width="32"
+							height="16"
+							fill="url(#fill-gradient)"
+							stroke="#888"
+						/>
+					</svg>
+					<Typography.Text className="section-heading-small">
+						Gradient
+					</Typography.Text>
+				</ToggleGroupItem>
+			</ToggleGroup>
+		</section>
+	);
+}

frontend/src/container/NewWidget/RightContainer/components/LineInterpolationSelector/LineInterpolationSelector.styles.scss

@@ -0,0 +1,21 @@
+.line-interpolation-selector {
+	.line-interpolation-icon {
+		width: 24px;
+		height: 24px;
+	}
+
+	.line-interpolation-label {
+		text-transform: uppercase;
+		font-size: 12px;
+		font-weight: 500;
+		color: var(--bg-vanilla-400);
+	}
+}
+
+.lightMode {
+	.line-interpolation-selector {
+		.line-interpolation-label {
+			color: var(--bg-ink-400);
+		}
+	}
+}

frontend/src/container/NewWidget/RightContainer/components/LineInterpolationSelector/LineInterpolationSelector.tsx

@@ -0,0 +1,110 @@
+import { ToggleGroup, ToggleGroupItem } from '@signozhq/toggle-group';
+import { Typography } from 'antd';
+import { LineInterpolation } from 'lib/uPlotV2/config/types';
+
+import './LineInterpolationSelector.styles.scss';
+
+interface LineInterpolationSelectorProps {
+	value: LineInterpolation;
+	onChange: (value: LineInterpolation) => void;
+}
+
+export function LineInterpolationSelector({
+	value,
+	onChange,
+}: LineInterpolationSelectorProps): JSX.Element {
+	return (
+		<section className="line-interpolation-selector control-container">
+			<Typography.Text className="section-heading">
+				Line interpolation
+			</Typography.Text>
+			<ToggleGroup
+				type="single"
+				value={value}
+				variant="outline"
+				size="lg"
+				onValueChange={(newValue): void => {
+					if (newValue) {
+						onChange(newValue as LineInterpolation);
+					}
+				}}
+			>
+				<ToggleGroupItem
+					value={LineInterpolation.Linear}
+					aria-label="Linear"
+					title="Linear"
+				>
+					<svg
+						className="line-interpolation-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<circle cx="8" cy="32" r="3" fill="#888" />
+						<circle cx="24" cy="16" r="3" fill="#888" />
+						<circle cx="40" cy="32" r="3" fill="#888" />
+						<path d="M8 32 L24 16 L40 32" stroke="#888" />
+					</svg>
+				</ToggleGroupItem>
+				<ToggleGroupItem value={LineInterpolation.Spline} aria-label="Spline">
+					<svg
+						className="line-interpolation-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<circle cx="8" cy="32" r="3" fill="#888" />
+						<circle cx="24" cy="16" r="3" fill="#888" />
+						<circle cx="40" cy="32" r="3" fill="#888" />
+						<path d="M8 32 C16 8, 32 8, 40 32" />
+					</svg>
+				</ToggleGroupItem>
+				<ToggleGroupItem
+					value={LineInterpolation.StepAfter}
+					aria-label="Step After"
+				>
+					<svg
+						className="line-interpolation-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<circle cx="8" cy="32" r="3" fill="#888" />
+						<circle cx="24" cy="16" r="3" fill="#888" />
+						<circle cx="40" cy="32" r="3" fill="#888" />
+						<path d="M8 32 V16 H24 V32 H40" />
+					</svg>
+				</ToggleGroupItem>
+
+				<ToggleGroupItem
+					value={LineInterpolation.StepBefore}
+					aria-label="Step Before"
+				>
+					<svg
+						className="line-interpolation-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<circle cx="8" cy="32" r="3" fill="#888" />
+						<circle cx="24" cy="16" r="3" fill="#888" />
+						<circle cx="40" cy="32" r="3" fill="#888" />
+						<path d="M8 32 H24 V16 H40 V32" />
+					</svg>
+				</ToggleGroupItem>
+			</ToggleGroup>
+		</section>
+	);
+}

frontend/src/container/NewWidget/RightContainer/components/LineStyleSelector/LineStyleSelector.styles.scss

@@ -0,0 +1,21 @@
+.line-style-selector {
+	.line-style-icon {
+		width: 24px;
+		height: 24px;
+	}
+
+	.line-style-label {
+		text-transform: uppercase;
+		font-size: 12px;
+		font-weight: 500;
+		color: var(--bg-vanilla-400);
+	}
+}
+
+.lightMode {
+	.line-style-selector {
+		.line-style-label {
+			color: var(--bg-ink-400);
+		}
+	}
+}

frontend/src/container/NewWidget/RightContainer/components/LineStyleSelector/LineStyleSelector.tsx

@@ -0,0 +1,66 @@
+import { ToggleGroup, ToggleGroupItem } from '@signozhq/toggle-group';
+import { Typography } from 'antd';
+import { LineStyle } from 'lib/uPlotV2/config/types';
+
+import './LineStyleSelector.styles.scss';
+
+interface LineStyleSelectorProps {
+	value: LineStyle;
+	onChange: (value: LineStyle) => void;
+}
+
+export function LineStyleSelector({
+	value,
+	onChange,
+}: LineStyleSelectorProps): JSX.Element {
+	return (
+		<section className="line-style-selector control-container">
+			<Typography.Text className="section-heading">Line style</Typography.Text>
+			<ToggleGroup
+				type="single"
+				value={value}
+				variant="outline"
+				size="lg"
+				onValueChange={(newValue): void => {
+					if (newValue) {
+						onChange(newValue as LineStyle);
+					}
+				}}
+			>
+				<ToggleGroupItem value={LineStyle.Solid} aria-label="Solid" title="Solid">
+					<svg
+						className="line-style-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<path d="M8 24 L40 24" />
+					</svg>
+					<Typography.Text className="section-heading-small">Solid</Typography.Text>
+				</ToggleGroupItem>
+				<ToggleGroupItem
+					value={LineStyle.Dashed}
+					aria-label="Dashed"
+					title="Dashed"
+				>
+					<svg
+						className="line-style-icon"
+						viewBox="0 0 48 48"
+						fill="none"
+						stroke="#888"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+						strokeDasharray="6 4"
+					>
+						<path d="M8 24 L40 24" />
+					</svg>
+					<Typography.Text className="section-heading-small">Dashed</Typography.Text>
+				</ToggleGroupItem>
+			</ToggleGroup>
+		</section>
+	);
+}

frontend/src/container/NewWidget/RightContainer/index.tsx

@@ -1,52 +1,16 @@
-import {
-	Dispatch,
-	SetStateAction,
-	useCallback,
-	useEffect,
-	useMemo,
-	useRef,
-	useState,
-} from 'react';
+import { Dispatch, SetStateAction, useMemo } from 'react';
 import { UseQueryResult } from 'react-query';
-import type { InputRef } from 'antd';
-import {
-	AutoComplete,
-	Input,
-	InputNumber,
-	Select,
-	Switch,
-	Typography,
-} from 'antd';
+import { Typography } from 'antd';
 import { PrecisionOption, PrecisionOptionsEnum } from 'components/Graph/types';
-import TimePreference from 'components/TimePreferenceDropDown';
 import { PANEL_TYPES, PanelDisplay } from 'constants/queryBuilder';
-import {
-	ItemsProps,
-	PanelTypesWithData,
-} from 'container/DashboardContainer/PanelTypeSelectionModal/menuItems';
+import { PanelTypesWithData } from 'container/DashboardContainer/PanelTypeSelectionModal/menuItems';
 import { useDashboardVariables } from 'hooks/dashboard/useDashboardVariables';
 import useCreateAlerts from 'hooks/queryBuilder/useCreateAlerts';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import {
 	FillMode,
 	LineInterpolation,
 	LineStyle,
 } from 'lib/uPlotV2/config/types';
-import {
-	Antenna,
-	Axis3D,
-	ConciergeBell,
-	Layers,
-	LayoutDashboard,
-	LineChart,
-	Link,
-	Paintbrush,
-	Pencil,
-	Plus,
-	SlidersHorizontal,
-	Spline,
-	SquareArrowOutUpRight,
-} from 'lucide-react';
 import { SuccessResponse } from 'types/api';
 import {
 	ColumnUnit,
@@ -55,11 +19,7 @@ import {
 	Widgets,
 } from 'types/api/dashboard/getAll';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { DataSource } from 'types/common/queryBuilder';
-import { popupContainer } from 'utils/selectPopupContainer';
 
-import { ColumnUnitSelector } from './ColumnUnitSelector/ColumnUnitSelector';
-import SettingsSection from './components/SettingsSection/SettingsSection';
 import {
 	panelTypeVsBucketConfig,
 	panelTypeVsColumnUnitPreferences,
@@ -80,32 +40,20 @@ import {
 	panelTypeVsThreshold,
 	panelTypeVsYAxisUnit,
 } from './constants';
-import ContextLinks from './ContextLinks';
-import DashboardYAxisUnitSelectorWrapper from './DashboardYAxisUnitSelectorWrapper';
-import { FillModeSelector } from './FillModeSelector';
-import LegendColors from './LegendColors/LegendColors';
-import { LineInterpolationSelector } from './LineInterpolationSelector';
-import { LineStyleSelector } from './LineStyleSelector';
-import ThresholdSelector from './Threshold/ThresholdSelector';
+import AlertsSection from './SettingSections/AlertsSection/AlertsSection';
+import AxesSection from './SettingSections/AxesSection/AxesSection';
+import ChartAppearanceSection from './SettingSections/ChartAppearanceSection/ChartAppearanceSection';
+import ContextLinksSection from './SettingSections/ContextLinksSection/ContextLinksSection';
+import FormattingUnitsSection from './SettingSections/FormattingUnitsSection/FormattingUnitsSection';
+import GeneralSettingsSection from './SettingSections/GeneralSettingsSection/GeneralSettingsSection';
+import HistogramBucketsSection from './SettingSections/HistogramBucketsSection/HistogramBucketsSection';
+import LegendSection from './SettingSections/LegendSection/LegendSection';
+import ThresholdsSection from './SettingSections/ThresholdsSection/ThresholdsSection';
+import VisualizationSettingsSection from './SettingSections/VisualizationSettingsSection/VisualizationSettingsSection';
 import { ThresholdProps } from './Threshold/types';
 import { timePreferance } from './timeItems';
 
 import './RightContainer.styles.scss';
-
-const { TextArea } = Input;
-const { Option } = Select;
-
-enum LogScale {
-	LINEAR = 'linear',
-	LOGARITHMIC = 'logarithmic',
-}
-
-interface VariableOption {
-	value: string;
-	label: string;
-}
-
-// eslint-disable-next-line sonarjs/cognitive-complexity
 function RightContainer({
 	description,
 	setDescription,
@@ -159,20 +107,10 @@ function RightContainer({
 	isNewDashboard,
 }: RightContainerProps): JSX.Element {
 	const { dashboardVariables } = useDashboardVariables();
-	const [inputValue, setInputValue] = useState(title);
-	const [autoCompleteOpen, setAutoCompleteOpen] = useState(false);
-	const [cursorPos, setCursorPos] = useState(0);
-	const inputRef = useRef<InputRef>(null);
 
-	const onChangeHandler = useCallback(
-		(setFunc: Dispatch<SetStateAction<string>>, value: string) => {
-			setFunc(value);
-		},
-		[],
-	);
-
-	const selectedGraphType =
-		PanelTypesWithData.find((e) => e.name === selectedGraph)?.display || '';
+	const selectedPanelDisplay = PanelTypesWithData.find(
+		(e) => e.name === selectedGraph,
+	)?.display as PanelDisplay;
 
 	const onCreateAlertsHandler = useCreateAlerts(selectedWidget, 'panelView');
 
@@ -201,16 +139,15 @@ function RightContainer({
 	const allowFillMode = panelTypeVsFillMode[selectedGraph];
 	const allowShowPoints = panelTypeVsShowPoints[selectedGraph];
 
-	const { currentQuery } = useQueryBuilder();
-
-	const [graphTypes, setGraphTypes] = useState<ItemsProps[]>(PanelTypesWithData);
-
-	const dashboardVariableOptions = useMemo<VariableOption[]>(() => {
-		return Object.entries(dashboardVariables).map(([, value]) => ({
-			value: value.name || '',
-			label: value.name || '',
-		}));
-	}, [dashboardVariables]);
+	const decimapPrecisionOptions = useMemo(
+		() => [
+			{ label: '0 decimals', value: PrecisionOptionsEnum.ZERO },
+			{ label: '1 decimal', value: PrecisionOptionsEnum.ONE },
+			{ label: '2 decimals', value: PrecisionOptionsEnum.TWO },
+			{ label: '3 decimals', value: PrecisionOptionsEnum.THREE },
+		],
+		[],
+	);
 
 	const isAxisSectionVisible = useMemo(() => allowSoftMinMax || allowLogScale, [
 		allowSoftMinMax,
@@ -243,96 +180,6 @@ function RightContainer({
 		[allowFillMode, allowLineStyle, allowLineInterpolation, allowShowPoints],
 	);
 
-	const updateCursorAndDropdown = (value: string, pos: number): void => {
-		setCursorPos(pos);
-		const lastDollar = value.lastIndexOf('$', pos - 1);
-		setAutoCompleteOpen(lastDollar !== -1 && pos >= lastDollar + 1);
-	};
-
-	const onInputChange = (value: string): void => {
-		setInputValue(value);
-		onChangeHandler(setTitle, value);
-		setTimeout(() => {
-			const pos = inputRef.current?.input?.selectionStart ?? 0;
-			updateCursorAndDropdown(value, pos);
-		}, 0);
-	};
-
-	const decimapPrecisionOptions = useMemo(() => {
-		return [
-			{ label: '0 decimals', value: PrecisionOptionsEnum.ZERO },
-			{ label: '1 decimal', value: PrecisionOptionsEnum.ONE },
-			{ label: '2 decimals', value: PrecisionOptionsEnum.TWO },
-			{ label: '3 decimals', value: PrecisionOptionsEnum.THREE },
-		];
-	}, []);
-
-	const handleInputCursor = (): void => {
-		const pos = inputRef.current?.input?.selectionStart ?? 0;
-		updateCursorAndDropdown(inputValue, pos);
-	};
-
-	const onSelect = (selectedValue: string): void => {
-		const pos = cursorPos;
-		const value = inputValue;
-		const lastDollar = value.lastIndexOf('$', pos - 1);
-		const textBeforeDollar = value.substring(0, lastDollar);
-		const textAfterDollar = value.substring(lastDollar + 1);
-		const match = textAfterDollar.match(/^([a-zA-Z0-9_.]*)/);
-		const rest = textAfterDollar.substring(match ? match[1].length : 0);
-		const newValue = `${textBeforeDollar}$${selectedValue}${rest}`;
-		setInputValue(newValue);
-		onChangeHandler(setTitle, newValue);
-		setAutoCompleteOpen(false);
-		setTimeout(() => {
-			const newCursor = `${textBeforeDollar}$${selectedValue}`.length;
-			inputRef.current?.input?.setSelectionRange(newCursor, newCursor);
-			setCursorPos(newCursor);
-		}, 0);
-	};
-
-	const filterOption = (
-		inputValue: string,
-		option?: VariableOption,
-	): boolean => {
-		const pos = cursorPos;
-		const value = inputValue;
-		const lastDollar = value.lastIndexOf('$', pos - 1);
-		if (lastDollar === -1) {
-			return false;
-		}
-		const afterDollar = value.substring(lastDollar + 1, pos).toLowerCase();
-		return option?.value.toLowerCase().startsWith(afterDollar) || false;
-	};
-
-	useEffect(() => {
-		const queryContainsMetricsDataSource = currentQuery.builder.queryData.some(
-			(query) => query.dataSource === DataSource.METRICS,
-		);
-
-		if (queryContainsMetricsDataSource) {
-			setGraphTypes((prev) =>
-				prev.filter((graph) => graph.name !== PANEL_TYPES.LIST),
-			);
-		} else {
-			setGraphTypes(PanelTypesWithData);
-		}
-	}, [currentQuery]);
-
-	const softMinHandler = useCallback(
-		(value: number | null) => {
-			setSoftMin(value);
-		},
-		[setSoftMin],
-	);
-
-	const softMaxHandler = useCallback(
-		(value: number | null) => {
-			setSoftMax(value);
-		},
-		[setSoftMax],
-	);
-
 	return (
 		<div className="right-container">
 			<section className="header">
@@ -340,372 +187,120 @@ function RightContainer({
 				<Typography.Text className="header-text">Panel Settings</Typography.Text>
 			</section>
 
-			<SettingsSection title="General" defaultOpen icon={<Pencil size={14} />}>
-				<section className="name-description control-container">
-					<Typography.Text className="section-heading">Name</Typography.Text>
-					<AutoComplete
-						options={dashboardVariableOptions}
-						value={inputValue}
-						onChange={onInputChange}
-						onSelect={onSelect}
-						filterOption={filterOption}
-						style={{ width: '100%' }}
-						getPopupContainer={popupContainer}
-						placeholder="Enter the panel name here..."
-						open={autoCompleteOpen}
-					>
-						<Input
-							rootClassName="name-input"
-							ref={inputRef}
-							onSelect={handleInputCursor}
-							onClick={handleInputCursor}
-							onBlur={(): void => setAutoCompleteOpen(false)}
-						/>
-					</AutoComplete>
-					<Typography.Text className="section-heading">Description</Typography.Text>
-					<TextArea
-						placeholder="Enter the panel description here..."
-						bordered
-						allowClear
-						value={description}
-						onChange={(event): void =>
-							onChangeHandler(setDescription, event.target.value)
-						}
-						rootClassName="description-input"
-					/>
-				</section>
-			</SettingsSection>
+			<GeneralSettingsSection
+				title={title}
+				setTitle={setTitle}
+				description={description}
+				setDescription={setDescription}
+				dashboardVariables={dashboardVariables}
+			/>
 
 			<section className="panel-config">
-				<SettingsSection
-					title="Visualization"
-					defaultOpen
-					icon={<LayoutDashboard size={14} />}
-				>
-					<section className="panel-type control-container">
-						<Typography.Text className="section-heading">Panel Type</Typography.Text>
-						<Select
-							onChange={setGraphHandler}
-							value={selectedGraph}
-							className="panel-type-select"
-							data-testid="panel-change-select"
-							data-stacking-state={stackedBarChart ? 'true' : 'false'}
-						>
-							{graphTypes.map((item) => (
-								<Option key={item.name} value={item.name}>
-									<div className="select-option">
-										<div className="icon">{item.icon}</div>
-										<Typography.Text className="display">{item.display}</Typography.Text>
-									</div>
-								</Option>
-							))}
-						</Select>
-					</section>
-
-					{allowPanelTimePreference && (
-						<section className="panel-time-preference control-container">
-							<Typography.Text className="section-heading">
-								Panel Time Preference
-							</Typography.Text>
-							<TimePreference
-								{...{
-									selectedTime,
-									setSelectedTime,
-								}}
-							/>
-						</section>
-					)}
-
-					{allowStackingBarChart && (
-						<section className="stack-chart control-container">
-							<Typography.Text className="section-heading">
-								Stack series
-							</Typography.Text>
-							<Switch
-								checked={stackedBarChart}
-								size="small"
-								onChange={(checked): void => setStackedBarChart(checked)}
-							/>
-						</section>
-					)}
-
-					{allowFillSpans && (
-						<section className="fill-gaps toggle-card">
-							<div className="toggle-card-text-container">
-								<Typography className="section-heading">Fill gaps</Typography>
-								<Typography.Text className="toggle-card-description">
-									Fill gaps in data with 0 for continuity
-								</Typography.Text>
-							</div>
-							<Switch
-								checked={isFillSpans}
-								size="small"
-								onChange={(checked): void => setIsFillSpans(checked)}
-							/>
-						</section>
-					)}
-				</SettingsSection>
+				<VisualizationSettingsSection
+					selectedGraph={selectedGraph}
+					setGraphHandler={setGraphHandler}
+					selectedTime={selectedTime}
+					setSelectedTime={setSelectedTime}
+					stackedBarChart={stackedBarChart}
+					setStackedBarChart={setStackedBarChart}
+					isFillSpans={isFillSpans}
+					setIsFillSpans={setIsFillSpans}
+					allowPanelTimePreference={allowPanelTimePreference}
+					allowStackingBarChart={allowStackingBarChart}
+					allowFillSpans={allowFillSpans}
+				/>
 
 				{isFormattingSectionVisible && (
-					<SettingsSection
-						title="Formatting & Units"
-						icon={<SlidersHorizontal size={14} />}
-					>
-						{allowYAxisUnit && (
-							<DashboardYAxisUnitSelectorWrapper
-								onSelect={setYAxisUnit}
-								value={yAxisUnit || ''}
-								fieldLabel={
-									selectedGraphType === PanelDisplay.VALUE ||
-									selectedGraphType === PanelDisplay.PIE
-										? 'Unit'
-										: 'Y Axis Unit'
-								}
-								// Only update the y-axis unit value automatically in create mode
-								shouldUpdateYAxisUnit={isNewDashboard}
-							/>
-						)}
-
-						{allowDecimalPrecision && (
-							<section className="decimal-precision-selector control-container">
-								<Typography.Text className="typography">
-									Decimal Precision
-								</Typography.Text>
-								<Select
-									options={decimapPrecisionOptions}
-									value={decimalPrecision}
-									style={{ width: '100%' }}
-									className="panel-type-select"
-									defaultValue={PrecisionOptionsEnum.TWO}
-									onChange={(val: PrecisionOption): void => setDecimalPrecision(val)}
-								/>
-							</section>
-						)}
-
-						{allowPanelColumnPreference && (
-							<ColumnUnitSelector
-								columnUnits={columnUnits}
-								setColumnUnits={setColumnUnits}
-								isNewDashboard={isNewDashboard}
-							/>
-						)}
-					</SettingsSection>
+					<FormattingUnitsSection
+						selectedPanelDisplay={selectedPanelDisplay}
+						yAxisUnit={yAxisUnit}
+						setYAxisUnit={setYAxisUnit}
+						isNewDashboard={isNewDashboard}
+						decimalPrecision={decimalPrecision}
+						setDecimalPrecision={setDecimalPrecision}
+						columnUnits={columnUnits}
+						setColumnUnits={setColumnUnits}
+						allowYAxisUnit={allowYAxisUnit}
+						allowDecimalPrecision={allowDecimalPrecision}
+						allowPanelColumnPreference={allowPanelColumnPreference}
+						decimapPrecisionOptions={decimapPrecisionOptions}
+					/>
 				)}
 
 				{isChartAppearanceSectionVisible && (
-					<SettingsSection title="Chart Appearance" icon={<Paintbrush size={14} />}>
-						{allowFillMode && (
-							<FillModeSelector value={fillMode} onChange={setFillMode} />
-						)}
-						{allowLineStyle && (
-							<LineStyleSelector value={lineStyle} onChange={setLineStyle} />
-						)}
-						{allowLineInterpolation && (
-							<LineInterpolationSelector
-								value={lineInterpolation}
-								onChange={setLineInterpolation}
-							/>
-						)}
-						{allowShowPoints && (
-							<section className="show-points toggle-card">
-								<div className="toggle-card-text-container">
-									<Typography.Text className="section-heading">
-										Show points
-									</Typography.Text>
-									<Typography.Text className="toggle-card-description">
-										Display individual data points on the chart
-									</Typography.Text>
-								</div>
-								<Switch size="small" checked={showPoints} onChange={setShowPoints} />
-							</section>
-						)}
-					</SettingsSection>
+					<ChartAppearanceSection
+						fillMode={fillMode}
+						setFillMode={setFillMode}
+						lineStyle={lineStyle}
+						setLineStyle={setLineStyle}
+						lineInterpolation={lineInterpolation}
+						setLineInterpolation={setLineInterpolation}
+						showPoints={showPoints}
+						setShowPoints={setShowPoints}
+						allowFillMode={allowFillMode}
+						allowLineStyle={allowLineStyle}
+						allowLineInterpolation={allowLineInterpolation}
+						allowShowPoints={allowShowPoints}
+					/>
 				)}
 
 				{isAxisSectionVisible && (
-					<SettingsSection title="Axes" icon={<Axis3D size={14} />}>
-						{allowSoftMinMax && (
-							<section className="soft-min-max">
-								<section className="container">
-									<Typography.Text className="text">Soft Min</Typography.Text>
-									<InputNumber
-										type="number"
-										value={softMin}
-										onChange={softMinHandler}
-										rootClassName="input"
-									/>
-								</section>
-								<section className="container">
-									<Typography.Text className="text">Soft Max</Typography.Text>
-									<InputNumber
-										value={softMax}
-										type="number"
-										rootClassName="input"
-										onChange={softMaxHandler}
-									/>
-								</section>
-							</section>
-						)}
-
-						{allowLogScale && (
-							<section className="log-scale control-container">
-								<Typography.Text className="section-heading">
-									Y Axis Scale
-								</Typography.Text>
-								<Select
-									onChange={(value): void =>
-										setIsLogScale(value === LogScale.LOGARITHMIC)
-									}
-									value={isLogScale ? LogScale.LOGARITHMIC : LogScale.LINEAR}
-									style={{ width: '100%' }}
-									className="panel-type-select"
-									defaultValue={LogScale.LINEAR}
-								>
-									<Option value={LogScale.LINEAR}>
-										<div className="select-option">
-											<div className="icon">
-												<LineChart size={16} />
-											</div>
-											<Typography.Text className="display">Linear</Typography.Text>
-										</div>
-									</Option>
-									<Option value={LogScale.LOGARITHMIC}>
-										<div className="select-option">
-											<div className="icon">
-												<Spline size={16} />
-											</div>
-											<Typography.Text className="display">Logarithmic</Typography.Text>
-										</div>
-									</Option>
-								</Select>
-							</section>
-						)}
-					</SettingsSection>
+					<AxesSection
+						allowSoftMinMax={allowSoftMinMax}
+						allowLogScale={allowLogScale}
+						softMin={softMin}
+						softMax={softMax}
+						setSoftMin={setSoftMin}
+						setSoftMax={setSoftMax}
+						isLogScale={isLogScale}
+						setIsLogScale={setIsLogScale}
+					/>
 				)}
 
 				{isLegendSectionVisible && (
-					<SettingsSection title="Legend" icon={<Layers size={14} />}>
-						{allowLegendPosition && (
-							<section className="legend-position control-container">
-								<Typography.Text className="section-heading">Position</Typography.Text>
-								<Select
-									onChange={(value: LegendPosition): void => setLegendPosition(value)}
-									value={legendPosition}
-									style={{ width: '100%' }}
-									className="panel-type-select"
-									defaultValue={LegendPosition.BOTTOM}
-								>
-									<Option value={LegendPosition.BOTTOM}>
-										<div className="select-option">
-											<Typography.Text className="display">Bottom</Typography.Text>
-										</div>
-									</Option>
-									<Option value={LegendPosition.RIGHT}>
-										<div className="select-option">
-											<Typography.Text className="display">Right</Typography.Text>
-										</div>
-									</Option>
-								</Select>
-							</section>
-						)}
-
-						{allowLegendColors && (
-							<section className="legend-colors">
-								<LegendColors
-									customLegendColors={customLegendColors}
-									setCustomLegendColors={setCustomLegendColors}
-									queryResponse={queryResponse}
-								/>
-							</section>
-						)}
-					</SettingsSection>
+					<LegendSection
+						allowLegendPosition={allowLegendPosition}
+						allowLegendColors={allowLegendColors}
+						legendPosition={legendPosition}
+						setLegendPosition={setLegendPosition}
+						customLegendColors={customLegendColors}
+						setCustomLegendColors={setCustomLegendColors}
+						queryResponse={queryResponse}
+					/>
 				)}
 
 				{allowBucketConfig && (
-					<SettingsSection title="Histogram / Buckets">
-						<section className="bucket-config control-container">
-							<Typography.Text className="section-heading">
-								Number of buckets
-							</Typography.Text>
-							<InputNumber
-								value={bucketCount || null}
-								type="number"
-								min={0}
-								rootClassName="bucket-input"
-								placeholder="Default: 30"
-								onChange={(val): void => {
-									setBucketCount(val || 0);
-								}}
-							/>
-							<Typography.Text className="section-heading bucket-size-label">
-								Bucket width
-							</Typography.Text>
-							<InputNumber
-								value={bucketWidth || null}
-								type="number"
-								precision={2}
-								placeholder="Default: Auto"
-								step={0.1}
-								min={0.0}
-								rootClassName="bucket-input"
-								onChange={(val): void => {
-									setBucketWidth(val || 0);
-								}}
-							/>
-							<section className="combine-hist">
-								<Typography.Text className="section-heading">
-									Merge all series into one
-								</Typography.Text>
-								<Switch
-									checked={combineHistogram}
-									size="small"
-									onChange={(checked): void => setCombineHistogram(checked)}
-								/>
-							</section>
-						</section>
-					</SettingsSection>
+					<HistogramBucketsSection
+						bucketCount={bucketCount}
+						setBucketCount={setBucketCount}
+						bucketWidth={bucketWidth}
+						setBucketWidth={setBucketWidth}
+						combineHistogram={combineHistogram}
+						setCombineHistogram={setCombineHistogram}
+					/>
 				)}
 			</section>
 
 			{allowCreateAlerts && (
-				<section className="alerts" onClick={onCreateAlertsHandler}>
-					<div className="left-section">
-						<ConciergeBell size={14} className="bell-icon" />
-						<Typography.Text className="alerts-text">Alerts</Typography.Text>
-						<SquareArrowOutUpRight size={10} className="info-icon" />
-					</div>
-					<Plus size={14} className="plus-icon" />
-				</section>
+				<AlertsSection onCreateAlertsHandler={onCreateAlertsHandler} />
 			)}
 
 			{allowContextLinks && (
-				<SettingsSection
-					title="Context Links"
-					icon={<Link size={14} />}
-					defaultOpen={!!contextLinks.linksData.length}
-				>
-					<ContextLinks
-						contextLinks={contextLinks}
-						setContextLinks={setContextLinks}
-						selectedWidget={selectedWidget}
-					/>
-				</SettingsSection>
+				<ContextLinksSection
+					contextLinks={contextLinks}
+					setContextLinks={setContextLinks}
+					selectedWidget={selectedWidget}
+				/>
 			)}
 
 			{allowThreshold && (
-				<SettingsSection
-					title="Thresholds"
-					icon={<Antenna size={14} />}
-					defaultOpen={!!thresholds.length}
-				>
-					<ThresholdSelector
-						thresholds={thresholds}
-						setThresholds={setThresholds}
-						yAxisUnit={yAxisUnit}
-						selectedGraph={selectedGraph}
-						columnUnits={columnUnits}
-					/>
-				</SettingsSection>
+				<ThresholdsSection
+					thresholds={thresholds}
+					setThresholds={setThresholds}
+					yAxisUnit={yAxisUnit}
+					selectedGraph={selectedGraph}
+					columnUnits={columnUnits}
+				/>
 			)}
 		</div>
 	);

pkg/apiserver/signozapiserver/provider.go

@@ -23,7 +23,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/user"
 	"github.com/SigNoz/signoz/pkg/querier"
 	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
+	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/zeus"
 	"github.com/gorilla/mux"
 )
@@ -238,13 +238,13 @@ func (provider *provider) AddToRouter(router *mux.Router) error {
 
 func newSecuritySchemes(role types.Role) []handler.OpenAPISecurityScheme {
 	return []handler.OpenAPISecurityScheme{
-		{Name: ctxtypes.AuthTypeAPIKey.StringValue(), Scopes: []string{role.String()}},
-		{Name: ctxtypes.AuthTypeTokenizer.StringValue(), Scopes: []string{role.String()}},
+		{Name: authtypes.IdentNProviderAPIkey.StringValue(), Scopes: []string{role.String()}},
+		{Name: authtypes.IdentNProviderTokenizer.StringValue(), Scopes: []string{role.String()}},
 	}
 }
 
 func newAnonymousSecuritySchemes(scopes []string) []handler.OpenAPISecurityScheme {
 	return []handler.OpenAPISecurityScheme{
-		{Name: ctxtypes.AuthTypeAnonymous.StringValue(), Scopes: scopes},
+		{Name: authtypes.IdentNProviderAnonymous.StringValue(), Scopes: scopes},
 	}
 }

pkg/apiserver/signozapiserver/session.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/SigNoz/signoz/pkg/http/handler"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	"github.com/gorilla/mux"
 )
 
@@ -73,7 +72,7 @@ func (provider *provider) addSessionRoutes(router *mux.Router) error {
 		SuccessStatusCode:   http.StatusNoContent,
 		ErrorStatusCodes:    []int{http.StatusBadRequest},
 		Deprecated:          false,
-		SecuritySchemes:     []handler.OpenAPISecurityScheme{{Name: ctxtypes.AuthTypeTokenizer.StringValue()}},
+		SecuritySchemes:     []handler.OpenAPISecurityScheme{{Name: authtypes.IdentNProviderTokenizer.StringValue()}},
 	})).Methods(http.MethodDelete).GetError(); err != nil {
 		return err
 	}

pkg/apiserver/signozapiserver/user.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/SigNoz/signoz/pkg/http/handler"
 	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
+	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/gorilla/mux"
 )
 
@@ -208,7 +208,7 @@ func (provider *provider) addUserRoutes(router *mux.Router) error {
 		SuccessStatusCode:   http.StatusOK,
 		ErrorStatusCodes:    []int{},
 		Deprecated:          false,
-		SecuritySchemes:     []handler.OpenAPISecurityScheme{{Name: ctxtypes.AuthTypeTokenizer.StringValue()}},
+		SecuritySchemes:     []handler.OpenAPISecurityScheme{{Name: authtypes.IdentNProviderTokenizer.StringValue()}},
 	})).Methods(http.MethodGet).GetError(); err != nil {
 		return err
 	}

pkg/authn/passwordauthn/emailpasswordauthn/authn.go

@@ -30,5 +30,5 @@ func (a *AuthN) Authenticate(ctx context.Context, email string, password string,
 		return nil, errors.New(errors.TypeUnauthenticated, types.ErrCodeIncorrectPassword, "invalid email or password")
 	}
 
-	return authtypes.NewIdentity(user.ID, orgID, user.Email, user.Role), nil
+	return authtypes.NewIdentity(user.ID, orgID, user.Email, user.Role, authtypes.IdentNProviderTokenizer), nil
 }

pkg/http/middleware/api_key.go

@@ -1,143 +0,0 @@
-package middleware
-
-import (
-	"context"
-	"log/slog"
-	"net/http"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/sharder"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"golang.org/x/sync/singleflight"
-)
-
-const (
-	apiKeyCrossOrgMessage string = "::API-KEY-CROSS-ORG::"
-)
-
-type APIKey struct {
-	store   sqlstore.SQLStore
-	uuid    *authtypes.UUID
-	headers []string
-	logger  *slog.Logger
-	sharder sharder.Sharder
-	sfGroup *singleflight.Group
-}
-
-func NewAPIKey(store sqlstore.SQLStore, headers []string, logger *slog.Logger, sharder sharder.Sharder) *APIKey {
-	return &APIKey{
-		store:   store,
-		uuid:    authtypes.NewUUID(),
-		headers: headers,
-		logger:  logger,
-		sharder: sharder,
-		sfGroup: &singleflight.Group{},
-	}
-}
-
-func (a *APIKey) Wrap(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var values []string
-		var apiKeyToken string
-		var apiKey types.StorableAPIKey
-
-		for _, header := range a.headers {
-			values = append(values, r.Header.Get(header))
-		}
-
-		ctx, err := a.uuid.ContextFromRequest(r.Context(), values...)
-		if err != nil {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		apiKeyToken, ok := authtypes.UUIDFromContext(ctx)
-		if !ok {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		err = a.
-			store.
-			BunDB().
-			NewSelect().
-			Model(&apiKey).
-			Where("token = ?", apiKeyToken).
-			Scan(r.Context())
-		if err != nil {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		// allow the APIKey if expires_at is not set
-		if apiKey.ExpiresAt.Before(time.Now()) && !apiKey.ExpiresAt.Equal(types.NEVER_EXPIRES) {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		// get user from db
-		user := types.User{}
-		err = a.store.BunDB().NewSelect().Model(&user).Where("id = ?", apiKey.UserID).Scan(r.Context())
-		if err != nil {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		jwt := authtypes.Claims{
-			UserID: user.ID.String(),
-			Role:   apiKey.Role,
-			Email:  user.Email.String(),
-			OrgID:  user.OrgID.String(),
-		}
-
-		ctx = authtypes.NewContextWithClaims(ctx, jwt)
-
-		claims, err := authtypes.ClaimsFromContext(ctx)
-		if err != nil {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		if err := a.sharder.IsMyOwnedKey(r.Context(), types.NewOrganizationKey(valuer.MustNewUUID(claims.OrgID))); err != nil {
-			a.logger.ErrorContext(r.Context(), apiKeyCrossOrgMessage, "claims", claims, "error", err)
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		ctx = ctxtypes.SetAuthType(ctx, ctxtypes.AuthTypeAPIKey)
-
-		comment := ctxtypes.CommentFromContext(ctx)
-		comment.Set("auth_type", ctxtypes.AuthTypeAPIKey.StringValue())
-		comment.Set("user_id", claims.UserID)
-		comment.Set("org_id", claims.OrgID)
-
-		r = r.WithContext(ctxtypes.NewContextWithComment(ctx, comment))
-
-		next.ServeHTTP(w, r)
-
-		lastUsedCtx := context.WithoutCancel(r.Context())
-		_, _, _ = a.sfGroup.Do(apiKey.ID.StringValue(), func() (any, error) {
-			apiKey.LastUsed = time.Now()
-			_, err = a.
-				store.
-				BunDB().
-				NewUpdate().
-				Model(&apiKey).
-				Column("last_used").
-				Where("token = ?", apiKeyToken).
-				Where("revoked = false").
-				Exec(lastUsedCtx)
-			if err != nil {
-				a.logger.ErrorContext(lastUsedCtx, "failed to update last used of api key", "error", err)
-			}
-
-			return true, nil
-		})
-
-	})
-
-}

pkg/http/middleware/authn.go

@@ -1,150 +0,0 @@
-package middleware
-
-import (
-	"context"
-	"log/slog"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/sharder"
-	"github.com/SigNoz/signoz/pkg/tokenizer"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"golang.org/x/sync/singleflight"
-)
-
-const (
-	authCrossOrgMessage string = "::AUTH-CROSS-ORG::"
-)
-
-type AuthN struct {
-	tokenizer tokenizer.Tokenizer
-	headers   []string
-	sharder   sharder.Sharder
-	logger    *slog.Logger
-	sfGroup   *singleflight.Group
-}
-
-func NewAuthN(headers []string, sharder sharder.Sharder, tokenizer tokenizer.Tokenizer, logger *slog.Logger) *AuthN {
-	return &AuthN{
-		headers:   headers,
-		sharder:   sharder,
-		tokenizer: tokenizer,
-		logger:    logger,
-		sfGroup:   &singleflight.Group{},
-	}
-}
-
-func (a *AuthN) Wrap(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var values []string
-		for _, header := range a.headers {
-			values = append(values, r.Header.Get(header))
-		}
-
-		ctx, err := a.contextFromRequest(r.Context(), values...)
-		if err != nil {
-			r = r.WithContext(ctx)
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		r = r.WithContext(ctx)
-
-		claims, err := authtypes.ClaimsFromContext(ctx)
-		if err != nil {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		if err := a.sharder.IsMyOwnedKey(r.Context(), types.NewOrganizationKey(valuer.MustNewUUID(claims.OrgID))); err != nil {
-			a.logger.ErrorContext(r.Context(), authCrossOrgMessage, "claims", claims, "error", err)
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		ctx = ctxtypes.SetAuthType(ctx, ctxtypes.AuthTypeTokenizer)
-
-		comment := ctxtypes.CommentFromContext(ctx)
-		comment.Set("auth_type", ctxtypes.AuthTypeTokenizer.StringValue())
-		comment.Set("tokenizer_provider", a.tokenizer.Config().Provider)
-		comment.Set("user_id", claims.UserID)
-		comment.Set("org_id", claims.OrgID)
-
-		r = r.WithContext(ctxtypes.NewContextWithComment(ctx, comment))
-
-		next.ServeHTTP(w, r)
-
-		accessToken, err := authtypes.AccessTokenFromContext(r.Context())
-		if err != nil {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		lastObservedAtCtx := context.WithoutCancel(r.Context())
-		_, _, _ = a.sfGroup.Do(accessToken, func() (any, error) {
-			if err := a.tokenizer.SetLastObservedAt(lastObservedAtCtx, accessToken, time.Now()); err != nil {
-				a.logger.ErrorContext(lastObservedAtCtx, "failed to set last observed at", "error", err)
-				return false, err
-			}
-
-			return true, nil
-		})
-	})
-}
-
-func (a *AuthN) contextFromRequest(ctx context.Context, values ...string) (context.Context, error) {
-	ctx, err := a.contextFromAccessToken(ctx, values...)
-	if err != nil {
-		return ctx, err
-	}
-
-	accessToken, err := authtypes.AccessTokenFromContext(ctx)
-	if err != nil {
-		return ctx, err
-	}
-
-	authenticatedUser, err := a.tokenizer.GetIdentity(ctx, accessToken)
-	if err != nil {
-		return ctx, err
-	}
-
-	return authtypes.NewContextWithClaims(ctx, authenticatedUser.ToClaims()), nil
-}
-
-func (a *AuthN) contextFromAccessToken(ctx context.Context, values ...string) (context.Context, error) {
-	var value string
-	for _, v := range values {
-		if v != "" {
-			value = v
-			break
-		}
-	}
-
-	if value == "" {
-		return ctx, errors.New(errors.TypeUnauthenticated, errors.CodeUnauthenticated, "missing authorization header")
-	}
-
-	// parse from
-	bearerToken, ok := parseBearerAuth(value)
-	if !ok {
-		// this will take care that if the value is not of type bearer token, directly use it
-		bearerToken = value
-	}
-
-	return authtypes.NewContextWithAccessToken(ctx, bearerToken), nil
-}
-
-func parseBearerAuth(auth string) (string, bool) {
-	const prefix = "Bearer "
-	// Case insensitive prefix match
-	if len(auth) < len(prefix) || !strings.EqualFold(auth[:len(prefix)], prefix) {
-		return "", false
-	}
-
-	return auth[len(prefix):], true
-}

pkg/http/middleware/authz.go

@@ -44,7 +44,7 @@ func (middleware *AuthZ) ViewAccess(next http.HandlerFunc) http.HandlerFunc {
 
 		commentCtx := ctxtypes.CommentFromContext(ctx)
 		authtype, ok := commentCtx.Map()["auth_type"]
-		if ok && authtype == ctxtypes.AuthTypeAPIKey.StringValue() {
+		if ok && (authtype == authtypes.IdentNProviderAPIkey.StringValue()) {
 			if err := claims.IsViewer(); err != nil {
 				middleware.logger.WarnContext(ctx, authzDeniedMessage, "claims", claims)
 				render.Error(rw, err)
@@ -96,7 +96,7 @@ func (middleware *AuthZ) EditAccess(next http.HandlerFunc) http.HandlerFunc {
 
 		commentCtx := ctxtypes.CommentFromContext(ctx)
 		authtype, ok := commentCtx.Map()["auth_type"]
-		if ok && authtype == ctxtypes.AuthTypeAPIKey.StringValue() {
+		if ok && (authtype == authtypes.IdentNProviderAPIkey.StringValue()) {
 			if err := claims.IsEditor(); err != nil {
 				middleware.logger.WarnContext(ctx, authzDeniedMessage, "claims", claims)
 				render.Error(rw, err)
@@ -147,7 +147,7 @@ func (middleware *AuthZ) AdminAccess(next http.HandlerFunc) http.HandlerFunc {
 
 		commentCtx := ctxtypes.CommentFromContext(ctx)
 		authtype, ok := commentCtx.Map()["auth_type"]
-		if ok && authtype == ctxtypes.AuthTypeAPIKey.StringValue() {
+		if ok && (authtype == authtypes.IdentNProviderAPIkey.StringValue()) {
 			if err := claims.IsAdmin(); err != nil {
 				middleware.logger.WarnContext(ctx, authzDeniedMessage, "claims", claims)
 				render.Error(rw, err)

pkg/http/middleware/identn.go

@@ -0,0 +1,75 @@
+package middleware
+
+import (
+	"context"
+	"log/slog"
+	"net/http"
+
+	"github.com/SigNoz/signoz/pkg/identn"
+	"github.com/SigNoz/signoz/pkg/sharder"
+	"github.com/SigNoz/signoz/pkg/types"
+	"github.com/SigNoz/signoz/pkg/types/authtypes"
+	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+)
+
+const (
+	identityCrossOrgMessage string = "::IDENTITY-CROSS-ORG::"
+)
+
+type IdentN struct {
+	resolver identn.IdentNResolver
+	sharder  sharder.Sharder
+	logger   *slog.Logger
+}
+
+func NewIdentN(resolver identn.IdentNResolver, sharder sharder.Sharder, logger *slog.Logger) *IdentN {
+	return &IdentN{
+		resolver: resolver,
+		sharder:  sharder,
+		logger:   logger,
+	}
+}
+
+func (m *IdentN) Wrap(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		idn := m.resolver.GetIdentN(r)
+		if idn == nil {
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		if pre, ok := idn.(identn.IdentNWithPreHook); ok {
+			r = pre.Pre(r)
+		}
+
+		identity, err := idn.GetIdentity(r)
+		if err != nil {
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		ctx := r.Context()
+		claims := identity.ToClaims()
+		if err := m.sharder.IsMyOwnedKey(ctx, types.NewOrganizationKey(valuer.MustNewUUID(claims.OrgID))); err != nil {
+			m.logger.ErrorContext(ctx, identityCrossOrgMessage, "claims", claims, "error", err)
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		ctx = authtypes.NewContextWithClaims(ctx, claims)
+
+		comment := ctxtypes.CommentFromContext(ctx)
+		comment.Set("identn_provider", claims.IdentNProvider)
+		comment.Set("user_id", claims.UserID)
+		comment.Set("org_id", claims.OrgID)
+		ctx = ctxtypes.NewContextWithComment(ctx, comment)
+
+		r = r.WithContext(ctx)
+		next.ServeHTTP(w, r)
+
+		if hook, ok := idn.(identn.IdentNWithPostHook); ok {
+			hook.Post(context.WithoutCancel(r.Context()), r, claims)
+		}
+	})
+}

pkg/identn/apikeyidentn/identn.go

@@ -0,0 +1,153 @@
+package apikeyidentn
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/errors"
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/identn"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/SigNoz/signoz/pkg/types"
+	"github.com/SigNoz/signoz/pkg/types/authtypes"
+	"golang.org/x/sync/singleflight"
+)
+
+// todo: will move this in types layer with service account integration
+type apiKeyTokenKey struct{}
+
+type resolver struct {
+	store    sqlstore.SQLStore
+	config   identn.Config
+	settings factory.ScopedProviderSettings
+	sfGroup  *singleflight.Group
+}
+
+func NewFactory(store sqlstore.SQLStore) factory.ProviderFactory[identn.IdentN, identn.Config] {
+	return factory.NewProviderFactory(factory.MustNewName(authtypes.IdentNProviderAPIkey.StringValue()), func(ctx context.Context, providerSettings factory.ProviderSettings, config identn.Config) (identn.IdentN, error) {
+		return New(providerSettings, store, config)
+	})
+}
+
+func New(providerSettings factory.ProviderSettings, store sqlstore.SQLStore, config identn.Config) (identn.IdentN, error) {
+	return &resolver{
+		store:    store,
+		config:   config,
+		settings: factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/identn/apikeyidentn"),
+		sfGroup:  &singleflight.Group{},
+	}, nil
+}
+
+func (r *resolver) Name() authtypes.IdentNProvider {
+	return authtypes.IdentNProviderAPIkey
+}
+
+func (r *resolver) Test(req *http.Request) bool {
+	if !r.config.Tokenizer.Enabled {
+		return false
+	}
+
+	for _, header := range r.config.APIKeyConfig.Headers {
+		if req.Header.Get(header) != "" {
+			return true
+		}
+	}
+	return false
+}
+
+func (r *resolver) Pre(req *http.Request) *http.Request {
+	if !r.config.Tokenizer.Enabled {
+		return req
+	}
+
+	token := r.extractToken(req)
+	if token == "" {
+		return req
+	}
+
+	ctx := context.WithValue(req.Context(), apiKeyTokenKey{}, token)
+	return req.WithContext(ctx)
+}
+
+func (r *resolver) GetIdentity(req *http.Request) (*authtypes.Identity, error) {
+	if !r.config.Tokenizer.Enabled {
+		// this should never happen since Test returns false
+		return nil, errors.Newf(errors.TypeInternal, errors.CodeInternal, "identN:%s resolver is disabled", r.Name().StringValue())
+	}
+
+	ctx := req.Context()
+	apiKeyToken, ok := ctx.Value(apiKeyTokenKey{}).(string)
+	if !ok || apiKeyToken == "" {
+		return nil, errors.New(errors.TypeUnauthenticated, errors.CodeUnauthenticated, "missing api key")
+	}
+
+	var apiKey types.StorableAPIKey
+	err := r.store.
+		BunDB().
+		NewSelect().
+		Model(&apiKey).
+		Where("token = ?", apiKeyToken).
+		Scan(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if apiKey.ExpiresAt.Before(time.Now()) && !apiKey.ExpiresAt.Equal(types.NEVER_EXPIRES) {
+		return nil, errors.New(errors.TypeUnauthenticated, errors.CodeUnauthenticated, "api key has expired")
+	}
+
+	var user types.User
+	err = r.store.
+		BunDB().
+		NewSelect().
+		Model(&user).
+		Where("id = ?", apiKey.UserID).
+		Scan(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	identity := authtypes.Identity{
+		UserID: user.ID,
+		Role:   apiKey.Role,
+		Email:  user.Email,
+		OrgID:  user.OrgID,
+	}
+	return &identity, nil
+}
+
+func (r *resolver) Post(ctx context.Context, _ *http.Request, _ authtypes.Claims) {
+	if !r.config.Tokenizer.Enabled {
+		return
+	}
+
+	apiKeyToken, ok := ctx.Value(apiKeyTokenKey{}).(string)
+	if !ok || apiKeyToken == "" {
+		return
+	}
+
+	_, _, _ = r.sfGroup.Do(apiKeyToken, func() (any, error) {
+		_, err := r.store.
+			BunDB().
+			NewUpdate().
+			Model(new(types.StorableAPIKey)).
+			Set("last_used = ?", time.Now()).
+			Where("token = ?", apiKeyToken).
+			Where("revoked = false").
+			Exec(ctx)
+		if err != nil {
+			r.settings.Logger().ErrorContext(ctx, "failed to update last used of api key", "error", err)
+		}
+		return true, nil
+	})
+}
+
+func (r *resolver) extractToken(req *http.Request) string {
+	for _, header := range r.config.APIKeyConfig.Headers {
+		if v := req.Header.Get(header); v != "" {
+			return v
+		}
+	}
+	return ""
+}

pkg/identn/config.go

@@ -0,0 +1,48 @@
+package identn
+
+import (
+	"github.com/SigNoz/signoz/pkg/factory"
+)
+
+type Config struct {
+	// Config for tokenizer identN resolver
+	Tokenizer TokenizerConfig `mapstructure:"tokenizer"`
+
+	// Config for apikey identN resolver
+	APIKeyConfig APIKeyConfig `mapstructure:"apikey"`
+}
+
+type TokenizerConfig struct {
+	// Toggles the identN resolver
+	Enabled bool `mapstructure:"enabled"`
+	// Headers to extract from incoming requests
+	Headers []string `mapstructure:"headers"`
+}
+
+type APIKeyConfig struct {
+	// Toggles the identN resolver
+	Enabled bool `mapstructure:"enabled"`
+	// Headers to extract from incoming requests
+	Headers []string `mapstructure:"headers"`
+}
+
+func NewConfigFactory() factory.ConfigFactory {
+	return factory.NewConfigFactory(factory.MustNewName("identn"), newConfig)
+}
+
+func newConfig() factory.Config {
+	return &Config{
+		Tokenizer: TokenizerConfig{
+			Enabled: true,
+			Headers: []string{"Authorization", "Sec-WebSocket-Protocol"},
+		},
+		APIKeyConfig: APIKeyConfig{
+			Enabled: true,
+			Headers: []string{"SIGNOZ-API-KEY"},
+		},
+	}
+}
+
+func (c Config) Validate() error {
+	return nil
+}

pkg/identn/identn.go

@@ -0,0 +1,43 @@
+package identn
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/SigNoz/signoz/pkg/types/authtypes"
+)
+
+type IdentNResolver interface {
+	// GetIdentN returns the first IdentN whose Test() returns true for the request.
+	// Returns nil if no resolver matched.
+	GetIdentN(r *http.Request) IdentN
+}
+
+type IdentN interface {
+	// Test checks if this identN can handle the request.
+	// This should be a cheap check (e.g., header presence) with no I/O.
+	Test(r *http.Request) bool
+
+	// GetIdentity returns the resolved identity.
+	// Only called when Test() returns true.
+	GetIdentity(r *http.Request) (*authtypes.Identity, error)
+
+	Name() authtypes.IdentNProvider
+}
+
+// IdentNWithPreHook is optionally implemented by resolvers that need to
+// enrich the request before authentication (e.g., storing the access token
+// in context so downstream handlers can use it even on auth failure).
+type IdentNWithPreHook interface {
+	IdentN
+
+	Pre(r *http.Request) *http.Request
+}
+
+// IdentNWithPostHook is optionally implemented by resolvers that need
+// post-response side-effects (e.g., updating last_observed_at).
+type IdentNWithPostHook interface {
+	IdentN
+
+	Post(ctx context.Context, r *http.Request, claims authtypes.Claims)
+}

pkg/identn/resolver.go

@@ -0,0 +1,31 @@
+package identn
+
+import (
+	"net/http"
+
+	"github.com/SigNoz/signoz/pkg/factory"
+)
+
+type identNResolver struct {
+	identNs  []IdentN
+	settings factory.ScopedProviderSettings
+}
+
+func NewIdentNResolver(providerSettings factory.ProviderSettings, identNs ...IdentN) IdentNResolver {
+	return &identNResolver{
+		identNs:  identNs,
+		settings: factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/identn"),
+	}
+}
+
+// GetIdentN returns the first IdentN whose Test() returns true.
+// Returns nil if no resolver matched.
+func (c *identNResolver) GetIdentN(r *http.Request) IdentN {
+	for _, idn := range c.identNs {
+		if idn.Test(r) {
+			c.settings.Logger().DebugContext(r.Context(), "identN matched", "provider", idn.Name())
+			return idn
+		}
+	}
+	return nil
+}

pkg/identn/tokenizeridentn/identn.go

@@ -0,0 +1,126 @@
+package tokenizeridentn
+
+import (
+	"context"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/errors"
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/identn"
+	"github.com/SigNoz/signoz/pkg/tokenizer"
+	"github.com/SigNoz/signoz/pkg/types/authtypes"
+	"golang.org/x/sync/singleflight"
+)
+
+type resolver struct {
+	tokenizer tokenizer.Tokenizer
+	config    identn.Config
+	settings  factory.ScopedProviderSettings
+	sfGroup   *singleflight.Group
+}
+
+func NewFactory(tokenizer tokenizer.Tokenizer) factory.ProviderFactory[identn.IdentN, identn.Config] {
+	return factory.NewProviderFactory(factory.MustNewName(authtypes.IdentNProviderTokenizer.StringValue()), func(ctx context.Context, providerSettings factory.ProviderSettings, config identn.Config) (identn.IdentN, error) {
+		return New(providerSettings, tokenizer, config)
+	})
+}
+
+func New(providerSettings factory.ProviderSettings, tokenizer tokenizer.Tokenizer, config identn.Config) (identn.IdentN, error) {
+	return &resolver{
+		tokenizer: tokenizer,
+		config:    config,
+		settings:  factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/identn/tokenizeridentn"),
+		sfGroup:   &singleflight.Group{},
+	}, nil
+}
+
+func (r *resolver) Name() authtypes.IdentNProvider {
+	return authtypes.IdentNProviderTokenizer
+}
+
+func (r *resolver) Test(req *http.Request) bool {
+	if !r.config.Tokenizer.Enabled {
+		return false
+	}
+
+	for _, header := range r.config.Tokenizer.Headers {
+		if req.Header.Get(header) != "" {
+			return true
+		}
+	}
+	return false
+}
+
+func (r *resolver) Pre(req *http.Request) *http.Request {
+	if !r.config.Tokenizer.Enabled {
+		return req
+	}
+
+	accessToken := r.extractToken(req)
+	if accessToken == "" {
+		return req
+	}
+
+	ctx := authtypes.NewContextWithAccessToken(req.Context(), accessToken)
+	return req.WithContext(ctx)
+}
+
+func (r *resolver) GetIdentity(req *http.Request) (*authtypes.Identity, error) {
+	if !r.config.Tokenizer.Enabled {
+		// this should never happen since Test returns false
+		return nil, errors.Newf(errors.TypeInternal, errors.CodeInternal, "identN:%s resolver is disabled", r.Name().StringValue())
+	}
+
+	ctx := req.Context()
+	accessToken, err := authtypes.AccessTokenFromContext(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return r.tokenizer.GetIdentity(ctx, accessToken)
+}
+
+func (r *resolver) Post(ctx context.Context, _ *http.Request, _ authtypes.Claims) {
+	if !r.config.Tokenizer.Enabled {
+		return
+	}
+
+	accessToken, err := authtypes.AccessTokenFromContext(ctx)
+	if err != nil {
+		return
+	}
+
+	_, _, _ = r.sfGroup.Do(accessToken, func() (any, error) {
+		if err := r.tokenizer.SetLastObservedAt(ctx, accessToken, time.Now()); err != nil {
+			r.settings.Logger().ErrorContext(ctx, "failed to set last observed at", "error", err)
+			return false, err
+		}
+		return true, nil
+	})
+}
+
+func (r *resolver) extractToken(req *http.Request) string {
+	var value string
+	for _, header := range r.config.Tokenizer.Headers {
+		if v := req.Header.Get(header); v != "" {
+			value = v
+			break
+		}
+	}
+
+	accessToken, ok := r.parseBearerAuth(value)
+	if !ok {
+		return value
+	}
+	return accessToken
+}
+
+func (r *resolver) parseBearerAuth(auth string) (string, bool) {
+	const prefix = "Bearer "
+	if len(auth) < len(prefix) || !strings.EqualFold(auth[:len(prefix)], prefix) {
+		return "", false
+	}
+	return auth[len(prefix):], true
+}

pkg/modules/dashboard/impldashboard/handler.go

@@ -15,7 +15,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/transition"
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/gorilla/mux"
@@ -109,7 +108,7 @@ func (handler *handler) Update(rw http.ResponseWriter, r *http.Request) {
 
 	diff := 0
 	// Allow multiple deletions for API key requests; enforce for others
-	if authType, ok := ctxtypes.AuthTypeFromContext(ctx); ok && authType == ctxtypes.AuthTypeTokenizer {
+	if claims.IdentNProvider == authtypes.IdentNProviderTokenizer.StringValue() {
 		diff = 1
 	}
 

pkg/modules/session/implsession/module.go

@@ -158,7 +158,7 @@ func (module *module) CreateCallbackAuthNSession(ctx context.Context, authNProvi
 		return "", errors.WithAdditionalf(err, "root user can only authenticate via password")
 	}
 
-	token, err := module.tokenizer.CreateToken(ctx, authtypes.NewIdentity(user.ID, user.OrgID, user.Email, user.Role), map[string]string{})
+	token, err := module.tokenizer.CreateToken(ctx, authtypes.NewIdentity(user.ID, user.OrgID, user.Email, user.Role, authtypes.IdentNProviderTokenizer), map[string]string{})
 	if err != nil {
 		return "", err
 	}

pkg/query-service/app/server.go

@@ -196,13 +196,12 @@ func (s *Server) createPublicServer(api *APIHandler, web web.Web) (*http.Server,
 		}),
 		otelmux.WithPublicEndpoint(),
 	))
-	r.Use(middleware.NewAuthN([]string{"Authorization", "Sec-WebSocket-Protocol"}, s.signoz.Sharder, s.signoz.Tokenizer, s.signoz.Instrumentation.Logger()).Wrap)
+	r.Use(middleware.NewIdentN(s.signoz.IdentNResolver, s.signoz.Sharder, s.signoz.Instrumentation.Logger()).Wrap)
 	r.Use(middleware.NewTimeout(s.signoz.Instrumentation.Logger(),
 		s.config.APIServer.Timeout.ExcludedRoutes,
 		s.config.APIServer.Timeout.Default,
 		s.config.APIServer.Timeout.Max,
 	).Wrap)
-	r.Use(middleware.NewAPIKey(s.signoz.SQLStore, []string{"SIGNOZ-API-KEY"}, s.signoz.Instrumentation.Logger(), s.signoz.Sharder).Wrap)
 	r.Use(middleware.NewLogging(s.signoz.Instrumentation.Logger(), s.config.APIServer.Logging.ExcludedRoutes).Wrap)
 	r.Use(middleware.NewComment().Wrap)
 

pkg/signoz/config.go

@@ -20,6 +20,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/gateway"
 	"github.com/SigNoz/signoz/pkg/global"
+	"github.com/SigNoz/signoz/pkg/identn"
 	"github.com/SigNoz/signoz/pkg/instrumentation"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/user"
@@ -113,6 +114,9 @@ type Config struct {
 
 	// User config
 	User user.Config `mapstructure:"user"`
+
+	// IdentN config
+	IdentN identn.Config `mapstructure:"identn"`
 }
 
 // DeprecatedFlags are the flags that are deprecated and scheduled for removal.
@@ -176,6 +180,7 @@ func NewConfig(ctx context.Context, logger *slog.Logger, resolverConfig config.R
 		metricsexplorer.NewConfigFactory(),
 		flagger.NewConfigFactory(),
 		user.NewConfigFactory(),
+		identn.NewConfigFactory(),
 	}
 
 	conf, err := config.New(ctx, resolverConfig, configFactories)

pkg/signoz/openapi.go

@@ -26,7 +26,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/session"
 	"github.com/SigNoz/signoz/pkg/modules/user"
 	"github.com/SigNoz/signoz/pkg/querier"
-	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
+	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/zeus"
 	"github.com/swaggest/jsonschema-go"
 	"github.com/swaggest/openapi-go"
@@ -82,8 +82,8 @@ func NewOpenAPI(ctx context.Context, instrumentation instrumentation.Instrumenta
 
 	reflector.SpecSchema().SetTitle("SigNoz")
 	reflector.SpecSchema().SetDescription("OpenTelemetry-Native Logs, Metrics and Traces in a single pane")
-	reflector.SpecSchema().SetAPIKeySecurity(ctxtypes.AuthTypeAPIKey.StringValue(), "SigNoz-Api-Key", openapi.InHeader, "API Keys")
-	reflector.SpecSchema().SetHTTPBearerTokenSecurity(ctxtypes.AuthTypeTokenizer.StringValue(), "Tokenizer", "Tokens generated by the tokenizer")
+	reflector.SpecSchema().SetAPIKeySecurity(authtypes.IdentNProviderAPIkey.StringValue(), "SigNoz-Api-Key", openapi.InHeader, "API Keys")
+	reflector.SpecSchema().SetHTTPBearerTokenSecurity(authtypes.IdentNProviderTokenizer.StringValue(), "Tokenizer", "Tokens generated by the tokenizer")
 
 	collector := handler.NewOpenAPICollector(reflector)
 

pkg/signoz/provider.go

@@ -22,6 +22,9 @@ import (
 	"github.com/SigNoz/signoz/pkg/flagger/configflagger"
 	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/global/signozglobal"
+	"github.com/SigNoz/signoz/pkg/identn"
+	"github.com/SigNoz/signoz/pkg/identn/apikeyidentn"
+	"github.com/SigNoz/signoz/pkg/identn/tokenizeridentn"
 	"github.com/SigNoz/signoz/pkg/modules/authdomain/implauthdomain"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
 	"github.com/SigNoz/signoz/pkg/modules/organization/implorganization"
@@ -271,6 +274,13 @@ func NewTokenizerProviderFactories(cache cache.Cache, sqlstore sqlstore.SQLStore
 	)
 }
 
+func NewIdentNProviderFactories(sqlstore sqlstore.SQLStore, tokenizer tokenizer.Tokenizer) factory.NamedMap[factory.ProviderFactory[identn.IdentN, identn.Config]] {
+	return factory.MustNewNamedMap(
+		tokenizeridentn.NewFactory(tokenizer),
+		apikeyidentn.NewFactory(sqlstore),
+	)
+}
+
 func NewGlobalProviderFactories() factory.NamedMap[factory.ProviderFactory[global.Global, global.Config]] {
 	return factory.MustNewNamedMap(
 		signozglobal.NewFactory(),

pkg/signoz/signoz.go

@@ -16,6 +16,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/gateway"
+	"github.com/SigNoz/signoz/pkg/identn"
 	"github.com/SigNoz/signoz/pkg/instrumentation"
 	"github.com/SigNoz/signoz/pkg/licensing"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
@@ -65,6 +66,7 @@ type SigNoz struct {
 	Sharder                sharder.Sharder
 	StatsReporter          statsreporter.StatsReporter
 	Tokenizer              pkgtokenizer.Tokenizer
+	IdentNResolver         identn.IdentNResolver
 	Authz                  authz.AuthZ
 	Modules                Modules
 	Handlers               Handlers
@@ -390,6 +392,18 @@ func New(
 	// Initialize all modules
 	modules := NewModules(sqlstore, tokenizer, emailing, providerSettings, orgGetter, alertmanager, analytics, querier, telemetrystore, telemetryMetadataStore, authNs, authz, cache, queryParser, config, dashboard, userGetter)
 
+	// Initialize identN resolver
+	identNFactories := NewIdentNProviderFactories(sqlstore, tokenizer)
+	identNs := []identn.IdentN{}
+	for _, identNFactory := range identNFactories.GetInOrder() {
+		identN, err := identNFactory.New(ctx, providerSettings, config.IdentN)
+		if err != nil {
+			return nil, err
+		}
+		identNs = append(identNs, identN)
+	}
+	identNResolver := identn.NewIdentNResolver(providerSettings, identNs...)
+
 	userService := impluser.NewService(providerSettings, impluser.NewStore(sqlstore, providerSettings), modules.User, orgGetter, authz, config.User.Root)
 
 	// Initialize the querier handler via callback (allows EE to decorate with anomaly detection)
@@ -468,6 +482,7 @@ func New(
 		Emailing:               emailing,
 		Sharder:                sharder,
 		Tokenizer:              tokenizer,
+		IdentNResolver:         identNResolver,
 		Authz:                  authz,
 		Modules:                modules,
 		Handlers:               handlers,

pkg/sqlschema/column.go

@@ -41,6 +41,13 @@ type Column struct {
 	Default string
 }
 
+func (column *Column) Equals(other *Column) bool {
+	return column.Name == other.Name &&
+		column.DataType == other.DataType &&
+		column.Nullable == other.Nullable &&
+		column.Default == other.Default
+}
+
 func (column *Column) ToDefinitionSQL(fmter SQLFormatter) []byte {
 	sql := []byte{}
 
@@ -129,3 +136,53 @@ func (column *Column) ToSetNotNullSQL(fmter SQLFormatter, tableName TableName) [
 
 	return sql
 }
+
+func (column *Column) ToDropNotNullSQL(fmter SQLFormatter, tableName TableName) []byte {
+	sql := []byte{}
+
+	sql = append(sql, "ALTER TABLE "...)
+	sql = fmter.AppendIdent(sql, string(tableName))
+	sql = append(sql, " ALTER COLUMN "...)
+	sql = fmter.AppendIdent(sql, string(column.Name))
+	sql = append(sql, " DROP NOT NULL"...)
+
+	return sql
+}
+
+func (column *Column) ToSetDefaultSQL(fmter SQLFormatter, tableName TableName) []byte {
+	sql := []byte{}
+
+	sql = append(sql, "ALTER TABLE "...)
+	sql = fmter.AppendIdent(sql, string(tableName))
+	sql = append(sql, " ALTER COLUMN "...)
+	sql = fmter.AppendIdent(sql, string(column.Name))
+	sql = append(sql, " SET DEFAULT "...)
+	sql = append(sql, column.Default...)
+
+	return sql
+}
+
+func (column *Column) ToDropDefaultSQL(fmter SQLFormatter, tableName TableName) []byte {
+	sql := []byte{}
+
+	sql = append(sql, "ALTER TABLE "...)
+	sql = fmter.AppendIdent(sql, string(tableName))
+	sql = append(sql, " ALTER COLUMN "...)
+	sql = fmter.AppendIdent(sql, string(column.Name))
+	sql = append(sql, " DROP DEFAULT"...)
+
+	return sql
+}
+
+func (column *Column) ToSetDataTypeSQL(fmter SQLFormatter, tableName TableName) []byte {
+	sql := []byte{}
+
+	sql = append(sql, "ALTER TABLE "...)
+	sql = fmter.AppendIdent(sql, string(tableName))
+	sql = append(sql, " ALTER COLUMN "...)
+	sql = fmter.AppendIdent(sql, string(column.Name))
+	sql = append(sql, " SET DATA TYPE "...)
+	sql = append(sql, fmter.SQLDataTypeOf(column.DataType)...)
+
+	return sql
+}

pkg/sqlschema/constraint.go

@@ -49,6 +49,9 @@ type Constraint interface {
 
 	// The SQL representation of the constraint.
 	ToDropSQL(fmter SQLFormatter, tableName TableName) []byte
+
+	// The SQL representation of the constraint.
+	ToCreateSQL(fmter SQLFormatter, tableName TableName) []byte
 }
 
 type PrimaryKeyConstraint struct {
@@ -139,6 +142,27 @@ func (constraint *PrimaryKeyConstraint) ToDropSQL(fmter SQLFormatter, tableName
 	return sql
 }
 
+func (constraint *PrimaryKeyConstraint) ToCreateSQL(fmter SQLFormatter, tableName TableName) []byte {
+	sql := []byte{}
+
+	sql = append(sql, "ALTER TABLE "...)
+	sql = fmter.AppendIdent(sql, string(tableName))
+	sql = append(sql, " ADD CONSTRAINT "...)
+	sql = fmter.AppendIdent(sql, constraint.Name(tableName))
+	sql = append(sql, " PRIMARY KEY ("...)
+
+	for i, column := range constraint.ColumnNames {
+		if i > 0 {
+			sql = append(sql, ", "...)
+		}
+		sql = fmter.AppendIdent(sql, string(column))
+	}
+
+	sql = append(sql, ")"...)
+
+	return sql
+}
+
 type ForeignKeyConstraint struct {
 	ReferencingColumnName ColumnName
 	ReferencedTableName   TableName
@@ -220,6 +244,24 @@ func (constraint *ForeignKeyConstraint) ToDropSQL(fmter SQLFormatter, tableName
 	return sql
 }
 
+func (constraint *ForeignKeyConstraint) ToCreateSQL(fmter SQLFormatter, tableName TableName) []byte {
+	sql := []byte{}
+
+	sql = append(sql, "ALTER TABLE "...)
+	sql = fmter.AppendIdent(sql, string(tableName))
+	sql = append(sql, " ADD CONSTRAINT "...)
+	sql = fmter.AppendIdent(sql, constraint.Name(tableName))
+	sql = append(sql, " FOREIGN KEY ("...)
+	sql = fmter.AppendIdent(sql, string(constraint.ReferencingColumnName))
+	sql = append(sql, ") REFERENCES "...)
+	sql = fmter.AppendIdent(sql, string(constraint.ReferencedTableName))
+	sql = append(sql, " ("...)
+	sql = fmter.AppendIdent(sql, string(constraint.ReferencedColumnName))
+	sql = append(sql, ")"...)
+
+	return sql
+}
+
 // Do not use this constraint type. Instead create an index with the `UniqueIndex` type.
 // The main difference between a Unique Index and a Unique Constraint is mostly semantic, with a constraint focusing more on data integrity, while an index focuses on performance.
 // We choose to create unique indices because of sqlite. Dropping a unique index is directly supported whilst dropping a unique constraint requires a recreation of the table with the constraint removed.
@@ -323,3 +365,7 @@ func (constraint *UniqueConstraint) ToDropSQL(fmter SQLFormatter, tableName Tabl
 
 	return sql
 }
+
+func (constraint *UniqueConstraint) ToCreateSQL(fmter SQLFormatter, tableName TableName) []byte {
+	return []byte{}
+}

pkg/sqlschema/index.go

@@ -1,6 +1,7 @@
 package sqlschema
 
 import (
+	"slices"
 	"strings"
 
 	"github.com/SigNoz/signoz/pkg/valuer"
@@ -27,12 +28,18 @@ type Index interface {
 	// Add name to the index. This is typically used to override the autogenerated name because the database might have a different name.
 	Named(name string) Index
 
+	// Returns true if the index is named. A named index is not autogenerated
+	IsNamed() bool
+
 	// The type of the index.
 	Type() IndexType
 
 	// The columns that the index is applied to.
 	Columns() []ColumnName
 
+	// Equals returns true if the index is equal to the other index.
+	Equals(other Index) bool
+
 	// The SQL representation of the index.
 	ToCreateSQL(fmter SQLFormatter) []byte
 
@@ -76,6 +83,10 @@ func (index *UniqueIndex) Named(name string) Index {
 	}
 }
 
+func (index *UniqueIndex) IsNamed() bool {
+	return index.name != ""
+}
+
 func (*UniqueIndex) Type() IndexType {
 	return IndexTypeUnique
 }
@@ -84,6 +95,14 @@ func (index *UniqueIndex) Columns() []ColumnName {
 	return index.ColumnNames
 }
 
+func (index *UniqueIndex) Equals(other Index) bool {
+	if other.Type() != IndexTypeUnique {
+		return false
+	}
+
+	return index.Name() == other.Name() && slices.Equal(index.Columns(), other.Columns())
+}
+
 func (index *UniqueIndex) ToCreateSQL(fmter SQLFormatter) []byte {
 	sql := []byte{}
 

pkg/sqlschema/operator.go

@@ -1,11 +1,21 @@
 package sqlschema
 
+import (
+	"reflect"
+	"slices"
+)
+
 var _ SQLOperator = (*Operator)(nil)
 
 type OperatorSupport struct {
-	DropConstraint          bool
-	ColumnIfNotExistsExists bool
-	AlterColumnSetNotNull   bool
+	// Support for creating and dropping constraints.
+	SCreateAndDropConstraint bool
+
+	// Support for `IF EXISTS` and `IF NOT EXISTS` in `ALTER TABLE ADD COLUMN` and `ALTER TABLE DROP COLUMN`.
+	SAlterTableAddAndDropColumnIfNotExistsAndExists bool
+
+	// Support for altering columns such as `ALTER TABLE ALTER COLUMN SET NOT NULL`.
+	SAlterTableAlterColumnSetAndDrop bool
 }
 
 type Operator struct {
@@ -25,9 +35,115 @@ func (operator *Operator) CreateTable(table *Table) [][]byte {
 }
 
 func (operator *Operator) RenameTable(table *Table, newName TableName) [][]byte {
-	sqls := [][]byte{table.ToRenameSQL(operator.fmter, newName)}
+	sql := table.ToRenameSQL(operator.fmter, newName)
 	table.Name = newName
-	return sqls
+
+	return [][]byte{sql}
+}
+
+func (operator *Operator) AlterTable(oldTable *Table, oldTableUniqueConstraints []*UniqueConstraint, newTable *Table) [][]byte {
+	// The following has to be done in order:
+	// 		- Drop constraints
+	// 		- Drop columns (some columns might be part of constraints therefore this depends on Step 1)
+	// 		- Add columns, then modify columns
+	// 		- Rename table
+	// 		- Add constraints (some constraints might be part of columns therefore this depends on Step 3, constraint names also depend on table name which is changed in Step 4)
+	// 		- Create unique indices from unique constraints for the new table
+
+	sql := [][]byte{}
+
+	// Drop primary key constraint if it is in the old table but not in the new table.
+	if oldTable.PrimaryKeyConstraint != nil && newTable.PrimaryKeyConstraint == nil {
+		sql = append(sql, operator.DropConstraint(oldTable, oldTableUniqueConstraints, oldTable.PrimaryKeyConstraint)...)
+	}
+
+	// Drop primary key constraint if it is in the old table and the new table but they are different.
+	if oldTable.PrimaryKeyConstraint != nil && newTable.PrimaryKeyConstraint != nil && !oldTable.PrimaryKeyConstraint.Equals(newTable.PrimaryKeyConstraint) {
+		sql = append(sql, operator.DropConstraint(oldTable, oldTableUniqueConstraints, oldTable.PrimaryKeyConstraint)...)
+	}
+
+	// Drop foreign key constraints that are in the old table but not in the new table.
+	for _, fkConstraint := range oldTable.ForeignKeyConstraints {
+		if index := operator.findForeignKeyConstraint(newTable, fkConstraint); index == -1 {
+			sql = append(sql, operator.DropConstraint(oldTable, oldTableUniqueConstraints, fkConstraint)...)
+		}
+	}
+
+	// Drop all unique constraints.
+	for _, uniqueConstraint := range oldTableUniqueConstraints {
+		sql = append(sql, operator.DropConstraint(oldTable, oldTableUniqueConstraints, uniqueConstraint)...)
+	}
+
+	// Reduce number of drops for engines with no SCreateAndDropConstraint.
+	if !operator.support.SCreateAndDropConstraint && len(sql) > 0 {
+		// Do not send the unique constraints to recreate table. We will change them to indexes at the end.
+		sql = operator.RecreateTable(oldTable, nil)
+	}
+
+	// Drop columns that are in the old table but not in the new table.
+	for _, column := range oldTable.Columns {
+		if index := operator.findColumnByName(newTable, column.Name); index == -1 {
+			sql = append(sql, operator.DropColumn(oldTable, column)...)
+		}
+	}
+
+	// Add columns that are in the new table but not in the old table.
+	for _, column := range newTable.Columns {
+		if index := operator.findColumnByName(oldTable, column.Name); index == -1 {
+			sql = append(sql, operator.AddColumn(oldTable, oldTableUniqueConstraints, column, nil)...)
+		}
+	}
+
+	// Modify columns that are in the new table and in the old table
+	alterColumnSQLs := [][]byte{}
+	for _, column := range newTable.Columns {
+		alterColumnSQLs = append(alterColumnSQLs, operator.AlterColumn(oldTable, oldTableUniqueConstraints, column)...)
+	}
+
+	// Reduce number of drops for engines with no SAlterTableAlterColumnSetAndDrop.
+	if !operator.support.SAlterTableAlterColumnSetAndDrop && len(alterColumnSQLs) > 0 {
+		// Do not send the unique constraints to recreate table. We will change them to indexes at the end.
+		sql = append(sql, operator.RecreateTable(oldTable, nil)...)
+	}
+
+	if operator.support.SAlterTableAlterColumnSetAndDrop && len(alterColumnSQLs) > 0 {
+		sql = append(sql, alterColumnSQLs...)
+	}
+
+	// Check if the name has changed
+	if oldTable.Name != newTable.Name {
+		sql = append(sql, operator.RenameTable(oldTable, newTable.Name)...)
+	}
+
+	// If the old table does not have a primary key constraint and the new table does, we need to create it.
+	if oldTable.PrimaryKeyConstraint == nil {
+		if newTable.PrimaryKeyConstraint != nil {
+			sql = append(sql, operator.CreateConstraint(oldTable, oldTableUniqueConstraints, newTable.PrimaryKeyConstraint)...)
+		}
+	}
+
+	if oldTable.PrimaryKeyConstraint != nil {
+		if !oldTable.PrimaryKeyConstraint.Equals(newTable.PrimaryKeyConstraint) {
+			sql = append(sql, operator.CreateConstraint(oldTable, oldTableUniqueConstraints, newTable.PrimaryKeyConstraint)...)
+		}
+	}
+
+	// Create foreign key constraints that are in the new table but not in the old table.
+	for _, fkConstraint := range newTable.ForeignKeyConstraints {
+		if index := operator.findForeignKeyConstraint(oldTable, fkConstraint); index == -1 {
+			sql = append(sql, operator.CreateConstraint(oldTable, oldTableUniqueConstraints, fkConstraint)...)
+		}
+	}
+
+	// Create indices for the new table.
+	for _, uniqueConstraint := range oldTableUniqueConstraints {
+		sql = append(sql, uniqueConstraint.ToIndex(oldTable.Name).ToCreateSQL(operator.fmter))
+	}
+
+	// Remove duplicate SQLs.
+	return slices.CompactFunc(sql, func(a, b []byte) bool {
+		return string(a) == string(b)
+	})
 }
 
 func (operator *Operator) RecreateTable(table *Table, uniqueConstraints []*UniqueConstraint) [][]byte {
@@ -64,16 +180,23 @@ func (operator *Operator) AddColumn(table *Table, uniqueConstraints []*UniqueCon
 	table.Columns = append(table.Columns, column)
 
 	sqls := [][]byte{
-		column.ToAddSQL(operator.fmter, table.Name, operator.support.ColumnIfNotExistsExists),
+		column.ToAddSQL(operator.fmter, table.Name, operator.support.SAlterTableAddAndDropColumnIfNotExistsAndExists),
 	}
 
-	if !column.Nullable {
-		if val == nil {
-			val = column.DataType.z
-		}
+	// If the value is not nil, always try to update the column.
+	if val != nil {
 		sqls = append(sqls, column.ToUpdateSQL(operator.fmter, table.Name, val))
+	}
 
-		if operator.support.AlterColumnSetNotNull {
+	// If the column is not nullable and does not have a default value and no value is provided, we need to set something.
+	// So we set it to the zero value of the column's data type.
+	if !column.Nullable && column.Default == "" && val == nil {
+		sqls = append(sqls, column.ToUpdateSQL(operator.fmter, table.Name, column.DataType.z))
+	}
+
+	// If the column is not nullable, we need to set it to not null.
+	if !column.Nullable {
+		if operator.support.SAlterTableAlterColumnSetAndDrop {
 			sqls = append(sqls, column.ToSetNotNullSQL(operator.fmter, table.Name))
 		} else {
 			sqls = append(sqls, operator.RecreateTable(table, uniqueConstraints)...)
@@ -83,6 +206,62 @@ func (operator *Operator) AddColumn(table *Table, uniqueConstraints []*UniqueCon
 	return sqls
 }
 
+func (operator *Operator) AlterColumn(table *Table, uniqueConstraints []*UniqueConstraint, column *Column) [][]byte {
+	index := operator.findColumnByName(table, column.Name)
+	// If the column does not exist, we do not need to alter it.
+	if index == -1 {
+		return [][]byte{}
+	}
+
+	oldColumn := table.Columns[index]
+	// If the column is the same, we do not need to alter it.
+	if oldColumn.Equals(column) {
+		return [][]byte{}
+	}
+
+	sqls := [][]byte{}
+	var recreateTable bool
+
+	if oldColumn.DataType != column.DataType {
+		if operator.support.SAlterTableAlterColumnSetAndDrop {
+			sqls = append(sqls, column.ToSetDataTypeSQL(operator.fmter, table.Name))
+		} else {
+			recreateTable = true
+		}
+	}
+
+	if oldColumn.Nullable != column.Nullable {
+		if operator.support.SAlterTableAlterColumnSetAndDrop {
+			if column.Nullable {
+				sqls = append(sqls, column.ToDropNotNullSQL(operator.fmter, table.Name))
+			} else {
+				sqls = append(sqls, column.ToSetNotNullSQL(operator.fmter, table.Name))
+			}
+		} else {
+			recreateTable = true
+		}
+	}
+
+	if oldColumn.Default != column.Default {
+		if operator.support.SAlterTableAlterColumnSetAndDrop {
+			if column.Default != "" {
+				sqls = append(sqls, column.ToSetDefaultSQL(operator.fmter, table.Name))
+			} else {
+				sqls = append(sqls, column.ToDropDefaultSQL(operator.fmter, table.Name))
+			}
+		} else {
+			recreateTable = true
+		}
+	}
+
+	table.Columns[index] = column
+	if recreateTable {
+		sqls = append(sqls, operator.RecreateTable(table, uniqueConstraints)...)
+	}
+
+	return sqls
+}
+
 func (operator *Operator) DropColumn(table *Table, column *Column) [][]byte {
 	index := operator.findColumnByName(table, column.Name)
 	// If the column does not exist, we do not need to drop it.
@@ -92,7 +271,48 @@ func (operator *Operator) DropColumn(table *Table, column *Column) [][]byte {
 
 	table.Columns = append(table.Columns[:index], table.Columns[index+1:]...)
 
-	return [][]byte{column.ToDropSQL(operator.fmter, table.Name, operator.support.ColumnIfNotExistsExists)}
+	return [][]byte{column.ToDropSQL(operator.fmter, table.Name, operator.support.SAlterTableAddAndDropColumnIfNotExistsAndExists)}
+}
+
+func (operator *Operator) CreateConstraint(table *Table, uniqueConstraints []*UniqueConstraint, constraint Constraint) [][]byte {
+	if constraint == nil {
+		return [][]byte{}
+	}
+
+	if reflect.ValueOf(constraint).IsNil() {
+		return [][]byte{}
+	}
+
+	if constraint.Type() == ConstraintTypeForeignKey {
+		// Constraint already exists as foreign key constraint.
+		if table.ForeignKeyConstraints != nil {
+			for _, fkConstraint := range table.ForeignKeyConstraints {
+				if constraint.Equals(fkConstraint) {
+					return [][]byte{}
+				}
+			}
+		}
+
+		table.ForeignKeyConstraints = append(table.ForeignKeyConstraints, constraint.(*ForeignKeyConstraint))
+	}
+
+	sqls := [][]byte{}
+	if constraint.Type() == ConstraintTypePrimaryKey {
+		if operator.support.SCreateAndDropConstraint {
+			if table.PrimaryKeyConstraint != nil {
+				// TODO(grandwizard28): this is a hack to drop the primary key constraint.
+				// We need to find a better way to do this.
+				sqls = append(sqls, table.PrimaryKeyConstraint.ToDropSQL(operator.fmter, table.Name))
+			}
+		}
+		table.PrimaryKeyConstraint = constraint.(*PrimaryKeyConstraint)
+	}
+
+	if operator.support.SCreateAndDropConstraint {
+		return append(sqls, constraint.ToCreateSQL(operator.fmter, table.Name))
+	}
+
+	return operator.RecreateTable(table, uniqueConstraints)
 }
 
 func (operator *Operator) DropConstraint(table *Table, uniqueConstraints []*UniqueConstraint, constraint Constraint) [][]byte {
@@ -105,20 +325,48 @@ func (operator *Operator) DropConstraint(table *Table, uniqueConstraints []*Uniq
 			return [][]byte{}
 		}
 
-		if operator.support.DropConstraint {
+		if operator.support.SCreateAndDropConstraint {
 			return [][]byte{uniqueConstraints[uniqueConstraintIndex].ToDropSQL(operator.fmter, table.Name)}
 		}
 
-		return operator.RecreateTable(table, append(uniqueConstraints[:uniqueConstraintIndex], uniqueConstraints[uniqueConstraintIndex+1:]...))
+		var copyOfUniqueConstraints []*UniqueConstraint
+		copyOfUniqueConstraints = append(copyOfUniqueConstraints, uniqueConstraints[:uniqueConstraintIndex]...)
+		copyOfUniqueConstraints = append(copyOfUniqueConstraints, uniqueConstraints[uniqueConstraintIndex+1:]...)
+
+		return operator.RecreateTable(table, copyOfUniqueConstraints)
 	}
 
-	if operator.support.DropConstraint {
+	if operator.support.SCreateAndDropConstraint {
 		return [][]byte{toDropConstraint.ToDropSQL(operator.fmter, table.Name)}
 	}
 
 	return operator.RecreateTable(table, uniqueConstraints)
 }
 
+func (operator *Operator) DiffIndices(oldIndices []Index, newIndices []Index) [][]byte {
+	sqls := [][]byte{}
+
+	for i, oldIndex := range oldIndices {
+		if index := operator.findIndex(newIndices, oldIndex); index == -1 {
+			sqls = append(sqls, oldIndex.ToDropSQL(operator.fmter))
+			continue
+		}
+
+		if oldIndex.IsNamed() {
+			sqls = append(sqls, oldIndex.ToDropSQL(operator.fmter))
+			sqls = append(sqls, newIndices[i].ToCreateSQL(operator.fmter))
+		}
+	}
+
+	for _, newIndex := range newIndices {
+		if index := operator.findIndex(oldIndices, newIndex); index == -1 {
+			sqls = append(sqls, newIndex.ToCreateSQL(operator.fmter))
+		}
+	}
+
+	return sqls
+}
+
 func (*Operator) findColumnByName(table *Table, columnName ColumnName) int {
 	for i, column := range table.Columns {
 		if column.Name == columnName {
@@ -142,3 +390,27 @@ func (*Operator) findUniqueConstraint(uniqueConstraints []*UniqueConstraint, con
 
 	return -1
 }
+
+func (*Operator) findForeignKeyConstraint(table *Table, constraint Constraint) int {
+	if constraint.Type() != ConstraintTypeForeignKey {
+		return -1
+	}
+
+	for i, fkConstraint := range table.ForeignKeyConstraints {
+		if fkConstraint.Equals(constraint) {
+			return i
+		}
+	}
+
+	return -1
+}
+
+func (*Operator) findIndex(indices []Index, index Index) int {
+	for i, inputIndex := range indices {
+		if index.Equals(inputIndex) {
+			return i
+		}
+	}
+
+	return -1
+}

pkg/sqlschema/operator_test.go

@@ -2,6 +2,7 @@ package sqlschema
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/uptrace/bun/schema"
@@ -54,9 +55,8 @@ func TestOperatorAddColumn(t *testing.T) {
 		column            *Column
 		val               any
 		uniqueConstraints []*UniqueConstraint
-		support           OperatorSupport
-		expectedSQLs      [][]byte
 		expectedTable     *Table
+		expected          map[OperatorSupport][][]byte
 	}{
 		{
 			name: "NullableNoDefault_DoesNotExist",
@@ -68,19 +68,21 @@ func TestOperatorAddColumn(t *testing.T) {
 			},
 			column: &Column{Name: "name", DataType: DataTypeText, Nullable: true, Default: ""},
 			val:    nil,
-			support: OperatorSupport{
-				ColumnIfNotExistsExists: true,
-				AlterColumnSetNotNull:   true,
-			},
-			expectedSQLs: [][]byte{
-				[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "name" TEXT`),
-			},
 			expectedTable: &Table{
 				Name: "users",
 				Columns: []*Column{
 					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
 					{Name: "name", DataType: DataTypeText, Nullable: true, Default: ""},
 				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN "name" TEXT`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "name" TEXT`),
+				},
 			},
 		},
 		{
@@ -94,21 +96,21 @@ func TestOperatorAddColumn(t *testing.T) {
 			},
 			column: &Column{Name: "name", DataType: DataTypeBigInt, Nullable: true, Default: ""},
 			val:    nil,
-			support: OperatorSupport{
-				ColumnIfNotExistsExists: true,
-				AlterColumnSetNotNull:   true,
-			},
-			expectedSQLs: [][]byte{},
 			expectedTable: &Table{
 				Name: "users",
 				Columns: []*Column{
 					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
 					{Name: "name", DataType: DataTypeText, Nullable: true, Default: ""},
 				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}:    {},
 			},
 		},
 		{
-			name: "NotNullableNoDefaultNoVal_DoesNotExist",
+			name: "TextNotNullableNoDefaultNoVal_DoesNotExist",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -117,25 +119,32 @@ func TestOperatorAddColumn(t *testing.T) {
 			},
 			column: &Column{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
 			val:    nil,
-			support: OperatorSupport{
-				ColumnIfNotExistsExists: true,
-				AlterColumnSetNotNull:   true,
-			},
-			expectedSQLs: [][]byte{
-				[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "name" TEXT`),
-				[]byte(`UPDATE "users" SET "name" = ''`),
-				[]byte(`ALTER TABLE "users" ALTER COLUMN "name" SET NOT NULL`),
-			},
 			expectedTable: &Table{
 				Name: "users",
 				Columns: []*Column{
 					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
 					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
 				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN "name" TEXT`),
+					[]byte(`UPDATE "users" SET "name" = ''`),
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "name" TEXT NOT NULL)`),
+					[]byte(`INSERT INTO "users__temp" ("id", "name") SELECT "id", "name" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "name" TEXT`),
+					[]byte(`UPDATE "users" SET "name" = ''`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "name" SET NOT NULL`),
+				},
 			},
 		},
 		{
-			name: "NotNullableNoDefault_DoesNotExist",
+			name: "IntegerNotNullableNoDefaultNoVal_DoesNotExist",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -143,81 +152,154 @@ func TestOperatorAddColumn(t *testing.T) {
 				},
 			},
 			column: &Column{Name: "num", DataType: DataTypeInteger, Nullable: false, Default: ""},
-			val:    int64(100),
-			support: OperatorSupport{
-				ColumnIfNotExistsExists: true,
-				AlterColumnSetNotNull:   true,
-			},
-			expectedSQLs: [][]byte{
-				[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "num" INTEGER`),
-				[]byte(`UPDATE "users" SET "num" = 100`),
-				[]byte(`ALTER TABLE "users" ALTER COLUMN "num" SET NOT NULL`),
-			},
-			expectedTable: &Table{
-				Name: "users",
-				Columns: []*Column{
-					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
-					{Name: "num", DataType: DataTypeInteger, Nullable: false, Default: ""},
-				},
-			},
-		},
-		{
-			name: "NotNullableNoDefault_DoesNotExist_AlterColumnSetNotNullFalse",
-			table: &Table{
-				Name: "users",
-				Columns: []*Column{
-					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
-					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
-				},
-			},
-			column: &Column{Name: "num", DataType: DataTypeInteger, Nullable: false, Default: ""},
-			val:    int64(100),
-			uniqueConstraints: []*UniqueConstraint{
-				{ColumnNames: []ColumnName{"name"}},
-			},
-			support: OperatorSupport{
-				ColumnIfNotExistsExists: true,
-				AlterColumnSetNotNull:   false,
-			},
-			expectedSQLs: [][]byte{
-				[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "num" INTEGER`),
-				[]byte(`UPDATE "users" SET "num" = 100`),
-				[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "name" TEXT NOT NULL, "num" INTEGER NOT NULL)`),
-				[]byte(`INSERT INTO "users__temp" ("id", "name", "num") SELECT "id", "name", "num" FROM "users"`),
-				[]byte(`DROP TABLE IF EXISTS "users"`),
-				[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
-				[]byte(`CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_name" ON "users" ("name")`),
-			},
-			expectedTable: &Table{
-				Name: "users",
-				Columns: []*Column{
-					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
-					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
-					{Name: "num", DataType: DataTypeInteger, Nullable: false, Default: ""},
-				},
-			},
-		},
-		{
-			name: "MismatchingDataType_DoesExist_AlterColumnSetNotNullFalse",
-			table: &Table{
-				Name: "users",
-				Columns: []*Column{
-					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
-					{Name: "name", DataType: DataTypeText, Nullable: true, Default: ""},
-				},
-			},
-			column: &Column{Name: "name", DataType: DataTypeBigInt, Nullable: false, Default: ""},
 			val:    nil,
-			support: OperatorSupport{
-				ColumnIfNotExistsExists: true,
-				AlterColumnSetNotNull:   false,
-			},
-			expectedSQLs: [][]byte{},
 			expectedTable: &Table{
 				Name: "users",
 				Columns: []*Column{
 					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
-					{Name: "name", DataType: DataTypeText, Nullable: true, Default: ""},
+					{Name: "num", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN "num" INTEGER`),
+					[]byte(`UPDATE "users" SET "num" = 0`),
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "num" INTEGER NOT NULL)`),
+					[]byte(`INSERT INTO "users__temp" ("id", "num") SELECT "id", "num" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "num" INTEGER`),
+					[]byte(`UPDATE "users" SET "num" = 0`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "num" SET NOT NULL`),
+				},
+			},
+		},
+		{
+			name: "IntegerNotNullableNoDefaultVal_DoesNotExist",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+			},
+			column: &Column{Name: "num", DataType: DataTypeInteger, Nullable: false, Default: ""},
+			val:    int64(100),
+			expectedTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "num", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN "num" INTEGER`),
+					[]byte(`UPDATE "users" SET "num" = 100`),
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "num" INTEGER NOT NULL)`),
+					[]byte(`INSERT INTO "users__temp" ("id", "num") SELECT "id", "num" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "num" INTEGER`),
+					[]byte(`UPDATE "users" SET "num" = 100`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "num" SET NOT NULL`),
+				},
+			},
+		},
+		{
+			name: "BooleanNotNullableNoDefaultValNoVal_DoesNotExist",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+			},
+			column: &Column{Name: "is_admin", DataType: DataTypeBoolean, Nullable: false, Default: ""},
+			val:    nil,
+			expectedTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "is_admin", DataType: DataTypeBoolean, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN "is_admin" BOOLEAN`),
+					// Set to the zero value
+					[]byte(`UPDATE "users" SET "is_admin" = FALSE`),
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "is_admin" BOOLEAN NOT NULL)`),
+					[]byte(`INSERT INTO "users__temp" ("id", "is_admin") SELECT "id", "is_admin" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "is_admin" BOOLEAN`),
+					// Set to the zero value
+					[]byte(`UPDATE "users" SET "is_admin" = FALSE`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "is_admin" SET NOT NULL`),
+				},
+			},
+		},
+		{
+			name: "BooleanNullableDefaultVal_DoesNotExist",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+			},
+			column: &Column{Name: "is_admin", DataType: DataTypeBoolean, Nullable: true, Default: "TRUE"},
+			val:    nil,
+			expectedTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "is_admin", DataType: DataTypeBoolean, Nullable: true, Default: "TRUE"},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN "is_admin" BOOLEAN DEFAULT TRUE`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "is_admin" BOOLEAN DEFAULT TRUE`),
+				},
+			},
+		},
+		{
+			name: "TimestampNullableDefaultValAndVal_DoesNotExist",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+			},
+			column: &Column{Name: "created_at", DataType: DataTypeTimestamp, Nullable: true, Default: "CURRENT_TIMESTAMP"},
+			val:    time.Time{},
+			expectedTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "created_at", DataType: DataTypeTimestamp, Nullable: true, Default: "CURRENT_TIMESTAMP"},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN "created_at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP`),
+					[]byte(`UPDATE "users" SET "created_at" = '0001-01-01 00:00:00+00:00'`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "created_at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP`),
+					[]byte(`UPDATE "users" SET "created_at" = '0001-01-01 00:00:00+00:00'`),
 				},
 			},
 		},
@@ -226,11 +308,15 @@ func TestOperatorAddColumn(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			fmter := NewFormatter(schema.NewNopFormatter().Dialect())
-			operator := NewOperator(fmter, testCase.support)
 
-			actuals := operator.AddColumn(testCase.table, testCase.uniqueConstraints, testCase.column, testCase.val)
-			assert.Equal(t, testCase.expectedSQLs, actuals)
-			assert.Equal(t, testCase.expectedTable, testCase.table)
+			for support, expectedSQLs := range testCase.expected {
+				operator := NewOperator(fmter, support)
+				clonedTable := testCase.table.Clone()
+
+				actuals := operator.AddColumn(clonedTable, testCase.uniqueConstraints, testCase.column, testCase.val)
+				assert.Equal(t, expectedSQLs, actuals)
+				assert.Equal(t, testCase.expectedTable, clonedTable)
+			}
 		})
 	}
 }
@@ -246,7 +332,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 		expectedTable     *Table
 	}{
 		{
-			name: "PrimaryKeyConstraint_DoesExist_DropConstraintTrue",
+			name: "PrimaryKeyConstraint_DoesExist_SCreateAndDropConstraintTrue",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -260,7 +346,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				ColumnNames: []ColumnName{"id"},
 			},
 			support: OperatorSupport{
-				DropConstraint: true,
+				SCreateAndDropConstraint: true,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "pk_users"`),
@@ -273,7 +359,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "PrimaryKeyConstraint_DoesNotExist_DropConstraintTrue",
+			name: "PrimaryKeyConstraint_DoesNotExist_SCreateAndDropConstraintTrue",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -284,7 +370,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				ColumnNames: []ColumnName{"id"},
 			},
 			support: OperatorSupport{
-				DropConstraint: true,
+				SCreateAndDropConstraint: true,
 			},
 			expectedSQLs: [][]byte{},
 			expectedTable: &Table{
@@ -295,7 +381,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "PrimaryKeyConstraintDifferentName_DoesExist_DropConstraintTrue",
+			name: "PrimaryKeyConstraintDifferentName_DoesExist_SCreateAndDropConstraintTrue",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -310,7 +396,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				ColumnNames: []ColumnName{"id"},
 			},
 			support: OperatorSupport{
-				DropConstraint: true,
+				SCreateAndDropConstraint: true,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "pk_users_different_name"`),
@@ -323,7 +409,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "PrimaryKeyConstraint_DoesExist_DropConstraintFalse",
+			name: "PrimaryKeyConstraint_DoesExist_SCreateAndDropConstraintFalse",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -337,7 +423,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				ColumnNames: []ColumnName{"id"},
 			},
 			support: OperatorSupport{
-				DropConstraint: false,
+				SCreateAndDropConstraint: false,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL)`),
@@ -353,7 +439,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "PrimaryKeyConstraint_DoesNotExist_DropConstraintFalse",
+			name: "PrimaryKeyConstraint_DoesNotExist_SCreateAndDropConstraintFalse",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -364,7 +450,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				ColumnNames: []ColumnName{"id"},
 			},
 			support: OperatorSupport{
-				DropConstraint: false,
+				SCreateAndDropConstraint: false,
 			},
 			expectedSQLs: [][]byte{},
 			expectedTable: &Table{
@@ -375,7 +461,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "UniqueConstraint_DoesExist_DropConstraintTrue",
+			name: "UniqueConstraint_DoesExist_SCreateAndDropConstraintTrue",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -390,7 +476,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"name"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: true,
+				SCreateAndDropConstraint: true,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "uq_users_name"`),
@@ -404,7 +490,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "UniqueConstraint_DoesNotExist_DropConstraintTrue",
+			name: "UniqueConstraint_DoesNotExist_SCreateAndDropConstraintTrue",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -419,7 +505,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"id"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: true,
+				SCreateAndDropConstraint: true,
 			},
 			expectedSQLs: [][]byte{},
 			expectedTable: &Table{
@@ -431,7 +517,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "UniqueConstraint_DoesExist_DropConstraintFalse",
+			name: "UniqueConstraint_DoesExist_SCreateAndDropConstraintFalse",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -446,7 +532,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"name"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: false,
+				SCreateAndDropConstraint: false,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "name" TEXT NOT NULL)`),
@@ -463,7 +549,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "UniqueConstraint_DoesNotExist_DropConstraintFalse",
+			name: "UniqueConstraint_DoesNotExist_SCreateAndDropConstraintFalse",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -478,7 +564,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"id"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: false,
+				SCreateAndDropConstraint: false,
 			},
 			expectedSQLs: [][]byte{},
 			expectedTable: &Table{
@@ -490,7 +576,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "ForeignKeyConstraint_DoesExist_DropConstraintTrue",
+			name: "ForeignKeyConstraint_DoesExist_SCreateAndDropConstraintTrue",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -506,7 +592,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"id"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: true,
+				SCreateAndDropConstraint: true,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "fk_users_org_id"`),
@@ -521,7 +607,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "ForeignKeyConstraintDifferentName_DoesExist_DropConstraintTrue",
+			name: "ForeignKeyConstraintDifferentName_DoesExist_SCreateAndDropConstraintTrue",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -537,7 +623,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"id"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: true,
+				SCreateAndDropConstraint: true,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "my_fk"`),
@@ -552,7 +638,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "ForeignKeyConstraint_DoesNotExist_DropConstraintTrue",
+			name: "ForeignKeyConstraint_DoesNotExist_SCreateAndDropConstraintTrue",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -569,7 +655,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"id"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: true,
+				SCreateAndDropConstraint: true,
 			},
 			expectedSQLs: [][]byte{},
 			expectedTable: &Table{
@@ -584,7 +670,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "ForeignKeyConstraint_DoesExist_DropConstraintFalse",
+			name: "ForeignKeyConstraint_DoesExist_SCreateAndDropConstraintFalse",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -600,7 +686,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"id"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: false,
+				SCreateAndDropConstraint: false,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "org_id" INTEGER NOT NULL)`),
@@ -620,7 +706,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "ForeignKeyConstraintDifferentName_DoesExist_DropConstraintFalse",
+			name: "ForeignKeyConstraintDifferentName_DoesExist_SCreateAndDropConstraintFalse",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -636,7 +722,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"id"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: false,
+				SCreateAndDropConstraint: false,
 			},
 			expectedSQLs: [][]byte{
 				[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "org_id" INTEGER NOT NULL)`),
@@ -656,7 +742,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 			},
 		},
 		{
-			name: "ForeignKeyConstraint_DoesNotExist_DropConstraintFalse",
+			name: "ForeignKeyConstraint_DoesNotExist_SCreateAndDropConstraintFalse",
 			table: &Table{
 				Name: "users",
 				Columns: []*Column{
@@ -673,7 +759,7 @@ func TestOperatorDropConstraint(t *testing.T) {
 				{ColumnNames: []ColumnName{"id"}},
 			},
 			support: OperatorSupport{
-				DropConstraint: false,
+				SCreateAndDropConstraint: false,
 			},
 			expectedSQLs: [][]byte{},
 			expectedTable: &Table{
@@ -700,3 +786,363 @@ func TestOperatorDropConstraint(t *testing.T) {
 		})
 	}
 }
+
+func TestOperatorAlterTable(t *testing.T) {
+	testCases := []struct {
+		name              string
+		table             *Table
+		uniqueConstraints []*UniqueConstraint
+		newTable          *Table
+		expected          map[OperatorSupport][][]byte
+	}{
+		{
+			name: "NoOperation",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
+				},
+			},
+			newTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}:    {},
+			},
+		},
+		{
+			name: "RenameTable",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+			},
+			newTable: &Table{
+				Name: "users_new",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" RENAME TO "users_new"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" RENAME TO "users_new"`),
+				},
+			},
+		},
+		{
+			name: "AddColumn_NullableNoDefault_SAlterTableAddAndDropColumnIfNotExistsAndExistsTrue",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
+				},
+			},
+			newTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
+					{Name: "age", DataType: DataTypeInteger, Nullable: true, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN "age" INTEGER`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "age" INTEGER`),
+				},
+			},
+		},
+		{
+			name: "CreatePrimaryKeyConstraint",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+			},
+			newTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				PrimaryKeyConstraint: &PrimaryKeyConstraint{
+					ColumnNames: []ColumnName{"id"},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, CONSTRAINT "pk_users" PRIMARY KEY ("id"))`),
+					[]byte(`INSERT INTO "users__temp" ("id") SELECT "id" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" ADD CONSTRAINT "pk_users" PRIMARY KEY ("id")`),
+				},
+			},
+		},
+		{
+			name: "DropPrimaryKeyConstraint_AlterColumnNullable",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: true, Default: ""},
+				},
+				PrimaryKeyConstraint: &PrimaryKeyConstraint{ColumnNames: []ColumnName{"id"}},
+			},
+			newTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					// first drop to remove the primary key constraint
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "name" TEXT)`),
+					[]byte(`INSERT INTO "users__temp" ("id", "name") SELECT "id", "name" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+					// second drop to make the column nullable
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "name" TEXT NOT NULL)`),
+					[]byte(`INSERT INTO "users__temp" ("id", "name") SELECT "id", "name" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "pk_users"`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "name" SET NOT NULL`),
+				},
+			},
+		},
+		{
+			name: "DropForeignKeyConstraint_DropColumn",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "org_id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{
+					{ReferencingColumnName: "org_id", ReferencedTableName: "orgs", ReferencedColumnName: "id"},
+				},
+			},
+			newTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					// first drop to remove the foreign key constraint
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "org_id" INTEGER NOT NULL)`),
+					[]byte(`INSERT INTO "users__temp" ("id", "org_id") SELECT "id", "org_id" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+					// second drop to remove the column
+					[]byte(`ALTER TABLE "users" DROP COLUMN "org_id"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					// first drop to remove the foreign key constraint
+					[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "fk_users_org_id"`),
+					// second drop to remove the column
+					[]byte(`ALTER TABLE "users" DROP COLUMN IF EXISTS "org_id"`),
+				},
+			},
+		},
+		{
+			name: "DropMultipleConstraints",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
+					{Name: "age", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "org_id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "team_id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				PrimaryKeyConstraint: &PrimaryKeyConstraint{ColumnNames: []ColumnName{"id"}},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{
+					{ReferencingColumnName: "org_id", ReferencedTableName: "orgs", ReferencedColumnName: "id"},
+					{ReferencingColumnName: "team_id", ReferencedTableName: "teams", ReferencedColumnName: "id"},
+				},
+			},
+			uniqueConstraints: []*UniqueConstraint{
+				{ColumnNames: []ColumnName{"name", "age"}},
+			},
+			newTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
+					{Name: "age", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "org_id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "team_id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{
+					{ReferencingColumnName: "team_id", ReferencedTableName: "teams", ReferencedColumnName: "id"},
+				},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "name" TEXT NOT NULL, "age" INTEGER NOT NULL, "org_id" INTEGER NOT NULL, "team_id" INTEGER NOT NULL, CONSTRAINT "fk_users_team_id" FOREIGN KEY ("team_id") REFERENCES "teams" ("id"))`),
+					[]byte(`INSERT INTO "users__temp" ("id", "name", "age", "org_id", "team_id") SELECT "id", "name", "age", "org_id", "team_id" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+					[]byte(`CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_name_age" ON "users" ("name", "age")`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "pk_users"`),
+					[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "fk_users_org_id"`),
+					[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "uq_users_name_age"`),
+					[]byte(`CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_name_age" ON "users" ("name", "age")`),
+				},
+			},
+		},
+		{
+			name: "DropUniqueConstraints_AlterMultipleColumns",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: true, Default: ""},
+					{Name: "age", DataType: DataTypeInteger, Nullable: true, Default: ""},
+					{Name: "email", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				PrimaryKeyConstraint: &PrimaryKeyConstraint{ColumnNames: []ColumnName{"id"}},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{
+					{ReferencingColumnName: "org_id", ReferencedTableName: "orgs", ReferencedColumnName: "id"},
+				},
+			},
+			uniqueConstraints: []*UniqueConstraint{
+				{ColumnNames: []ColumnName{"email"}},
+				{name: "my_name_constraint", ColumnNames: []ColumnName{"name"}},
+			},
+			newTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeInteger, Nullable: false, Default: ""},
+					{Name: "name", DataType: DataTypeText, Nullable: false, Default: ""},
+					{Name: "age", DataType: DataTypeInteger, Nullable: false, Default: "0"},
+					{Name: "email", DataType: DataTypeInteger, Nullable: false, Default: ""},
+				},
+				PrimaryKeyConstraint: &PrimaryKeyConstraint{ColumnNames: []ColumnName{"id"}},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{
+					{ReferencingColumnName: "org_id", ReferencedTableName: "orgs", ReferencedColumnName: "id"},
+				},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					// first drop to remove unique constraint
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "name" TEXT, "age" INTEGER, "email" INTEGER NOT NULL, CONSTRAINT "pk_users" PRIMARY KEY ("id"), CONSTRAINT "fk_users_org_id" FOREIGN KEY ("org_id") REFERENCES "orgs" ("id"))`),
+					[]byte(`INSERT INTO "users__temp" ("id", "name", "age", "email") SELECT "id", "name", "age", "email" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+					// second drop to change all columns
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" INTEGER NOT NULL, "name" TEXT NOT NULL, "age" INTEGER NOT NULL DEFAULT 0, "email" INTEGER NOT NULL, CONSTRAINT "pk_users" PRIMARY KEY ("id"), CONSTRAINT "fk_users_org_id" FOREIGN KEY ("org_id") REFERENCES "orgs" ("id"))`),
+					[]byte(`INSERT INTO "users__temp" ("id", "name", "age", "email") SELECT "id", "name", "age", "email" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+					// create unique index for the constraint
+					[]byte(`CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_email" ON "users" ("email")`),
+					[]byte(`CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_name" ON "users" ("name")`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "uq_users_email"`),
+					[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "my_name_constraint"`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "name" SET NOT NULL`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "age" SET NOT NULL`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "age" SET DEFAULT 0`),
+					[]byte(`CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_email" ON "users" ("email")`),
+					[]byte(`CREATE UNIQUE INDEX IF NOT EXISTS "uq_users_name" ON "users" ("name")`),
+				},
+			},
+		},
+		{
+			name: "ChangePrimaryKeyConstraint",
+			table: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "id", DataType: DataTypeText, Nullable: false, Default: ""},
+				},
+				PrimaryKeyConstraint: &PrimaryKeyConstraint{ColumnNames: []ColumnName{"id"}},
+			},
+			newTable: &Table{
+				Name: "users",
+				Columns: []*Column{
+					{Name: "uuid", DataType: DataTypeText, Nullable: false, Default: ""},
+				},
+				PrimaryKeyConstraint:  &PrimaryKeyConstraint{ColumnNames: []ColumnName{"uuid"}},
+				ForeignKeyConstraints: []*ForeignKeyConstraint{},
+			},
+			expected: map[OperatorSupport][][]byte{
+				{SCreateAndDropConstraint: false, SAlterTableAddAndDropColumnIfNotExistsAndExists: false, SAlterTableAlterColumnSetAndDrop: false}: {
+					// first drop to remove the primary key constraint
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("id" TEXT NOT NULL)`),
+					[]byte(`INSERT INTO "users__temp" ("id") SELECT "id" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+					// drop the column
+					[]byte(`ALTER TABLE "users" DROP COLUMN "id"`),
+					// add the column
+					[]byte(`ALTER TABLE "users" ADD COLUMN "uuid" TEXT`),
+					[]byte(`UPDATE "users" SET "uuid" = ''`),
+					// second drop to make it non-nullable
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("uuid" TEXT NOT NULL)`),
+					[]byte(`INSERT INTO "users__temp" ("uuid") SELECT "uuid" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+					// third drop to add the primary key constraint
+					[]byte(`CREATE TABLE IF NOT EXISTS "users__temp" ("uuid" TEXT NOT NULL, CONSTRAINT "pk_users" PRIMARY KEY ("uuid"))`),
+					[]byte(`INSERT INTO "users__temp" ("uuid") SELECT "uuid" FROM "users"`),
+					[]byte(`DROP TABLE IF EXISTS "users"`),
+					[]byte(`ALTER TABLE "users__temp" RENAME TO "users"`),
+				},
+				{SCreateAndDropConstraint: true, SAlterTableAddAndDropColumnIfNotExistsAndExists: true, SAlterTableAlterColumnSetAndDrop: true}: {
+					[]byte(`ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "pk_users"`),
+					[]byte(`ALTER TABLE "users" DROP COLUMN IF EXISTS "id"`),
+					[]byte(`ALTER TABLE "users" ADD COLUMN IF NOT EXISTS "uuid" TEXT`),
+					[]byte(`UPDATE "users" SET "uuid" = ''`),
+					[]byte(`ALTER TABLE "users" ALTER COLUMN "uuid" SET NOT NULL`),
+					[]byte(`ALTER TABLE "users" ADD CONSTRAINT "pk_users" PRIMARY KEY ("uuid")`),
+				},
+			},
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			fmter := NewFormatter(schema.NewNopFormatter().Dialect())
+			for support, sqls := range testCase.expected {
+				operator := NewOperator(fmter, support)
+				clonedTable := testCase.table.Clone()
+
+				actuals := operator.AlterTable(clonedTable, testCase.uniqueConstraints, testCase.newTable)
+				assert.Equal(t, sqls, actuals)
+				assert.EqualValues(t, testCase.newTable, clonedTable)
+			}
+		})
+	}
+}

pkg/sqlschema/sqlitesqlschema/provider.go

@@ -33,9 +33,9 @@ func New(ctx context.Context, providerSettings factory.ProviderSettings, config
 		settings: settings,
 		sqlstore: sqlstore,
 		operator: sqlschema.NewOperator(fmter, sqlschema.OperatorSupport{
-			DropConstraint:          false,
-			ColumnIfNotExistsExists: false,
-			AlterColumnSetNotNull:   false,
+			SCreateAndDropConstraint:                        false,
+			SAlterTableAddAndDropColumnIfNotExistsAndExists: false,
+			SAlterTableAlterColumnSetAndDrop:                false,
 		}),
 	}, nil
 }
@@ -56,7 +56,7 @@ func (provider *provider) GetTable(ctx context.Context, tableName sqlschema.Tabl
 		BunDB().
 		NewRaw("SELECT sql FROM sqlite_master WHERE type IN (?) AND tbl_name = ? AND sql IS NOT NULL", bun.In([]string{"table"}), string(tableName)).
 		Scan(ctx, &sql); err != nil {
-		return nil, nil, err
+		return nil, nil, provider.sqlstore.WrapNotFoundErrf(err, errors.CodeNotFound, "table (%s) not found", tableName)
 	}
 
 	table, uniqueConstraints, err := parseCreateTable(sql, provider.fmter)
@@ -73,7 +73,7 @@ func (provider *provider) GetIndices(ctx context.Context, tableName sqlschema.Ta
 		BunDB().
 		QueryContext(ctx, "SELECT * FROM PRAGMA_index_list(?)", string(tableName))
 	if err != nil {
-		return nil, err
+		return nil, provider.sqlstore.WrapNotFoundErrf(err, errors.CodeNotFound, "no indices for table (%s) found", tableName)
 	}
 
 	defer func() {
@@ -115,10 +115,16 @@ func (provider *provider) GetIndices(ctx context.Context, tableName sqlschema.Ta
 		}
 
 		if unique {
-			indices = append(indices, (&sqlschema.UniqueIndex{
+			index := &sqlschema.UniqueIndex{
 				TableName:   tableName,
 				ColumnNames: columns,
-			}).Named(name).(*sqlschema.UniqueIndex))
+			}
+
+			if index.Name() == name {
+				indices = append(indices, index)
+			} else {
+				indices = append(indices, index.Named(name))
+			}
 		}
 	}
 

pkg/sqlschema/sqlschema.go

@@ -34,7 +34,10 @@ type SQLOperator interface {
 	// Returns a list of SQL statements to rename a table.
 	RenameTable(*Table, TableName) [][]byte
 
-	// Returns a list of SQL statements to recreate a table.
+	// Returns a list of SQL statements to alter the input table to the new table. It converts all unique constraints to unique indices and drops the unique constraints.
+	AlterTable(*Table, []*UniqueConstraint, *Table) [][]byte
+
+	// Returns a list of SQL statements to recreate a table. In recreating the table, it converts all unqiue constraints to indices and copies data from the old table.
 	RecreateTable(*Table, []*UniqueConstraint) [][]byte
 
 	// Returns a list of SQL statements to create an index.
@@ -47,11 +50,21 @@ type SQLOperator interface {
 	// If the column is not nullable, the column is added with the input value, then the column is made non-nullable.
 	AddColumn(*Table, []*UniqueConstraint, *Column, any) [][]byte
 
+	// Returns a list of SQL statements to alter a column.
+	AlterColumn(*Table, []*UniqueConstraint, *Column) [][]byte
+
 	// Returns a list of SQL statements to drop a column from a table.
 	DropColumn(*Table, *Column) [][]byte
 
+	// Returns a list of SQL statements to create a constraint on a table.
+	CreateConstraint(*Table, []*UniqueConstraint, Constraint) [][]byte
+
 	// Returns a list of SQL statements to drop a constraint from a table.
 	DropConstraint(*Table, []*UniqueConstraint, Constraint) [][]byte
+
+	// Returns a list of SQL statements to get the difference between the input indices and the output indices. If the input indices are named,
+	// they are dropped and recreated with autogenerated names.
+	DiffIndices([]Index, []Index) [][]byte
 }
 
 type SQLFormatter interface {

pkg/tokenizer/jwttokenizer/provider.go

@@ -125,7 +125,7 @@ func (provider *provider) GetIdentity(ctx context.Context, accessToken string) (
 		return nil, errors.Newf(errors.TypeUnauthenticated, errors.CodeUnauthenticated, "claim role mismatch")
 	}
 
-	return authtypes.NewIdentity(valuer.MustNewUUID(claims.UserID), valuer.MustNewUUID(claims.OrgID), valuer.MustNewEmail(claims.Email), claims.Role), nil
+	return authtypes.NewIdentity(valuer.MustNewUUID(claims.UserID), valuer.MustNewUUID(claims.OrgID), valuer.MustNewEmail(claims.Email), claims.Role, authtypes.IdentNProviderTokenizer), nil
 }
 
 func (provider *provider) DeleteToken(ctx context.Context, accessToken string) error {

pkg/tokenizer/tokenizerstore/sqltokenizerstore/store.go

@@ -47,7 +47,7 @@ func (store *store) GetIdentityByUserID(ctx context.Context, userID valuer.UUID)
 		return nil, store.sqlstore.WrapNotFoundErrf(err, types.ErrCodeUserNotFound, "user with id: %s does not exist", userID)
 	}
 
-	return authtypes.NewIdentity(userID, user.OrgID, user.Email, types.Role(user.Role)), nil
+	return authtypes.NewIdentity(userID, user.OrgID, user.Email, types.Role(user.Role), authtypes.IdentNProviderTokenizer), nil
 }
 
 func (store *store) GetByAccessToken(ctx context.Context, accessToken string) (*authtypes.StorableToken, error) {

pkg/types/authtypes/authn.go

@@ -25,10 +25,11 @@ var (
 type AuthNProvider struct{ valuer.String }
 
 type Identity struct {
-	UserID valuer.UUID  `json:"userId"`
-	OrgID  valuer.UUID  `json:"orgId"`
-	Email  valuer.Email `json:"email"`
-	Role   types.Role   `json:"role"`
+	UserID        valuer.UUID    `json:"userId"`
+	OrgID         valuer.UUID    `json:"orgId"`
+	IdenNProvider IdentNProvider `json:"identNProvider"`
+	Email         valuer.Email   `json:"email"`
+	Role          types.Role     `json:"role"`
 }
 
 type CallbackIdentity struct {
@@ -78,12 +79,13 @@ func NewStateFromString(state string) (State, error) {
 	}, nil
 }
 
-func NewIdentity(userID valuer.UUID, orgID valuer.UUID, email valuer.Email, role types.Role) *Identity {
+func NewIdentity(userID valuer.UUID, orgID valuer.UUID, email valuer.Email, role types.Role, identNProvider IdentNProvider) *Identity {
 	return &Identity{
-		UserID: userID,
-		OrgID:  orgID,
-		Email:  email,
-		Role:   role,
+		UserID:        userID,
+		OrgID:         orgID,
+		Email:         email,
+		Role:          role,
+		IdenNProvider: identNProvider,
 	}
 }
 
@@ -116,10 +118,11 @@ func (typ *Identity) UnmarshalBinary(data []byte) error {
 
 func (typ *Identity) ToClaims() Claims {
 	return Claims{
-		UserID: typ.UserID.String(),
-		Email:  typ.Email.String(),
-		Role:   typ.Role,
-		OrgID:  typ.OrgID.String(),
+		UserID:         typ.UserID.String(),
+		Email:          typ.Email.String(),
+		Role:           typ.Role,
+		OrgID:          typ.OrgID.String(),
+		IdentNProvider: typ.IdenNProvider.StringValue(),
 	}
 }
 

pkg/types/authtypes/claims.go

@@ -13,10 +13,11 @@ type claimsKey struct{}
 type accessTokenKey struct{}
 
 type Claims struct {
-	UserID string
-	Email  string
-	Role   types.Role
-	OrgID  string
+	UserID         string
+	Email          string
+	Role           types.Role
+	OrgID          string
+	IdentNProvider string
 }
 
 // NewContextWithClaims attaches individual claims to the context.
@@ -53,6 +54,7 @@ func (c *Claims) LogValue() slog.Value {
 		slog.String("email", c.Email),
 		slog.String("role", c.Role.String()),
 		slog.String("org_id", c.OrgID),
+		slog.String("identn_provider", c.IdentNProvider),
 	)
 }
 

pkg/types/authtypes/identn.go

@@ -0,0 +1,11 @@
+package authtypes
+
+import "github.com/SigNoz/signoz/pkg/valuer"
+
+var (
+	IdentNProviderTokenizer = IdentNProvider{valuer.NewString("tokenizer")}
+	IdentNProviderAPIkey    = IdentNProvider{valuer.NewString("api_key")}
+	IdentNProviderAnonymous = IdentNProvider{valuer.NewString("anonymous")}
+)
+
+type IdentNProvider struct{ valuer.String }

pkg/types/authtypes/uuid.go

@@ -1,41 +0,0 @@
-package authtypes
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-)
-
-type uuidKey struct{}
-
-type UUID struct {
-}
-
-func NewUUID() *UUID {
-	return &UUID{}
-}
-
-func (u *UUID) ContextFromRequest(ctx context.Context, values ...string) (context.Context, error) {
-	var value string
-	for _, v := range values {
-		if v != "" {
-			value = v
-			break
-		}
-	}
-
-	if value == "" {
-		return ctx, errors.Newf(errors.TypeInvalidInput, errors.CodeInvalidInput, "missing Authorization header")
-	}
-
-	return NewContextWithUUID(ctx, value), nil
-}
-
-func NewContextWithUUID(ctx context.Context, uuid string) context.Context {
-	return context.WithValue(ctx, uuidKey{}, uuid)
-}
-
-func UUIDFromContext(ctx context.Context) (string, bool) {
-	uuid, ok := ctx.Value(uuidKey{}).(string)
-	return uuid, ok
-}

pkg/types/ctxtypes/auth.go

@@ -1,31 +0,0 @@
-package ctxtypes
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type AuthType struct {
-	valuer.String
-}
-
-var (
-	AuthTypeTokenizer = AuthType{valuer.NewString("tokenizer")}
-	AuthTypeAPIKey    = AuthType{valuer.NewString("api_key")}
-	AuthTypeInternal  = AuthType{valuer.NewString("internal")}
-	AuthTypeAnonymous = AuthType{valuer.NewString("anonymous")}
-)
-
-type authTypeKey struct{}
-
-// SetAuthType stores the auth type (e.g., AuthTypeJWT, AuthTypeAPIKey, AuthTypeInternal) in context.
-func SetAuthType(ctx context.Context, authType AuthType) context.Context {
-	return context.WithValue(ctx, authTypeKey{}, authType)
-}
-
-// AuthTypeFromContext retrieves the auth type from context if set.
-func AuthTypeFromContext(ctx context.Context) (AuthType, bool) {
-	v, ok := ctx.Value(authTypeKey{}).(AuthType)
-	return v, ok
-}