Merge branch 'main' into fix/array-json

* chore(lint): enable godot and staticcheck

* chore(lint): merge main and fix new lint issues in main

.devenv/docker/clickhouse/compose.yaml

@@ -27,8 +27,8 @@ services:
       - ${PWD}/fs/tmp/var/lib/clickhouse/user_scripts/:/var/lib/clickhouse/user_scripts/
       - ${PWD}/../../../deploy/common/clickhouse/custom-function.xml:/etc/clickhouse-server/custom-function.xml
     ports:
-      - '127.0.0.1:8123:8123'
-      - '127.0.0.1:9000:9000'
+      - "127.0.0.1:8123:8123"
+      - "127.0.0.1:9000:9000"
     tty: true
     healthcheck:
       test:
@@ -47,13 +47,16 @@ services:
         condition: service_healthy
     environment:
       - CLICKHOUSE_SKIP_USER_SETUP=1
+    networks:
+      - default
+      - signoz-devenv
   zookeeper:
     image: signoz/zookeeper:3.7.1
     container_name: zookeeper
     volumes:
       - ${PWD}/fs/tmp/zookeeper:/bitnami/zookeeper
     ports:
-      - '127.0.0.1:2181:2181'
+      - "127.0.0.1:2181:2181"
     environment:
       - ALLOW_ANONYMOUS_LOGIN=yes
     healthcheck:
@@ -74,12 +77,19 @@ services:
     entrypoint:
       - /bin/sh
     command:
-    - -c 
-    - |
-      /signoz-otel-collector migrate bootstrap &&
-      /signoz-otel-collector migrate sync up &&
-      /signoz-otel-collector migrate async up
+      - -c
+      - |
+        /signoz-otel-collector migrate bootstrap &&
+        /signoz-otel-collector migrate sync up &&
+        /signoz-otel-collector migrate async up
     depends_on:
       clickhouse:
         condition: service_healthy
     restart: on-failure
+    networks:
+      - default
+      - signoz-devenv
+
+networks:
+  signoz-devenv:
+    name: signoz-devenv

.devenv/docker/signoz-otel-collector/compose.yaml

@@ -3,7 +3,7 @@ services:
     image: signoz/signoz-otel-collector:v0.142.0
     container_name: signoz-otel-collector-dev
     entrypoint:
-    - /bin/sh
+      - /bin/sh
     command:
       - -c
       - |
@@ -34,4 +34,11 @@ services:
       retries: 3
     restart: unless-stopped
     extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - "host.docker.internal:host-gateway"
+    networks:
+      - default
+      - signoz-devenv
+
+networks:
+  signoz-devenv:
+    name: signoz-devenv

.devenv/docker/signoz-otel-collector/otel-collector-config.yaml

@@ -12,10 +12,10 @@ receivers:
       scrape_configs:
         - job_name: otel-collector
           static_configs:
-          - targets:
-              - localhost:8888
-            labels:
-              job_name: otel-collector
+            - targets:
+                - localhost:8888
+              labels:
+                job_name: otel-collector
 
 processors:
   batch:
@@ -29,7 +29,26 @@ processors:
   signozspanmetrics/delta:
     metrics_exporter: signozclickhousemetrics
     metrics_flush_interval: 60s
-    latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
+    latency_histogram_buckets:
+      [
+        100us,
+        1ms,
+        2ms,
+        6ms,
+        10ms,
+        50ms,
+        100ms,
+        250ms,
+        500ms,
+        1000ms,
+        1400ms,
+        2000ms,
+        5s,
+        10s,
+        20s,
+        40s,
+        60s,
+      ]
     dimensions_cache_size: 100000
     aggregation_temporality: AGGREGATION_TEMPORALITY_DELTA
     enable_exp_histogram: true
@@ -60,13 +79,13 @@ extensions:
 
 exporters:
   clickhousetraces:
-    datasource: tcp://host.docker.internal:9000/signoz_traces
+    datasource: tcp://clickhouse:9000/signoz_traces
     low_cardinal_exception_grouping: ${env:LOW_CARDINAL_EXCEPTION_GROUPING}
     use_new_schema: true
   signozclickhousemetrics:
-    dsn: tcp://host.docker.internal:9000/signoz_metrics
+    dsn: tcp://clickhouse:9000/signoz_metrics
   clickhouselogsexporter:
-    dsn: tcp://host.docker.internal:9000/signoz_logs
+    dsn: tcp://clickhouse:9000/signoz_logs
     timeout: 10s
     use_new_schema: true
 
@@ -93,4 +112,4 @@ service:
     logs:
       receivers: [otlp]
       processors: [batch]
-      exporters: [clickhouselogsexporter]
+      exporters: [clickhouselogsexporter]

.golangci.yml

@@ -6,12 +6,14 @@ linters:
     - depguard
     - errcheck
     - forbidigo
+    - godot
     - govet
     - iface
     - ineffassign
     - misspell
     - nilnil
     - sloglint
+    - staticcheck
     - wastedassign
     - unparam
     - unused

docs/api/openapi.yml

@@ -1114,6 +1114,33 @@ components:
         enabled:
           type: boolean
       type: object
+    MetricsexplorertypesInspectMetricsRequest:
+      properties:
+        end:
+          format: int64
+          type: integer
+        filter:
+          $ref: '#/components/schemas/Querybuildertypesv5Filter'
+        metricName:
+          type: string
+        start:
+          format: int64
+          type: integer
+      required:
+      - metricName
+      - start
+      - end
+      type: object
+    MetricsexplorertypesInspectMetricsResponse:
+      properties:
+        series:
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5TimeSeries'
+          nullable: true
+          type: array
+      required:
+      - series
+      type: object
     MetricsexplorertypesListMetric:
       properties:
         description:
@@ -1262,6 +1289,13 @@ components:
       - temporality
       - isMonotonic
       type: object
+    MetricsexplorertypesMetricsOnboardingResponse:
+      properties:
+        hasMetrics:
+          type: boolean
+      required:
+      - hasMetrics
+      type: object
     MetricsexplorertypesStat:
       properties:
         description:
@@ -7750,6 +7784,111 @@ paths:
       summary: Update metric metadata
       tags:
       - metrics
+  /api/v2/metrics/inspect:
+    post:
+      deprecated: false
+      description: Returns raw time series data points for a metric within a time
+        range (max 30 minutes). Each series includes labels and timestamp/value pairs.
+      operationId: InspectMetrics
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/MetricsexplorertypesInspectMetricsRequest'
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                properties:
+                  data:
+                    $ref: '#/components/schemas/MetricsexplorertypesInspectMetricsResponse'
+                  status:
+                    type: string
+                required:
+                - status
+                - data
+                type: object
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - VIEWER
+      - tokenizer:
+        - VIEWER
+      summary: Inspect raw metric data points
+      tags:
+      - metrics
+  /api/v2/metrics/onboarding:
+    get:
+      deprecated: false
+      description: Lightweight endpoint that checks if any non-SigNoz metrics have
+        been ingested, used for onboarding status detection
+      operationId: GetMetricsOnboardingStatus
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                properties:
+                  data:
+                    $ref: '#/components/schemas/MetricsexplorertypesMetricsOnboardingResponse'
+                  status:
+                    type: string
+                required:
+                - status
+                - data
+                type: object
+          description: OK
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - VIEWER
+      - tokenizer:
+        - VIEWER
+      summary: Check if non-SigNoz metrics have been received
+      tags:
+      - metrics
   /api/v2/metrics/stats:
     post:
       deprecated: false

ee/anomaly/hourly.go

@@ -16,7 +16,7 @@ func (hp *HourlyProvider) GetBaseSeasonalProvider() *BaseSeasonalProvider {
 	return &hp.BaseSeasonalProvider
 }
 
-// NewHourlyProvider now uses the generic option type
+// NewHourlyProvider now uses the generic option type.
 func NewHourlyProvider(opts ...GenericProviderOption[*HourlyProvider]) *HourlyProvider {
 	hp := &HourlyProvider{
 		BaseSeasonalProvider: BaseSeasonalProvider{},

ee/anomaly/params.go

@@ -47,7 +47,7 @@ type AnomaliesResponse struct {
 //		              |                                  |
 //			(rounded value for past peiod)    +      (seasonal growth)
 //
-// score = abs(value - prediction) / stddev (current_season_query)
+// score = abs(value - prediction) / stddev (current_season_query).
 type anomalyQueryParams struct {
 	// CurrentPeriodQuery is the query range params for period user is looking at or eval window
 	// Example: (now-5m, now), (now-30m, now), (now-1h, now)

ee/anomaly/seasonal.go

@@ -18,12 +18,12 @@ var (
 	movingAvgWindowSize = 7
 )
 
-// BaseProvider is an interface that includes common methods for all provider types
+// BaseProvider is an interface that includes common methods for all provider types.
 type BaseProvider interface {
 	GetBaseSeasonalProvider() *BaseSeasonalProvider
 }
 
-// GenericProviderOption is a generic type for provider options
+// GenericProviderOption is a generic type for provider options.
 type GenericProviderOption[T BaseProvider] func(T)
 
 func WithQuerier[T BaseProvider](querier querier.Querier) GenericProviderOption[T] {
@@ -121,7 +121,7 @@ func (p *BaseSeasonalProvider) getResults(ctx context.Context, orgID valuer.UUID
 }
 
 // getMatchingSeries gets the matching series from the query result
-// for the given series
+// for the given series.
 func (p *BaseSeasonalProvider) getMatchingSeries(_ context.Context, queryResult *qbtypes.TimeSeriesData, series *qbtypes.TimeSeries) *qbtypes.TimeSeries {
 	if queryResult == nil || len(queryResult.Aggregations) == 0 || len(queryResult.Aggregations[0].Series) == 0 {
 		return nil
@@ -155,13 +155,14 @@ func (p *BaseSeasonalProvider) getStdDev(series *qbtypes.TimeSeries) float64 {
 	avg := p.getAvg(series)
 	var sum float64
 	for _, smpl := range series.Values {
-		sum += math.Pow(smpl.Value-avg, 2)
+		d := smpl.Value - avg
+		sum += d * d
 	}
 	return math.Sqrt(sum / float64(len(series.Values)))
 }
 
 // getMovingAvg gets the moving average for the given series
-// for the given window size and start index
+// for the given window size and start index.
 func (p *BaseSeasonalProvider) getMovingAvg(series *qbtypes.TimeSeries, movingAvgWindowSize, startIdx int) float64 {
 	if series == nil || len(series.Values) == 0 {
 		return 0
@@ -236,7 +237,7 @@ func (p *BaseSeasonalProvider) getPredictedSeries(
 // getBounds gets the upper and lower bounds for the given series
 // for the given z score threshold
 // moving avg of the previous period series + z score threshold * std dev of the series
-// moving avg of the previous period series - z score threshold * std dev of the series
+// moving avg of the previous period series - z score threshold * std dev of the series.
 func (p *BaseSeasonalProvider) getBounds(
 	series, predictedSeries, weekSeries *qbtypes.TimeSeries,
 	zScoreThreshold float64,
@@ -269,7 +270,7 @@ func (p *BaseSeasonalProvider) getBounds(
 
 // getExpectedValue gets the expected value for the given series
 // for the given index
-// prevSeriesAvg + currentSeasonSeriesAvg - mean of past season series, past2 season series and past3 season series
+// prevSeriesAvg + currentSeasonSeriesAvg - mean of past season series, past2 season series and past3 season series.
 func (p *BaseSeasonalProvider) getExpectedValue(
 	_, prevSeries, currentSeasonSeries, pastSeasonSeries, past2SeasonSeries, past3SeasonSeries *qbtypes.TimeSeries, idx int,
 ) float64 {
@@ -283,7 +284,7 @@ func (p *BaseSeasonalProvider) getExpectedValue(
 
 // getScore gets the anomaly score for the given series
 // for the given index
-// (value - expectedValue) / std dev of the series
+// (value - expectedValue) / std dev of the series.
 func (p *BaseSeasonalProvider) getScore(
 	series, prevSeries, weekSeries, weekPrevSeries, past2SeasonSeries, past3SeasonSeries *qbtypes.TimeSeries, value float64, idx int,
 ) float64 {
@@ -296,7 +297,7 @@ func (p *BaseSeasonalProvider) getScore(
 
 // getAnomalyScores gets the anomaly scores for the given series
 // for the given index
-// (value - expectedValue) / std dev of the series
+// (value - expectedValue) / std dev of the series.
 func (p *BaseSeasonalProvider) getAnomalyScores(
 	series, prevSeries, currentSeasonSeries, pastSeasonSeries, past2SeasonSeries, past3SeasonSeries *qbtypes.TimeSeries,
 ) *qbtypes.TimeSeries {

ee/licensing/config.go

@@ -13,7 +13,7 @@ var (
 	once   sync.Once
 )
 
-// initializes the licensing configuration
+// Config initializes the licensing configuration.
 func Config(pollInterval time.Duration, failureThreshold int) licensing.Config {
 	once.Do(func() {
 		config = licensing.Config{PollInterval: pollInterval, FailureThreshold: failureThreshold}

ee/querier/handler.go

@@ -79,7 +79,7 @@ func (h *handler) QueryRange(rw http.ResponseWriter, req *http.Request) {
 		// Build step intervals from the anomaly query
 		stepIntervals := make(map[string]uint64)
 		if anomalyQuery.StepInterval.Duration > 0 {
-			stepIntervals[anomalyQuery.Name] = uint64(anomalyQuery.StepInterval.Duration.Seconds())
+			stepIntervals[anomalyQuery.Name] = uint64(anomalyQuery.StepInterval.Seconds())
 		}
 
 		finalResp := &qbtypes.QueryRangeResponse{

ee/query-service/app/server.go

@@ -242,7 +242,6 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler, web web.Web) (*h
 	apiHandler.RegisterWebSocketPaths(r, am)
 	apiHandler.RegisterMessagingQueuesRoutes(r, am)
 	apiHandler.RegisterThirdPartyApiRoutes(r, am)
-	apiHandler.MetricExplorerRoutes(r, am)
 	apiHandler.RegisterTraceFunnelsRoutes(r, am)
 
 	err := s.signoz.APIServer.AddToRouter(r)

ee/sqlstore/postgressqlstore/dialect.go

@@ -336,9 +336,10 @@ func (dialect *dialect) UpdatePrimaryKey(ctx context.Context, bun bun.IDB, oldMo
 	}
 
 	fkReference := ""
-	if reference == Org {
+	switch reference {
+	case Org:
 		fkReference = OrgReference
-	} else if reference == User {
+	case User:
 		fkReference = UserReference
 	}
 
@@ -392,9 +393,10 @@ func (dialect *dialect) AddPrimaryKey(ctx context.Context, bun bun.IDB, oldModel
 	}
 
 	fkReference := ""
-	if reference == Org {
+	switch reference {
+	case Org:
 		fkReference = OrgReference
-	} else if reference == User {
+	case User:
 		fkReference = UserReference
 	}
 

ee/zeus/config.go

@@ -19,7 +19,7 @@ var (
 	once   sync.Once
 )
 
-// initializes the Zeus configuration
+// initializes the Zeus configuration.
 func Config() zeus.Config {
 	once.Do(func() {
 		parsedURL, err := neturl.Parse(url)

ee/zeus/httpzeus/provider.go

@@ -189,7 +189,7 @@ func (provider *Provider) do(ctx context.Context, url *url.URL, method string, k
 	return nil, provider.errFromStatusCode(response.StatusCode, errorMessage)
 }
 
-// This can be taken down to the client package
+// This can be taken down to the client package.
 func (provider *Provider) errFromStatusCode(statusCode int, errorMessage string) error {
 	switch statusCode {
 	case http.StatusBadRequest:

frontend/README.md

@@ -12,7 +12,7 @@
 or
 `docker build . -t tagname`
 
-**Tag to remote url- Introduce versinoing later on**
+**Tag to remote url- Introduce versioning later on**
 
 ```
 docker tag signoz/frontend:latest 7296823551/signoz:latest

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

@@ -31,10 +31,13 @@ import type {
 	GetMetricHighlightsPathParameters,
 	GetMetricMetadata200,
 	GetMetricMetadataPathParameters,
+	GetMetricsOnboardingStatus200,
 	GetMetricsStats200,
 	GetMetricsTreemap200,
+	InspectMetrics200,
 	ListMetrics200,
 	ListMetricsParams,
+	MetricsexplorertypesInspectMetricsRequestDTO,
 	MetricsexplorertypesStatsRequestDTO,
 	MetricsexplorertypesTreemapRequestDTO,
 	MetricsexplorertypesUpdateMetricMetadataRequestDTO,
@@ -778,6 +781,176 @@ export const useUpdateMetricMetadata = <
 
 	return useMutation(mutationOptions);
 };
+/**
+ * Returns raw time series data points for a metric within a time range (max 30 minutes). Each series includes labels and timestamp/value pairs.
+ * @summary Inspect raw metric data points
+ */
+export const inspectMetrics = (
+	metricsexplorertypesInspectMetricsRequestDTO: BodyType<MetricsexplorertypesInspectMetricsRequestDTO>,
+	signal?: AbortSignal,
+) => {
+	return GeneratedAPIInstance<InspectMetrics200>({
+		url: `/api/v2/metrics/inspect`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: metricsexplorertypesInspectMetricsRequestDTO,
+		signal,
+	});
+};
+
+export const getInspectMetricsMutationOptions = <
+	TError = ErrorType<RenderErrorResponseDTO>,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof inspectMetrics>>,
+		TError,
+		{ data: BodyType<MetricsexplorertypesInspectMetricsRequestDTO> },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof inspectMetrics>>,
+	TError,
+	{ data: BodyType<MetricsexplorertypesInspectMetricsRequestDTO> },
+	TContext
+> => {
+	const mutationKey = ['inspectMetrics'];
+	const { mutation: mutationOptions } = options
+		? options.mutation &&
+		  'mutationKey' in options.mutation &&
+		  options.mutation.mutationKey
+			? options
+			: { ...options, mutation: { ...options.mutation, mutationKey } }
+		: { mutation: { mutationKey } };
+
+	const mutationFn: MutationFunction<
+		Awaited<ReturnType<typeof inspectMetrics>>,
+		{ data: BodyType<MetricsexplorertypesInspectMetricsRequestDTO> }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return inspectMetrics(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type InspectMetricsMutationResult = NonNullable<
+	Awaited<ReturnType<typeof inspectMetrics>>
+>;
+export type InspectMetricsMutationBody = BodyType<MetricsexplorertypesInspectMetricsRequestDTO>;
+export type InspectMetricsMutationError = ErrorType<RenderErrorResponseDTO>;
+
+/**
+ * @summary Inspect raw metric data points
+ */
+export const useInspectMetrics = <
+	TError = ErrorType<RenderErrorResponseDTO>,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof inspectMetrics>>,
+		TError,
+		{ data: BodyType<MetricsexplorertypesInspectMetricsRequestDTO> },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof inspectMetrics>>,
+	TError,
+	{ data: BodyType<MetricsexplorertypesInspectMetricsRequestDTO> },
+	TContext
+> => {
+	const mutationOptions = getInspectMetricsMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * Lightweight endpoint that checks if any non-SigNoz metrics have been ingested, used for onboarding status detection
+ * @summary Check if non-SigNoz metrics have been received
+ */
+export const getMetricsOnboardingStatus = (signal?: AbortSignal) => {
+	return GeneratedAPIInstance<GetMetricsOnboardingStatus200>({
+		url: `/api/v2/metrics/onboarding`,
+		method: 'GET',
+		signal,
+	});
+};
+
+export const getGetMetricsOnboardingStatusQueryKey = () => {
+	return [`/api/v2/metrics/onboarding`] as const;
+};
+
+export const getGetMetricsOnboardingStatusQueryOptions = <
+	TData = Awaited<ReturnType<typeof getMetricsOnboardingStatus>>,
+	TError = ErrorType<RenderErrorResponseDTO>
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricsOnboardingStatus>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getGetMetricsOnboardingStatusQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getMetricsOnboardingStatus>>
+	> = ({ signal }) => getMetricsOnboardingStatus(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricsOnboardingStatus>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetMetricsOnboardingStatusQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getMetricsOnboardingStatus>>
+>;
+export type GetMetricsOnboardingStatusQueryError = ErrorType<RenderErrorResponseDTO>;
+
+/**
+ * @summary Check if non-SigNoz metrics have been received
+ */
+
+export function useGetMetricsOnboardingStatus<
+	TData = Awaited<ReturnType<typeof getMetricsOnboardingStatus>>,
+	TError = ErrorType<RenderErrorResponseDTO>
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricsOnboardingStatus>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetMetricsOnboardingStatusQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Check if non-SigNoz metrics have been received
+ */
+export const invalidateGetMetricsOnboardingStatus = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetMetricsOnboardingStatusQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
 /**
  * This endpoint provides list of metrics with their number of samples and timeseries for the given time range
  * @summary Get metrics statistics

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

@@ -1363,6 +1363,32 @@ export interface GlobaltypesTokenizerConfigDTO {
 	enabled?: boolean;
 }
 
+export interface MetricsexplorertypesInspectMetricsRequestDTO {
+	/**
+	 * @type integer
+	 * @format int64
+	 */
+	end: number;
+	filter?: Querybuildertypesv5FilterDTO;
+	/**
+	 * @type string
+	 */
+	metricName: string;
+	/**
+	 * @type integer
+	 * @format int64
+	 */
+	start: number;
+}
+
+export interface MetricsexplorertypesInspectMetricsResponseDTO {
+	/**
+	 * @type array
+	 * @nullable true
+	 */
+	series: Querybuildertypesv5TimeSeriesDTO[] | null;
+}
+
 export interface MetricsexplorertypesListMetricDTO {
 	/**
 	 * @type string
@@ -1508,6 +1534,13 @@ export interface MetricsexplorertypesMetricMetadataDTO {
 	unit: string;
 }
 
+export interface MetricsexplorertypesMetricsOnboardingResponseDTO {
+	/**
+	 * @type boolean
+	 */
+	hasMetrics: boolean;
+}
+
 export interface MetricsexplorertypesStatDTO {
 	/**
 	 * @type string
@@ -4391,6 +4424,22 @@ export type GetMetricMetadata200 = {
 export type UpdateMetricMetadataPathParameters = {
 	metricName: string;
 };
+export type InspectMetrics200 = {
+	data: MetricsexplorertypesInspectMetricsResponseDTO;
+	/**
+	 * @type string
+	 */
+	status: string;
+};
+
+export type GetMetricsOnboardingStatus200 = {
+	data: MetricsexplorertypesMetricsOnboardingResponseDTO;
+	/**
+	 * @type string
+	 */
+	status: string;
+};
+
 export type GetMetricsStats200 = {
 	data: MetricsexplorertypesStatsResponseDTO;
 	/**

frontend/src/api/metricsExplorer/getInspectMetricsDetails.ts

@@ -1,54 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
-
-export interface InspectMetricsRequest {
-	metricName: string;
-	start: number;
-	end: number;
-	filters: TagFilter;
-}
-
-export interface InspectMetricsResponse {
-	status: string;
-	data: {
-		series: InspectMetricsSeries[];
-	};
-}
-
-export interface InspectMetricsSeries {
-	title?: string;
-	strokeColor?: string;
-	labels: Record<string, string>;
-	labelsArray: Array<Record<string, string>>;
-	values: InspectMetricsTimestampValue[];
-}
-
-interface InspectMetricsTimestampValue {
-	timestamp: number;
-	value: string;
-}
-
-export const getInspectMetricsDetails = async (
-	request: InspectMetricsRequest,
-	signal?: AbortSignal,
-	headers?: Record<string, string>,
-): Promise<SuccessResponse<InspectMetricsResponse> | ErrorResponse> => {
-	try {
-		const response = await axios.post(`/metrics/inspect`, request, {
-			signal,
-			headers,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: 'Success',
-			payload: response.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};

frontend/src/api/metricsExplorer/getMetricDetails.ts

@@ -1,75 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-import { MetricType } from './getMetricsList';
-
-export interface MetricDetails {
-	name: string;
-	description: string;
-	type: string;
-	unit: string;
-	timeseries: number;
-	samples: number;
-	timeSeriesTotal: number;
-	timeSeriesActive: number;
-	lastReceived: string;
-	attributes: MetricDetailsAttribute[] | null;
-	metadata?: {
-		metric_type: MetricType;
-		description: string;
-		unit: string;
-		temporality?: Temporality;
-	};
-	alerts: MetricDetailsAlert[] | null;
-	dashboards: MetricDetailsDashboard[] | null;
-}
-
-export enum Temporality {
-	CUMULATIVE = 'Cumulative',
-	DELTA = 'Delta',
-}
-
-export interface MetricDetailsAttribute {
-	key: string;
-	value: string[];
-	valueCount: number;
-}
-
-export interface MetricDetailsAlert {
-	alert_name: string;
-	alert_id: string;
-}
-
-export interface MetricDetailsDashboard {
-	dashboard_name: string;
-	dashboard_id: string;
-}
-
-export interface MetricDetailsResponse {
-	status: string;
-	data: MetricDetails;
-}
-
-export const getMetricDetails = async (
-	metricName: string,
-	signal?: AbortSignal,
-	headers?: Record<string, string>,
-): Promise<SuccessResponse<MetricDetailsResponse> | ErrorResponse> => {
-	try {
-		const response = await axios.get(`/metrics/${metricName}/metadata`, {
-			signal,
-			headers,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: 'Success',
-			payload: response.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};

frontend/src/api/metricsExplorer/getMetricsList.ts

@@ -1,67 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import {
-	OrderByPayload,
-	TreemapViewType,
-} from 'container/MetricsExplorer/Summary/types';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
-
-export interface MetricsListPayload {
-	filters: TagFilter;
-	groupBy?: BaseAutocompleteData[];
-	offset?: number;
-	limit?: number;
-	orderBy?: OrderByPayload;
-}
-
-export enum MetricType {
-	SUM = 'Sum',
-	GAUGE = 'Gauge',
-	HISTOGRAM = 'Histogram',
-	SUMMARY = 'Summary',
-	EXPONENTIAL_HISTOGRAM = 'ExponentialHistogram',
-}
-
-export interface MetricsListItemData {
-	metric_name: string;
-	description: string;
-	type: MetricType;
-	unit: string;
-	[TreemapViewType.TIMESERIES]: number;
-	[TreemapViewType.SAMPLES]: number;
-	lastReceived: string;
-}
-
-export interface MetricsListResponse {
-	status: string;
-	data: {
-		metrics: MetricsListItemData[];
-		total?: number;
-	};
-}
-
-export const getMetricsList = async (
-	props: MetricsListPayload,
-	signal?: AbortSignal,
-	headers?: Record<string, string>,
-): Promise<SuccessResponse<MetricsListResponse> | ErrorResponse> => {
-	try {
-		const response = await axios.post('/metrics', props, {
-			signal,
-			headers,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data,
-			params: props,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};

frontend/src/api/metricsExplorer/getMetricsListFilterKeys.ts

@@ -1,44 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
-
-export interface MetricsListFilterKeysResponse {
-	status: string;
-	data: {
-		metricColumns: string[];
-		attributeKeys: BaseAutocompleteData[];
-	};
-}
-
-export interface GetMetricsListFilterKeysParams {
-	searchText: string;
-	limit?: number;
-}
-
-export const getMetricsListFilterKeys = async (
-	params: GetMetricsListFilterKeysParams,
-	signal?: AbortSignal,
-	headers?: Record<string, string>,
-): Promise<SuccessResponse<MetricsListFilterKeysResponse> | ErrorResponse> => {
-	try {
-		const response = await axios.get('/metrics/filters/keys', {
-			params: {
-				searchText: params.searchText,
-				limit: params.limit,
-			},
-			signal,
-			headers,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};

frontend/src/api/metricsExplorer/getMetricsListFilterValues.ts

@@ -1,43 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-export interface MetricsListFilterValuesPayload {
-	filterAttributeKeyDataType: string;
-	filterKey: string;
-	searchText: string;
-	limit: number;
-}
-
-export interface MetricsListFilterValuesResponse {
-	status: string;
-	data: {
-		filterValues: string[];
-	};
-}
-
-export const getMetricsListFilterValues = async (
-	props: MetricsListFilterValuesPayload,
-	signal?: AbortSignal,
-	headers?: Record<string, string>,
-): Promise<
-	SuccessResponse<MetricsListFilterValuesResponse> | ErrorResponse
-> => {
-	try {
-		const response = await axios.post('/metrics/filters/values', props, {
-			signal,
-			headers,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data,
-			params: props,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};

frontend/src/api/metricsExplorer/getRelatedMetrics.ts

@@ -1,60 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-
-export interface RelatedMetricsPayload {
-	start: number;
-	end: number;
-	currentMetricName: string;
-}
-
-export interface RelatedMetricDashboard {
-	dashboard_name: string;
-	dashboard_id: string;
-	widget_id: string;
-	widget_name: string;
-}
-
-export interface RelatedMetricAlert {
-	alert_name: string;
-	alert_id: string;
-}
-
-export interface RelatedMetric {
-	name: string;
-	query: IBuilderQuery;
-	dashboards: RelatedMetricDashboard[];
-	alerts: RelatedMetricAlert[];
-}
-
-export interface RelatedMetricsResponse {
-	status: 'success';
-	data: {
-		related_metrics: RelatedMetric[];
-	};
-}
-
-export const getRelatedMetrics = async (
-	props: RelatedMetricsPayload,
-	signal?: AbortSignal,
-	headers?: Record<string, string>,
-): Promise<SuccessResponse<RelatedMetricsResponse> | ErrorResponse> => {
-	try {
-		const response = await axios.post('/metrics/related', props, {
-			signal,
-			headers,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data,
-			params: props,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};

frontend/src/container/Home/Home.tsx

@@ -1,10 +1,11 @@
 /* eslint-disable sonarjs/no-duplicate-string */
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useMutation, useQuery } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
 import { Compass, Dot, House, Plus, Wrench } from '@signozhq/icons';
 import { Button, Popover } from 'antd';
 import logEvent from 'api/common/logEvent';
+import { useGetMetricsOnboardingStatus } from 'api/generated/services/metrics';
 import listUserPreferences from 'api/v1/user/preferences/list';
 import updateUserPreferenceAPI from 'api/v1/user/preferences/name/update';
 import { PersistedAnnouncementBanner } from 'components/AnnouncementBanner';
@@ -15,10 +16,8 @@ import { ORG_PREFERENCES } from 'constants/orgPreferences';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import ROUTES from 'constants/routes';
-import { getMetricsListQuery } from 'container/MetricsExplorer/Summary/utils';
 import { IS_SERVICE_ACCOUNTS_ENABLED } from 'container/ServiceAccountsSettings/config';
 import { DEFAULT_TIME_RANGE } from 'container/TopNav/DateTimeSelectionV2/constants';
-import { useGetMetricsList } from 'hooks/metricsExplorer/useGetMetricsList';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
@@ -127,38 +126,7 @@ export default function Home(): JSX.Element {
 	);
 
 	// Detect Metrics
-	const query = useMemo(() => {
-		const baseQuery = getMetricsListQuery();
-
-		let queryStartTime = startTime;
-		let queryEndTime = endTime;
-
-		if (!startTime || !endTime) {
-			const now = new Date();
-			const startTime = new Date(now.getTime() - homeInterval);
-			const endTime = now;
-
-			queryStartTime = startTime.getTime();
-			queryEndTime = endTime.getTime();
-		}
-
-		return {
-			...baseQuery,
-			limit: 10,
-			offset: 0,
-			filters: {
-				items: [],
-				op: 'AND',
-			},
-			start: queryStartTime,
-			end: queryEndTime,
-		};
-	}, [startTime, endTime]);
-
-	const { data: metricsData } = useGetMetricsList(query, {
-		enabled: !!query,
-		queryKey: ['metricsList', query],
-	});
+	const { data: metricsOnboardingData } = useGetMetricsOnboardingStatus();
 
 	const [isLogsIngestionActive, setIsLogsIngestionActive] = useState(false);
 	const [isTracesIngestionActive, setIsTracesIngestionActive] = useState(false);
@@ -284,14 +252,12 @@ export default function Home(): JSX.Element {
 	}, [tracesData, handleUpdateChecklistDoneItem]);
 
 	useEffect(() => {
-		const metricsDataTotal = metricsData?.payload?.data?.total ?? 0;
-
-		if (metricsDataTotal > 0) {
+		if (metricsOnboardingData?.data?.hasMetrics) {
 			setIsMetricsIngestionActive(true);
 			handleUpdateChecklistDoneItem('ADD_DATA_SOURCE');
 			handleUpdateChecklistDoneItem('SEND_METRICS');
 		}
-	}, [metricsData, handleUpdateChecklistDoneItem]);
+	}, [metricsOnboardingData, handleUpdateChecklistDoneItem]);
 
 	useEffect(() => {
 		logEvent('Homepage: Visited', {});

frontend/src/container/MeterExplorer/Explorer/types.ts

@@ -1,37 +0,0 @@
-import { UseQueryResult } from 'react-query';
-import { RelatedMetric } from 'api/metricsExplorer/getRelatedMetrics';
-import { SuccessResponse } from 'types/api';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-
-export enum ExplorerTabs {
-	TIME_SERIES = 'time-series',
-	RELATED_METRICS = 'related-metrics',
-}
-
-export interface TimeSeriesProps {
-	showOneChartPerQuery: boolean;
-}
-
-export interface RelatedMetricsProps {
-	metricNames: string[];
-}
-
-export interface RelatedMetricsCardProps {
-	metric: RelatedMetricWithQueryResult;
-}
-
-export interface UseGetRelatedMetricsGraphsProps {
-	selectedMetricName: string | null;
-	startMs: number;
-	endMs: number;
-}
-
-export interface UseGetRelatedMetricsGraphsReturn {
-	relatedMetrics: RelatedMetricWithQueryResult[];
-	isRelatedMetricsLoading: boolean;
-	isRelatedMetricsError: boolean;
-}
-
-export interface RelatedMetricWithQueryResult extends RelatedMetric {
-	queryResult: UseQueryResult<SuccessResponse<MetricRangePayloadProps>, unknown>;
-}

frontend/src/container/MetricsExplorer/Explorer/Explorer.styles.scss

@@ -30,31 +30,6 @@
 		}
 	}
 
-	.explore-tabs {
-		margin: 15px 0;
-		.tab {
-			background-color: var(--bg-slate-500);
-			border-color: var(--bg-ink-200);
-			width: 180px;
-			padding: 16px 0;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.tab:first-of-type {
-			border-top-left-radius: 2px;
-		}
-
-		.tab:last-of-type {
-			border-top-right-radius: 2px;
-		}
-
-		.selected-view {
-			background: var(--bg-ink-500);
-		}
-	}
-
 	.explore-content {
 		padding: 0 8px;
 
@@ -116,81 +91,6 @@
 			width: 100%;
 			height: fit-content;
 		}
-
-		.related-metrics-container {
-			width: 100%;
-			min-height: 300px;
-			display: flex;
-			flex-direction: column;
-			gap: 10px;
-
-			.related-metrics-header {
-				display: flex;
-				align-items: center;
-				justify-content: flex-start;
-
-				.metric-name-select {
-					width: 20%;
-					margin-right: 10px;
-				}
-
-				.related-metrics-input {
-					width: 40%;
-
-					.ant-input-wrapper {
-						.ant-input-group-addon {
-							.related-metrics-select {
-								width: 250px;
-								border: 1px solid var(--bg-slate-500) !important;
-
-								.ant-select-selector {
-									text-align: left;
-									color: var(--text-vanilla-500) !important;
-								}
-							}
-						}
-					}
-				}
-			}
-
-			.related-metrics-body {
-				margin-top: 20px;
-				max-height: 650px;
-				overflow-y: scroll;
-
-				.related-metrics-card-container {
-					margin-bottom: 20px;
-					min-height: 640px;
-
-					.related-metrics-card {
-						display: flex;
-						flex-direction: column;
-						gap: 16px;
-
-						.related-metrics-card-error {
-							padding-top: 10px;
-							height: fit-content;
-							width: fit-content;
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-.lightMode {
-	.metrics-explorer-explore-container {
-		.explore-tabs {
-			.tab {
-				background-color: var(--bg-vanilla-100);
-				border-color: var(--bg-vanilla-400);
-			}
-
-			.selected-view {
-				background: var(--bg-vanilla-500);
-			}
-		}
 	}
 }
 

frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx

@@ -32,7 +32,6 @@ import { v4 as uuid } from 'uuid';
 import { MetricsExplorerEventKeys, MetricsExplorerEvents } from '../events';
 import MetricDetails from '../MetricDetails/MetricDetails';
 import TimeSeries from './TimeSeries';
-import { ExplorerTabs } from './types';
 import {
 	getMetricUnits,
 	splitQueryIntoOneChartPerQuery,
@@ -95,7 +94,6 @@ function Explorer(): JSX.Element {
 	const [disableOneChartPerQuery, toggleDisableOneChartPerQuery] = useState(
 		false,
 	);
-	const [selectedTab] = useState<ExplorerTabs>(ExplorerTabs.TIME_SERIES);
 	const [yAxisUnit, setYAxisUnit] = useState<string | undefined>();
 
 	const unitsLength = useMemo(() => units.length, [units]);
@@ -319,48 +317,21 @@ function Explorer(): JSX.Element {
 					showFunctions={false}
 					version="v3"
 				/>
-				{/* TODO: Enable once we have resolved all related metrics issues */}
-				{/* <Button.Group className="explore-tabs">
-					<Button
-						value={ExplorerTabs.TIME_SERIES}
-						className={classNames('tab', {
-							'selected-view': selectedTab === ExplorerTabs.TIME_SERIES,
-						})}
-						onClick={(): void => setSelectedTab(ExplorerTabs.TIME_SERIES)}
-					>
-						<Typography.Text>Time series</Typography.Text>
-					</Button>
-					<Button
-						value={ExplorerTabs.RELATED_METRICS}
-						className={classNames('tab', {
-							'selected-view': selectedTab === ExplorerTabs.RELATED_METRICS,
-						})}
-						onClick={(): void => setSelectedTab(ExplorerTabs.RELATED_METRICS)}
-					>
-						<Typography.Text>Related</Typography.Text>
-					</Button>
-				</Button.Group> */}
 				<div className="explore-content">
-					{selectedTab === ExplorerTabs.TIME_SERIES && (
-						<TimeSeries
-							showOneChartPerQuery={showOneChartPerQuery}
-							setWarning={setWarning}
-							areAllMetricUnitsSame={areAllMetricUnitsSame}
-							isMetricUnitsLoading={isMetricUnitsLoading}
-							isMetricUnitsError={isMetricUnitsError}
-							metricUnits={units}
-							metricNames={metricNames}
-							metrics={metrics}
-							handleOpenMetricDetails={handleOpenMetricDetails}
-							yAxisUnit={yAxisUnit}
-							setYAxisUnit={setYAxisUnit}
-							showYAxisUnitSelector={showYAxisUnitSelector}
-						/>
-					)}
-					{/* TODO: Enable once we have resolved all related metrics issues */}
-					{/* {selectedTab === ExplorerTabs.RELATED_METRICS && (
-						<RelatedMetrics metricNames={metricNames} />
-					)} */}
+					<TimeSeries
+						showOneChartPerQuery={showOneChartPerQuery}
+						setWarning={setWarning}
+						areAllMetricUnitsSame={areAllMetricUnitsSame}
+						isMetricUnitsLoading={isMetricUnitsLoading}
+						isMetricUnitsError={isMetricUnitsError}
+						metricUnits={units}
+						metricNames={metricNames}
+						metrics={metrics}
+						handleOpenMetricDetails={handleOpenMetricDetails}
+						yAxisUnit={yAxisUnit}
+						setYAxisUnit={setYAxisUnit}
+						showYAxisUnitSelector={showYAxisUnitSelector}
+					/>
 				</div>
 			</div>
 			<ExplorerOptionWrapper

frontend/src/container/MetricsExplorer/Explorer/RelatedMetrics.tsx

@@ -1,153 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
-// eslint-disable-next-line no-restricted-imports
-import { useSelector } from 'react-redux';
-import { Color } from '@signozhq/design-tokens';
-import { Card, Col, Empty, Input, Row, Select, Skeleton } from 'antd';
-import { Gauge } from 'lucide-react';
-import { AppState } from 'store/reducers';
-import { GlobalReducer } from 'types/reducer/globalTime';
-
-import RelatedMetricsCard from './RelatedMetricsCard';
-import { RelatedMetricsProps, RelatedMetricWithQueryResult } from './types';
-import { useGetRelatedMetricsGraphs } from './useGetRelatedMetricsGraphs';
-
-function RelatedMetrics({ metricNames }: RelatedMetricsProps): JSX.Element {
-	const graphRef = useRef<HTMLDivElement>(null);
-	const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(
-		(state) => state.globalTime,
-	);
-
-	const [selectedMetricName, setSelectedMetricName] = useState<string | null>(
-		null,
-	);
-	const [selectedRelatedMetric, setSelectedRelatedMetric] = useState('all');
-	const [searchValue, setSearchValue] = useState<string | null>(null);
-
-	const startMs = useMemo(() => Math.floor(Number(minTime) / 1000000000), [
-		minTime,
-	]);
-	const endMs = useMemo(() => Math.floor(Number(maxTime) / 1000000000), [
-		maxTime,
-	]);
-
-	useEffect(() => {
-		if (metricNames.length) {
-			setSelectedMetricName(metricNames[0]);
-		}
-	}, [metricNames]);
-
-	const {
-		relatedMetrics,
-		isRelatedMetricsLoading,
-		isRelatedMetricsError,
-	} = useGetRelatedMetricsGraphs({
-		selectedMetricName,
-		startMs,
-		endMs,
-	});
-
-	const metricNamesSelectOptions = useMemo(
-		() =>
-			metricNames.map((name) => ({
-				value: name,
-				label: name,
-			})),
-		[metricNames],
-	);
-
-	const relatedMetricsSelectOptions = useMemo(() => {
-		const options: { value: string; label: string }[] = [
-			{
-				value: 'all',
-				label: 'All',
-			},
-		];
-		relatedMetrics.forEach((metric) => {
-			options.push({
-				value: metric.name,
-				label: metric.name,
-			});
-		});
-		return options;
-	}, [relatedMetrics]);
-
-	const filteredRelatedMetrics = useMemo(() => {
-		let filteredMetrics: RelatedMetricWithQueryResult[] = [];
-		if (selectedRelatedMetric === 'all') {
-			filteredMetrics = [...relatedMetrics];
-		} else {
-			filteredMetrics = relatedMetrics.filter(
-				(metric) => metric.name === selectedRelatedMetric,
-			);
-		}
-		if (searchValue?.length) {
-			filteredMetrics = filteredMetrics.filter((metric) =>
-				metric.name.toLowerCase().includes(searchValue?.toLowerCase() ?? ''),
-			);
-		}
-		return filteredMetrics;
-	}, [relatedMetrics, selectedRelatedMetric, searchValue]);
-
-	return (
-		<div className="related-metrics-container">
-			<div className="related-metrics-header">
-				<Select
-					className="metric-name-select"
-					value={selectedMetricName}
-					options={metricNamesSelectOptions}
-					onChange={(value): void => setSelectedMetricName(value)}
-					suffixIcon={<Gauge size={12} color={Color.BG_SAKURA_500} />}
-				/>
-				<Input
-					className="related-metrics-input"
-					placeholder="Search..."
-					onChange={(e): void => setSearchValue(e.target.value)}
-					bordered
-					addonBefore={
-						<Select
-							loading={isRelatedMetricsLoading}
-							value={selectedRelatedMetric}
-							className="related-metrics-select"
-							options={relatedMetricsSelectOptions}
-							onChange={(value): void => setSelectedRelatedMetric(value)}
-							bordered={false}
-						/>
-					}
-				/>
-			</div>
-			<div className="related-metrics-body">
-				{isRelatedMetricsLoading && <Skeleton active />}
-				{isRelatedMetricsError && (
-					<Empty description="Error fetching related metrics" />
-				)}
-				{!isRelatedMetricsLoading &&
-					!isRelatedMetricsError &&
-					filteredRelatedMetrics.length === 0 && (
-						<Empty description="No related metrics found" />
-					)}
-				{!isRelatedMetricsLoading &&
-					!isRelatedMetricsError &&
-					filteredRelatedMetrics.length > 0 && (
-						<Row gutter={24}>
-							{filteredRelatedMetrics.map((relatedMetricWithQueryResult) => (
-								<Col span={12} key={relatedMetricWithQueryResult.name}>
-									<Card
-										bordered
-										ref={graphRef}
-										className="related-metrics-card-container"
-									>
-										<RelatedMetricsCard
-											key={relatedMetricWithQueryResult.name}
-											metric={relatedMetricWithQueryResult}
-										/>
-									</Card>
-								</Col>
-							))}
-						</Row>
-					)}
-			</div>
-		</div>
-	);
-}
-
-export default RelatedMetrics;

frontend/src/container/MetricsExplorer/Explorer/RelatedMetricsCard.tsx

@@ -1,47 +0,0 @@
-import { Empty, Skeleton, Typography } from 'antd';
-import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';
-import { DataSource } from 'types/common/queryBuilder';
-
-import DashboardsAndAlertsPopover from '../MetricDetails/DashboardsAndAlertsPopover';
-import { RelatedMetricsCardProps } from './types';
-
-function RelatedMetricsCard({ metric }: RelatedMetricsCardProps): JSX.Element {
-	const { queryResult } = metric;
-
-	if (queryResult.isLoading) {
-		return <Skeleton />;
-	}
-
-	if (queryResult.error) {
-		const errorMessage =
-			(queryResult.error as Error)?.message || 'Something went wrong';
-		return <div>{errorMessage}</div>;
-	}
-
-	return (
-		<div className="related-metrics-card">
-			<Typography.Text className="related-metrics-card-name">
-				{metric.name}
-			</Typography.Text>
-			{queryResult.isLoading ? <Skeleton /> : null}
-			{queryResult.isError ? (
-				<div className="related-metrics-card-error">
-					<Empty description="Error fetching metric data" />
-				</div>
-			) : null}
-			{!queryResult.isLoading && !queryResult.error && (
-				<TimeSeriesView
-					isFilterApplied={false}
-					isError={queryResult.isError}
-					isLoading={queryResult.isLoading}
-					data={queryResult.data}
-					yAxisUnit="ms"
-					dataSource={DataSource.METRICS}
-				/>
-			)}
-			<DashboardsAndAlertsPopover metricName={metric.name} />
-		</div>
-	);
-}
-
-export default RelatedMetricsCard;

frontend/src/container/MetricsExplorer/Explorer/types.ts

@@ -1,14 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
-import { UseQueryResult } from 'react-query';
 import { MetricsexplorertypesMetricMetadataDTO } from 'api/generated/services/sigNoz.schemas';
-import { RelatedMetric } from 'api/metricsExplorer/getRelatedMetrics';
-import { SuccessResponse, Warning } from 'types/api';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-
-export enum ExplorerTabs {
-	TIME_SERIES = 'time-series',
-	RELATED_METRICS = 'related-metrics',
-}
+import { Warning } from 'types/api';
 
 export interface TimeSeriesProps {
 	showOneChartPerQuery: boolean;
@@ -24,27 +16,3 @@ export interface TimeSeriesProps {
 	setYAxisUnit: (unit: string) => void;
 	showYAxisUnitSelector: boolean;
 }
-
-export interface RelatedMetricsProps {
-	metricNames: string[];
-}
-
-export interface RelatedMetricsCardProps {
-	metric: RelatedMetricWithQueryResult;
-}
-
-export interface UseGetRelatedMetricsGraphsProps {
-	selectedMetricName: string | null;
-	startMs: number;
-	endMs: number;
-}
-
-export interface UseGetRelatedMetricsGraphsReturn {
-	relatedMetrics: RelatedMetricWithQueryResult[];
-	isRelatedMetricsLoading: boolean;
-	isRelatedMetricsError: boolean;
-}
-
-export interface RelatedMetricWithQueryResult extends RelatedMetric {
-	queryResult: UseQueryResult<SuccessResponse<MetricRangePayloadProps>, unknown>;
-}

frontend/src/container/MetricsExplorer/Explorer/useGetRelatedMetricsGraphs.ts

@@ -1,113 +0,0 @@
-import { useMemo } from 'react';
-import { useQueries } from 'react-query';
-// eslint-disable-next-line no-restricted-imports
-import { useSelector } from 'react-redux';
-import { ENTITY_VERSION_V4 } from 'constants/app';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { useGetRelatedMetrics } from 'hooks/metricsExplorer/useGetRelatedMetrics';
-import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
-import { AppState } from 'store/reducers';
-import { SuccessResponse } from 'types/api';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { EQueryType } from 'types/common/dashboard';
-import { DataSource } from 'types/common/queryBuilder';
-import { GlobalReducer } from 'types/reducer/globalTime';
-import { v4 as uuidv4 } from 'uuid';
-
-import { convertNanoToMilliseconds } from '../Summary/utils';
-import {
-	UseGetRelatedMetricsGraphsProps,
-	UseGetRelatedMetricsGraphsReturn,
-} from './types';
-
-export const useGetRelatedMetricsGraphs = ({
-	selectedMetricName,
-	startMs,
-	endMs,
-}: UseGetRelatedMetricsGraphsProps): UseGetRelatedMetricsGraphsReturn => {
-	const { maxTime, minTime, selectedTime: globalSelectedTime } = useSelector<
-		AppState,
-		GlobalReducer
-	>((state) => state.globalTime);
-
-	// Build the query for the related metrics
-	const relatedMetricsQuery = useMemo(
-		() => ({
-			start: convertNanoToMilliseconds(minTime),
-			end: convertNanoToMilliseconds(maxTime),
-			currentMetricName: selectedMetricName ?? '',
-		}),
-		[selectedMetricName, minTime, maxTime],
-	);
-
-	// Get the related metrics
-	const {
-		data: relatedMetricsData,
-		isLoading: isRelatedMetricsLoading,
-		isError: isRelatedMetricsError,
-	} = useGetRelatedMetrics(relatedMetricsQuery, {
-		enabled: !!selectedMetricName,
-	});
-
-	// Build the related metrics array
-	const relatedMetrics = useMemo(() => {
-		if (relatedMetricsData?.payload?.data?.related_metrics) {
-			return relatedMetricsData.payload.data.related_metrics;
-		}
-		return [];
-	}, [relatedMetricsData]);
-
-	// Build the query results for the related metrics
-	const relatedMetricsQueryResults = useQueries(
-		useMemo(
-			() =>
-				relatedMetrics.map((metric) => ({
-					queryKey: ['related-metrics', metric.name],
-					queryFn: (): Promise<SuccessResponse<MetricRangePayloadProps>> =>
-						GetMetricQueryRange(
-							{
-								query: {
-									queryType: EQueryType.QUERY_BUILDER,
-									promql: [],
-									builder: {
-										queryData: [metric.query],
-										queryFormulas: [],
-										queryTraceOperator: [],
-									},
-									clickhouse_sql: [],
-									id: uuidv4(),
-								},
-								graphType: PANEL_TYPES.TIME_SERIES,
-								selectedTime: 'GLOBAL_TIME',
-								globalSelectedInterval: globalSelectedTime,
-								start: startMs,
-								end: endMs,
-								formatForWeb: false,
-								params: {
-									dataSource: DataSource.METRICS,
-								},
-							},
-							ENTITY_VERSION_V4,
-						),
-					enabled: !!metric.query,
-				})),
-			[relatedMetrics, globalSelectedTime, startMs, endMs],
-		),
-	);
-
-	// Build the related metrics with query results
-	const relatedMetricsWithQueryResults = useMemo(
-		() =>
-			relatedMetrics.map((metric, index) => ({
-				...metric,
-				queryResult: relatedMetricsQueryResults[index],
-			})),
-		[relatedMetrics, relatedMetricsQueryResults],
-	);
-
-	return {
-		relatedMetrics: relatedMetricsWithQueryResults,
-		isRelatedMetricsLoading,
-		isRelatedMetricsError,
-	};
-};

frontend/src/container/MetricsExplorer/Inspect/ExpandedView.tsx

@@ -4,7 +4,6 @@ import { Color } from '@signozhq/design-tokens';
 import type { TableColumnsType as ColumnsType } from 'antd';
 import { Card, Tooltip, Typography } from 'antd';
 import logEvent from 'api/common/logEvent';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
 import classNames from 'classnames';
 import ResizeTable from 'components/ResizeTable/ResizeTable';
 import { DataType } from 'container/LogDetailedView/TableView';
@@ -15,6 +14,7 @@ import {
 	SPACE_AGGREGATION_OPTIONS_FOR_EXPANDED_VIEW,
 	TIME_AGGREGATION_OPTIONS,
 } from './constants';
+import { InspectMetricsSeries } from './types';
 import {
 	ExpandedViewProps,
 	InspectionStep,
@@ -42,7 +42,8 @@ function ExpandedView({
 	useEffect(() => {
 		logEvent(MetricsExplorerEvents.InspectPointClicked, {
 			[MetricsExplorerEventKeys.Modal]: 'inspect',
-			[MetricsExplorerEventKeys.Filters]: metricInspectionAppliedOptions.filters,
+			[MetricsExplorerEventKeys.Filters]:
+				metricInspectionAppliedOptions.filterExpression,
 			[MetricsExplorerEventKeys.TimeAggregationInterval]:
 				metricInspectionAppliedOptions.timeAggregationInterval,
 			[MetricsExplorerEventKeys.TimeAggregationOption]:

frontend/src/container/MetricsExplorer/Inspect/Inspect.tsx

@@ -3,7 +3,7 @@ import * as Sentry from '@sentry/react';
 import { Color } from '@signozhq/design-tokens';
 import { Button, Drawer, Empty, Skeleton, Typography } from 'antd';
 import logEvent from 'api/common/logEvent';
-import { useGetMetricDetails } from 'hooks/metricsExplorer/useGetMetricDetails';
+import { useGetMetricMetadata } from 'api/generated/services/metrics';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
 import { useIsDarkMode } from 'hooks/useDarkMode';
@@ -48,10 +48,12 @@ function Inspect({
 	] = useState<GraphPopoverOptions | null>(null);
 	const [showExpandedView, setShowExpandedView] = useState(false);
 
-	const { data: metricDetailsData } = useGetMetricDetails(
-		appliedMetricName ?? '',
+	const { data: metricDetailsData } = useGetMetricMetadata(
+		{ metricName: appliedMetricName ?? '' },
 		{
-			enabled: !!appliedMetricName,
+			query: {
+				enabled: !!appliedMetricName,
+			},
 		},
 	);
 
@@ -93,7 +95,6 @@ function Inspect({
 
 	const {
 		inspectMetricsTimeSeries,
-		inspectMetricsStatusCode,
 		isInspectMetricsLoading,
 		isInspectMetricsError,
 		formattedInspectMetricsTimeSeries,
@@ -118,15 +119,13 @@ function Inspect({
 		[dispatchMetricInspectionOptions],
 	);
 
-	const selectedMetricType = useMemo(
-		() => metricDetailsData?.payload?.data?.metadata?.metric_type,
-		[metricDetailsData],
-	);
+	const selectedMetricType = useMemo(() => metricDetailsData?.data?.type, [
+		metricDetailsData,
+	]);
 
-	const selectedMetricUnit = useMemo(
-		() => metricDetailsData?.payload?.data?.metadata?.unit,
-		[metricDetailsData],
-	);
+	const selectedMetricUnit = useMemo(() => metricDetailsData?.data?.unit, [
+		metricDetailsData,
+	]);
 
 	const aggregateAttribute = useMemo(
 		() => ({
@@ -180,11 +179,8 @@ function Inspect({
 			);
 		}
 
-		if (isInspectMetricsError || inspectMetricsStatusCode !== 200) {
-			const errorMessage =
-				inspectMetricsStatusCode === 400
-					? 'The time range is too large. Please modify it to be within 30 minutes.'
-					: 'Error loading inspect metrics.';
+		if (isInspectMetricsError) {
+			const errorMessage = 'Error loading inspect metrics.';
 
 			return (
 				<div
@@ -261,7 +257,6 @@ function Inspect({
 		isInspectMetricsLoading,
 		isInspectMetricsRefetching,
 		isInspectMetricsError,
-		inspectMetricsStatusCode,
 		inspectMetricsTimeSeries,
 		aggregatedTimeSeries,
 		formattedInspectMetricsTimeSeries,

frontend/src/container/MetricsExplorer/Inspect/MetricFilters.tsx

@@ -33,7 +33,7 @@ function MetricFilters({
 			});
 			dispatchMetricInspectionOptions({
 				type: 'SET_FILTERS',
-				payload: tagFilter,
+				payload: expression,
 			});
 		},
 		[currentQuery, dispatchMetricInspectionOptions, setCurrentQuery],

frontend/src/container/MetricsExplorer/Inspect/TableView.tsx

@@ -1,8 +1,8 @@
 import { useCallback, useMemo } from 'react';
 import type { TableColumnsType as ColumnsType } from 'antd';
 import { Card, Flex, Table, Typography } from 'antd';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
 
+import { InspectMetricsSeries } from './types';
 import { TableViewProps } from './types';
 import { formatTimestampToFullDateTime } from './utils';
 

frontend/src/container/MetricsExplorer/Inspect/__tests__/ExpandedView.test.tsx

@@ -1,11 +1,11 @@
 import { render, screen } from '@testing-library/react';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
 
 import {
 	SPACE_AGGREGATION_OPTIONS_FOR_EXPANDED_VIEW,
 	TIME_AGGREGATION_OPTIONS,
 } from '../constants';
 import ExpandedView from '../ExpandedView';
+import { InspectMetricsSeries } from '../types';
 import {
 	GraphPopoverData,
 	InspectionStep,
@@ -25,7 +25,6 @@ describe('ExpandedView', () => {
 		labels: {
 			host_id: 'test-id',
 		},
-		labelsArray: [],
 		title: 'TS1',
 	};
 
@@ -66,10 +65,7 @@ describe('ExpandedView', () => {
 		timeAggregationInterval: 60,
 		spaceAggregationOption: SpaceAggregationOptions.MAX_BY,
 		spaceAggregationLabels: ['host_name'],
-		filters: {
-			items: [],
-			op: 'AND',
-		},
+		filterExpression: '',
 	};
 
 	it('renders entire time series for a raw data inspection', () => {

frontend/src/container/MetricsExplorer/Inspect/__tests__/GraphPopover.test.tsx

@@ -1,7 +1,7 @@
 import { fireEvent, render, screen } from '@testing-library/react';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
 
 import GraphPopover from '../GraphPopover';
+import { InspectMetricsSeries } from '../types';
 import { GraphPopoverOptions, InspectionStep } from '../types';
 
 describe('GraphPopover', () => {
@@ -16,7 +16,6 @@ describe('GraphPopover', () => {
 				{ timestamp: 1672531260000, value: '43.456' },
 			],
 			labels: {},
-			labelsArray: [],
 		},
 	};
 	const mockSpaceAggregationSeriesMap: Map<

frontend/src/container/MetricsExplorer/Inspect/__tests__/GraphView.test.tsx

@@ -2,12 +2,12 @@
 import { Provider } from 'react-redux';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
+import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import store from 'store';
 import { AlignedData } from 'uplot';
 
 import GraphView from '../GraphView';
+import { InspectMetricsSeries } from '../types';
 import {
 	InspectionStep,
 	SpaceAggregationOptions,
@@ -32,7 +32,6 @@ describe('GraphView', () => {
 				{ timestamp: 1234567891000, value: '20' },
 			],
 			labels: { label1: 'value1' },
-			labelsArray: [{ label: 'label1', value: 'value1' }],
 		},
 	];
 
@@ -44,7 +43,7 @@ describe('GraphView', () => {
 		] as AlignedData,
 		metricUnit: '',
 		metricName: 'test_metric',
-		metricType: MetricType.GAUGE,
+		metricType: MetrictypesTypeDTO.gauge,
 		spaceAggregationSeriesMap: new Map(),
 		inspectionStep: InspectionStep.COMPLETED,
 		setPopoverOptions: jest.fn(),
@@ -58,10 +57,7 @@ describe('GraphView', () => {
 			spaceAggregationOption: SpaceAggregationOptions.MAX_BY,
 			spaceAggregationLabels: ['host_name'],
 			timeAggregationOption: TimeAggregationOptions.MAX,
-			filters: {
-				items: [],
-				op: 'AND',
-			},
+			filterExpression: '',
 		},
 		isInspectMetricsRefetching: false,
 	};

frontend/src/container/MetricsExplorer/Inspect/__tests__/Inspect.test.tsx

@@ -2,17 +2,21 @@ import { QueryClient, QueryClientProvider } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { Provider } from 'react-redux';
 import { render, screen } from '@testing-library/react';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
-import * as useInspectMetricsHooks from 'hooks/metricsExplorer/useGetInspectMetricsDetails';
-import * as useGetMetricDetailsHooks from 'hooks/metricsExplorer/useGetMetricDetails';
+import * as metricsGeneratedAPI from 'api/generated/services/metrics';
+import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import * as appContextHooks from 'providers/App/App';
 import store from 'store';
 
 import ROUTES from '../../../../constants/routes';
 import { LicenseEvent } from '../../../../types/api/licensesV3/getActive';
+import { INITIAL_INSPECT_METRICS_OPTIONS } from '../constants';
 import Inspect from '../Inspect';
-import { InspectionStep } from '../types';
+import {
+	InspectionStep,
+	InspectMetricsSeries,
+	UseInspectMetricsReturnData,
+} from '../types';
+import * as useInspectMetricsModule from '../useInspectMetrics';
 
 const queryClient = new QueryClient();
 const mockTimeSeries: InspectMetricsSeries[] = [
@@ -24,7 +28,6 @@ const mockTimeSeries: InspectMetricsSeries[] = [
 			{ timestamp: 1234567891000, value: '20' },
 		],
 		labels: { label1: 'value1' },
-		labelsArray: [{ label: 'label1', value: 'value1' }],
 	},
 ];
 
@@ -52,29 +55,19 @@ jest.spyOn(appContextHooks, 'useAppContext').mockReturnValue({
 	},
 } as any);
 
-jest.spyOn(useGetMetricDetailsHooks, 'useGetMetricDetails').mockReturnValue({
+jest.spyOn(metricsGeneratedAPI, 'useGetMetricMetadata').mockReturnValue({
 	data: {
-		metricDetails: {
-			metricName: 'test_metric',
-			metricType: MetricType.GAUGE,
+		data: {
+			type: MetrictypesTypeDTO.gauge,
+			unit: '',
+			description: '',
+			temporality: '',
+			isMonotonic: false,
 		},
+		status: 'success',
 	},
 } as any);
 
-jest
-	.spyOn(useInspectMetricsHooks, 'useGetInspectMetricsDetails')
-	.mockReturnValue({
-		data: {
-			payload: {
-				data: {
-					series: mockTimeSeries,
-				},
-				status: 'success',
-			},
-		},
-		isLoading: false,
-	} as any);
-
 jest.mock('react-router-dom', () => ({
 	...jest.requireActual('react-router-dom'),
 	useLocation: (): { pathname: string } => ({
@@ -90,16 +83,25 @@ mockResizeObserver.mockImplementation(() => ({
 }));
 window.ResizeObserver = mockResizeObserver;
 
+const baseHookReturn: UseInspectMetricsReturnData = {
+	inspectMetricsTimeSeries: [],
+	isInspectMetricsLoading: false,
+	isInspectMetricsError: false,
+	formattedInspectMetricsTimeSeries: [[], []],
+	spaceAggregationLabels: [],
+	metricInspectionOptions: INITIAL_INSPECT_METRICS_OPTIONS,
+	dispatchMetricInspectionOptions: jest.fn(),
+	inspectionStep: InspectionStep.COMPLETED,
+	isInspectMetricsRefetching: false,
+	spaceAggregatedSeriesMap: new Map(),
+	aggregatedTimeSeries: [],
+	timeAggregatedSeriesMap: new Map(),
+	reset: jest.fn(),
+};
+
 describe('Inspect', () => {
 	const defaultProps = {
-		inspectMetricsTimeSeries: mockTimeSeries,
-		formattedInspectMetricsTimeSeries: [],
-		metricUnit: '',
 		metricName: 'test_metric',
-		metricType: MetricType.GAUGE,
-		spaceAggregationSeriesMap: new Map(),
-		inspectionStep: InspectionStep.COMPLETED,
-		resetInspection: jest.fn(),
 		isOpen: true,
 		onClose: jest.fn(),
 	};
@@ -109,6 +111,12 @@ describe('Inspect', () => {
 	});
 
 	it('renders all components', () => {
+		jest.spyOn(useInspectMetricsModule, 'useInspectMetrics').mockReturnValue({
+			...baseHookReturn,
+			inspectMetricsTimeSeries: mockTimeSeries,
+			aggregatedTimeSeries: mockTimeSeries,
+		});
+
 		render(
 			<QueryClientProvider client={queryClient}>
 				<Provider store={store}>
@@ -123,18 +131,11 @@ describe('Inspect', () => {
 	});
 
 	it('renders loading state', () => {
-		jest
-			.spyOn(useInspectMetricsHooks, 'useGetInspectMetricsDetails')
-			.mockReturnValue({
-				data: {
-					payload: {
-						data: {
-							series: [],
-						},
-					},
-				},
-				isLoading: true,
-			} as any);
+		jest.spyOn(useInspectMetricsModule, 'useInspectMetrics').mockReturnValue({
+			...baseHookReturn,
+			isInspectMetricsLoading: true,
+		});
+
 		render(
 			<QueryClientProvider client={queryClient}>
 				<Provider store={store}>
@@ -147,18 +148,11 @@ describe('Inspect', () => {
 	});
 
 	it('renders empty state', () => {
-		jest
-			.spyOn(useInspectMetricsHooks, 'useGetInspectMetricsDetails')
-			.mockReturnValue({
-				data: {
-					payload: {
-						data: {
-							series: [],
-						},
-					},
-				},
-				isLoading: false,
-			} as any);
+		jest.spyOn(useInspectMetricsModule, 'useInspectMetrics').mockReturnValue({
+			...baseHookReturn,
+			inspectMetricsTimeSeries: [],
+		});
+
 		render(
 			<QueryClientProvider client={queryClient}>
 				<Provider store={store}>
@@ -171,39 +165,11 @@ describe('Inspect', () => {
 	});
 
 	it('renders error state', () => {
-		jest
-			.spyOn(useInspectMetricsHooks, 'useGetInspectMetricsDetails')
-			.mockReturnValue({
-				data: {
-					payload: {
-						data: {
-							series: [],
-						},
-					},
-				},
-				isLoading: false,
-				isError: true,
-			} as any);
-		render(
-			<QueryClientProvider client={queryClient}>
-				<Provider store={store}>
-					<Inspect {...defaultProps} />
-				</Provider>
-			</QueryClientProvider>,
-		);
+		jest.spyOn(useInspectMetricsModule, 'useInspectMetrics').mockReturnValue({
+			...baseHookReturn,
+			isInspectMetricsError: true,
+		});
 
-		expect(screen.getByTestId('inspect-metrics-error')).toBeInTheDocument();
-	});
-
-	it('renders error state with 400 status code', () => {
-		jest
-			.spyOn(useInspectMetricsHooks, 'useGetInspectMetricsDetails')
-			.mockReturnValue({
-				data: {
-					statusCode: 400,
-				},
-				isError: false,
-			} as any);
 		render(
 			<QueryClientProvider client={queryClient}>
 				<Provider store={store}>

frontend/src/container/MetricsExplorer/Inspect/__tests__/QueryBuilder.test.tsx

@@ -4,7 +4,7 @@ import { Provider } from 'react-redux';
 import { fireEvent, render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import * as metricsService from 'api/generated/services/metrics';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
+import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import * as appContextHooks from 'providers/App/App';
 import store from 'store';
 
@@ -89,13 +89,10 @@ describe('QueryBuilder', () => {
 			timeAggregationOption: TimeAggregationOptions.AVG,
 			spaceAggregationLabels: [],
 			spaceAggregationOption: SpaceAggregationOptions.AVG_BY,
-			filters: {
-				items: [],
-				op: 'and',
-			},
+			filterExpression: '',
 		},
 		dispatchMetricInspectionOptions: jest.fn(),
-		metricType: MetricType.SUM,
+		metricType: MetrictypesTypeDTO.sum,
 		inspectionStep: InspectionStep.TIME_AGGREGATION,
 		inspectMetricsTimeSeries: [],
 		currentQuery: {
@@ -103,6 +100,7 @@ describe('QueryBuilder', () => {
 				items: [],
 				op: 'and',
 			},
+			filterExpression: '',
 		} as any,
 		setCurrentQuery: jest.fn(),
 	};

frontend/src/container/MetricsExplorer/Inspect/__tests__/TableView.test.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
 
 import TableView from '../TableView';
+import { InspectMetricsSeries } from '../types';
 import {
 	InspectionStep,
 	SpaceAggregationOptions,
@@ -19,12 +19,6 @@ describe('TableView', () => {
 				{ timestamp: 1234567891000, value: '20' },
 			],
 			labels: { label1: 'value1' },
-			labelsArray: [
-				{
-					label: 'label1',
-					value: 'value1',
-				},
-			],
 		},
 		{
 			strokeColor: '#fff',
@@ -34,12 +28,6 @@ describe('TableView', () => {
 				{ timestamp: 1234567891000, value: '40' },
 			],
 			labels: { label2: 'value2' },
-			labelsArray: [
-				{
-					label: 'label2',
-					value: 'value2',
-				},
-			],
 		},
 	];
 
@@ -53,10 +41,7 @@ describe('TableView', () => {
 			timeAggregationOption: TimeAggregationOptions.MAX,
 			spaceAggregationOption: SpaceAggregationOptions.MAX_BY,
 			spaceAggregationLabels: ['host_name'],
-			filters: {
-				items: [],
-				op: 'AND',
-			},
+			filterExpression: '',
 		},
 		isInspectMetricsRefetching: false,
 	};

frontend/src/container/MetricsExplorer/Inspect/constants.ts

@@ -1,6 +1,6 @@
 import { ForwardRefExoticComponent, RefAttributes } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
+import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import {
 	BarChart,
 	BarChart2,
@@ -18,25 +18,25 @@ import {
 
 export const INSPECT_FEATURE_FLAG_KEY = 'metrics-explorer-inspect-feature-flag';
 
-export const METRIC_TYPE_TO_COLOR_MAP: Record<MetricType, string> = {
-	[MetricType.GAUGE]: Color.BG_SAKURA_500,
-	[MetricType.HISTOGRAM]: Color.BG_SIENNA_500,
-	[MetricType.SUM]: Color.BG_ROBIN_500,
-	[MetricType.SUMMARY]: Color.BG_FOREST_500,
-	[MetricType.EXPONENTIAL_HISTOGRAM]: Color.BG_AQUA_500,
+export const METRIC_TYPE_TO_COLOR_MAP: Record<MetrictypesTypeDTO, string> = {
+	[MetrictypesTypeDTO.gauge]: Color.BG_SAKURA_500,
+	[MetrictypesTypeDTO.histogram]: Color.BG_SIENNA_500,
+	[MetrictypesTypeDTO.sum]: Color.BG_ROBIN_500,
+	[MetrictypesTypeDTO.summary]: Color.BG_FOREST_500,
+	[MetrictypesTypeDTO.exponentialhistogram]: Color.BG_AQUA_500,
 };
 
 export const METRIC_TYPE_TO_ICON_MAP: Record<
-	MetricType,
+	MetrictypesTypeDTO,
 	ForwardRefExoticComponent<
 		Omit<LucideProps, 'ref'> & RefAttributes<SVGSVGElement>
 	>
 > = {
-	[MetricType.GAUGE]: Gauge,
-	[MetricType.HISTOGRAM]: BarChart2,
-	[MetricType.SUM]: Diff,
-	[MetricType.SUMMARY]: BarChartHorizontal,
-	[MetricType.EXPONENTIAL_HISTOGRAM]: BarChart,
+	[MetrictypesTypeDTO.gauge]: Gauge,
+	[MetrictypesTypeDTO.histogram]: BarChart2,
+	[MetrictypesTypeDTO.sum]: Diff,
+	[MetrictypesTypeDTO.summary]: BarChartHorizontal,
+	[MetrictypesTypeDTO.exponentialhistogram]: BarChart,
 };
 
 export const TIME_AGGREGATION_OPTIONS: Record<
@@ -77,20 +77,14 @@ export const INITIAL_INSPECT_METRICS_OPTIONS: MetricInspectionState = {
 		timeAggregationInterval: undefined,
 		spaceAggregationOption: undefined,
 		spaceAggregationLabels: [],
-		filters: {
-			items: [],
-			op: 'AND',
-		},
+		filterExpression: '',
 	},
 	appliedOptions: {
 		timeAggregationOption: undefined,
 		timeAggregationInterval: undefined,
 		spaceAggregationOption: undefined,
 		spaceAggregationLabels: [],
-		filters: {
-			items: [],
-			op: 'AND',
-		},
+		filterExpression: '',
 	},
 };
 

frontend/src/container/MetricsExplorer/Inspect/types.ts

@@ -1,11 +1,19 @@
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
-import {
-	IBuilderQuery,
-	TagFilter,
-} from 'types/api/queryBuilder/queryBuilderData';
+import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { AlignedData } from 'uplot';
 
+export interface InspectMetricsTimestampValue {
+	timestamp: number;
+	value: string;
+}
+
+export interface InspectMetricsSeries {
+	title?: string;
+	strokeColor?: string;
+	labels: Record<string, string>;
+	values: InspectMetricsTimestampValue[];
+}
+
 export type InspectProps = {
 	metricName: string;
 	isOpen: boolean;
@@ -14,7 +22,6 @@ export type InspectProps = {
 
 export interface UseInspectMetricsReturnData {
 	inspectMetricsTimeSeries: InspectMetricsSeries[];
-	inspectMetricsStatusCode: number;
 	isInspectMetricsLoading: boolean;
 	isInspectMetricsError: boolean;
 	formattedInspectMetricsTimeSeries: AlignedData;
@@ -33,7 +40,7 @@ export interface GraphViewProps {
 	inspectMetricsTimeSeries: InspectMetricsSeries[];
 	metricUnit: string | undefined;
 	metricName: string | null;
-	metricType?: MetricType | undefined;
+	metricType?: MetrictypesTypeDTO | undefined;
 	formattedInspectMetricsTimeSeries: AlignedData;
 	resetInspection: () => void;
 	spaceAggregationSeriesMap: Map<string, InspectMetricsSeries[]>;
@@ -106,7 +113,7 @@ export interface MetricInspectionOptions {
 	timeAggregationInterval: number | undefined;
 	spaceAggregationOption: SpaceAggregationOptions | undefined;
 	spaceAggregationLabels: string[];
-	filters: TagFilter;
+	filterExpression: string;
 }
 
 export interface MetricInspectionState {
@@ -119,7 +126,7 @@ export type MetricInspectionAction =
 	| { type: 'SET_TIME_AGGREGATION_INTERVAL'; payload: number }
 	| { type: 'SET_SPACE_AGGREGATION_OPTION'; payload: SpaceAggregationOptions }
 	| { type: 'SET_SPACE_AGGREGATION_LABELS'; payload: string[] }
-	| { type: 'SET_FILTERS'; payload: TagFilter }
+	| { type: 'SET_FILTERS'; payload: string }
 	| { type: 'RESET_INSPECTION' }
 	| { type: 'APPLY_METRIC_INSPECTION_OPTIONS' };
 

frontend/src/container/MetricsExplorer/Inspect/useInspectMetrics.ts

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useMemo, useReducer, useState } from 'react';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
+import { useQuery } from 'react-query';
+import { inspectMetrics } from 'api/generated/services/metrics';
 import { themeColors } from 'constants/theme';
-import { useGetInspectMetricsDetails } from 'hooks/metricsExplorer/useGetInspectMetricsDetails';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { generateColor } from 'lib/uPlotLib/utils/generateColor';
 
@@ -9,6 +9,7 @@ import { INITIAL_INSPECT_METRICS_OPTIONS } from './constants';
 import {
 	GraphPopoverData,
 	InspectionStep,
+	InspectMetricsSeries,
 	MetricInspectionAction,
 	MetricInspectionState,
 	UseInspectMetricsReturnData,
@@ -61,7 +62,7 @@ const metricInspectionReducer = (
 				...state,
 				currentOptions: {
 					...state.currentOptions,
-					filters: action.payload,
+					filterExpression: action.payload,
 				},
 			};
 		case 'APPLY_METRIC_INSPECTION_OPTIONS':
@@ -100,26 +101,58 @@ export function useInspectMetrics(
 	);
 
 	const {
-		data: inspectMetricsData,
+		data: inspectMetricsResponse,
 		isLoading: isInspectMetricsLoading,
 		isError: isInspectMetricsError,
 		isRefetching: isInspectMetricsRefetching,
-	} = useGetInspectMetricsDetails(
-		{
-			metricName: metricName ?? '',
+	} = useQuery({
+		queryKey: [
+			'inspectMetrics',
+			metricName,
 			start,
 			end,
-			filters: metricInspectionOptions.appliedOptions.filters,
-		},
-		{
-			enabled: !!metricName,
-			keepPreviousData: true,
-		},
+			metricInspectionOptions.appliedOptions.filterExpression,
+		],
+		queryFn: ({ signal }) =>
+			inspectMetrics(
+				{
+					metricName: metricName ?? '',
+					start,
+					end,
+					filter: metricInspectionOptions.appliedOptions.filterExpression
+						? { expression: metricInspectionOptions.appliedOptions.filterExpression }
+						: undefined,
+				},
+				signal,
+			),
+		enabled: !!metricName,
+		keepPreviousData: true,
+	});
+
+	const inspectMetricsData = useMemo(
+		() => ({
+			series: (inspectMetricsResponse?.data?.series ?? []).map((s) => {
+				const labels: Record<string, string> = {};
+				for (const l of s.labels ?? []) {
+					if (l.key?.name) {
+						labels[l.key.name] = String(l.value ?? '');
+					}
+				}
+				return {
+					labels,
+					values: (s.values ?? []).map((v) => ({
+						timestamp: v.timestamp ?? 0,
+						value: String(v.value ?? 0),
+					})),
+				};
+			}) as InspectMetricsSeries[],
+		}),
+		[inspectMetricsResponse],
 	);
 	const isDarkMode = useIsDarkMode();
 
 	const inspectMetricsTimeSeries = useMemo(() => {
-		const series = inspectMetricsData?.payload?.data?.series ?? [];
+		const series = inspectMetricsData?.series ?? [];
 
 		return series.map((series, index) => {
 			const title = `TS${index + 1}`;
@@ -136,11 +169,6 @@ export function useInspectMetrics(
 		});
 	}, [inspectMetricsData, isDarkMode]);
 
-	const inspectMetricsStatusCode = useMemo(
-		() => inspectMetricsData?.statusCode || 200,
-		[inspectMetricsData],
-	);
-
 	// Evaluate inspection step
 	const currentInspectionStep = useMemo(() => {
 		if (metricInspectionOptions.currentOptions.spaceAggregationOption) {
@@ -231,7 +259,7 @@ export function useInspectMetrics(
 
 	const spaceAggregationLabels = useMemo(() => {
 		const labels = new Set<string>();
-		inspectMetricsData?.payload?.data.series.forEach((series) => {
+		inspectMetricsData?.series?.forEach((series) => {
 			Object.keys(series.labels).forEach((label) => {
 				labels.add(label);
 			});
@@ -250,7 +278,6 @@ export function useInspectMetrics(
 
 	return {
 		inspectMetricsTimeSeries,
-		inspectMetricsStatusCode,
 		isInspectMetricsLoading,
 		isInspectMetricsError,
 		formattedInspectMetricsTimeSeries,

frontend/src/container/MetricsExplorer/Inspect/utils.ts

@@ -1,7 +1,7 @@
 import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
-import { InspectMetricsSeries } from 'api/metricsExplorer/getInspectMetricsDetails';
 import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
 
+import { InspectMetricsSeries } from './types';
 import {
 	GraphPopoverData,
 	GraphPopoverOptions,

frontend/src/container/MetricsExplorer/MetricDetails/__tests__/Metadata.test.tsx

@@ -5,7 +5,6 @@ import {
 	MetrictypesTemporalityDTO,
 	MetrictypesTypeDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { Temporality } from 'api/metricsExplorer/getMetricDetails';
 import {
 	UniversalYAxisUnit,
 	YAxisUnitSelectorProps,
@@ -180,7 +179,10 @@ describe('Metadata', () => {
 
 		const temporalitySelect = screen.getByTestId('temporality-select');
 		expect(temporalitySelect).toBeInTheDocument();
-		await userEvent.selectOptions(temporalitySelect, Temporality.CUMULATIVE);
+		await userEvent.selectOptions(
+			temporalitySelect,
+			MetrictypesTemporalityDTO.cumulative,
+		);
 
 		const unitSelect = screen.getByTestId('unit-select');
 		expect(unitSelect).toBeInTheDocument();

frontend/src/container/MetricsExplorer/Summary/MetricNameSearch.tsx

@@ -9,16 +9,17 @@ import {
 	Popover,
 	Spin,
 } from 'antd';
+import {
+	getListMetricsQueryKey,
+	useListMetrics,
+} from 'api/generated/services/metrics';
 import { Filter } from 'api/v5/v5';
 import {
 	convertExpressionToFilters,
 	convertFiltersToExpression,
 } from 'components/QueryBuilderV2/utils';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { useGetMetricsListFilterValues } from 'hooks/metricsExplorer/useGetMetricsListFilterValues';
 import useDebouncedFn from 'hooks/useDebouncedFunction';
 import { Search } from 'lucide-react';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 
 function MetricNameSearch({
 	queryFilterExpression,
@@ -44,25 +45,27 @@ function MetricNameSearch({
 	}, [isPopoverOpen]);
 
 	const {
-		data: metricNameFilterValuesData,
+		data: metricNameListData,
 		isLoading: isLoadingMetricNameFilterValues,
 		isError: isErrorMetricNameFilterValues,
-	} = useGetMetricsListFilterValues(
+	} = useListMetrics(
 		{
 			searchText: debouncedSearchString,
-			filterKey: 'metric_name',
-			filterAttributeKeyDataType: DataTypes.String,
 			limit: 10,
 		},
 		{
-			enabled: isPopoverOpen,
-			refetchOnWindowFocus: false,
-			queryKey: [
-				REACT_QUERY_KEY.GET_METRICS_LIST_FILTER_VALUES,
-				'metric_name',
-				debouncedSearchString,
-				isPopoverOpen,
-			],
+			query: {
+				enabled: isPopoverOpen,
+				refetchOnWindowFocus: false,
+				queryKey: [
+					...getListMetricsQueryKey({
+						searchText: debouncedSearchString,
+						limit: 10,
+					}),
+					'search',
+					isPopoverOpen,
+				],
+			},
 		},
 	);
 
@@ -95,8 +98,8 @@ function MetricNameSearch({
 	);
 
 	const metricNameFilterValues = useMemo(
-		() => metricNameFilterValuesData?.payload?.data?.filterValues || [],
-		[metricNameFilterValuesData],
+		() => metricNameListData?.data?.metrics?.map((m) => m.metricName) || [],
+		[metricNameListData],
 	);
 
 	const handleKeyDown = useCallback(

frontend/src/container/MetricsExplorer/Summary/__tests__/MetricsTable.test.tsx

@@ -2,8 +2,8 @@
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
 import { fireEvent, render, screen } from '@testing-library/react';
+import * as metricsGeneratedAPI from 'api/generated/services/metrics';
 import { Filter } from 'api/v5/v5';
-import * as useGetMetricsListFilterValues from 'hooks/metricsExplorer/useGetMetricsListFilterValues';
 import * as useQueryBuilderOperationsHooks from 'hooks/queryBuilder/useQueryBuilderOperations';
 import store from 'store';
 import APIError from 'types/api/error';
@@ -53,21 +53,33 @@ describe('MetricsTable', () => {
 			} as any);
 	});
 
-	jest
-		.spyOn(useGetMetricsListFilterValues, 'useGetMetricsListFilterValues')
-		.mockReturnValue({
+	jest.spyOn(metricsGeneratedAPI, 'useListMetrics').mockReturnValue(({
+		data: {
 			data: {
-				statusCode: 200,
-				payload: {
-					status: 'success',
-					data: {
-						filterValues: ['metric1', 'metric2'],
+				metrics: [
+					{
+						metricName: 'metric1',
+						description: '',
+						type: '',
+						unit: '',
+						temporality: '',
+						isMonotonic: false,
 					},
-				},
+					{
+						metricName: 'metric2',
+						description: '',
+						type: '',
+						unit: '',
+						temporality: '',
+						isMonotonic: false,
+					},
+				],
 			},
-			isLoading: false,
-			isError: false,
-		} as any);
+			status: 'success',
+		},
+		isLoading: false,
+		isError: false,
+	} as unknown) as ReturnType<typeof metricsGeneratedAPI.useListMetrics>);
 
 	it('renders table with data correctly', () => {
 		render(

frontend/src/container/MetricsExplorer/Summary/utils.tsx

@@ -6,7 +6,6 @@ import {
 	MetricsexplorertypesTreemapEntryDTO,
 	MetricsexplorertypesTreemapModeDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { MetricsListPayload } from 'api/metricsExplorer/getMetricsList';
 import { Filter } from 'api/v5/v5';
 import { getUniversalNameFromMetricUnit } from 'components/YAxisUnitSelector/utils';
 
@@ -76,14 +75,6 @@ export const getMetricsTableColumns = (
 	},
 ];
 
-export const getMetricsListQuery = (): MetricsListPayload => ({
-	filters: {
-		items: [],
-		op: 'and',
-	},
-	orderBy: { columnName: 'metric_name', order: 'asc' },
-});
-
 function ValidateRowValueWrapper({
 	value,
 	children,

frontend/src/container/QueryBuilder/filters/ReduceToFilter/ReduceToFilter.test.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
+import { MetrictypesTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { ReduceOperators } from 'types/common/queryBuilder';
 
@@ -47,7 +47,7 @@ describe('ReduceToFilter', () => {
 							spaceAggregation: 'sum',
 						},
 					],
-					aggregateAttribute: { key: 'test', type: MetricType.SUM },
+					aggregateAttribute: { key: 'test', type: MetrictypesTypeDTO.sum },
 				})}
 				onChange={mockOnChange}
 			/>,
@@ -61,7 +61,7 @@ describe('ReduceToFilter', () => {
 			<ReduceToFilter
 				query={baseQuery({
 					reduceTo: ReduceOperators.MAX,
-					aggregateAttribute: { key: 'test', type: MetricType.GAUGE },
+					aggregateAttribute: { key: 'test', type: MetrictypesTypeDTO.gauge },
 				})}
 				onChange={mockOnChange}
 			/>,

frontend/src/hooks/metricsExplorer/useGetInspectMetricsDetails.ts

@@ -1,55 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import {
-	getInspectMetricsDetails,
-	InspectMetricsRequest,
-	InspectMetricsResponse,
-} from 'api/metricsExplorer/getInspectMetricsDetails';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-type UseGetInspectMetricsDetails = (
-	requestData: InspectMetricsRequest,
-	options?: UseQueryOptions<
-		SuccessResponse<InspectMetricsResponse> | ErrorResponse,
-		Error
-	>,
-	headers?: Record<string, string>,
-) => UseQueryResult<
-	SuccessResponse<InspectMetricsResponse> | ErrorResponse,
-	Error
->;
-
-export const useGetInspectMetricsDetails: UseGetInspectMetricsDetails = (
-	requestData,
-	options,
-	headers,
-) => {
-	const queryKey = useMemo(() => {
-		if (options?.queryKey && Array.isArray(options.queryKey)) {
-			return [...options.queryKey];
-		}
-
-		if (options?.queryKey && typeof options.queryKey === 'string') {
-			return options.queryKey;
-		}
-
-		return [
-			REACT_QUERY_KEY.GET_INSPECT_METRICS_DETAILS,
-			requestData.metricName,
-			requestData.start,
-			requestData.end,
-			requestData.filters,
-		];
-	}, [options?.queryKey, requestData]);
-
-	return useQuery<
-		SuccessResponse<InspectMetricsResponse> | ErrorResponse,
-		Error
-	>({
-		queryFn: ({ signal }) =>
-			getInspectMetricsDetails(requestData, signal, headers),
-		...options,
-		queryKey,
-	});
-};

frontend/src/hooks/metricsExplorer/useGetMetricDetails.ts

@@ -1,46 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import {
-	getMetricDetails,
-	MetricDetailsResponse,
-} from 'api/metricsExplorer/getMetricDetails';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-type UseGetMetricDetails = (
-	metricName: string,
-	options?: UseQueryOptions<
-		SuccessResponse<MetricDetailsResponse> | ErrorResponse,
-		Error
-	>,
-	headers?: Record<string, string>,
-) => UseQueryResult<
-	SuccessResponse<MetricDetailsResponse> | ErrorResponse,
-	Error
->;
-
-export const useGetMetricDetails: UseGetMetricDetails = (
-	metricName,
-	options,
-	headers,
-) => {
-	const queryKey = useMemo(() => {
-		if (options?.queryKey && Array.isArray(options.queryKey)) {
-			return [...options.queryKey];
-		}
-
-		if (options?.queryKey && typeof options.queryKey === 'string') {
-			return options.queryKey;
-		}
-
-		return [REACT_QUERY_KEY.GET_METRIC_DETAILS, metricName];
-	}, [options?.queryKey, metricName]);
-
-	return useQuery<SuccessResponse<MetricDetailsResponse> | ErrorResponse, Error>(
-		{
-			queryFn: ({ signal }) => getMetricDetails(metricName, signal, headers),
-			...options,
-			queryKey,
-		},
-	);
-};

frontend/src/hooks/metricsExplorer/useGetMetricsList.ts

@@ -1,47 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import {
-	getMetricsList,
-	MetricsListPayload,
-	MetricsListResponse,
-} from 'api/metricsExplorer/getMetricsList';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-type UseGetMetricsList = (
-	requestData: MetricsListPayload,
-
-	options?: UseQueryOptions<
-		SuccessResponse<MetricsListResponse> | ErrorResponse,
-		Error
-	>,
-
-	headers?: Record<string, string>,
-) => UseQueryResult<
-	SuccessResponse<MetricsListResponse> | ErrorResponse,
-	Error
->;
-
-export const useGetMetricsList: UseGetMetricsList = (
-	requestData,
-	options,
-	headers,
-) => {
-	const queryKey = useMemo(() => {
-		if (options?.queryKey && Array.isArray(options.queryKey)) {
-			return [...options.queryKey];
-		}
-
-		if (options?.queryKey && typeof options.queryKey === 'string') {
-			return options.queryKey;
-		}
-
-		return [REACT_QUERY_KEY.GET_METRICS_LIST, requestData];
-	}, [options?.queryKey, requestData]);
-
-	return useQuery<SuccessResponse<MetricsListResponse> | ErrorResponse, Error>({
-		queryFn: ({ signal }) => getMetricsList(requestData, signal, headers),
-		...options,
-		queryKey,
-	});
-};

frontend/src/hooks/metricsExplorer/useGetMetricsListFilterKeys.ts

@@ -1,48 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import {
-	getMetricsListFilterKeys,
-	GetMetricsListFilterKeysParams,
-	MetricsListFilterKeysResponse,
-} from 'api/metricsExplorer/getMetricsListFilterKeys';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-type UseGetMetricsListFilterKeys = (
-	params: GetMetricsListFilterKeysParams,
-	options?: UseQueryOptions<
-		SuccessResponse<MetricsListFilterKeysResponse> | ErrorResponse,
-		Error
-	>,
-	headers?: Record<string, string>,
-) => UseQueryResult<
-	SuccessResponse<MetricsListFilterKeysResponse> | ErrorResponse,
-	Error
->;
-
-export const useGetMetricsListFilterKeys: UseGetMetricsListFilterKeys = (
-	params,
-	options,
-	headers,
-) => {
-	const queryKey = useMemo(() => {
-		if (options?.queryKey && Array.isArray(options.queryKey)) {
-			return [...options.queryKey];
-		}
-
-		if (options?.queryKey && typeof options.queryKey === 'string') {
-			return options.queryKey;
-		}
-
-		return [REACT_QUERY_KEY.GET_METRICS_LIST_FILTER_KEYS];
-	}, [options?.queryKey]);
-
-	return useQuery<
-		SuccessResponse<MetricsListFilterKeysResponse> | ErrorResponse,
-		Error
-	>({
-		queryFn: ({ signal }) => getMetricsListFilterKeys(params, signal, headers),
-		...options,
-		queryKey,
-	});
-};

frontend/src/hooks/metricsExplorer/useGetMetricsListFilterValues.ts

@@ -1,42 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import {
-	getMetricsListFilterValues,
-	MetricsListFilterValuesPayload,
-	MetricsListFilterValuesResponse,
-} from 'api/metricsExplorer/getMetricsListFilterValues';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-type UseGetMetricsListFilterValues = (
-	payload: MetricsListFilterValuesPayload,
-	options?: UseQueryOptions<
-		SuccessResponse<MetricsListFilterValuesResponse> | ErrorResponse,
-		Error
-	>,
-	headers?: Record<string, string>,
-) => UseQueryResult<
-	SuccessResponse<MetricsListFilterValuesResponse> | ErrorResponse,
-	Error
->;
-
-export const useGetMetricsListFilterValues: UseGetMetricsListFilterValues = (
-	props,
-	options,
-	headers,
-) => {
-	const queryKey = useMemo(() => {
-		if (options?.queryKey && Array.isArray(options.queryKey)) {
-			return [...options.queryKey];
-		}
-		return [props];
-	}, [options?.queryKey, props]);
-
-	return useQuery<
-		SuccessResponse<MetricsListFilterValuesResponse> | ErrorResponse,
-		Error
-	>({
-		queryFn: ({ signal }) => getMetricsListFilterValues(props, signal, headers),
-		...options,
-		queryKey,
-	});
-};

frontend/src/hooks/metricsExplorer/useGetRelatedMetrics.ts

@@ -1,48 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import {
-	getRelatedMetrics,
-	RelatedMetricsPayload,
-	RelatedMetricsResponse,
-} from 'api/metricsExplorer/getRelatedMetrics';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-type UseGetRelatedMetrics = (
-	requestData: RelatedMetricsPayload,
-	options?: UseQueryOptions<
-		SuccessResponse<RelatedMetricsResponse> | ErrorResponse,
-		Error
-	>,
-	headers?: Record<string, string>,
-) => UseQueryResult<
-	SuccessResponse<RelatedMetricsResponse> | ErrorResponse,
-	Error
->;
-
-export const useGetRelatedMetrics: UseGetRelatedMetrics = (
-	requestData,
-	options,
-	headers,
-) => {
-	const queryKey = useMemo(() => {
-		if (options?.queryKey && Array.isArray(options.queryKey)) {
-			return [...options.queryKey];
-		}
-
-		if (options?.queryKey && typeof options.queryKey === 'string') {
-			return options.queryKey;
-		}
-
-		return [REACT_QUERY_KEY.GET_RELATED_METRICS, requestData];
-	}, [options?.queryKey, requestData]);
-
-	return useQuery<
-		SuccessResponse<RelatedMetricsResponse> | ErrorResponse,
-		Error
-	>({
-		queryFn: ({ signal }) => getRelatedMetrics(requestData, signal, headers),
-		...options,
-		queryKey,
-	});
-};

frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts

@@ -1,7 +1,6 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useDebounce } from 'react-use';
-import { getMetricsListFilterValues } from 'api/metricsExplorer/getMetricsListFilterValues';
 import { getAttributesValues } from 'api/queryBuilder/getAttributesValues';
 import { DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY } from 'constants/queryBuilder';
 import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
@@ -14,7 +13,6 @@ import {
 	getTagToken,
 	isInNInOperator,
 } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';
-import { useGetMetricsListFilterKeys } from 'hooks/metricsExplorer/useGetMetricsListFilterKeys';
 import useDebounceValue from 'hooks/useDebounce';
 import { cloneDeep, isEqual, uniqWith, unset } from 'lodash-es';
 import { IAttributeValuesResponse } from 'types/api/queryBuilder/getAttributesValues';
@@ -152,21 +150,8 @@ export const useFetchKeysAndValues = (
 		},
 	);
 
-	const {
-		data: metricsListFilterKeysData,
-		isFetching: isFetchingMetricsListFilterKeys,
-		status: fetchingMetricsListFilterKeysStatus,
-	} = useGetMetricsListFilterKeys(
-		{
-			searchText: searchKey,
-		},
-		{
-			enabled: isMetricsExplorer && isQueryEnabled && !shouldUseSuggestions,
-			queryKey: [searchKey],
-		},
-	);
-
 	function isAttributeValuesResponse(
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		payload: any,
 	): payload is IAttributeValuesResponse {
 		return (
@@ -180,14 +165,6 @@ export const useFetchKeysAndValues = (
 		);
 	}
 
-	function isMetricsListFilterValuesData(
-		payload: any,
-	): payload is { filterValues: string[] } {
-		return (
-			payload && 'filterValues' in payload && Array.isArray(payload.filterValues)
-		);
-	}
-
 	/**
 	 * Fetches the options to be displayed based on the selected value
 	 * @param value - the selected value
@@ -231,15 +208,6 @@ export const useFetchKeysAndValues = (
 						: tagValue?.toString() ?? '',
 				});
 				payload = response.payload;
-			} else if (isMetricsExplorer) {
-				const response = await getMetricsListFilterValues({
-					searchText: searchKey,
-					filterKey: filterAttributeKey?.key ?? tagKey,
-					filterAttributeKeyDataType:
-						filterAttributeKey?.dataType ?? DataTypes.EMPTY,
-					limit: 10,
-				});
-				payload = response.payload?.data;
 			} else {
 				const response = await getAttributesValues({
 					aggregateOperator: query.aggregateOperator || '',
@@ -256,18 +224,11 @@ export const useFetchKeysAndValues = (
 				payload = response.payload;
 			}
 
-			if (payload) {
-				if (isAttributeValuesResponse(payload)) {
-					const dataType = filterAttributeKey?.dataType ?? DataTypes.String;
-					const key = DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY[dataType];
-					setResults(key ? payload[key] || [] : []);
-					return;
-				}
-
-				if (isMetricsExplorer && isMetricsListFilterValuesData(payload)) {
-					setResults(payload.filterValues || []);
-					return;
-				}
+			if (payload && isAttributeValuesResponse(payload)) {
+				const dataType = filterAttributeKey?.dataType ?? DataTypes.String;
+				const key = DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY[dataType];
+				setResults(key ? payload[key] || [] : []);
+				return;
 			}
 		} catch (e) {
 			console.error(e);
@@ -305,32 +266,6 @@ export const useFetchKeysAndValues = (
 		}
 	}, [data?.payload?.attributeKeys, status]);
 
-	useEffect(() => {
-		if (
-			isMetricsExplorer &&
-			fetchingMetricsListFilterKeysStatus === 'success' &&
-			!isFetchingMetricsListFilterKeys &&
-			metricsListFilterKeysData?.payload?.data?.attributeKeys
-		) {
-			setKeys(metricsListFilterKeysData.payload.data.attributeKeys);
-			setSourceKeys((prevState) =>
-				uniqWith(
-					[
-						...(metricsListFilterKeysData.payload.data.attributeKeys ?? []),
-						...prevState,
-					],
-					isEqual,
-				),
-			);
-		}
-	}, [
-		metricsListFilterKeysData?.payload?.data?.attributeKeys,
-		fetchingMetricsListFilterKeysStatus,
-		isMetricsExplorer,
-		metricsListFilterKeysData,
-		isFetchingMetricsListFilterKeys,
-	]);
-
 	useEffect(() => {
 		if (
 			fetchingSuggestionsStatus === 'success' &&

frontend/src/types/api/metricsExplorer/v2/getMetricMetadata.ts

@@ -1,15 +0,0 @@
-import { Temporality } from 'api/metricsExplorer/getMetricDetails';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
-
-export interface MetricMetadata {
-	description: string;
-	type: MetricType;
-	unit: string;
-	temporality: Temporality;
-	isMonotonic: boolean;
-}
-
-export interface MetricMetadataResponse {
-	status: string;
-	data: MetricMetadata;
-}

pkg/alertmanager/alertmanagerserver/dispatcher.go

@@ -47,7 +47,7 @@ type Dispatcher struct {
 	receiverRoutes      map[string]*dispatch.Route
 }
 
-// We use the upstream Limits interface from Prometheus
+// We use the upstream Limits interface from Prometheus.
 type Limits = dispatch.Limits
 
 // NewDispatcher returns a new Dispatcher.
@@ -273,7 +273,7 @@ type notifyFunc func(context.Context, ...*types.Alert) bool
 
 // processAlert determines in which aggregation group the alert falls
 // and inserts it.
-// no data alert will only have ruleId and no data label
+// no data alert will only have ruleId and no data label.
 func (d *Dispatcher) processAlert(alert *types.Alert, route *dispatch.Route) {
 	ruleId := getRuleIDFromAlert(alert)
 	config, err := d.notificationManager.GetNotificationConfig(d.orgID, ruleId)
@@ -510,7 +510,7 @@ func (ag *aggrGroup) flush(notify func(...*types.Alert) bool) {
 	}
 }
 
-// unlimitedLimits provides unlimited aggregation groups for SigNoz
+// unlimitedLimits provides unlimited aggregation groups for SigNoz.
 type unlimitedLimits struct{}
 
 func (u *unlimitedLimits) MaxNumberOfAggregationGroups() int { return 0 }

pkg/alertmanager/alertmanagerserver/server_e2e_test.go

@@ -169,19 +169,20 @@ func TestEndToEndAlertManagerFlow(t *testing.T) {
 		require.Len(t, alerts, 3, "Expected 3 active alerts")
 
 		for _, alert := range alerts {
-			require.Equal(t, "high-cpu-usage", alert.Alert.Labels["ruleId"])
-			require.NotEmpty(t, alert.Alert.Labels["severity"])
-			require.Contains(t, []string{"critical", "warning"}, alert.Alert.Labels["severity"])
-			require.Equal(t, "prod-cluster", alert.Alert.Labels["cluster"])
-			require.NotEmpty(t, alert.Alert.Labels["instance"])
+			require.Equal(t, "high-cpu-usage", alert.Labels["ruleId"])
+			require.NotEmpty(t, alert.Labels["severity"])
+			require.Contains(t, []string{"critical", "warning"}, alert.Labels["severity"])
+			require.Equal(t, "prod-cluster", alert.Labels["cluster"])
+			require.NotEmpty(t, alert.Labels["instance"])
 		}
 
 		criticalAlerts := 0
 		warningAlerts := 0
 		for _, alert := range alerts {
-			if alert.Alert.Labels["severity"] == "critical" {
+			switch alert.Labels["severity"] {
+			case "critical":
 				criticalAlerts++
-			} else if alert.Alert.Labels["severity"] == "warning" {
+			case "warning":
 				warningAlerts++
 			}
 		}

pkg/alertmanager/alertmanagerserver/server_test.go

@@ -124,7 +124,7 @@ func TestServerPutAlerts(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Equal(t, 1, len(gettableAlerts))
-	assert.Equal(t, gettableAlerts[0].Alert.Labels["alertname"], "test-alert")
+	assert.Equal(t, gettableAlerts[0].Labels["alertname"], "test-alert")
 	assert.NoError(t, server.Stop(context.Background()))
 }
 

pkg/alertmanager/alertmanagerserver/telemetry.go

@@ -9,7 +9,7 @@ type DispatcherMetrics struct {
 }
 
 // NewDispatcherMetrics returns a new registered DispatchMetrics.
-// todo(aniketio-ctrl): change prom metrics to otel metrics
+// todo(aniketio-ctrl): change prom metrics to otel metrics.
 func NewDispatcherMetrics(registerLimitMetrics bool, r prometheus.Registerer) *DispatcherMetrics {
 	m := DispatcherMetrics{
 		aggrGroups: prometheus.NewGauge(

pkg/alertmanager/nfmanager/nfmanagertest/provider.go

@@ -9,7 +9,7 @@ import (
 	"github.com/prometheus/common/model"
 )
 
-// MockNotificationManager is a simple mock implementation of NotificationManager
+// MockNotificationManager is a simple mock implementation of NotificationManager.
 type MockNotificationManager struct {
 	configs      map[string]*alertmanagertypes.NotificationConfig
 	routes       map[string]*alertmanagertypes.RoutePolicy
@@ -17,7 +17,7 @@ type MockNotificationManager struct {
 	errors       map[string]error
 }
 
-// NewMock creates a new mock notification manager
+// NewMock creates a new mock notification manager.
 func NewMock() *MockNotificationManager {
 	return &MockNotificationManager{
 		configs:      make(map[string]*alertmanagertypes.NotificationConfig),

pkg/alertmanager/nfmanager/rulebasednotification/provider.go

@@ -216,7 +216,7 @@ func (r *provider) Match(ctx context.Context, orgID string, ruleID string, set m
 // the nested structure takes precedence. That means we will replace an existing leaf at any
 // intermediate path with a map so we can materialize the deeper structure.
 // TODO(srikanthccv): we need a better solution to handle this, remove the following
-// when we update the expr to support dotted keys
+// when we update the expr to support dotted keys.
 func (r *provider) convertLabelSetToEnv(ctx context.Context, labelSet model.LabelSet) map[string]interface{} {
 	env := make(map[string]interface{})
 

pkg/alertmanager/signozalertmanager/provider.go

@@ -217,7 +217,7 @@ func (provider *provider) GetConfig(ctx context.Context, orgID string) (*alertma
 }
 
 func (provider *provider) SetDefaultConfig(ctx context.Context, orgID string) error {
-	config, err := alertmanagertypes.NewDefaultConfig(provider.config.Signoz.Config.Global, provider.config.Signoz.Config.Route, orgID)
+	config, err := alertmanagertypes.NewDefaultConfig(provider.config.Signoz.Global, provider.config.Signoz.Route, orgID)
 	if err != nil {
 		return err
 	}

pkg/apiserver/signozapiserver/metricsexplorer.go

@@ -183,5 +183,43 @@ func (provider *provider) addMetricsExplorerRoutes(router *mux.Router) error {
 		return err
 	}
 
+	if err := router.Handle("/api/v2/metrics/inspect", handler.New(
+		provider.authZ.ViewAccess(provider.metricsExplorerHandler.InspectMetrics),
+		handler.OpenAPIDef{
+			ID:                  "InspectMetrics",
+			Tags:                []string{"metrics"},
+			Summary:             "Inspect raw metric data points",
+			Description:         "Returns raw time series data points for a metric within a time range (max 30 minutes). Each series includes labels and timestamp/value pairs.",
+			Request:             new(metricsexplorertypes.InspectMetricsRequest),
+			RequestContentType:  "application/json",
+			Response:            new(metricsexplorertypes.InspectMetricsResponse),
+			ResponseContentType: "application/json",
+			SuccessStatusCode:   http.StatusOK,
+			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusUnauthorized, http.StatusInternalServerError},
+			Deprecated:          false,
+			SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
+		})).Methods(http.MethodPost).GetError(); err != nil {
+		return err
+	}
+
+	if err := router.Handle("/api/v2/metrics/onboarding", handler.New(
+		provider.authZ.ViewAccess(provider.metricsExplorerHandler.GetOnboardingStatus),
+		handler.OpenAPIDef{
+			ID:                  "GetMetricsOnboardingStatus",
+			Tags:                []string{"metrics"},
+			Summary:             "Check if non-SigNoz metrics have been received",
+			Description:         "Lightweight endpoint that checks if any non-SigNoz metrics have been ingested, used for onboarding status detection",
+			Request:             nil,
+			RequestContentType:  "",
+			Response:            new(metricsexplorertypes.MetricsOnboardingResponse),
+			ResponseContentType: "application/json",
+			SuccessStatusCode:   http.StatusOK,
+			ErrorStatusCodes:    []int{http.StatusUnauthorized, http.StatusInternalServerError},
+			Deprecated:          false,
+			SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
+		})).Methods(http.MethodGet).GetError(); err != nil {
+		return err
+	}
+
 	return nil
 }

pkg/auditor/auditor.go

@@ -3,10 +3,13 @@ package auditor
 import (
 	"context"
 
+	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/types/audittypes"
 )
 
 type Auditor interface {
+	factory.ServiceWithHealthy
+
 	// Audit emits an audit event. It is fire-and-forget: callers never block on audit outcomes.
 	Audit(ctx context.Context, event audittypes.AuditEvent)
 }

pkg/auditor/noopauditor/provider.go

@@ -0,0 +1,42 @@
+package noopauditor
+
+import (
+	"context"
+
+	"github.com/SigNoz/signoz/pkg/auditor"
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/types/audittypes"
+)
+
+type provider struct {
+	healthyC chan struct{}
+	stopC    chan struct{}
+}
+
+func NewFactory() factory.ProviderFactory[auditor.Auditor, auditor.Config] {
+	return factory.NewProviderFactory(factory.MustNewName("noop"), New)
+}
+
+func New(ctx context.Context, providerSettings factory.ProviderSettings, config auditor.Config) (auditor.Auditor, error) {
+	return &provider{
+		healthyC: make(chan struct{}),
+		stopC:    make(chan struct{}),
+	}, nil
+}
+
+func (p *provider) Start(_ context.Context) error {
+	close(p.healthyC)
+	<-p.stopC
+	return nil
+}
+
+func (p *provider) Stop(_ context.Context) error {
+	close(p.stopC)
+	return nil
+}
+
+func (p *provider) Healthy() <-chan struct{} {
+	return p.healthyC
+}
+
+func (p *provider) Audit(_ context.Context, _ audittypes.AuditEvent) {}

pkg/authn/callbackauthn/googlecallbackauthn/authn.go

@@ -210,7 +210,7 @@ func (a *AuthN) fetchGoogleWorkspaceGroups(ctx context.Context, userEmail string
 	return a.getGroups(ctx, adminService, userEmail, config.FetchTransitiveGroupMembership, checkedGroups)
 }
 
-// Recursive method
+// Recursive method.
 func (a *AuthN) getGroups(ctx context.Context, adminService *admin.Service, userEmail string, fetchTransitive bool, checkedGroups map[string]struct{}) ([]string, error) {
 	var userGroups []string
 	var pageToken string

pkg/config/conf.go

@@ -27,7 +27,7 @@ func NewConf() *Conf {
 // NewConfFromMap creates a new Conf instance from a map.
 func NewConfFromMap(m map[string]any) (*Conf, error) {
 	conf := NewConf()
-	if err := conf.Koanf.Load(confmap.Provider(m, KoanfDelimiter), nil); err != nil {
+	if err := conf.Load(confmap.Provider(m, KoanfDelimiter), nil); err != nil {
 		return nil, err
 	}
 
@@ -74,7 +74,7 @@ func (conf *Conf) Unmarshal(path string, input any, tags ...string) error {
 			Result: input,
 		}
 
-		err := conf.Koanf.UnmarshalWithConf(path, input, koanf.UnmarshalConf{Tag: tag, DecoderConfig: dc})
+		err := conf.UnmarshalWithConf(path, input, koanf.UnmarshalConf{Tag: tag, DecoderConfig: dc})
 		if err != nil {
 			return err
 		}
@@ -93,7 +93,7 @@ func (conf *Conf) Set(key string, input any) error {
 	}
 
 	newConf := NewConf()
-	if err := newConf.Koanf.Load(confmap.Provider(m, KoanfDelimiter), nil); err != nil {
+	if err := newConf.Load(confmap.Provider(m, KoanfDelimiter), nil); err != nil {
 		return err
 	}
 

pkg/contextlinks/alert_link_visitor.go

@@ -40,7 +40,7 @@ type WhereClauseRewriter struct {
 // In this case, the Severity text will appear in the `labels` if it were part of the group
 // by clause, in which case we replace it with the actual value for the notification
 // i.e Severity text = WARN
-// If the Severity text is not part of the group by clause, then we add it as it is
+// If the Severity text is not part of the group by clause, then we add it as it is.
 func PrepareFilterExpression(labels map[string]string, whereClause string, groupByItems []qbtypes.GroupByKey) string {
 	if whereClause == "" && len(labels) == 0 {
 		return ""
@@ -100,12 +100,12 @@ func PrepareFilterExpression(labels map[string]string, whereClause string, group
 	return rewrittenClause
 }
 
-// Visit implements the visitor for the query rule
+// Visit implements the visitor for the query rule.
 func (r *WhereClauseRewriter) Visit(tree antlr.ParseTree) interface{} {
 	return tree.Accept(r)
 }
 
-// VisitQuery visits the query node
+// VisitQuery visits the query node.
 func (r *WhereClauseRewriter) VisitQuery(ctx *parser.QueryContext) interface{} {
 	if ctx.Expression() != nil {
 		ctx.Expression().Accept(r)
@@ -113,7 +113,7 @@ func (r *WhereClauseRewriter) VisitQuery(ctx *parser.QueryContext) interface{} {
 	return nil
 }
 
-// VisitExpression visits the expression node
+// VisitExpression visits the expression node.
 func (r *WhereClauseRewriter) VisitExpression(ctx *parser.ExpressionContext) interface{} {
 	if ctx.OrExpression() != nil {
 		ctx.OrExpression().Accept(r)
@@ -121,7 +121,7 @@ func (r *WhereClauseRewriter) VisitExpression(ctx *parser.ExpressionContext) int
 	return nil
 }
 
-// VisitOrExpression visits OR expressions
+// VisitOrExpression visits OR expressions.
 func (r *WhereClauseRewriter) VisitOrExpression(ctx *parser.OrExpressionContext) interface{} {
 	for i, andExpr := range ctx.AllAndExpression() {
 		if i > 0 {
@@ -132,7 +132,7 @@ func (r *WhereClauseRewriter) VisitOrExpression(ctx *parser.OrExpressionContext)
 	return nil
 }
 
-// VisitAndExpression visits AND expressions
+// VisitAndExpression visits AND expressions.
 func (r *WhereClauseRewriter) VisitAndExpression(ctx *parser.AndExpressionContext) interface{} {
 	unaryExprs := ctx.AllUnaryExpression()
 	for i, unaryExpr := range unaryExprs {
@@ -150,7 +150,7 @@ func (r *WhereClauseRewriter) VisitAndExpression(ctx *parser.AndExpressionContex
 	return nil
 }
 
-// VisitUnaryExpression visits unary expressions (with optional NOT)
+// VisitUnaryExpression visits unary expressions (with optional NOT).
 func (r *WhereClauseRewriter) VisitUnaryExpression(ctx *parser.UnaryExpressionContext) interface{} {
 	if ctx.NOT() != nil {
 		r.rewritten.WriteString("NOT ")
@@ -161,7 +161,7 @@ func (r *WhereClauseRewriter) VisitUnaryExpression(ctx *parser.UnaryExpressionCo
 	return nil
 }
 
-// VisitPrimary visits primary expressions
+// VisitPrimary visits primary expressions.
 func (r *WhereClauseRewriter) VisitPrimary(ctx *parser.PrimaryContext) interface{} {
 	if ctx.LPAREN() != nil && ctx.RPAREN() != nil {
 		r.rewritten.WriteString("(")
@@ -183,7 +183,7 @@ func (r *WhereClauseRewriter) VisitPrimary(ctx *parser.PrimaryContext) interface
 	return nil
 }
 
-// VisitComparison visits comparison expressions
+// VisitComparison visits comparison expressions.
 func (r *WhereClauseRewriter) VisitComparison(ctx *parser.ComparisonContext) interface{} {
 	if ctx.Key() == nil {
 		return nil
@@ -304,7 +304,7 @@ func (r *WhereClauseRewriter) VisitComparison(ctx *parser.ComparisonContext) int
 	return nil
 }
 
-// VisitInClause visits IN clauses
+// VisitInClause visits IN clauses.
 func (r *WhereClauseRewriter) VisitInClause(ctx *parser.InClauseContext) interface{} {
 	r.rewritten.WriteString("IN ")
 	if ctx.LPAREN() != nil {
@@ -325,7 +325,7 @@ func (r *WhereClauseRewriter) VisitInClause(ctx *parser.InClauseContext) interfa
 	return nil
 }
 
-// VisitNotInClause visits NOT IN clauses
+// VisitNotInClause visits NOT IN clauses.
 func (r *WhereClauseRewriter) VisitNotInClause(ctx *parser.NotInClauseContext) interface{} {
 	r.rewritten.WriteString("NOT IN ")
 	if ctx.LPAREN() != nil {
@@ -346,7 +346,7 @@ func (r *WhereClauseRewriter) VisitNotInClause(ctx *parser.NotInClauseContext) i
 	return nil
 }
 
-// VisitValueList visits value lists
+// VisitValueList visits value lists.
 func (r *WhereClauseRewriter) VisitValueList(ctx *parser.ValueListContext) interface{} {
 	values := ctx.AllValue()
 	for i, val := range values {
@@ -358,13 +358,13 @@ func (r *WhereClauseRewriter) VisitValueList(ctx *parser.ValueListContext) inter
 	return nil
 }
 
-// VisitFullText visits full text expressions
+// VisitFullText visits full text expressions.
 func (r *WhereClauseRewriter) VisitFullText(ctx *parser.FullTextContext) interface{} {
 	r.rewritten.WriteString(ctx.GetText())
 	return nil
 }
 
-// VisitFunctionCall visits function calls
+// VisitFunctionCall visits function calls.
 func (r *WhereClauseRewriter) VisitFunctionCall(ctx *parser.FunctionCallContext) interface{} {
 	// Write function name
 	if ctx.HAS() != nil {
@@ -385,7 +385,7 @@ func (r *WhereClauseRewriter) VisitFunctionCall(ctx *parser.FunctionCallContext)
 	return nil
 }
 
-// VisitFunctionParamList visits function parameter lists
+// VisitFunctionParamList visits function parameter lists.
 func (r *WhereClauseRewriter) VisitFunctionParamList(ctx *parser.FunctionParamListContext) interface{} {
 	params := ctx.AllFunctionParam()
 	for i, param := range params {
@@ -397,7 +397,7 @@ func (r *WhereClauseRewriter) VisitFunctionParamList(ctx *parser.FunctionParamLi
 	return nil
 }
 
-// VisitFunctionParam visits function parameters
+// VisitFunctionParam visits function parameters.
 func (r *WhereClauseRewriter) VisitFunctionParam(ctx *parser.FunctionParamContext) interface{} {
 	if ctx.Key() != nil {
 		ctx.Key().Accept(r)
@@ -409,7 +409,7 @@ func (r *WhereClauseRewriter) VisitFunctionParam(ctx *parser.FunctionParamContex
 	return nil
 }
 
-// VisitArray visits array expressions
+// VisitArray visits array expressions.
 func (r *WhereClauseRewriter) VisitArray(ctx *parser.ArrayContext) interface{} {
 	r.rewritten.WriteString("[")
 	if ctx.ValueList() != nil {
@@ -419,13 +419,13 @@ func (r *WhereClauseRewriter) VisitArray(ctx *parser.ArrayContext) interface{} {
 	return nil
 }
 
-// VisitValue visits value expressions
+// VisitValue visits value expressions.
 func (r *WhereClauseRewriter) VisitValue(ctx *parser.ValueContext) interface{} {
 	r.rewritten.WriteString(ctx.GetText())
 	return nil
 }
 
-// VisitKey visits key expressions
+// VisitKey visits key expressions.
 func (r *WhereClauseRewriter) VisitKey(ctx *parser.KeyContext) interface{} {
 	r.keysSeen[ctx.GetText()] = struct{}{}
 	r.rewritten.WriteString(ctx.GetText())
@@ -438,7 +438,7 @@ func (r *WhereClauseRewriter) isKeyInWhereClause(key string) bool {
 }
 
 // escapeValueIfNeeded adds single quotes to string values and escapes single quotes within them
-// Numeric and boolean values are returned as-is
+// Numeric and boolean values are returned as-is.
 func escapeValueIfNeeded(value string) string {
 	// Check if it's a number
 	if _, err := fmt.Sscanf(value, "%f", new(float64)); err == nil {

pkg/contextlinks/links.go

@@ -146,7 +146,7 @@ func PrepareLinksToLogs(start, end time.Time, filterItems []v3.FilterItem) strin
 // In this case, the Severity text will appear in the `lbls` if it were part of the group
 // by clause, in which case we replace it with the actual value for the notification
 // i.e Severity text = WARN
-// If the Severity text is not part of the group by clause, then we add it as it is
+// If the Severity text is not part of the group by clause, then we add it as it is.
 func PrepareFilters(labels map[string]string, whereClauseItems []v3.FilterItem, groupByItems []v3.AttributeKey, keys map[string]v3.AttributeKey) []v3.FilterItem {
 	filterItems := make([]v3.FilterItem, 0)
 

pkg/contextlinks/types.go

@@ -5,7 +5,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/ruletypes"
 )
 
-// TODO(srikanthccv): Fix the URL management
+// TODO(srikanthccv): Fix the URL management.
 type URLShareableTimeRange struct {
 	Start    int64 `json:"start"`
 	End      int64 `json:"end"`

pkg/errors/errors.go

@@ -155,7 +155,7 @@ func (b *base) WithAdditional(a ...string) *base {
 // Otherwise, it returns TypeInternal, the original error string
 // and the error itself.
 //
-//lint:ignore ST1008 we want to return arguments in the 'TCMEUA' order of the struct
+//nolint:staticcheck // ST1008: intentional return order matching struct field order (TCMEUA)
 func Unwrapb(cause error) (typ, Code, string, error, string, []string) {
 	base, ok := cause.(*base)
 	if ok {

pkg/errors/type.go

@@ -16,7 +16,7 @@ var (
 	TypeLicenseUnavailable     = typ{"license-unavailable"}
 )
 
-// Defines custom error types
+// Defines custom error types.
 type typ struct{ s string }
 
 func (t typ) String() string {

pkg/flagger/flagger.go

@@ -115,7 +115,7 @@ func (f *flagger) Boolean(ctx context.Context, flag featuretypes.Name, evalCtx f
 	for _, client := range f.clients {
 		value, err := client.BooleanValue(ctx, flag.String(), defaultValue, evalCtx.Ctx())
 		if err != nil {
-			f.settings.Logger().ErrorContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Name()))
+			f.settings.Logger().ErrorContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Domain()))
 			continue
 		}
 
@@ -148,7 +148,7 @@ func (f *flagger) String(ctx context.Context, flag featuretypes.Name, evalCtx fe
 	for _, client := range f.clients {
 		value, err := client.StringValue(ctx, flag.String(), defaultValue, evalCtx.Ctx())
 		if err != nil {
-			f.settings.Logger().WarnContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Name()))
+			f.settings.Logger().WarnContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Domain()))
 			continue
 		}
 
@@ -181,7 +181,7 @@ func (f *flagger) Float(ctx context.Context, flag featuretypes.Name, evalCtx fea
 	for _, client := range f.clients {
 		value, err := client.FloatValue(ctx, flag.String(), defaultValue, evalCtx.Ctx())
 		if err != nil {
-			f.settings.Logger().WarnContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Name()))
+			f.settings.Logger().WarnContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Domain()))
 			continue
 		}
 
@@ -214,7 +214,7 @@ func (f *flagger) Int(ctx context.Context, flag featuretypes.Name, evalCtx featu
 	for _, client := range f.clients {
 		value, err := client.IntValue(ctx, flag.String(), defaultValue, evalCtx.Ctx())
 		if err != nil {
-			f.settings.Logger().WarnContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Name()))
+			f.settings.Logger().WarnContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Domain()))
 			continue
 		}
 
@@ -247,7 +247,7 @@ func (f *flagger) Object(ctx context.Context, flag featuretypes.Name, evalCtx fe
 	for _, client := range f.clients {
 		value, err := client.ObjectValue(ctx, flag.String(), defaultValue, evalCtx.Ctx())
 		if err != nil {
-			f.settings.Logger().WarnContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Name()))
+			f.settings.Logger().WarnContext(ctx, "failed to get value from client", errors.Attr(err), slog.Any("flag", flag), slog.String("client", client.Metadata().Domain()))
 			continue
 		}
 

pkg/http/handler/openapi.go

@@ -17,7 +17,7 @@ type OpenAPIExample struct {
 	Value       any
 }
 
-// Def is the definition of an OpenAPI operation
+// Def is the definition of an OpenAPI operation.
 type OpenAPIDef struct {
 	ID                  string
 	Tags                []string
@@ -40,7 +40,7 @@ type OpenAPISecurityScheme struct {
 	Scopes []string
 }
 
-// Collector is a collector for OpenAPI operations
+// OpenAPICollector is a collector for OpenAPI operations.
 type OpenAPICollector struct {
 	collector *openapi.Collector
 }

pkg/http/middleware/middleware.go

@@ -6,15 +6,15 @@ const (
 	pkgname string = "go.signoz.io/pkg/http/middleware"
 )
 
-// Wrapper is an interface implemented by all middlewares
+// Wrapper is an interface implemented by all middlewares.
 type Wrapper interface {
 	Wrap(http.Handler) http.Handler
 }
 
-// WrapperFunc is to Wrapper as http.HandlerFunc is to http.Handler
+// WrapperFunc is to Wrapper as http.HandlerFunc is to http.Handler.
 type WrapperFunc func(http.Handler) http.Handler
 
-// WrapperFunc implements Wrapper
+// WrapperFunc implements Wrapper.
 func (m WrapperFunc) Wrap(next http.Handler) http.Handler {
 	return m(next)
 }

pkg/http/middleware/response.go

@@ -46,7 +46,7 @@ type nonFlushingBadResponseLoggingWriter struct {
 	writeError    error // The error returned when downstream Write() fails.
 }
 
-// Extends nonFlushingBadResponseLoggingWriter that implements http.Flusher
+// Extends nonFlushingBadResponseLoggingWriter that implements http.Flusher.
 type flushingBadResponseLoggingWriter struct {
 	nonFlushingBadResponseLoggingWriter
 	f http.Flusher

pkg/http/render/status.go

@@ -5,7 +5,7 @@ var (
 	StatusError          = status{"error"}
 )
 
-// Defines custom error types
+// Defines custom error types.
 type status struct{ s string }
 
 func (s status) String() string {

pkg/instrumentation/instrumentation.go

@@ -25,7 +25,7 @@ type Instrumentation interface {
 	ToProviderSettings() factory.ProviderSettings
 }
 
-// conversion functions required for using zap interface with underlying slog provider
+// ZapToSlogConverter defines conversion functions required for using zap interface with underlying slog provider.
 type ZapToSlogConverter interface {
 	FieldsToAttributes(fields []zap.Field) []any
 }

pkg/instrumentation/loghandler/loghandler.go

@@ -5,10 +5,10 @@ import (
 	"log/slog"
 )
 
-// LogHandlerFunc is to LogHandler as http.HandlerFunc is to http.Handler
+// LogHandlerFunc is to LogHandler as http.HandlerFunc is to http.Handler.
 type LogHandlerFunc func(ctx context.Context, r slog.Record) error
 
-// LogHandlerFunc implements LogHandler
+// LogHandlerFunc implements LogHandler.
 func (m LogHandlerFunc) Handle(ctx context.Context, r slog.Record) error {
 	return m(ctx, r)
 }
@@ -17,7 +17,7 @@ type LogHandler interface {
 	Handle(ctx context.Context, r slog.Record) error
 }
 
-// Wrapper is an interface implemented by all log handlers
+// Wrapper is an interface implemented by all log handlers.
 type Wrapper interface {
 	Wrap(LogHandler) LogHandler
 }

pkg/instrumentation/metric.go

@@ -22,7 +22,7 @@ import (
 )
 
 // readerWithServer wraps a metric reader with an HTTP server for proper shutdown
-// This mirrors the upstream contrib/config implementation
+// This mirrors the upstream contrib/config implementation.
 type readerWithServer struct {
 	sdkmetric.Reader
 	server *http.Server
@@ -36,7 +36,7 @@ func (rws readerWithServer) Shutdown(ctx context.Context) error {
 }
 
 // prometheusReaderWithCustomRegistry creates a Prometheus metric reader using a custom registry
-// This is based on the upstream contrib/config implementation but allows passing a custom registry
+// This is based on the upstream contrib/config implementation but allows passing a custom registry.
 func prometheusReaderWithCustomRegistry(ctx context.Context, prometheusConfig *contribsdkconfig.Prometheus, customRegistry *prometheus.Registry) (sdkmetric.Reader, error) {
 	var opts []otelprom.Option
 	if prometheusConfig.Host == nil {
@@ -49,10 +49,10 @@ func prometheusReaderWithCustomRegistry(ctx context.Context, prometheusConfig *c
 		opts = append(opts, otelprom.WithoutScopeInfo())
 	}
 	if prometheusConfig.WithoutTypeSuffix != nil && *prometheusConfig.WithoutTypeSuffix {
-		opts = append(opts, otelprom.WithoutCounterSuffixes())
+		opts = append(opts, otelprom.WithoutCounterSuffixes()) //nolint:staticcheck // SA1019: WithTranslationStrategy does not provide equivalent per-option granularity
 	}
 	if prometheusConfig.WithoutUnits != nil && *prometheusConfig.WithoutUnits {
-		opts = append(opts, otelprom.WithoutUnits())
+		opts = append(opts, otelprom.WithoutUnits()) //nolint:staticcheck // SA1019: WithTranslationStrategy does not provide equivalent per-option granularity
 	}
 	if prometheusConfig.WithResourceConstantLabels != nil {
 		if prometheusConfig.WithResourceConstantLabels.Included != nil {
@@ -109,11 +109,11 @@ func prometheusReaderWithCustomRegistry(ctx context.Context, prometheusConfig *c
 
 type shutdownFunc func(context.Context) error
 
-// noopShutdown is a no-op shutdown function
+// noopShutdown is a no-op shutdown function.
 func noopShutdown(context.Context) error { return nil }
 
 // meterProviderWithCustomRegistry creates a meter provider using contrib config approach
-// but with custom Prometheus registry injection
+// but with custom Prometheus registry injection.
 func meterProviderWithCustomRegistry(ctx context.Context, meterProviderConfig *contribsdkconfig.MeterProvider, res *resource.Resource, customRegistry *prometheus.Registry) (metric.MeterProvider, shutdownFunc, error) {
 	if meterProviderConfig == nil {
 		return noop.NewMeterProvider(), noopShutdown, nil
@@ -140,7 +140,7 @@ func meterProviderWithCustomRegistry(ctx context.Context, meterProviderConfig *c
 	return mp, mp.Shutdown, nil
 }
 
-// metricReaderWithCustomRegistry creates metric readers with custom Prometheus registry support
+// metricReaderWithCustomRegistry creates metric readers with custom Prometheus registry support.
 func metricReaderWithCustomRegistry(ctx context.Context, r contribsdkconfig.MetricReader, customRegistry *prometheus.Registry) (sdkmetric.Reader, error) {
 	if r.Periodic != nil && r.Pull != nil {
 		return nil, errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "must not specify multiple metric reader type")
@@ -152,7 +152,7 @@ func metricReaderWithCustomRegistry(ctx context.Context, r contribsdkconfig.Metr
 	return nil, errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "no valid metric reader")
 }
 
-// pullReaderWithCustomRegistry creates pull readers with custom Prometheus registry support
+// pullReaderWithCustomRegistry creates pull readers with custom Prometheus registry support.
 func pullReaderWithCustomRegistry(ctx context.Context, exporter contribsdkconfig.MetricExporter, customRegistry *prometheus.Registry) (sdkmetric.Reader, error) {
 	if exporter.Prometheus != nil {
 		return prometheusReaderWithCustomRegistry(ctx, exporter.Prometheus, customRegistry)

pkg/modules/apdex/implapdex/module.go

@@ -63,7 +63,7 @@ func (module *module) Get(ctx context.Context, orgID string, services []string)
 
 func (module *module) Set(ctx context.Context, orgID string, apdexSettings *apdextypes.Settings) error {
 	apdexSettings.OrgID = orgID
-	apdexSettings.Identifiable.ID = valuer.GenerateUUID()
+	apdexSettings.ID = valuer.GenerateUUID()
 
 	_, err := module.
 		sqlstore.

pkg/modules/dashboard/impldashboard/module.go

@@ -14,7 +14,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
-	"github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
@@ -211,7 +210,7 @@ func (module *module) MustGetManagedRoleTransactions() map[string][]*authtypes.T
 	return nil
 }
 
-// not supported
+// CreatePublic is not supported.
 func (module *module) CreatePublic(ctx context.Context, orgID valuer.UUID, publicDashboard *dashboardtypes.PublicDashboard) error {
 	return errors.Newf(errors.TypeUnsupported, dashboardtypes.ErrCodePublicDashboardUnsupported, "not implemented")
 }
@@ -224,7 +223,7 @@ func (module *module) GetDashboardByPublicID(_ context.Context, _ valuer.UUID) (
 	return nil, errors.Newf(errors.TypeUnsupported, dashboardtypes.ErrCodePublicDashboardUnsupported, "not implemented")
 }
 
-func (module *module) GetPublicWidgetQueryRange(context.Context, valuer.UUID, uint64, uint64, uint64) (*querybuildertypesv5.QueryRangeResponse, error) {
+func (module *module) GetPublicWidgetQueryRange(context.Context, valuer.UUID, uint64, uint64, uint64) (*qbtypes.QueryRangeResponse, error) {
 	return nil, errors.Newf(errors.TypeUnsupported, dashboardtypes.ErrCodePublicDashboardUnsupported, "not implemented")
 }
 
@@ -240,7 +239,7 @@ func (module *module) DeletePublic(_ context.Context, _ valuer.UUID, _ valuer.UU
 	return errors.Newf(errors.TypeUnsupported, dashboardtypes.ErrCodePublicDashboardUnsupported, "not implemented")
 }
 
-// checkBuilderQueriesForMetricNames checks builder.queryData[] for aggregations[].metricName
+// checkBuilderQueriesForMetricNames checks builder.queryData[] for aggregations[].metricName.
 func (module *module) checkBuilderQueriesForMetricNames(query map[string]interface{}, metricNames []string, foundMetrics map[string]bool) {
 	builder, ok := query["builder"].(map[string]interface{})
 	if !ok {
@@ -287,7 +286,7 @@ func (module *module) checkBuilderQueriesForMetricNames(query map[string]interfa
 	}
 }
 
-// checkClickHouseQueriesForMetricNames checks clickhouse_sql[] array for metric names in query strings
+// checkClickHouseQueriesForMetricNames checks clickhouse_sql[] array for metric names in query strings.
 func (module *module) checkClickHouseQueriesForMetricNames(ctx context.Context, query map[string]interface{}, metricNames []string, foundMetrics map[string]bool) {
 	clickhouseSQL, ok := query["clickhouse_sql"].([]interface{})
 	if !ok {
@@ -322,7 +321,7 @@ func (module *module) checkClickHouseQueriesForMetricNames(ctx context.Context,
 	}
 }
 
-// checkPromQLQueriesForMetricNames checks promql[] array for metric names in query strings
+// checkPromQLQueriesForMetricNames checks promql[] array for metric names in query strings.
 func (module *module) checkPromQLQueriesForMetricNames(ctx context.Context, query map[string]interface{}, metricNames []string, foundMetrics map[string]bool) {
 	promQL, ok := query["promql"].([]interface{})
 	if !ok {

pkg/modules/metricsexplorer/implmetricsexplorer/handler.go

@@ -300,6 +300,41 @@ func (h *handler) GetMetricAttributes(rw http.ResponseWriter, req *http.Request)
 	render.Success(rw, http.StatusOK, out)
 }
 
+func (h *handler) InspectMetrics(rw http.ResponseWriter, req *http.Request) {
+	claims, err := authtypes.ClaimsFromContext(req.Context())
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	var in metricsexplorertypes.InspectMetricsRequest
+	if err := binding.JSON.BindBody(req.Body, &in); err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	orgID := valuer.MustNewUUID(claims.OrgID)
+	out, err := h.module.InspectMetrics(req.Context(), orgID, &in)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	render.Success(rw, http.StatusOK, out)
+}
+
+func (h *handler) GetOnboardingStatus(rw http.ResponseWriter, req *http.Request) {
+	hasMetrics, err := h.module.HasNonSigNozMetrics(req.Context())
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	render.Success(rw, http.StatusOK, &metricsexplorertypes.MetricsOnboardingResponse{
+		HasMetrics: hasMetrics,
+	})
+}
+
 func (h *handler) checkMetricExists(ctx context.Context, orgID valuer.UUID, metricName string) error {
 	exists, err := h.module.CheckMetricExists(ctx, orgID, metricName)
 	if err != nil {

pkg/modules/metricsexplorer/implmetricsexplorer/helpers.go

@@ -9,7 +9,7 @@ import (
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 )
 
-// used for mapping the sqlColumns via orderBy
+// used for mapping the sqlColumns via orderBy.
 const (
 	sqlColumnTimeSeries = "timeseries"
 	sqlColumnSamples    = "samples"

pkg/modules/metricsexplorer/implmetricsexplorer/module.go

@@ -3,6 +3,7 @@ package implmetricsexplorer
 import (
 	"context"
 	"database/sql"
+	"encoding/json"
 	"fmt"
 	"log/slog"
 	"strings"
@@ -59,7 +60,7 @@ func NewModule(ts telemetrystore.TelemetryStore, telemetryMetadataStore telemetr
 	}
 }
 
-// TODO(srikanthccv): use metadata store to fetch metric metadata
+// TODO(srikanthccv): use metadata store to fetch metric metadata.
 func (m *module) ListMetrics(ctx context.Context, orgID valuer.UUID, params *metricsexplorertypes.ListMetricsParams) (*metricsexplorertypes.ListMetricsResponse, error) {
 	ctx = m.withMetricsExplorerContext(ctx, "ListMetrics")
 
@@ -502,6 +503,157 @@ func (m *module) CheckMetricExists(ctx context.Context, orgID valuer.UUID, metri
 	return exists, nil
 }
 
+func (m *module) HasNonSigNozMetrics(ctx context.Context) (bool, error) {
+	ctx = m.withMetricsExplorerContext(ctx, "HasNonSigNozMetrics")
+
+	sb := sqlbuilder.NewSelectBuilder()
+	sb.Select("count(*) > 0")
+	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.TimeseriesV41weekTableName))
+	sb.Where("metric_name NOT LIKE 'signoz_%'")
+
+	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+
+	db := m.telemetryStore.ClickhouseDB()
+	var hasMetrics bool
+	valueCtx := ctxtypes.SetClickhouseMaxThreads(ctx, m.config.TelemetryStore.Threads)
+
+	err := db.QueryRow(valueCtx, query, args...).Scan(&hasMetrics)
+	if err != nil {
+		return false, errors.WrapInternalf(err, errors.CodeInternal, "failed to check for non-signoz metrics")
+	}
+
+	return hasMetrics, nil
+}
+
+func (m *module) InspectMetrics(
+	ctx context.Context,
+	orgID valuer.UUID,
+	req *metricsexplorertypes.InspectMetricsRequest,
+) (*metricsexplorertypes.InspectMetricsResponse, error) {
+	ctx = m.withMetricsExplorerContext(ctx, "InspectMetrics")
+
+	if err := req.Validate(); err != nil {
+		return nil, err
+	}
+
+	start := uint64(req.Start)
+	end := uint64(req.End)
+
+	filterWhereClause, err := m.buildFilterClause(ctx, req.Filter, req.Start, req.End)
+	if err != nil {
+		return nil, err
+	}
+
+	tsStart, _, tsTable, _ := telemetrymetrics.WhichTSTableToUse(start, end, nil)
+	tsSb := sqlbuilder.NewSelectBuilder()
+	tsSb.Select("fingerprint", "labels")
+	tsSb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, tsTable))
+	tsSb.Where(
+		tsSb.E("metric_name", req.MetricName),
+		tsSb.GE("unix_milli", tsStart),
+		tsSb.LE("unix_milli", end),
+	)
+	if filterWhereClause != nil {
+		tsSb.AddWhereClause(sqlbuilder.CopyWhereClause(filterWhereClause))
+	}
+	tsSb.GroupBy("fingerprint", "labels")
+	tsSb.Limit(50)
+
+	tsQuery, tsArgs := tsSb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	db := m.telemetryStore.ClickhouseDB()
+	valueCtx := ctxtypes.SetClickhouseMaxThreads(ctx, m.config.TelemetryStore.Threads)
+
+	tsRows, err := db.Query(valueCtx, tsQuery, tsArgs...)
+	if err != nil {
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to query time series for inspect")
+	}
+	defer tsRows.Close()
+
+	type tsInfo struct {
+		fingerprint uint64
+		labels      map[string]string
+	}
+	var tsList []tsInfo
+	var fingerprints []any
+
+	for tsRows.Next() {
+		var fp uint64
+		var labelsStr string
+		if err := tsRows.Scan(&fp, &labelsStr); err != nil {
+			return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to scan time series row")
+		}
+		parsedLabels := make(map[string]string)
+		if err := json.Unmarshal([]byte(labelsStr), &parsedLabels); err != nil {
+			parsedLabels = map[string]string{}
+		}
+		tsList = append(tsList, tsInfo{fingerprint: fp, labels: parsedLabels})
+		fingerprints = append(fingerprints, fp)
+	}
+	if err := tsRows.Err(); err != nil {
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to iterate time series rows")
+	}
+
+	if len(fingerprints) == 0 {
+		return &metricsexplorertypes.InspectMetricsResponse{Series: []*qbtypes.TimeSeries{}}, nil
+	}
+
+	samplesSb := sqlbuilder.NewSelectBuilder()
+	samplesSb.Select("fingerprint", "unix_milli", "value")
+	samplesSb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.SamplesV4TableName))
+	samplesSb.Where(
+		samplesSb.In("fingerprint", fingerprints...),
+		samplesSb.E("metric_name", req.MetricName),
+		samplesSb.GE("unix_milli", int64(start)),
+		samplesSb.LE("unix_milli", int64(end)),
+	)
+	samplesSb.OrderBy("fingerprint", "unix_milli")
+
+	samplesQuery, samplesArgs := samplesSb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	samplesRows, err := db.Query(valueCtx, samplesQuery, samplesArgs...)
+	if err != nil {
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to query samples for inspect")
+	}
+	defer samplesRows.Close()
+
+	valuesMap := make(map[uint64][]*qbtypes.TimeSeriesValue)
+	for samplesRows.Next() {
+		var fp uint64
+		var unixMilli int64
+		var value float64
+		if err := samplesRows.Scan(&fp, &unixMilli, &value); err != nil {
+			return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to scan samples row")
+		}
+		valuesMap[fp] = append(valuesMap[fp], &qbtypes.TimeSeriesValue{
+			Timestamp: unixMilli,
+			Value:     value,
+		})
+	}
+	if err := samplesRows.Err(); err != nil {
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to iterate samples rows")
+	}
+
+	series := make([]*qbtypes.TimeSeries, 0, len(tsList))
+	for _, ts := range tsList {
+		labels := make([]*qbtypes.Label, 0, len(ts.labels))
+		for k, v := range ts.labels {
+			labels = append(labels, &qbtypes.Label{
+				Key:   telemetrytypes.TelemetryFieldKey{Name: k},
+				Value: v,
+			})
+		}
+		values := valuesMap[ts.fingerprint]
+		if values == nil {
+			values = []*qbtypes.TimeSeriesValue{}
+		}
+		series = append(series, &qbtypes.TimeSeries{
+			Labels: labels,
+			Values: values,
+		})
+	}
+
+	return &metricsexplorertypes.InspectMetricsResponse{Series: series}, nil
+}
+
 func (m *module) fetchMetadataFromCache(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string]*metricsexplorertypes.MetricMetadata, []string) {
 	hits := make(map[string]*metricsexplorertypes.MetricMetadata)
 	misses := make([]string, 0)
@@ -511,7 +663,7 @@ func (m *module) fetchMetadataFromCache(ctx context.Context, orgID valuer.UUID,
 		if err := m.cache.Get(ctx, orgID, cacheKey, &cachedMetadata); err == nil {
 			hits[metricName] = &cachedMetadata
 		} else {
-			m.logger.WarnContext(ctx, "cache miss for metric metadata", slog.String("metric_name", metricName), errors.Attr(err))
+			m.logger.WarnContext(ctx, "cache miss for metric metadata", slog.String("metric_name", metricName))
 			misses = append(misses, metricName)
 		}
 	}

pkg/modules/metricsexplorer/metricsexplorer.go

@@ -19,6 +19,8 @@ type Handler interface {
 	GetMetricAlerts(http.ResponseWriter, *http.Request)
 	GetMetricDashboards(http.ResponseWriter, *http.Request)
 	GetMetricHighlights(http.ResponseWriter, *http.Request)
+	GetOnboardingStatus(http.ResponseWriter, *http.Request)
+	InspectMetrics(http.ResponseWriter, *http.Request)
 }
 
 // Module represents the metrics module interface.
@@ -33,4 +35,6 @@ type Module interface {
 	GetMetricDashboards(ctx context.Context, orgID valuer.UUID, metricName string) (*metricsexplorertypes.MetricDashboardsResponse, error)
 	GetMetricHighlights(ctx context.Context, orgID valuer.UUID, metricName string) (*metricsexplorertypes.MetricHighlightsResponse, error)
 	GetMetricAttributes(ctx context.Context, orgID valuer.UUID, req *metricsexplorertypes.MetricAttributesRequest) (*metricsexplorertypes.MetricAttributesResponse, error)
+	HasNonSigNozMetrics(ctx context.Context) (bool, error)
+	InspectMetrics(ctx context.Context, orgID valuer.UUID, req *metricsexplorertypes.InspectMetricsRequest) (*metricsexplorertypes.InspectMetricsResponse, error)
 }

pkg/modules/quickfilter/implquickfilter/module.go

@@ -19,7 +19,7 @@ func NewModule(store quickfiltertypes.QuickFilterStore) quickfilter.Module {
 	return &module{store: store}
 }
 
-// GetQuickFilters returns all quick filters for an organization
+// GetQuickFilters returns all quick filters for an organization.
 func (module *module) GetQuickFilters(ctx context.Context, orgID valuer.UUID) ([]*quickfiltertypes.SignalFilters, error) {
 	storedFilters, err := module.store.Get(ctx, orgID)
 	if err != nil {
@@ -38,7 +38,7 @@ func (module *module) GetQuickFilters(ctx context.Context, orgID valuer.UUID) ([
 	return result, nil
 }
 
-// GetSignalFilters returns quick filters for a specific signal in an organization
+// GetSignalFilters returns quick filters for a specific signal in an organization.
 func (m *module) GetSignalFilters(ctx context.Context, orgID valuer.UUID, signal quickfiltertypes.Signal) (*quickfiltertypes.SignalFilters, error) {
 	storedFilter, err := m.store.GetBySignal(ctx, orgID, signal.StringValue())
 	if err != nil {
@@ -62,7 +62,7 @@ func (m *module) GetSignalFilters(ctx context.Context, orgID valuer.UUID, signal
 	return signalFilter, nil
 }
 
-// UpdateQuickFilters updates quick filters for a specific signal in an organization
+// UpdateQuickFilters updates quick filters for a specific signal in an organization.
 func (module *module) UpdateQuickFilters(ctx context.Context, orgID valuer.UUID, signal quickfiltertypes.Signal, filters []v3.AttributeKey) error {
 	// Validate each filter
 	for _, filter := range filters {

pkg/modules/rawdataexport/implrawdataexport/constants.go

@@ -5,14 +5,14 @@ import (
 )
 
 const (
-	// Row Limits
+	// Row Limits.
 	MaxExportRowCountLimit     = 50_000 // 50k
 	DefaultExportRowCountLimit = 10_000 // 10k
 
-	// Data Limits
+	// Data Limits.
 	MaxExportBytesLimit = 10 * 1024 * 1024 * 1024 // 10 GB
 
-	// Query Limits
+	// Query Limits.
 	ChunkSize                         = 5_000 // 5k
 	ClickhouseExportRawDataMaxThreads = 2
 	ClickhouseExportRawDataTimeout    = 10 * time.Minute

pkg/modules/rawdataexport/implrawdataexport/handler.go

@@ -78,7 +78,7 @@ func (handler *handler) ExportRawData(rw http.ResponseWriter, r *http.Request) {
 	rw.Header().Set("X-Response-Complete", strconv.FormatBool(isComplete))
 }
 
-// validateSpecForExport validates query specs
+// validateSpecForExport validates query specs.
 func validateSpecForExport(req *qbtypes.QueryRangeRequest) error {
 
 	queries := req.CompositeQuery.Queries
@@ -256,7 +256,7 @@ func constructCSVHeaderFromQueryResponse(data map[string]any) []string {
 
 // sanitizeForCSV sanitizes a string for CSV by prefixing a single quote if the first non-whitespace rune is '=', '+', '-', or '@'.
 // Excel and sheets remove these leading single quote when displaying the cell content.
-// TODO: will revisit this in a future PR
+// TODO: will revisit this in a future PR.
 func sanitizeForCSV(s string) string {
 	// Find first non-whitespace rune
 	i := 0

pkg/modules/services/implservices/module.go

@@ -34,7 +34,7 @@ func NewModule(q querier.Querier, ts telemetrystore.TelemetryStore) services.Mod
 	}
 }
 
-// FetchTopLevelOperations returns top-level operations per service using db query
+// FetchTopLevelOperations returns top-level operations per service using db query.
 func (m *module) FetchTopLevelOperations(ctx context.Context, start time.Time, services []string) (map[string][]string, error) {
 	ctx = m.withServicesContext(ctx, "FetchTopLevelOperations")
 
@@ -107,7 +107,7 @@ func (m *module) Get(ctx context.Context, orgUUID valuer.UUID, req *servicetypes
 	return items, nil
 }
 
-// GetTopOperations implements services.Module for QBV5 based top ops
+// GetTopOperations implements services.Module for QBV5 based top ops.
 func (m *module) GetTopOperations(ctx context.Context, orgUUID valuer.UUID, req *servicetypesv1.OperationsRequest) ([]servicetypesv1.OperationItem, error) {
 	ctx = m.withServicesContext(ctx, "GetTopOperations")
 	if req == nil {
@@ -128,7 +128,7 @@ func (m *module) GetTopOperations(ctx context.Context, orgUUID valuer.UUID, req
 	return items, nil
 }
 
-// GetEntryPointOperations implements services.Module for QBV5 based entry point ops
+// GetEntryPointOperations implements services.Module for QBV5 based entry point ops.
 func (m *module) GetEntryPointOperations(ctx context.Context, orgUUID valuer.UUID, req *servicetypesv1.OperationsRequest) ([]servicetypesv1.OperationItem, error) {
 	ctx = m.withServicesContext(ctx, "GetEntryPointOperations")
 	if req == nil {
@@ -240,7 +240,7 @@ func (m *module) mapQueryRangeRespToServices(resp *qbtypes.QueryRangeResponse, s
 	for i, c := range sd.Columns {
 		switch c.Type {
 		case qbtypes.ColumnTypeGroup:
-			if c.TelemetryFieldKey.Name == "service.name" {
+			if c.Name == "service.name" {
 				serviceNameRespIndex = i
 			}
 		case qbtypes.ColumnTypeAggregation:
@@ -388,7 +388,7 @@ func (m *module) mapTopOpsQueryRangeResp(resp *qbtypes.QueryRangeResponse) []ser
 	for i, c := range sd.Columns {
 		switch c.Type {
 		case qbtypes.ColumnTypeGroup:
-			if c.TelemetryFieldKey.Name == "name" {
+			if c.Name == "name" {
 				nameIdx = i
 			}
 		case qbtypes.ColumnTypeAggregation:
@@ -502,7 +502,7 @@ func (m *module) mapEntryPointOpsQueryRangeResp(resp *qbtypes.QueryRangeResponse
 	for i, c := range sd.Columns {
 		switch c.Type {
 		case qbtypes.ColumnTypeGroup:
-			if c.TelemetryFieldKey.Name == "name" {
+			if c.Name == "name" {
 				nameIdx = i
 			}
 		case qbtypes.ColumnTypeAggregation:

pkg/modules/services/implservices/module_test.go

@@ -53,7 +53,7 @@ func TestBuildQueryRangeRequest(t *testing.T) {
 
 				// GroupBy should include service.name
 				if assert.Equal(t, 1, len(spec.GroupBy)) {
-					assert.Equal(t, "service.name", spec.GroupBy[0].TelemetryFieldKey.Name)
+					assert.Equal(t, "service.name", spec.GroupBy[0].Name)
 				}
 
 				// Aggregations should match expected expressions and aliases
@@ -373,8 +373,8 @@ func TestBuildTopOpsQueryRangeRequest(t *testing.T) {
 						assert.NotContains(t, expr, "isRoot = true OR isEntryPoint = true")
 					}
 					if assert.Equal(t, 1, len(spec.GroupBy)) {
-						assert.Equal(t, "name", spec.GroupBy[0].TelemetryFieldKey.Name)
-						assert.Equal(t, telemetrytypes.FieldContextSpan, spec.GroupBy[0].TelemetryFieldKey.FieldContext)
+						assert.Equal(t, "name", spec.GroupBy[0].Name)
+						assert.Equal(t, telemetrytypes.FieldContextSpan, spec.GroupBy[0].FieldContext)
 					}
 					if assert.Equal(t, 5, len(spec.Aggregations)) {
 						assert.Equal(t, "p50(duration_nano)", spec.Aggregations[0].Expression)
@@ -389,7 +389,7 @@ func TestBuildTopOpsQueryRangeRequest(t *testing.T) {
 						assert.Equal(t, "errorCount", spec.Aggregations[4].Alias)
 					}
 					if assert.Equal(t, 1, len(spec.Order)) {
-						assert.Equal(t, "p99", spec.Order[0].Key.TelemetryFieldKey.Name)
+						assert.Equal(t, "p99", spec.Order[0].Key.Name)
 						assert.Equal(t, qbtypes.OrderDirectionDesc, spec.Order[0].Direction)
 					}
 					assert.Equal(t, 50, spec.Limit)
@@ -576,8 +576,8 @@ func TestBuildEntryPointOpsQueryRangeRequest(t *testing.T) {
 					}
 					// groupBy is name (span)
 					if assert.Equal(t, 1, len(spec.GroupBy)) {
-						assert.Equal(t, "name", spec.GroupBy[0].TelemetryFieldKey.Name)
-						assert.Equal(t, telemetrytypes.FieldContextSpan, spec.GroupBy[0].TelemetryFieldKey.FieldContext)
+						assert.Equal(t, "name", spec.GroupBy[0].Name)
+						assert.Equal(t, telemetrytypes.FieldContextSpan, spec.GroupBy[0].FieldContext)
 					}
 				}
 			},
@@ -608,8 +608,8 @@ func TestBuildEntryPointOpsQueryRangeRequest(t *testing.T) {
 					assert.Contains(t, expr, "http.method IN $3")
 					assert.Contains(t, expr, "isRoot = true OR isEntryPoint = true")
 					if assert.Equal(t, 1, len(spec.GroupBy)) {
-						assert.Equal(t, "name", spec.GroupBy[0].TelemetryFieldKey.Name)
-						assert.Equal(t, telemetrytypes.FieldContextSpan, spec.GroupBy[0].TelemetryFieldKey.FieldContext)
+						assert.Equal(t, "name", spec.GroupBy[0].Name)
+						assert.Equal(t, telemetrytypes.FieldContextSpan, spec.GroupBy[0].FieldContext)
 					}
 					if assert.Equal(t, 5, len(spec.Aggregations)) {
 						assert.Equal(t, "p50(duration_nano)", spec.Aggregations[0].Expression)
@@ -624,7 +624,7 @@ func TestBuildEntryPointOpsQueryRangeRequest(t *testing.T) {
 						assert.Equal(t, "errorCount", spec.Aggregations[4].Alias)
 					}
 					if assert.Equal(t, 1, len(spec.Order)) {
-						assert.Equal(t, "p99", spec.Order[0].Key.TelemetryFieldKey.Name)
+						assert.Equal(t, "p99", spec.Order[0].Key.Name)
 						assert.Equal(t, qbtypes.OrderDirectionDesc, spec.Order[0].Direction)
 					}
 					assert.Equal(t, 25, spec.Limit)

pkg/modules/services/services.go

@@ -9,14 +9,14 @@ import (
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
-// Handler exposes HTTP handler for services_qbv5
+// Handler exposes HTTP handler for services_qbv5.
 type Handler interface {
 	Get(http.ResponseWriter, *http.Request)
 	GetTopOperations(http.ResponseWriter, *http.Request)
 	GetEntryPointOperations(http.ResponseWriter, *http.Request)
 }
 
-// Module represents the services QBv5 module interface
+// Module represents the services QBv5 module interface.
 type Module interface {
 	Get(ctx context.Context, orgID valuer.UUID, req *servicetypesv1.Request) ([]*servicetypesv1.ResponseItem, error)
 	FetchTopLevelOperations(ctx context.Context, start time.Time, services []string) (map[string][]string, error)

pkg/modules/spanpercentile/implspanpercentile/statement_builder_test.go

@@ -50,10 +50,10 @@ func TestBuildSpanPercentileQuery(t *testing.T) {
 	require.Equal(t, "service.name = 'test-service' AND name = 'test'", query.Filter.Expression)
 
 	require.Equal(t, 2, len(query.GroupBy))
-	require.Equal(t, "service.name", query.GroupBy[0].TelemetryFieldKey.Name)
-	require.Equal(t, telemetrytypes.FieldContextResource, query.GroupBy[0].TelemetryFieldKey.FieldContext)
-	require.Equal(t, "name", query.GroupBy[1].TelemetryFieldKey.Name)
-	require.Equal(t, telemetrytypes.FieldContextSpan, query.GroupBy[1].TelemetryFieldKey.FieldContext)
+	require.Equal(t, "service.name", query.GroupBy[0].Name)
+	require.Equal(t, telemetrytypes.FieldContextResource, query.GroupBy[0].FieldContext)
+	require.Equal(t, "name", query.GroupBy[1].Name)
+	require.Equal(t, telemetrytypes.FieldContextSpan, query.GroupBy[1].FieldContext)
 
 	require.Equal(t, qbtypes.RequestTypeScalar, result.RequestType)
 }
@@ -128,12 +128,12 @@ func TestBuildSpanPercentileQueryWithResourceAttributes(t *testing.T) {
 
 			expectedGroupByCount := 2 + len(tc.request.ResourceAttributes)
 			require.Equal(t, expectedGroupByCount, len(query.GroupBy))
-			require.Equal(t, "service.name", query.GroupBy[0].TelemetryFieldKey.Name)
-			require.Equal(t, "name", query.GroupBy[1].TelemetryFieldKey.Name)
+			require.Equal(t, "service.name", query.GroupBy[0].Name)
+			require.Equal(t, "name", query.GroupBy[1].Name)
 
 			for i, key := range getSortedKeys(tc.request.ResourceAttributes) {
-				require.Equal(t, key, query.GroupBy[2+i].TelemetryFieldKey.Name)
-				require.Equal(t, telemetrytypes.FieldContextResource, query.GroupBy[2+i].TelemetryFieldKey.FieldContext)
+				require.Equal(t, key, query.GroupBy[2+i].Name)
+				require.Equal(t, telemetrytypes.FieldContextResource, query.GroupBy[2+i].FieldContext)
 			}
 		})
 	}

pkg/modules/tracefunnel/clickhouse_queries.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-// BuildFunnelValidationQuery builds a validation query for n-step funnels
+// BuildFunnelValidationQuery builds a validation query for n-step funnels.
 func BuildFunnelValidationQuery(
 	steps []struct {
 		ServiceName   string
@@ -73,7 +73,7 @@ LIMIT 5;`
 	)
 }
 
-// BuildFunnelOverviewQuery builds an overview query for n-step funnels
+// BuildFunnelOverviewQuery builds an overview query for n-step funnels.
 func BuildFunnelOverviewQuery(
 	steps []struct {
 		ServiceName    string
@@ -216,7 +216,7 @@ FROM totals;
 	)
 }
 
-// BuildFunnelCountQuery builds a count query for n-step funnels
+// BuildFunnelCountQuery builds a count query for n-step funnels.
 func BuildFunnelCountQuery(
 	steps []struct {
 		ServiceName   string
@@ -313,7 +313,7 @@ FROM (
 	)
 }
 
-// BuildFunnelStepOverviewQuery builds a step overview query for transitions between any specified steps
+// BuildFunnelStepOverviewQuery builds a step overview query for transitions between any specified steps.
 func BuildFunnelStepOverviewQuery(
 	steps []struct {
 		ServiceName    string
@@ -460,7 +460,7 @@ FROM (
 	)
 }
 
-// BuildFunnelTopSlowTracesQuery builds a query to find the slowest traces between two funnel steps
+// BuildFunnelTopSlowTracesQuery builds a query to find the slowest traces between two funnel steps.
 func BuildFunnelTopSlowTracesQuery(
 	containsErrorT1 int,
 	containsErrorT2 int,
@@ -536,7 +536,7 @@ LIMIT 5;
 	)
 }
 
-// BuildFunnelTopSlowErrorTracesQuery builds a query to find the slowest error traces between two funnel steps
+// BuildFunnelTopSlowErrorTracesQuery builds a query to find the slowest error traces between two funnel steps.
 func BuildFunnelTopSlowErrorTracesQuery(
 	containsErrorT1 int,
 	containsErrorT2 int,

pkg/modules/tracefunnel/impltracefunnel/module.go

@@ -49,7 +49,7 @@ func (module *module) Create(ctx context.Context, timestamp int64, name string,
 
 	// Set created_by if CreatedByUser is present
 	if funnel.CreatedByUser != nil {
-		funnel.CreatedBy = funnel.CreatedByUser.Identifiable.ID.String()
+		funnel.CreatedBy = funnel.CreatedByUser.ID.String()
 	}
 
 	err := module.store.Create(ctx, funnel)
@@ -61,18 +61,18 @@ func (module *module) Create(ctx context.Context, timestamp int64, name string,
 	return funnel, nil
 }
 
-// Get gets a funnel by ID
+// Get gets a funnel by ID.
 func (module *module) Get(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
 	return module.store.Get(ctx, funnelID, orgID)
 }
 
-// Update updates a funnel
+// Update updates a funnel.
 func (module *module) Update(ctx context.Context, funnel *traceFunnels.StorableFunnel, userID valuer.UUID) error {
 	funnel.UpdatedBy = userID.String()
 	return module.store.Update(ctx, funnel)
 }
 
-// List lists all funnels for an organization
+// List lists all funnels for an organization.
 func (module *module) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnels.StorableFunnel, error) {
 	funnels, err := module.store.List(ctx, orgID)
 	if err != nil {
@@ -82,12 +82,12 @@ func (module *module) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunn
 	return funnels, nil
 }
 
-// Delete deletes a funnel
+// Delete deletes a funnel.
 func (module *module) Delete(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) error {
 	return module.store.Delete(ctx, funnelID, orgID)
 }
 
-// GetFunnelMetadata gets metadata for a funnel
+// GetFunnelMetadata gets metadata for a funnel.
 func (module *module) GetFunnelMetadata(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) (int64, int64, string, error) {
 	funnel, err := module.store.Get(ctx, funnelID, orgID)
 	if err != nil {

pkg/modules/tracefunnel/impltracefunnel/store.go

@@ -58,7 +58,7 @@ func (store *store) Create(ctx context.Context, funnel *traceFunnels.StorableFun
 	return nil
 }
 
-// Get retrieves a funnel by ID
+// Get retrieves a funnel by ID.
 func (store *store) Get(ctx context.Context, uuid valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
 	funnel := &traceFunnels.StorableFunnel{}
 	err := store.
@@ -75,7 +75,7 @@ func (store *store) Get(ctx context.Context, uuid valuer.UUID, orgID valuer.UUID
 	return funnel, nil
 }
 
-// Update updates an existing funnel
+// Update updates an existing funnel.
 func (store *store) Update(ctx context.Context, funnel *traceFunnels.StorableFunnel) error {
 	tx, err := store.sqlstore.BunDB().BeginTx(ctx, nil)
 	if err != nil {
@@ -119,7 +119,7 @@ func (store *store) Update(ctx context.Context, funnel *traceFunnels.StorableFun
 	return nil
 }
 
-// List retrieves all funnels for a given organization
+// List retrieves all funnels for a given organization.
 func (store *store) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnels.StorableFunnel, error) {
 	var funnels []*traceFunnels.StorableFunnel
 	err := store.
@@ -136,7 +136,7 @@ func (store *store) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnel
 	return funnels, nil
 }
 
-// Delete removes a funnel by ID
+// Delete removes a funnel by ID.
 func (store *store) Delete(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) error {
 	_, err := store.
 		sqlstore.

pkg/modules/tracefunnel/impltracefunnel/store_duplicate_names_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-// Test that Create method properly validates duplicate names
+// Test that Create method properly validates duplicate names.
 func TestModule_Create_DuplicateNameValidation(t *testing.T) {
 	mockStore := new(MockStore)
 	module := NewModule(mockStore)
@@ -37,7 +37,7 @@ func TestModule_Create_DuplicateNameValidation(t *testing.T) {
 	mockStore.AssertExpectations(t)
 }
 
-// Test that Update method properly validates duplicate names
+// Test that Update method properly validates duplicate names.
 func TestModule_Update_DuplicateNameValidation(t *testing.T) {
 	mockStore := new(MockStore)
 	module := NewModule(mockStore)
@@ -65,7 +65,7 @@ func TestModule_Update_DuplicateNameValidation(t *testing.T) {
 	mockStore.AssertExpectations(t)
 }
 
-// MockStore for testing
+// MockStore for testing.
 type MockStore struct {
 	mock.Mock
 }