chore: remove orphaned helpers after v2 waterfall and flamegraph removal

Drop GetSpansForTrace, cacheForTraceDetail, fluxIntervalForTraceDetail from
clickhouseReader — all were only used by the deleted v2 handlers. Also remove
the orphaned model.Span and model.Event types, and clean up the
cacheForTraceDetail initialization from server.go.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.github/workflows/build-staging.yaml

@@ -64,10 +64,6 @@ jobs:
         run: |
           mkdir -p frontend
           echo 'CI=1' > frontend/.env
-          echo 'VITE_SENTRY_AUTH_TOKEN="${{ secrets.SENTRY_AUTH_TOKEN }}"' >> frontend/.env
-          echo 'VITE_SENTRY_ORG="${{ secrets.SENTRY_ORG }}"' >> frontend/.env
-          echo 'VITE_SENTRY_PROJECT_ID="${{ secrets.SENTRY_PROJECT_ID }}"' >> frontend/.env
-          echo 'VITE_SENTRY_DSN="${{ secrets.SENTRY_DSN }}"' >> frontend/.env
           echo 'VITE_TUNNEL_URL="${{ secrets.NP_TUNNEL_URL }}"' >> frontend/.env
           echo 'VITE_TUNNEL_DOMAIN="${{ secrets.NP_TUNNEL_DOMAIN }}"' >> frontend/.env
           echo 'VITE_PYLON_APP_ID="${{ secrets.NP_PYLON_APP_ID }}"' >> frontend/.env

.github/workflows/integrationci.yaml

@@ -43,7 +43,6 @@ jobs:
           - callbackauthn
           - cloudintegrations
           - dashboard
-          - emptystate
           - ingestionkeys
           - inframonitoring
           - logspipelines

.gitignore

@@ -40,8 +40,6 @@ frontend/src/constants/env.ts
 **/__debug_bin
 
 .env
-# sqlite db created at repo root by `make go-run-community` / `make go-run-enterprise`
-/signoz.db
 pkg/query-service/signoz.db
 
 pkg/query-service/tests/test-deploy/data/

deploy/docker-swarm/docker-compose.ha.yaml

@@ -190,7 +190,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.128.0
+    image: signoz/signoz:v0.127.1
     ports:
       - "8080:8080" # signoz port
     #   - "6060:6060"     # pprof port

deploy/docker-swarm/docker-compose.yaml

@@ -117,7 +117,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.128.0
+    image: signoz/signoz:v0.127.1
     ports:
       - "8080:8080" # signoz port
     volumes:

deploy/docker/docker-compose.ha.yaml

@@ -181,7 +181,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.128.0}
+    image: signoz/signoz:${VERSION:-v0.127.1}
     container_name: signoz
     ports:
       - "8080:8080" # signoz port

deploy/docker/docker-compose.yaml

@@ -109,7 +109,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.128.0}
+    image: signoz/signoz:${VERSION:-v0.127.1}
     container_name: signoz
     ports:
       - "8080:8080" # signoz port

docs/api/openapi.yml

@@ -1360,8 +1360,6 @@ components:
       - sqs
       - storageaccountsblob
       - cdnprofile
-      - virtualmachine
-      - appservice
       - containerapp
       - aks
       type: string
@@ -3355,57 +3353,6 @@ components:
       - kind
       - spec
       type: object
-    EmptystatetypesLastIngestedAt:
-      properties:
-        logs:
-          description: Null when no logs were ingested in the last 7 days.
-          format: date-time
-          nullable: true
-          type: string
-        metrics:
-          description: Null when no metrics were ingested in the last 7 days. Excludes
-            span-generated metrics (signoz_ prefix), which only prove traces ingestion.
-          format: date-time
-          nullable: true
-          type: string
-        traces:
-          description: Null when no traces were ingested in the last 7 days.
-          format: date-time
-          nullable: true
-          type: string
-      required:
-      - logs
-      - traces
-      - metrics
-      type: object
-    EmptystatetypesOrgContext:
-      properties:
-        alertsCount:
-          type: integer
-        dashboardsCount:
-          type: integer
-        hasInfraMetrics:
-          type: boolean
-        hasIngestedData:
-          type: boolean
-        lastIngestedAt:
-          $ref: '#/components/schemas/EmptystatetypesLastIngestedAt'
-        licenseStatus:
-          description: Raw Zeus license state. Known values include DEFAULTED, ACTIVATED,
-            EXPIRED, ISSUED, EVALUATING, EVALUATION_EXPIRED, TERMINATED, CANCELLED.
-            UNKNOWN is emitted when no license state is available.
-          type: string
-        savedViewsCount:
-          type: integer
-      required:
-      - hasIngestedData
-      - lastIngestedAt
-      - hasInfraMetrics
-      - alertsCount
-      - dashboardsCount
-      - savedViewsCount
-      - licenseStatus
-      type: object
     ErrorsJSON:
       properties:
         code:
@@ -9560,53 +9507,6 @@ paths:
       summary: Update downtime schedule
       tags:
       - downtimeschedules
-  /api/v1/empty_state/org_context:
-    get:
-      deprecated: false
-      description: This endpoint returns raw org-level observability signals used
-        to render contextual empty states
-      operationId: GetOrgContext
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/EmptystatetypesOrgContext'
-                  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: Get org context for empty states
-      tags:
-      - emptystate
   /api/v1/export_raw_data:
     post:
       deprecated: false

frontend/src/api/alerts/getTriggered.ts

@@ -5,13 +5,6 @@ import convertObjectIntoParams from 'lib/query/convertObjectIntoParams';
 import { ErrorResponse, SuccessResponse } from 'types/api';
 import { PayloadProps, Props } from 'types/api/alerts/getTriggered';
 
-/**
- * @deprecated Use the generated `useGetAlerts` hook (or `getAlerts` fetcher) from
- * `api/generated/services/alerts` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const getTriggered = async (
 	props: Props,
 ): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {

frontend/src/api/channels/createEmail.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/createEmail';
 
-/**
- * @deprecated Use the generated `useCreateChannel` hook (or `createChannel` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const create = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/createMsTeams.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/createMsTeams';
 
-/**
- * @deprecated Use the generated `useCreateChannel` hook (or `createChannel` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const create = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/createOpsgenie.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/createOpsgenie';
 
-/**
- * @deprecated Use the generated `useCreateChannel` hook (or `createChannel` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const create = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/createPager.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/createPager';
 
-/**
- * @deprecated Use the generated `useCreateChannel` hook (or `createChannel` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const create = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/createSlack.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/createSlack';
 
-/**
- * @deprecated Use the generated `useCreateChannel` hook (or `createChannel` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const create = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/createWebhook.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/createWebhook';
 
-/**
- * @deprecated Use the generated `useCreateChannel` hook (or `createChannel` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const create = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/delete.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/delete';
 
-/**
- * @deprecated Use the generated `useDeleteChannelByID` hook (or `deleteChannelByID` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const deleteChannel = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/editEmail.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/editEmail';
 
-/**
- * @deprecated Use the generated `useUpdateChannelByID` hook (or `updateChannelByID` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const editEmail = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/editMsTeams.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/editMsTeams';
 
-/**
- * @deprecated Use the generated `useUpdateChannelByID` hook (or `updateChannelByID` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const editMsTeams = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/editOpsgenie.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorResponse, ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/editOpsgenie';
 
-/**
- * @deprecated Use the generated `useUpdateChannelByID` hook (or `updateChannelByID` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const editOpsgenie = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps> | ErrorResponse> => {

frontend/src/api/channels/editPager.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/editPager';
 
-/**
- * @deprecated Use the generated `useUpdateChannelByID` hook (or `updateChannelByID` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const editPager = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/editSlack.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/editSlack';
 
-/**
- * @deprecated Use the generated `useUpdateChannelByID` hook (or `updateChannelByID` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const editSlack = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/editWebhook.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/editWebhook';
 
-/**
- * @deprecated Use the generated `useUpdateChannelByID` hook (or `updateChannelByID` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const editWebhook = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/channels/get.ts

@@ -5,13 +5,6 @@ import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/channels/get';
 import { Channels } from 'types/api/channels/getAll';
 
-/**
- * @deprecated Use the generated `useGetChannelByID` hook (or `getChannelByID` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const get = async (props: Props): Promise<SuccessResponseV2<Channels>> => {
 	try {
 		const response = await axios.get<PayloadProps>(`/channels/${props.id}`);

frontend/src/api/channels/getAll.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { Channels, PayloadProps } from 'types/api/channels/getAll';
 
-/**
- * @deprecated Use the generated `useListChannels` hook (or `listChannels` fetcher) from
- * `api/generated/services/channels` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const getAll = async (): Promise<SuccessResponseV2<Channels[]>> => {
 	try {
 		const response = await axios.get<PayloadProps>('/channels');

frontend/src/api/dashboard/public/createPublicDashboard.ts

@@ -5,13 +5,6 @@ import { DEFAULT_TIME_RANGE } from 'container/TopNav/DateTimeSelectionV2/constan
 import { ErrorV2Resp, 	 SuccessResponseV2 } from 'types/api';
 import { CreatePublicDashboardProps } from 'types/api/dashboard/public/create';
 
-/**
- * @deprecated Use the generated `useCreatePublicDashboard` hook (or `createPublicDashboard` fetcher) from
- * `api/generated/services/dashboard` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const createPublicDashboard = async (
 	props: CreatePublicDashboardProps,
 ): Promise<SuccessResponseV2<CreatePublicDashboardProps>> => {

frontend/src/api/dashboard/public/getPublicDashboardData.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { GetPublicDashboardDataProps, PayloadProps,PublicDashboardDataProps } from 'types/api/dashboard/public/get';
 
-/**
- * @deprecated Use the generated `useGetPublicDashboardData` hook (or `getPublicDashboardData` fetcher) from
- * `api/generated/services/dashboard` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const getPublicDashboardData = async (props: GetPublicDashboardDataProps): Promise<SuccessResponseV2<PublicDashboardDataProps>> => {
 	try {
 		const response = await axios.get<PayloadProps>(`/public/dashboards/${props.id}`);

frontend/src/api/dashboard/public/getPublicDashboardMeta.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { GetPublicDashboardMetaProps, PayloadProps,PublicDashboardMetaProps } from 'types/api/dashboard/public/getMeta';
 
-/**
- * @deprecated Use the generated `useGetPublicDashboard` hook (or `getPublicDashboard` fetcher) from
- * `api/generated/services/dashboard` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const getPublicDashboardMeta = async (props: GetPublicDashboardMetaProps): Promise<SuccessResponseV2<PublicDashboardMetaProps>> => {
 	try {
 		const response = await axios.get<PayloadProps>(`/dashboards/${props.id}/public`);

frontend/src/api/dashboard/public/getPublicDashboardWidgetData.ts

@@ -6,13 +6,6 @@ import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { GetPublicDashboardWidgetDataProps } from 'types/api/dashboard/public/getWidgetData';
 
 
-/**
- * @deprecated Use the generated `useGetPublicDashboardWidgetQueryRange` hook (or `getPublicDashboardWidgetQueryRange` fetcher) from
- * `api/generated/services/dashboard` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const getPublicDashboardWidgetData = async (props: GetPublicDashboardWidgetDataProps): Promise<SuccessResponseV2<MetricRangePayloadV5>> => {
 	try {
 		const response = await axios.get(`/public/dashboards/${props.id}/widgets/${props.index}/query_range`, {

frontend/src/api/dashboard/public/revokePublicDashboardAccess.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps,RevokePublicDashboardAccessProps } from 'types/api/dashboard/public/delete';
 
-/**
- * @deprecated Use the generated `useDeletePublicDashboard` hook (or `deletePublicDashboard` fetcher) from
- * `api/generated/services/dashboard` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const revokePublicDashboardAccess = async (
 	props: RevokePublicDashboardAccessProps,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/dashboard/public/updatePublicDashboard.ts

@@ -5,13 +5,6 @@ import { DEFAULT_TIME_RANGE } from 'container/TopNav/DateTimeSelectionV2/constan
 import {  ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { UpdatePublicDashboardProps } from 'types/api/dashboard/public/update';
 
-/**
- * @deprecated Use the generated `useUpdatePublicDashboard` hook (or `updatePublicDashboard` fetcher) from
- * `api/generated/services/dashboard` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const updatePublicDashboard = async (
 	props: UpdatePublicDashboardProps,
 ): Promise<SuccessResponseV2<UpdatePublicDashboardProps>> => {

frontend/src/api/dashboard/substitute_vars.ts

@@ -9,13 +9,6 @@ interface ISubstituteVars {
 	compositeQuery: ICompositeMetricQuery;
 }
 
-/**
- * @deprecated Use the generated `useReplaceVariables` hook (or `replaceVariables` fetcher) from
- * `api/generated/services/querier` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 export const getSubstituteVars = async (
 	props?: Partial<QueryRangePayloadV5>,
 	signal?: AbortSignal,

frontend/src/api/dynamicVariables/getFieldKeys.ts

@@ -8,12 +8,6 @@ import { FieldKeyResponse } from 'types/api/dynamicVariables/getFieldKeys';
  * Get field keys for a given signal type
  * @param signal Type of signal (traces, logs, metrics)
  * @param name Optional search text
- *
- * @deprecated Use the generated `useGetFieldsKeys` hook (or `getFieldsKeys` fetcher) from
- * `api/generated/services/fields` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
  */
 export const getFieldKeys = async (
 	signal?: 'traces' | 'logs' | 'metrics',

frontend/src/api/dynamicVariables/getFieldValues.ts

@@ -11,12 +11,6 @@ import { FieldValueResponse } from 'types/api/dynamicVariables/getFieldValues';
  * @param name Name of the attribute for which values are being fetched
  * @param value Optional search text
  * @param existingQuery Optional existing query - across all present dynamic variables
- *
- * @deprecated Use the generated `useGetFieldsValues` hook (or `getFieldsValues` fetcher) from
- * `api/generated/services/fields` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
  */
 export const getFieldValues = async (
 	signal?: 'traces' | 'logs' | 'metrics',

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

@@ -1,107 +0,0 @@
-/**
- * ! Do not edit manually
- * * The file has been auto-generated using Orval for SigNoz
- * * regenerate with 'pnpm generate:api'
- * SigNoz
- */
-import { useQuery } from 'react-query';
-import type {
-	InvalidateOptions,
-	QueryClient,
-	QueryFunction,
-	QueryKey,
-	UseQueryOptions,
-	UseQueryResult,
-} from 'react-query';
-
-import type {
-	GetOrgContext200,
-	RenderErrorResponseDTO,
-} from '../sigNoz.schemas';
-
-import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
-import type { ErrorType } from '../../../generatedAPIInstance';
-
-/**
- * This endpoint returns raw org-level observability signals used to render contextual empty states
- * @summary Get org context for empty states
- */
-export const getOrgContext = (signal?: AbortSignal) => {
-	return GeneratedAPIInstance<GetOrgContext200>({
-		url: `/api/v1/empty_state/org_context`,
-		method: 'GET',
-		signal,
-	});
-};
-
-export const getGetOrgContextQueryKey = () => {
-	return [`/api/v1/empty_state/org_context`] as const;
-};
-
-export const getGetOrgContextQueryOptions = <
-	TData = Awaited<ReturnType<typeof getOrgContext>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(options?: {
-	query?: UseQueryOptions<
-		Awaited<ReturnType<typeof getOrgContext>>,
-		TError,
-		TData
-	>;
-}) => {
-	const { query: queryOptions } = options ?? {};
-
-	const queryKey = queryOptions?.queryKey ?? getGetOrgContextQueryKey();
-
-	const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrgContext>>> = ({
-		signal,
-	}) => getOrgContext(signal);
-
-	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-		Awaited<ReturnType<typeof getOrgContext>>,
-		TError,
-		TData
-	> & { queryKey: QueryKey };
-};
-
-export type GetOrgContextQueryResult = NonNullable<
-	Awaited<ReturnType<typeof getOrgContext>>
->;
-export type GetOrgContextQueryError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Get org context for empty states
- */
-
-export function useGetOrgContext<
-	TData = Awaited<ReturnType<typeof getOrgContext>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(options?: {
-	query?: UseQueryOptions<
-		Awaited<ReturnType<typeof getOrgContext>>,
-		TError,
-		TData
-	>;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
-	const queryOptions = getGetOrgContextQueryOptions(options);
-
-	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-		queryKey: QueryKey;
-	};
-
-	return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Get org context for empty states
- */
-export const invalidateGetOrgContext = async (
-	queryClient: QueryClient,
-	options?: InvalidateOptions,
-): Promise<QueryClient> => {
-	await queryClient.invalidateQueries(
-		{ queryKey: getGetOrgContextQueryKey() },
-		options,
-	);
-
-	return queryClient;
-};

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

@@ -2651,8 +2651,6 @@ export enum CloudintegrationtypesServiceIDDTO {
 	sqs = 'sqs',
 	storageaccountsblob = 'storageaccountsblob',
 	cdnprofile = 'cdnprofile',
-	virtualmachine = 'virtualmachine',
-	appservice = 'appservice',
 	containerapp = 'containerapp',
 	aks = 'aks',
 }
@@ -4826,56 +4824,6 @@ export enum DashboardtypesVariablePluginKindDTO {
 	'signoz/QueryVariable' = 'signoz/QueryVariable',
 	'signoz/CustomVariable' = 'signoz/CustomVariable',
 }
-export interface EmptystatetypesLastIngestedAtDTO {
-	/**
-	 * @type string,null
-	 * @format date-time
-	 * @description Null when no logs were ingested in the last 7 days.
-	 */
-	logs: string | null;
-	/**
-	 * @type string,null
-	 * @format date-time
-	 * @description Null when no metrics were ingested in the last 7 days. Excludes span-generated metrics (signoz_ prefix), which only prove traces ingestion.
-	 */
-	metrics: string | null;
-	/**
-	 * @type string,null
-	 * @format date-time
-	 * @description Null when no traces were ingested in the last 7 days.
-	 */
-	traces: string | null;
-}
-
-export interface EmptystatetypesOrgContextDTO {
-	/**
-	 * @type integer
-	 */
-	alertsCount: number;
-	/**
-	 * @type integer
-	 */
-	dashboardsCount: number;
-	/**
-	 * @type boolean
-	 */
-	hasInfraMetrics: boolean;
-	/**
-	 * @type boolean
-	 */
-	hasIngestedData: boolean;
-	lastIngestedAt: EmptystatetypesLastIngestedAtDTO;
-	/**
-	 * @type string
-	 * @description Raw Zeus license state. Known values include DEFAULTED, ACTIVATED, EXPIRED, ISSUED, EVALUATING, EVALUATION_EXPIRED, TERMINATED, CANCELLED. UNKNOWN is emitted when no license state is available.
-	 */
-	licenseStatus: string;
-	/**
-	 * @type integer
-	 */
-	savedViewsCount: number;
-}
-
 export type FactoryResponseDTOServicesAnyOf = { [key: string]: string[] };
 
 /**
@@ -9092,14 +9040,6 @@ export type GetDowntimeScheduleByID200 = {
 export type UpdateDowntimeScheduleByIDPathParameters = {
 	id: string;
 };
-export type GetOrgContext200 = {
-	data: EmptystatetypesOrgContextDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
 export type HandleExportRawDataPOSTParams = {
 	/**
 	 * @enum csv,jsonl

frontend/src/api/querySuggestions/getKeySuggestions.ts

@@ -5,13 +5,6 @@ import {
 	QueryKeySuggestionsResponseProps,
 } from 'types/api/querySuggestions/types';
 
-/**
- * @deprecated Use the generated `useGetFieldsKeys` hook (or `getFieldsKeys` fetcher) from
- * `api/generated/services/fields` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 export const getKeySuggestions = (
 	props: QueryKeyRequestProps,
 ): Promise<AxiosResponse<QueryKeySuggestionsResponseProps>> => {

frontend/src/api/querySuggestions/getValueSuggestion.ts

@@ -5,13 +5,6 @@ import {
 	QueryKeyValueSuggestionsResponseProps,
 } from 'types/api/querySuggestions/types';
 
-/**
- * @deprecated Use the generated `useGetFieldsValues` hook (or `getFieldsValues` fetcher) from
- * `api/generated/services/fields` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 export const getValueSuggestions = (
 	props: QueryKeyValueRequestProps,
 ): Promise<AxiosResponse<QueryKeyValueSuggestionsResponseProps>> => {

frontend/src/api/routingPolicies/createRoutingPolicy.ts

@@ -15,13 +15,6 @@ export interface CreateRoutingPolicyResponse {
 	message: string;
 }
 
-/**
- * @deprecated Use the generated `useCreateRoutePolicy` hook (or `createRoutePolicy` fetcher) from
- * `api/generated/services/routepolicies` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const createRoutingPolicy = async (
 	props: CreateRoutingPolicyBody,
 ): Promise<

frontend/src/api/routingPolicies/deleteRoutingPolicy.ts

@@ -8,13 +8,6 @@ export interface DeleteRoutingPolicyResponse {
 	message: string;
 }
 
-/**
- * @deprecated Use the generated `useDeleteRoutePolicyByID` hook (or `deleteRoutePolicyByID` fetcher) from
- * `api/generated/services/routepolicies` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const deleteRoutingPolicy = async (
 	routingPolicyId: string,
 ): Promise<

frontend/src/api/routingPolicies/getRoutingPolicies.ts

@@ -20,13 +20,6 @@ export interface GetRoutingPoliciesResponse {
 	data?: ApiRoutingPolicy[];
 }
 
-/**
- * @deprecated Use the generated `useGetAllRoutePolicies` hook (or `getAllRoutePolicies` fetcher) from
- * `api/generated/services/routepolicies` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 export const getRoutingPolicies = async (
 	signal?: AbortSignal,
 	headers?: Record<string, string>,

frontend/src/api/routingPolicies/updateRoutingPolicy.ts

@@ -15,13 +15,6 @@ export interface UpdateRoutingPolicyResponse {
 	message: string;
 }
 
-/**
- * @deprecated Use the generated `useUpdateRoutePolicy` hook (or `updateRoutePolicy` fetcher) from
- * `api/generated/services/routepolicies` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const updateRoutingPolicy = async (
 	id: string,
 	props: UpdateRoutingPolicyBody,

frontend/src/api/v1/factor_password/resetPassword.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/user/resetPassword';
 
-/**
- * @deprecated Use the generated `useResetPassword` hook (or `resetPassword` fetcher) from
- * `api/generated/services/users` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const resetPassword = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/v1/invite/bulk/create.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { UsersProps } from 'types/api/user/inviteUsers';
 
-/**
- * @deprecated Use the generated `useCreateBulkInvite` hook (or `createBulkInvite` fetcher) from
- * `api/generated/services/users` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const inviteUsers = async (
 	users: UsersProps,
 ): Promise<SuccessResponseV2<null>> => {

frontend/src/api/v1/invite/create.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/user/setInvite';
 
-/**
- * @deprecated Use the generated `useCreateInvite` hook (or `createInvite` fetcher) from
- * `api/generated/services/users` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const sendInvite = async (
 	props: Props,
 ): Promise<SuccessResponseV2<PayloadProps>> => {

frontend/src/api/v1/org/preferences/list.ts

@@ -5,13 +5,6 @@ import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps } from 'types/api/preferences/list';
 import { OrgPreference } from 'types/api/preferences/preference';
 
-/**
- * @deprecated Use the generated `useListOrgPreferences` hook (or `listOrgPreferences` fetcher) from
- * `api/generated/services/preferences` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const listPreference = async (): Promise<
 	SuccessResponseV2<OrgPreference[]>
 > => {

frontend/src/api/v1/org/preferences/name/update.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { Props } from 'types/api/preferences/update';
 
-/**
- * @deprecated Use the generated `useUpdateOrgPreference` hook (or `updateOrgPreference` fetcher) from
- * `api/generated/services/preferences` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const update = async (props: Props): Promise<SuccessResponseV2<null>> => {
 	try {
 		const response = await axios.put(`/org/preferences/${props.name}`, {

frontend/src/api/v1/user/preferences/list.ts

@@ -5,13 +5,6 @@ import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps } from 'types/api/preferences/list';
 import { UserPreference } from 'types/api/preferences/preference';
 
-/**
- * @deprecated Use the generated `useListUserPreferences` hook (or `listUserPreferences` fetcher) from
- * `api/generated/services/preferences` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const list = async (): Promise<SuccessResponseV2<UserPreference[]>> => {
 	try {
 		const response = await axios.get<PayloadProps>(`/user/preferences`);

frontend/src/api/v1/user/preferences/name/get.ts

@@ -5,13 +5,6 @@ import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { PayloadProps, Props } from 'types/api/preferences/get';
 import { UserPreference } from 'types/api/preferences/preference';
 
-/**
- * @deprecated Use the generated `useGetUserPreference` hook (or `getUserPreference` fetcher) from
- * `api/generated/services/preferences` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const get = async (
 	props: Props,
 ): Promise<SuccessResponseV2<UserPreference>> => {

frontend/src/api/v1/user/preferences/name/update.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
 import { Props } from 'types/api/preferences/update';
 
-/**
- * @deprecated Use the generated `useUpdateUserPreference` hook (or `updateUserPreference` fetcher) from
- * `api/generated/services/preferences` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const update = async (props: Props): Promise<SuccessResponseV2<null>> => {
 	try {
 		const response = await axios.put(`/user/preferences/${props.name}`, {

frontend/src/api/v2/sessions/context/get.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, RawSuccessResponse, SuccessResponseV2 } from 'types/api';
 import { Props, SessionsContext } from 'types/api/v2/sessions/context/get';
 
-/**
- * @deprecated Use the generated `useGetSessionContext` hook (or `getSessionContext` fetcher) from
- * `api/generated/services/sessions` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const get = async (
 	props: Props,
 ): Promise<SuccessResponseV2<SessionsContext>> => {

frontend/src/api/v2/sessions/delete.ts

@@ -3,13 +3,6 @@ import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
 import { AxiosError } from 'axios';
 import { ErrorV2Resp, RawSuccessResponse, SuccessResponseV2 } from 'types/api';
 
-/**
- * @deprecated Use the generated `useDeleteSession` hook (or `deleteSession` fetcher) from
- * `api/generated/services/sessions` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const deleteSession = async (): Promise<SuccessResponseV2<null>> => {
 	try {
 		const response = await axios.delete<RawSuccessResponse<null>>('/sessions');

frontend/src/api/v2/sessions/email_password/post.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, RawSuccessResponse, SuccessResponseV2 } from 'types/api';
 import { Props, Token } from 'types/api/v2/sessions/email_password/post';
 
-/**
- * @deprecated Use the generated `useCreateSessionByEmailPassword` hook (or `createSessionByEmailPassword` fetcher) from
- * `api/generated/services/sessions` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const post = async (props: Props): Promise<SuccessResponseV2<Token>> => {
 	try {
 		const response = await axios.post<RawSuccessResponse<Token>>(

frontend/src/api/v2/sessions/rotate/post.ts

@@ -4,13 +4,6 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp, RawSuccessResponse, SuccessResponseV2 } from 'types/api';
 import { Props, Token } from 'types/api/v2/sessions/rotate/post';
 
-/**
- * @deprecated Use the generated `useRotateSession` hook (or `rotateSession` fetcher) from
- * `api/generated/services/sessions` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 const post = async (props: Props): Promise<SuccessResponseV2<Token>> => {
 	try {
 		const response = await axios.post<RawSuccessResponse<Token>>(

frontend/src/api/v5/queryRange/getQueryRange.ts

@@ -8,13 +8,6 @@ import {
 	QueryRangePayloadV5,
 } from 'types/api/v5/queryRange';
 
-/**
- * @deprecated Use the generated `useQueryRangeV5` hook (or `queryRangeV5` fetcher) from
- * `api/generated/services/querier` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
 export const getQueryRangeV5 = async (
 	props: QueryRangePayloadV5,
 	version: string,

frontend/src/container/AIAssistant/events.ts

@@ -70,7 +70,6 @@ export const AIAssistantOpenSource = {
 	Icon: 'icon',
 	Shortcut: 'shortcut',
 	Cmdk: 'cmdk',
-	TraceDetails: 'trace_details',
 } as const;
 export type AIAssistantOpenSource =
 	(typeof AIAssistantOpenSource)[keyof typeof AIAssistantOpenSource];

frontend/src/container/BillingContainer/CancelSubscriptionBanner.module.scss

@@ -67,40 +67,3 @@
 	background: var(--secondary-background);
 	border: 1px solid var(--l1-border);
 }
-
-.fallbackBody {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-}
-
-.fallbackHint {
-	font-size: var(--paragraph-base-400-font-size);
-	font-weight: var(--paragraph-base-400-font-weight);
-	line-height: var(--paragraph-base-400-line-height);
-	color: var(--l2-foreground);
-	margin: 0;
-}
-
-.fallbackEmail {
-	font-size: var(--paragraph-base-500-font-size);
-	font-weight: var(--paragraph-base-500-font-weight);
-	color: var(--l1-foreground);
-	word-break: break-all;
-}
-
-.fallbackActions {
-	display: flex;
-	gap: var(--spacing-3);
-	flex-wrap: wrap;
-	padding-top: var(--padding-4);
-}
-
-.retryLink {
-	box-sizing: border-box;
-	text-decoration: none;
-
-	&:hover {
-		text-decoration: none;
-	}
-}

frontend/src/container/BillingContainer/CancelSubscriptionBanner.test.tsx

@@ -9,37 +9,7 @@ jest.mock('utils/basePath', () => ({
 	getBaseUrl: (): string => 'https://test.signoz.io',
 }));
 
-function mockMailto(): {
-	mockClick: jest.Mock;
-	appendSpy: jest.SpyInstance;
-	removeSpy: jest.SpyInstance;
-} {
-	const mockClick = jest.fn();
-	const realCreateElement = document.createElement.bind(document);
-
-	// Create a real anchor so JSDOM's appendChild/removeChild accept it.
-	// Override its click() so no navigation occurs.
-	jest
-		.spyOn(document, 'createElement')
-		.mockImplementation((tag: string, options?: ElementCreationOptions) => {
-			if (tag === 'a') {
-				const anchor = realCreateElement('a') as HTMLAnchorElement;
-				anchor.click = mockClick;
-				return anchor;
-			}
-			return realCreateElement(tag, options);
-		});
-
-	const appendSpy = jest.spyOn(document.body, 'appendChild');
-	const removeSpy = jest.spyOn(document.body, 'removeChild');
-	return { mockClick, appendSpy, removeSpy };
-}
-
 describe('CancelSubscriptionBanner', () => {
-	afterEach(() => {
-		jest.restoreAllMocks();
-	});
-
 	it('renders banner with title and subtitle', () => {
 		render(<CancelSubscriptionBanner />);
 		expect(
@@ -65,10 +35,12 @@ describe('CancelSubscriptionBanner', () => {
 			screen.getByText(/Cancelling your subscription would stop your data/i),
 		).toBeInTheDocument();
 		expect(screen.getByText(/Type/i)).toBeInTheDocument();
-		expect(screen.getByTestId('cancel-confirm-input')).toBeInTheDocument();
+		expect(
+			screen.getByPlaceholderText(/Enter the word cancel/i),
+		).toBeInTheDocument();
 		expect(screen.getByRole('button', { name: /go back/i })).toBeInTheDocument();
 		expect(
-			screen.getByTestId('cancel-subscription-confirm-btn'),
+			screen.getByRole('button', { name: /cancel subscription/i }),
 		).toBeInTheDocument();
 	});
 
@@ -80,10 +52,12 @@ describe('CancelSubscriptionBanner', () => {
 			screen.getByRole('button', { name: /cancel subscription/i }),
 		);
 
-		const confirmButton = screen.getByTestId('cancel-subscription-confirm-btn');
+		const confirmButton = screen.getByRole('button', {
+			name: /cancel subscription/i,
+		});
 		expect(confirmButton).toBeDisabled();
 
-		const input = screen.getByTestId('cancel-confirm-input');
+		const input = screen.getByPlaceholderText(/Enter the word cancel/i);
 		await user.type(input, 'canc');
 		expect(confirmButton).toBeDisabled();
 
@@ -99,7 +73,7 @@ describe('CancelSubscriptionBanner', () => {
 			screen.getByRole('button', { name: /cancel subscription/i }),
 		);
 
-		const input = screen.getByTestId('cancel-confirm-input');
+		const input = screen.getByPlaceholderText(/Enter the word cancel/i);
 		await user.type(input, 'cancel');
 
 		await user.click(screen.getByRole('button', { name: /go back/i }));
@@ -110,11 +84,19 @@ describe('CancelSubscriptionBanner', () => {
 		await user.click(
 			screen.getByRole('button', { name: /cancel subscription/i }),
 		);
-		expect(screen.getByTestId('cancel-confirm-input')).toHaveValue('');
+		expect(screen.getByPlaceholderText(/Enter the word cancel/i)).toHaveValue('');
 	});
 
-	it('fires mailto via DOM-attached anchor and shows fallback view after confirming', async () => {
-		const { mockClick, appendSpy, removeSpy } = mockMailto();
+	it('sends mailto to cloud-support with correct subject after typing "cancel"', async () => {
+		const realCreateElement = document.createElement.bind(document);
+		const mockClick = jest.fn();
+		const mockAnchor = { href: '', click: mockClick };
+		jest.spyOn(document, 'createElement').mockImplementation((tag: string) => {
+			if (tag === 'a') {
+				return mockAnchor as unknown as HTMLAnchorElement;
+			}
+			return realCreateElement(tag);
+		});
 
 		const user = userEvent.setup({ pointerEventsCheck: 0 });
 		render(<CancelSubscriptionBanner />);
@@ -122,85 +104,18 @@ describe('CancelSubscriptionBanner', () => {
 		await user.click(
 			screen.getByRole('button', { name: /cancel subscription/i }),
 		);
-		await user.type(screen.getByTestId('cancel-confirm-input'), 'cancel');
-		await user.click(screen.getByTestId('cancel-subscription-confirm-btn'));
 
-		const appendedAnchor = appendSpy.mock.calls
-			.map(([node]) => node)
-			.find(
-				(node): node is HTMLAnchorElement =>
-					node instanceof HTMLAnchorElement && node.href.startsWith('mailto:'),
-			);
-		expect(appendedAnchor).toBeDefined();
+		const input = screen.getByPlaceholderText(/Enter the word cancel/i);
+		await user.type(input, 'cancel');
+
+		await user.click(
+			screen.getByRole('button', { name: /cancel subscription/i }),
+		);
+
+		expect(mockAnchor.href).toContain('mailto:cloud-support@signoz.io');
+		expect(mockAnchor.href).toContain('Cancel%20My%20SigNoz%20Subscription');
 		expect(mockClick).toHaveBeenCalledTimes(1);
-		expect(removeSpy.mock.calls.some(([node]) => node === appendedAnchor)).toBe(
-			true,
-		);
 
-		expect(
-			screen.getByText(/An email draft has been opened/i),
-		).toBeInTheDocument();
-		expect(screen.getByText('cloud-support@signoz.io')).toBeInTheDocument();
-		expect(screen.getByTestId('copy-email-template-btn')).toBeInTheDocument();
-		expect(screen.getByTestId('retry-mailto-btn')).toBeInTheDocument();
-	});
-
-	it('copies email template to clipboard when Copy button is clicked', async () => {
-		mockMailto();
-
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(<CancelSubscriptionBanner />);
-
-		await user.click(
-			screen.getByRole('button', { name: /cancel subscription/i }),
-		);
-		await user.type(screen.getByTestId('cancel-confirm-input'), 'cancel');
-		await user.click(screen.getByTestId('cancel-subscription-confirm-btn'));
-
-		await user.click(screen.getByTestId('copy-email-template-btn'));
-
-		await waitFor(() =>
-			expect(screen.getByTestId('copy-email-template-btn')).toHaveTextContent(
-				'Copied!',
-			),
-		);
-	});
-
-	it('retry link is a native anchor with correct mailto href in fallback view', async () => {
-		mockMailto();
-
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(<CancelSubscriptionBanner />);
-
-		await user.click(
-			screen.getByRole('button', { name: /cancel subscription/i }),
-		);
-		await user.type(screen.getByTestId('cancel-confirm-input'), 'cancel');
-		await user.click(screen.getByTestId('cancel-subscription-confirm-btn'));
-
-		const retryLink = screen.getByTestId('retry-mailto-btn');
-		expect(retryLink.tagName).toBe('A');
-		expect(retryLink).toHaveAttribute(
-			'href',
-			expect.stringContaining('mailto:cloud-support@signoz.io'),
-		);
-	});
-
-	it('closes fallback view when Close is clicked and resets state', async () => {
-		mockMailto();
-
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(<CancelSubscriptionBanner />);
-
-		await user.click(
-			screen.getByRole('button', { name: /cancel subscription/i }),
-		);
-		await user.type(screen.getByTestId('cancel-confirm-input'), 'cancel');
-		await user.click(screen.getByTestId('cancel-subscription-confirm-btn'));
-
-		await user.click(screen.getByRole('button', { name: /close/i }));
-		await waitFor(() =>
-			expect(screen.queryByRole('dialog')).not.toBeInTheDocument(),
-		);
+		jest.restoreAllMocks();
 	});
 });

frontend/src/container/BillingContainer/CancelSubscriptionBanner.tsx

@@ -1,100 +1,27 @@
-import { useEffect, useRef, useState } from 'react';
-import {
-	CircleCheck,
-	Copy,
-	MailOpen,
-	SolidInfoCircle,
-	Undo2,
-	X,
-} from '@signozhq/icons';
+import { useState } from 'react';
+import { SolidInfoCircle, Undo2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { DialogWrapper } from '@signozhq/ui/dialog';
 import { Input } from '@signozhq/ui/input';
 import logEvent from 'api/common/logEvent';
 import { pick } from 'lodash-es';
 import { useAppContext } from 'providers/App/App';
-import { useCopyToClipboard } from 'react-use';
 import { getBaseUrl } from 'utils/basePath';
-import { Color } from '@signozhq/design-tokens';
 
 import styles from './CancelSubscriptionBanner.module.scss';
-
-const SUPPORT_EMAIL = 'cloud-support@signoz.io';
-const MAX_MAILTO_URI_LENGTH = 1800;
-
-type DialogView = 'confirm' | 'fallback';
-
-function buildEmailBody(orgName: string, userEmail: string): string {
-	return [
-		'Hi SigNoz Team,',
-		'',
-		'I would like to cancel my SigNoz Cloud subscription.',
-		'Please find my account details below.',
-		'',
-		'Account Details:',
-		`  • SigNoz URL: ${getBaseUrl()}`,
-		...(orgName ? [`  • Organization: ${orgName}`] : []),
-		`  • Account Email: ${userEmail}`,
-		'',
-		'Reason for Cancellation:',
-		'[Please share the reason for cancellation]',
-		'',
-		'Additional feedback (optional):',
-		'[Any other feedback]',
-		'',
-		'Regards,',
-		'[user name or team name]',
-	].join('\n');
-}
-
-function buildMailtoUri(orgName: string, userEmail: string): string {
-	const subject = encodeURIComponent('Cancel My SigNoz Subscription');
-	const body = encodeURIComponent(buildEmailBody(orgName, userEmail));
-	const full = `mailto:${SUPPORT_EMAIL}?subject=${subject}&body=${body}`;
-	if (full.length <= MAX_MAILTO_URI_LENGTH) {
-		return full;
-	}
-	const shortBody = encodeURIComponent(
-		'Hi SigNoz Team,\n\nI would like to cancel my SigNoz Cloud subscription.\nPlease find my account details and reason for cancellation below.\n\n[Your details here]\n\nRegards,',
-	);
-	return `mailto:${SUPPORT_EMAIL}?subject=${subject}&body=${shortBody}`;
-}
-
-function openMailto(uri: string): void {
-	const link = document.createElement('a');
-	link.href = uri;
-	link.style.display = 'none';
-	document.body.appendChild(link);
-	link.click();
-	document.body.removeChild(link);
-}
+import { Color } from '@signozhq/design-tokens';
 
 function CancelSubscriptionBanner(): JSX.Element {
-	const [dialogView, setDialogView] = useState<DialogView | null>(null);
+	const [open, setOpen] = useState(false);
 	const [confirmText, setConfirmText] = useState('');
-	const [copied, setCopied] = useState(false);
-	const [, copyToClipboard] = useCopyToClipboard();
-	const copyTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 	const { user, org } = useAppContext();
 
-	useEffect(
-		() => (): void => {
-			if (copyTimerRef.current) {
-				clearTimeout(copyTimerRef.current);
-			}
-		},
-		[],
-	);
-
-	const orgName = org?.[0]?.displayName ?? '';
-	const userEmail = user?.email ?? '';
-
 	const handleOpenCancelDialog = (): void => {
 		void logEvent('Billing : Cancel Subscription Clicked', {
 			user: pick(user, ['email', 'displayName', 'role', 'organization']),
 			role: user?.role,
 		});
-		setDialogView('confirm');
+		setOpen(true);
 	};
 
 	const handleContactSupport = (): void => {
@@ -102,41 +29,43 @@ function CancelSubscriptionBanner(): JSX.Element {
 			user: pick(user, ['email', 'displayName', 'role', 'organization']),
 			role: user?.role,
 		});
-		openMailto(buildMailtoUri(orgName, userEmail));
+		const subject = encodeURIComponent('Cancel My SigNoz Subscription');
+		const orgName = org?.[0]?.displayName ?? '';
+		const body = encodeURIComponent(
+			[
+				'Hi SigNoz Team,',
+				'',
+				'I would like to cancel my SigNoz Cloud subscription.',
+				'Please find my account details below.',
+				'',
+				'Account Details:',
+				`  • SigNoz URL: ${getBaseUrl()}`,
+				...(orgName ? [`  • Organization: ${orgName}`] : []),
+				`  • Account Email: ${user?.email ?? ''}`,
+				'',
+				'Reason for Cancellation:',
+				'[Please share the reason for cancellation]',
+				'',
+				'Additional feedback (optional):',
+				'[Any other feedback]',
+				'',
+				'Regards,',
+				'[user name or team name]',
+			].join('\n'),
+		);
+		const link = document.createElement('a');
+		link.href = `mailto:cloud-support@signoz.io?subject=${subject}&body=${body}`;
+		link.click();
+		setOpen(false);
 		setConfirmText('');
-		setDialogView('fallback');
-	};
-
-	const handleCopyTemplate = (): void => {
-		void logEvent('Billing : Cancel Subscription Email Template Copied', {
-			user: pick(user, ['email', 'displayName', 'role', 'organization']),
-			role: user?.role,
-		});
-		copyToClipboard(buildEmailBody(orgName, userEmail));
-		setCopied(true);
-		if (copyTimerRef.current) {
-			clearTimeout(copyTimerRef.current);
-		}
-		copyTimerRef.current = setTimeout(() => setCopied(false), 2000);
-	};
-
-	const handleRetryMailto = (): void => {
-		void logEvent('Billing : Cancel Subscription Email Client Reopened', {
-			user: pick(user, ['email', 'displayName', 'role', 'organization']),
-			role: user?.role,
-		});
 	};
 
 	const handleClose = (): void => {
-		if (copyTimerRef.current) {
-			clearTimeout(copyTimerRef.current);
-		}
-		setDialogView(null);
+		setOpen(false);
 		setConfirmText('');
-		setCopied(false);
 	};
 
-	const confirmFooter = (
+	const footer = (
 		<>
 			<Button
 				variant="solid"
@@ -152,19 +81,12 @@ function CancelSubscriptionBanner(): JSX.Element {
 				prefix={<X size={14} />}
 				disabled={confirmText !== 'cancel'}
 				onClick={handleContactSupport}
-				data-testid="cancel-subscription-confirm-btn"
 			>
 				Cancel subscription
 			</Button>
 		</>
 	);
 
-	const fallbackFooter = (
-		<Button variant="solid" color="secondary" onClick={handleClose}>
-			Close
-		</Button>
-	);
-
 	return (
 		<>
 			<div className={styles.banner}>
@@ -189,67 +111,27 @@ function CancelSubscriptionBanner(): JSX.Element {
 				</Button>
 			</div>
 			<DialogWrapper
-				open={dialogView !== null}
+				open={open}
 				onOpenChange={handleClose}
 				title="Cancel your subscription?"
 				width="narrow"
 				showCloseButton={false}
-				footer={dialogView === 'confirm' ? confirmFooter : fallbackFooter}
+				footer={footer}
 			>
-				{dialogView === 'confirm' && (
-					<div className={styles.dialogBody}>
-						<p className={styles.dialogDescription}>
-							Cancelling your subscription would stop your data from being ingested to
-							SigNoz. All the data that has been already sent will also be deleted.
-						</p>
-						<p className={styles.dialogConfirmLabel}>
-							Type <code>cancel</code> to confirm the cancellation.
-						</p>
-						<Input
-							placeholder="Enter the word cancel..."
-							value={confirmText}
-							onChange={(e): void => setConfirmText(e.target.value)}
-							data-testid="cancel-confirm-input"
-						/>
-					</div>
-				)}
-				{dialogView === 'fallback' && (
-					<div className={styles.fallbackBody}>
-						<p className={styles.fallbackHint}>
-							An email draft has been opened. If it did not open, send your
-							cancellation request directly to:
-						</p>
-						<span className={styles.fallbackEmail}>{SUPPORT_EMAIL}</span>
-						<div className={styles.fallbackActions}>
-							<Button
-								variant="outlined"
-								color="secondary"
-								prefix={copied ? <CircleCheck size={14} /> : <Copy size={14} />}
-								onClick={handleCopyTemplate}
-								data-testid="copy-email-template-btn"
-							>
-								{copied ? 'Copied!' : 'Copy email template'}
-							</Button>
-							<Button
-								asChild
-								variant="outlined"
-								color="secondary"
-								data-testid="retry-mailto-btn"
-							>
-								<a
-									href={buildMailtoUri(orgName, userEmail)}
-									onClick={handleRetryMailto}
-									className={styles.retryLink}
-									target="_blank"
-									rel="noopener noreferrer"
-								>
-									<MailOpen size={14} />
-									Reopen email client
-								</a>
-							</Button>
-						</div>
-					</div>
-				)}
+				<div className={styles.dialogBody}>
+					<p className={styles.dialogDescription}>
+						Cancelling your subscription would stop your data from being ingested to
+						SigNoz. All the data that has been already sent will also be deleted.
+					</p>
+					<p className={styles.dialogConfirmLabel}>
+						Type <code>cancel</code> to confirm the cancellation.
+					</p>
+					<Input
+						placeholder="Enter the word cancel..."
+						value={confirmText}
+						onChange={(e): void => setConfirmText(e.target.value)}
+					/>
+				</div>
 			</DialogWrapper>
 		</>
 	);

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

@@ -1,46 +0,0 @@
-import { useCallback } from 'react';
-import { useLocation } from 'react-router-dom';
-import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
-import logEvent from 'api/common/logEvent';
-import Noz from 'components/Noz/Noz';
-import { NOZ_TOOLTIP_TITLE } from 'components/Noz/Noz.constants';
-import {
-	AIAssistantEvents,
-	AIAssistantOpenSource,
-} from 'container/AIAssistant/events';
-import { normalizePage } from 'container/AIAssistant/hooks/useAIAssistantAnalyticsContext';
-import { openAIAssistant } from 'container/AIAssistant/store/useAIAssistantStore';
-import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
-
-export default function NozButton(): JSX.Element | null {
-	const { pathname } = useLocation();
-	const isAIAssistantEnabled = useIsAIAssistantEnabled();
-
-	const handleOpenNoz = useCallback((): void => {
-		void logEvent(AIAssistantEvents.Opened, {
-			source: AIAssistantOpenSource.TraceDetails,
-			currentPage: normalizePage(pathname),
-		});
-		openAIAssistant();
-	}, [pathname]);
-
-	if (!isAIAssistantEnabled) {
-		return null;
-	}
-
-	return (
-		<TooltipSimple title={NOZ_TOOLTIP_TITLE}>
-			<Button
-				variant="ghost"
-				size="icon"
-				color="secondary"
-				className="noz-wave"
-				aria-label="Open Noz"
-				onClick={handleOpenNoz}
-			>
-				<Noz size={16} />
-			</Button>
-		</TooltipSimple>
-	);
-}

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

@@ -20,7 +20,6 @@ import { DEFAULT_ENTITY_VERSION } from 'constants/app';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
 import { uniqBy } from 'lodash-es';
-import NozButton from 'pages/TraceDetailsV3/TraceDetailsHeader/NozButton';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { Query, TagFilter } from 'types/api/queryBuilder/queryBuilderData';
 import {
@@ -427,8 +426,6 @@ function Filters({
 					)}
 				</div>
 
-				<NozButton />
-
 				<div className={styles.highlightControl}>{highlightErrorsToggle}</div>
 			</div>
 		</TooltipProvider>

frontend/vite.config.ts

@@ -95,7 +95,7 @@ export default defineConfig(({ mode }): UserConfig => {
 				project: env.VITE_SENTRY_PROJECT_ID,
 				// Pin the sourcemap-upload release to the same value injected as
 				// process.env.VERSION so uploaded sourcemaps resolve. Ref: platform-pod#2393
-				release: { name: env.VITE_VERSION, setCommits: { auto: true } },
+				release: { name: env.VITE_VERSION },
 			}),
 		);
 	}

pkg/apiserver/signozapiserver/emptystate.go

@@ -1,34 +0,0 @@
-package signozapiserver
-
-import (
-	"net/http"
-
-	"github.com/gorilla/mux"
-
-	"github.com/SigNoz/signoz/pkg/http/handler"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/emptystatetypes"
-)
-
-func (provider *provider) addEmptyStateRoutes(router *mux.Router) error {
-	if err := router.Handle("/api/v1/empty_state/org_context", handler.New(
-		provider.authzMiddleware.ViewAccess(provider.statsReporterHandler.GetOrgContext),
-		handler.OpenAPIDef{
-			ID:                  "GetOrgContext",
-			Tags:                []string{"emptystate"},
-			Summary:             "Get org context for empty states",
-			Description:         "This endpoint returns raw org-level observability signals used to render contextual empty states",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            new(emptystatetypes.OrgContext),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{},
-			SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
-		},
-	)).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/apiserver/signozapiserver/provider.go

@@ -31,7 +31,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/user"
 	"github.com/SigNoz/signoz/pkg/querier"
 	"github.com/SigNoz/signoz/pkg/ruler"
-	"github.com/SigNoz/signoz/pkg/statsreporter"
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/zeus"
@@ -58,7 +57,6 @@ type provider struct {
 	infraMonitoringHandler  inframonitoring.Handler
 	gatewayHandler          gateway.Handler
 	fieldsHandler           fields.Handler
-	statsReporterHandler    statsreporter.Handler
 	authzHandler            authz.Handler
 	rawDataExportHandler    rawdataexport.Handler
 	zeusHandler             zeus.Handler
@@ -91,7 +89,6 @@ func NewFactory(
 	infraMonitoringHandler inframonitoring.Handler,
 	gatewayHandler gateway.Handler,
 	fieldsHandler fields.Handler,
-	statsReporterHandler statsreporter.Handler,
 	authzHandler authz.Handler,
 	rawDataExportHandler rawdataexport.Handler,
 	zeusHandler zeus.Handler,
@@ -127,7 +124,6 @@ func NewFactory(
 			infraMonitoringHandler,
 			gatewayHandler,
 			fieldsHandler,
-			statsReporterHandler,
 			authzHandler,
 			rawDataExportHandler,
 			zeusHandler,
@@ -165,7 +161,6 @@ func newProvider(
 	infraMonitoringHandler inframonitoring.Handler,
 	gatewayHandler gateway.Handler,
 	fieldsHandler fields.Handler,
-	statsReporterHandler statsreporter.Handler,
 	authzHandler authz.Handler,
 	rawDataExportHandler rawdataexport.Handler,
 	zeusHandler zeus.Handler,
@@ -202,7 +197,6 @@ func newProvider(
 		infraMonitoringHandler:  infraMonitoringHandler,
 		gatewayHandler:          gatewayHandler,
 		fieldsHandler:           fieldsHandler,
-		statsReporterHandler:    statsReporterHandler,
 		authzHandler:            authzHandler,
 		rawDataExportHandler:    rawDataExportHandler,
 		zeusHandler:             zeusHandler,
@@ -292,10 +286,6 @@ func (provider *provider) AddToRouter(router *mux.Router) error {
 		return err
 	}
 
-	if err := provider.addEmptyStateRoutes(router); err != nil {
-		return err
-	}
-
 	if err := provider.addRawDataExportRoutes(router); err != nil {
 		return err
 	}

pkg/modules/cloudintegration/config.go

@@ -22,7 +22,7 @@ func newConfig() factory.Config {
 		Agent: AgentConfig{
 			// we will maintain the latest version of cloud integration agent from here,
 			// till we automate it externally or figure out a way to validate it.
-			Version: "v0.0.11",
+			Version: "v0.0.10",
 		},
 	}
 }

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/azure/appservice/icon.svg

@@ -1 +0,0 @@
-<svg id="b70acf0a-34b4-4bdf-9024-7496043ff915" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><radialGradient id="e2cf8746-c9a8-4eee-86c2-4951983c6032" cx="13428.81" cy="3518.86" r="56.67" gradientTransform="translate(-2005.33 -518.83) scale(0.15)" gradientUnits="userSpaceOnUse"><stop offset="0.18" stop-color="#5ea0ef"/><stop offset="1" stop-color="#0078d4"/></radialGradient><linearGradient id="bdd213dd-d313-473c-8ff4-0133fd3a9033" x1="4.4" y1="11.48" x2="4.37" y2="7.53" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ccc"/><stop offset="1" stop-color="#fcfcfc"/></linearGradient><linearGradient id="afcc63c5-3649-4476-a742-bcb53a569f3c" x1="10.13" y1="15.45" x2="10.13" y2="11.9" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ccc"/><stop offset="1" stop-color="#fcfcfc"/></linearGradient><linearGradient id="bd873f0b-9954-4aa5-a3df-9f4c64e8729d" x1="14.18" y1="11.15" x2="14.18" y2="7.38" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ccc"/><stop offset="1" stop-color="#fcfcfc"/></linearGradient></defs><title>Icon-web-41</title><path id="ee75dd06-1aca-4f76-9d11-d05a284020ad" d="M14.21,15.72A8.5,8.5,0,0,1,3.79,2.28l.09-.06a8.5,8.5,0,0,1,10.33,13.5" fill="url(#e2cf8746-c9a8-4eee-86c2-4951983c6032)"/><path d="M6.69,7.23A13,13,0,0,1,15.6,3.65a8.47,8.47,0,0,0-1.49-1.44,14.34,14.34,0,0,0-4.69,1.1A12.54,12.54,0,0,0,5.34,6.13,2.76,2.76,0,0,1,6.69,7.23Z" fill="#fff" opacity="0.6"/><path d="M2.48,10.65a17.86,17.86,0,0,0-.83,2.62,7.82,7.82,0,0,0,.62.92c.18.23.35.44.55.65A17.94,17.94,0,0,1,3.9,11.37,2.76,2.76,0,0,1,2.48,10.65Z" fill="#fff" opacity="0.6"/><path d="M3.46,6.11a12,12,0,0,1-.69-2.94,8.15,8.15,0,0,0-1.1,1.45A12.69,12.69,0,0,0,2.24,7,2.69,2.69,0,0,1,3.46,6.11Z" fill="#f2f2f2" opacity="0.55"/><circle cx="4.38" cy="8.68" r="2.73" fill="url(#bdd213dd-d313-473c-8ff4-0133fd3a9033)"/><path d="M8.36,13.67A1.77,1.77,0,0,1,8.9,12.4a11.88,11.88,0,0,1-2.53-1.86,2.74,2.74,0,0,1-1.49.83,13.1,13.1,0,0,0,1.45,1.28A12.12,12.12,0,0,0,8.38,13.9,1.79,1.79,0,0,1,8.36,13.67Z" fill="#f2f2f2" opacity="0.55"/><path d="M14.66,13.88a12,12,0,0,1-2.76-.32.41.41,0,0,1,0,.11,1.75,1.75,0,0,1-.51,1.24,13.69,13.69,0,0,0,3.42.24A8.21,8.21,0,0,0,16,13.81,11.5,11.5,0,0,1,14.66,13.88Z" fill="#f2f2f2" opacity="0.55"/><circle cx="10.13" cy="13.67" r="1.78" fill="url(#afcc63c5-3649-4476-a742-bcb53a569f3c)"/><path d="M12.32,8.93a1.83,1.83,0,0,1,.61-1A25.5,25.5,0,0,1,8.47,3.79a16.91,16.91,0,0,1-2-2.92,7.64,7.64,0,0,0-1.09.42A18.14,18.14,0,0,0,7.53,4.47,26.44,26.44,0,0,0,12.32,8.93Z" fill="#f2f2f2" opacity="0.7"/><circle cx="14.18" cy="9.27" r="1.89" fill="url(#bd873f0b-9954-4aa5-a3df-9f4c64e8729d)"/><path d="M17.35,10.54,17,10.37l0,0-.3-.16-.06,0L16.38,10l-.07,0L16,9.8a1.76,1.76,0,0,1-.64.92c.12.08.25.15.38.22l.08.05.35.19,0,0,.86.45h0a8.63,8.63,0,0,0,.29-1.11Z" fill="#f2f2f2" opacity="0.55"/><circle cx="4.38" cy="8.68" r="2.73" fill="url(#bdd213dd-d313-473c-8ff4-0133fd3a9033)"/><circle cx="10.13" cy="13.67" r="1.78" fill="url(#afcc63c5-3649-4476-a742-bcb53a569f3c)"/></svg>

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/azure/appservice/integration.json

@@ -1,272 +0,0 @@
-{
-  "id": "appservice",
-  "title": "App Services",
-  "icon": "file://icon.svg",
-  "overview": "file://overview.md",
-  "supportedSignals": {
-    "metrics": true,
-    "logs": true
-  },
-  "dataCollected": {
-    "metrics": [
-      {
-        "name": "azure_averagememoryworkingset_average",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_bytesreceived_total",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_bytessent_total",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_backendrequestcount_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_cputime_count",
-        "unit": "Milliseconds",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_cputime_total",
-        "unit": "Milliseconds",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_cputime_minimum",
-        "unit": "Milliseconds",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_cputime_maximum",
-        "unit": "Milliseconds",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_currentassemblies_average",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_filesystemusage_average",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_gen0collections_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_ge10collections_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_gen2collections_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_handles_average",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_healthcheckstatus_average",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_http101_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_http2xx_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_http3xx_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_http401_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_http403_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_http404_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_http406_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_http4xx_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_http5xx_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-
-      {
-        "name": "azure_httpresponsetime_average",
-        "unit": "Milliseconds",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_iootherbytespersecond_total",
-        "unit": "BytesPerSecond",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_iootheroperationspersecond_total",
-        "unit": "BytesPerSecond",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_ioreadbytespersecond_total",
-        "unit": "BytesPerSecond",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_ioreadoperationspersecond_total",
-        "unit": "BytesPerSecond",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_iowritebytespersecond_total",
-        "unit": "BytesPerSecond",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_iowriteoperationspersecond_total",
-        "unit": "BytesPerSecond",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_privatebytes_average",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_requests_total",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_requestsinapplicationqueue_average",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_thread_average",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_totalappdomains_average",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "azure_totalappdomainsunloaded_average",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      }
-    ],
-    "logs": [
-      {
-        "name": "Resource ID",
-        "path": "resources.azure.resource.id",
-        "type": "string"
-      }
-    ]
-  },
-  "telemetryCollectionStrategy": {
-    "azure": {
-      "resourceProvider": "Microsoft.Web",
-      "resourceType": "sites",
-      "metrics": {},
-      "logs": {
-        "categoryGroups": ["allLogs"]
-      }
-    }
-  },
-  "assets": {
-    "dashboards": [
-      {
-        "id": "overview",
-        "title": "App Services Overview",
-        "description": "Overview of App Services metrics",
-        "definition": "file://assets/dashboards/overview.json"
-      }
-    ]
-  }
-}

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/azure/appservice/overview.md

@@ -1,5 +0,0 @@
-### Monitor Azure App Services with SigNoz
-
-Collect key App Services metrics and view them with an out of the box dashboard.
-
-Note: This integration DO NOT collect metrics for any database that was setup with your App Service (if any).

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/azure/virtualmachine/icon.svg

@@ -1 +0,0 @@
-<svg id="fd454f1c-5506-44b8-874e-8814b8b2f70b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><linearGradient id="f34d9569-2bd0-4002-8f16-3d01d8106cb5" x1="8.88" y1="12.21" x2="8.88" y2="0.21" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0078d4"/><stop offset="0.82" stop-color="#5ea0ef"/></linearGradient><linearGradient id="bdb45a0b-eb58-4970-a60a-fb2ce314f866" x1="8.88" y1="16.84" x2="8.88" y2="12.21" gradientUnits="userSpaceOnUse"><stop offset="0.15" stop-color="#ccc"/><stop offset="1" stop-color="#707070"/></linearGradient></defs><title>Icon-compute-21</title><rect x="-0.12" y="0.21" width="18" height="12" rx="0.6" fill="url(#f34d9569-2bd0-4002-8f16-3d01d8106cb5)"/><polygon points="11.88 4.46 11.88 7.95 8.88 9.71 8.88 6.21 11.88 4.46" fill="#50e6ff"/><polygon points="11.88 4.46 8.88 6.22 5.88 4.46 8.88 2.71 11.88 4.46" fill="#c3f1ff"/><polygon points="8.88 6.22 8.88 9.71 5.88 7.95 5.88 4.46 8.88 6.22" fill="#9cebff"/><polygon points="5.88 7.95 8.88 6.21 8.88 9.71 5.88 7.95" fill="#c3f1ff"/><polygon points="11.88 7.95 8.88 6.21 8.88 9.71 11.88 7.95" fill="#9cebff"/><path d="M12.49,15.84c-1.78-.28-1.85-1.56-1.85-3.63H7.11c0,2.07-.06,3.35-1.84,3.63a1,1,0,0,0-.89,1h9A1,1,0,0,0,12.49,15.84Z" fill="url(#bdb45a0b-eb58-4970-a60a-fb2ce314f866)"/></svg>

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/azure/virtualmachine/overview.md

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

pkg/modules/inframonitoring/implinframonitoring/hosts_constants.go

@@ -16,7 +16,12 @@ var hostNameGroupByKey = qbtypes.GroupByKey{
 	},
 }
 
-var hostsTableMetricNamesList = inframonitoringtypes.HostsTableMetricNames
+var hostsTableMetricNamesList = []string{
+	"system.cpu.time",
+	"system.memory.usage",
+	"system.cpu.load_average.15m",
+	"system.filesystem.usage",
+}
 
 var hostAttrKeysForMetadata = []string{
 	"os.type",

pkg/modules/inframonitoring/implinframonitoring/nodes_constants.go

@@ -17,7 +17,16 @@ var nodeNameGroupByKey = qbtypes.GroupByKey{
 	},
 }
 
-var nodesTableMetricNamesList = inframonitoringtypes.NodesTableMetricNames
+// nodesTableMetricNamesList drives the existence/retention check.
+// Includes condition_ready and pod.phase also.
+var nodesTableMetricNamesList = []string{
+	"k8s.node.cpu.usage",
+	"k8s.node.allocatable_cpu",
+	"k8s.node.memory.working_set",
+	"k8s.node.allocatable_memory",
+	"k8s.node.condition_ready",
+	"k8s.pod.phase",
+}
 
 var nodeAttrKeysForMetadata = []string{
 	"k8s.node.uid",

pkg/modules/inframonitoring/implinframonitoring/pods_constants.go

@@ -21,7 +21,15 @@ var podUIDGroupByKey = qbtypes.GroupByKey{
 	},
 }
 
-var podsTableMetricNamesList = inframonitoringtypes.PodsTableMetricNames
+var podsTableMetricNamesList = []string{
+	"k8s.pod.cpu.usage",
+	"k8s.pod.cpu_request_utilization",
+	"k8s.pod.cpu_limit_utilization",
+	"k8s.pod.memory.working_set",
+	"k8s.pod.memory_request_utilization",
+	"k8s.pod.memory_limit_utilization",
+	"k8s.pod.phase",
+}
 
 var podAttrKeysForMetadata = []string{
 	"k8s.pod.uid",

pkg/query-service/app/clickhouseReader/reader.go

@@ -18,7 +18,6 @@ import (
 	"github.com/uptrace/bun"
 
 	"github.com/SigNoz/signoz/pkg/prometheus"
-	"github.com/SigNoz/signoz/pkg/query-service/utils/timestamp"
 	"github.com/SigNoz/signoz/pkg/sqlstore"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
 	"github.com/SigNoz/signoz/pkg/types"
@@ -47,7 +46,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/query-service/app/resource"
 	"github.com/SigNoz/signoz/pkg/query-service/app/services"
 	"github.com/SigNoz/signoz/pkg/query-service/app/traces/smart"
-	"github.com/SigNoz/signoz/pkg/query-service/app/traces/tracedetail"
 	"github.com/SigNoz/signoz/pkg/query-service/common"
 	"github.com/SigNoz/signoz/pkg/query-service/constants"
 
@@ -161,9 +159,7 @@ type ClickHouseReader struct {
 	traceResourceTableV3 string
 	traceSummaryTable    string
 
-	fluxIntervalForTraceDetail time.Duration
-	cache                      cache.Cache
-	cacheForTraceDetail        cache.Cache
+	cache cache.Cache
 	metadataDB                 string
 	metadataTable              string
 }
@@ -175,8 +171,6 @@ func NewReader(
 	telemetryStore telemetrystore.TelemetryStore,
 	prometheus prometheus.Prometheus,
 	cluster string,
-	fluxIntervalForTraceDetail time.Duration,
-	cacheForTraceDetail cache.Cache,
 	cache cache.Cache,
 	options *Options,
 ) *ClickHouseReader {
@@ -224,9 +218,7 @@ func NewReader(
 		traceTableName:             traceTableName,
 		traceResourceTableV3:       options.primary.TraceResourceTableV3,
 		traceSummaryTable:          options.primary.TraceSummaryTable,
-		fluxIntervalForTraceDetail: fluxIntervalForTraceDetail,
-		cache:                      cache,
-		cacheForTraceDetail:        cacheForTraceDetail,
+		cache: cache,
 		metadataDB:                 options.primary.MetadataDB,
 		metadataTable:              options.primary.MetadataTable,
 	}
@@ -866,205 +858,6 @@ func (r *ClickHouseReader) GetUsage(ctx context.Context, queryParams *model.GetU
 	return &usageItems, nil
 }
 
-func (r *ClickHouseReader) GetSpansForTrace(ctx context.Context, traceID string, traceDetailsQuery string) ([]model.SpanItemV2, *model.ApiError) {
-
-	ctx = ctxtypes.NewContextWithCommentVals(ctx, map[string]string{
-		instrumentationtypes.TelemetrySignal:  telemetrytypes.SignalTraces.StringValue(),
-		instrumentationtypes.CodeNamespace:    "clickhouse-reader",
-		instrumentationtypes.CodeFunctionName: "GetSpansForTrace",
-	})
-
-	var traceSummary model.TraceSummary
-	summaryQuery := fmt.Sprintf("SELECT trace_id, min(start) AS start, max(end) AS end, sum(num_spans) AS num_spans FROM %s.%s WHERE trace_id=$1 GROUP BY trace_id", r.TraceDB, r.traceSummaryTable)
-	err := r.db.QueryRow(ctx, summaryQuery, traceID).Scan(&traceSummary.TraceID, &traceSummary.Start, &traceSummary.End, &traceSummary.NumSpans)
-	if err != nil {
-		if err == sql.ErrNoRows {
-			return []model.SpanItemV2{}, nil
-		}
-		r.logger.Error("Error in processing trace summary sql query", errorsV2.Attr(err))
-		return nil, model.ExecutionError(fmt.Errorf("error in processing trace summary sql query: %w", err))
-	}
-
-	var searchScanResponses []model.SpanItemV2
-	queryStartTime := time.Now()
-	err = r.db.Select(ctx, &searchScanResponses, traceDetailsQuery, traceID, strconv.FormatInt(traceSummary.Start.Unix()-1800, 10), strconv.FormatInt(traceSummary.End.Unix(), 10))
-	r.logger.Info(traceDetailsQuery)
-	if err != nil {
-		r.logger.Error("Error in processing sql query", errorsV2.Attr(err))
-		return nil, model.ExecutionError(fmt.Errorf("error in processing trace data sql query: %w", err))
-	}
-	r.logger.Info("trace details query took: ", "duration", time.Since(queryStartTime), "traceID", traceID)
-
-	return searchScanResponses, nil
-}
-
-
-func (r *ClickHouseReader) GetFlamegraphSpansForTraceCache(ctx context.Context, orgID valuer.UUID, traceID string) (*model.GetFlamegraphSpansForTraceCache, error) {
-	cachedTraceData := new(model.GetFlamegraphSpansForTraceCache)
-	err := r.cacheForTraceDetail.Get(ctx, orgID, strings.Join([]string{"getFlamegraphSpansForTrace", traceID}, "-"), cachedTraceData)
-	if err != nil {
-		r.logger.Debug("error in retrieving getFlamegraphSpansForTrace cache", errorsV2.Attr(err), "traceID", traceID)
-		return nil, err
-	}
-
-	if time.Since(time.UnixMilli(int64(cachedTraceData.EndTime))) < r.fluxIntervalForTraceDetail {
-		r.logger.Info("the trace end time falls under the flux interval, skipping getFlamegraphSpansForTrace cache", "traceID", traceID)
-		return nil, errors.Errorf("the trace end time falls under the flux interval, skipping getFlamegraphSpansForTrace cache, traceID: %s", traceID)
-	}
-
-	r.logger.Info("cache is successfully hit, applying cache for getFlamegraphSpansForTrace", "traceID", traceID)
-	return cachedTraceData, nil
-}
-
-func (r *ClickHouseReader) GetFlamegraphSpansForTrace(ctx context.Context, orgID valuer.UUID, traceID string, req *model.GetFlamegraphSpansForTraceParams) (*model.GetFlamegraphSpansForTraceResponse, error) {
-	trace := new(model.GetFlamegraphSpansForTraceResponse)
-	var startTime, endTime, durationNano uint64
-	var spanIdToSpanNodeMap = map[string]*model.FlamegraphSpan{}
-	// map[traceID][level]span
-	var selectedSpans = [][]*model.FlamegraphSpan{}
-	var traceRoots []*model.FlamegraphSpan
-
-	// get the trace tree from cache!
-	cachedTraceData, err := r.GetFlamegraphSpansForTraceCache(ctx, orgID, traceID)
-
-	if err == nil {
-		startTime = cachedTraceData.StartTime
-		endTime = cachedTraceData.EndTime
-		durationNano = cachedTraceData.DurationNano
-		selectedSpans = cachedTraceData.SelectedSpans
-		traceRoots = cachedTraceData.TraceRoots
-	}
-
-	if err != nil {
-		r.logger.Info("cache miss for getFlamegraphSpansForTrace", "traceID", traceID)
-
-		selectCols := "timestamp, duration_nano, span_id, trace_id, has_error, links as references, resource_string_service$$name, name, events"
-		if len(req.SelectFields) > 0 {
-			selectCols += ", attributes_string, attributes_number, attributes_bool, resources_string"
-		}
-		flamegraphQuery := fmt.Sprintf("SELECT %s FROM %s.%s WHERE trace_id=$1 and ts_bucket_start>=$2 and ts_bucket_start<=$3 ORDER BY timestamp ASC, name ASC", selectCols, r.TraceDB, r.traceTableName)
-
-		searchScanResponses, err := r.GetSpansForTrace(ctx, traceID, flamegraphQuery)
-		if err != nil {
-			return nil, err
-		}
-		if len(searchScanResponses) == 0 {
-			return trace, nil
-		}
-
-		for _, item := range searchScanResponses {
-			ref := []model.OtelSpanRef{}
-			err := json.Unmarshal([]byte(item.References), &ref)
-			if err != nil {
-				r.logger.Error("Error unmarshalling references", errorsV2.Attr(err))
-				return nil, errorsV2.Newf(errorsV2.TypeInternal, errorsV2.CodeInternal, "getFlamegraphSpansForTrace: error in unmarshalling references %s", err.Error())
-			}
-
-			events := make([]model.Event, 0)
-			for _, event := range item.Events {
-				var eventMap model.Event
-				err = json.Unmarshal([]byte(event), &eventMap)
-				if err != nil {
-					r.logger.Error("Error unmarshalling events", errorsV2.Attr(err))
-					return nil, errorsV2.Newf(errorsV2.TypeInternal, errorsV2.CodeInternal, "getFlamegraphSpansForTrace: error in unmarshalling events %s", err.Error())
-				}
-				events = append(events, eventMap)
-			}
-
-			jsonItem := model.FlamegraphSpan{
-				SpanID:       item.SpanID,
-				TraceID:      item.TraceID,
-				ServiceName:  item.ServiceName,
-				Name:         item.Name,
-				DurationNano: item.DurationNano,
-				HasError:     item.HasError,
-				References:   ref,
-				Events:       events,
-				Children:     make([]*model.FlamegraphSpan, 0),
-			}
-
-			if len(req.SelectFields) > 0 {
-				jsonItem.SetRequestedFields(item, req.SelectFields)
-			}
-
-			// metadata calculation
-			startTimeUnixNano := uint64(item.TimeUnixNano.UnixNano())
-			if startTime == 0 || startTimeUnixNano < startTime {
-				startTime = startTimeUnixNano
-			}
-			if endTime == 0 || (startTimeUnixNano+jsonItem.DurationNano) > endTime {
-				endTime = (startTimeUnixNano + jsonItem.DurationNano)
-			}
-			if durationNano == 0 || jsonItem.DurationNano > durationNano {
-				durationNano = jsonItem.DurationNano
-			}
-
-			jsonItem.TimeUnixNano = uint64(item.TimeUnixNano.UnixNano() / 1000000)
-			spanIdToSpanNodeMap[jsonItem.SpanID] = &jsonItem
-		}
-
-		// traverse through the map and append each node to the children array of the parent node
-		// and add missing spans
-		for _, spanNode := range spanIdToSpanNodeMap {
-			hasParentSpanNode := false
-			for _, reference := range spanNode.References {
-				if reference.RefType == "CHILD_OF" && reference.SpanId != "" {
-					hasParentSpanNode = true
-					if parentNode, exists := spanIdToSpanNodeMap[reference.SpanId]; exists {
-						parentNode.Children = append(parentNode.Children, spanNode)
-					} else {
-						// insert the missing spans
-						missingSpan := model.FlamegraphSpan{
-							SpanID:       reference.SpanId,
-							TraceID:      spanNode.TraceID,
-							ServiceName:  "",
-							Name:         "Missing Span",
-							TimeUnixNano: spanNode.TimeUnixNano,
-							DurationNano: spanNode.DurationNano,
-							HasError:     false,
-							Events:       make([]model.Event, 0),
-							Children:     make([]*model.FlamegraphSpan, 0),
-						}
-						missingSpan.Children = append(missingSpan.Children, spanNode)
-						spanIdToSpanNodeMap[missingSpan.SpanID] = &missingSpan
-						traceRoots = append(traceRoots, &missingSpan)
-					}
-				}
-			}
-			if !hasParentSpanNode && !tracedetail.ContainsFlamegraphSpan(traceRoots, spanNode) {
-				traceRoots = append(traceRoots, spanNode)
-			}
-		}
-
-		selectedSpans = tracedetail.GetAllSpansForFlamegraph(traceRoots, spanIdToSpanNodeMap)
-
-		// TODO: set the trace data (model.GetFlamegraphSpansForTraceCache) in cache here
-		// removed existing cache usage since it was not getting used due to this bug https://github.com/SigNoz/engineering-pod/issues/4648
-		// and was causing out of memory issues https://github.com/SigNoz/engineering-pod/issues/4638
-	}
-
-	processingPostCache := time.Now()
-	selectedSpansForRequest := selectedSpans
-	clientLimit := min(req.Limit, tracedetail.MaxLimitWithoutSampling)
-	totalSpanCount := tracedetail.GetTotalSpanCount(selectedSpans)
-	if totalSpanCount > uint64(clientLimit) {
-		// using trace start and end time if boundary ts are set to zero (or not set)
-		boundaryStart := max(timestamp.MilliToNano(req.BoundaryStartTS), startTime)
-		boundaryEnd := timestamp.MilliToNano(req.BoundaryEndTS)
-		if boundaryEnd == 0 {
-			boundaryEnd = endTime
-		}
-
-		selectedSpansForRequest = tracedetail.GetSelectedSpansForFlamegraphForRequest(req.SelectedSpanID, selectedSpans, boundaryStart, boundaryEnd)
-	}
-	r.logger.Debug("getFlamegraphSpansForTrace: processing post cache", "duration", time.Since(processingPostCache), "traceID", traceID, "totalSpans", totalSpanCount, "limit", clientLimit)
-
-	trace.Spans = selectedSpansForRequest
-	trace.StartTimestampMillis = startTime / 1000000
-	trace.EndTimestampMillis = endTime / 1000000
-	trace.HasMore = totalSpanCount > uint64(clientLimit)
-	return trace, nil
-}
 
 func (r *ClickHouseReader) GetDependencyGraph(ctx context.Context, queryParams *model.GetServicesParams) (*[]model.ServiceMapDependencyResponseItem, error) {
 

pkg/query-service/app/http_handler.go

@@ -534,7 +534,7 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *middleware.AuthZ) {
 
 	router.HandleFunc("/api/v2/traces/fields", am.ViewAccess(aH.traceFields)).Methods(http.MethodGet)
 	router.HandleFunc("/api/v2/traces/fields", am.EditAccess(aH.updateTraceField)).Methods(http.MethodPost)
-	router.HandleFunc("/api/v2/traces/flamegraph/{traceId}", am.ViewAccess(aH.GetFlamegraphSpansForTrace)).Methods(http.MethodPost)
+
 
 
 	router.HandleFunc("/api/v1/version", am.OpenAccess(aH.getVersion)).Methods(http.MethodGet)
@@ -1446,40 +1446,6 @@ func (aH *APIHandler) SearchTraces(w http.ResponseWriter, r *http.Request) {
 
 }
 
-func (aH *APIHandler) GetFlamegraphSpansForTrace(w http.ResponseWriter, r *http.Request) {
-	claims, err := authtypes.ClaimsFromContext(r.Context())
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-	orgID, err := valuer.NewUUID(claims.OrgID)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	traceID := mux.Vars(r)["traceId"]
-	if traceID == "" {
-		render.Error(w, errors.NewInvalidInputf(errors.CodeInvalidInput, "traceID is required"))
-		return
-	}
-
-	req := new(model.GetFlamegraphSpansForTraceParams)
-	err = json.NewDecoder(r.Body).Decode(&req)
-	if err != nil {
-		RespondError(w, model.BadRequest(err), nil)
-		return
-	}
-
-	result, apiErr := aH.reader.GetFlamegraphSpansForTrace(r.Context(), orgID, traceID, req)
-	if apiErr != nil {
-		render.Error(w, apiErr)
-		return
-	}
-
-	aH.WriteJSON(w, r, result)
-}
-
 func (aH *APIHandler) listErrors(w http.ResponseWriter, r *http.Request) {
 
 	query, err := parseListErrorsRequest(r)

pkg/query-service/app/querier/querier_test.go

@@ -1409,8 +1409,6 @@ func Test_querier_Traces_runWindowBasedListQueryDesc(t *testing.T) {
 				telemetryStore,
 				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
 				"",
-				time.Duration(time.Second),
-				nil,
 				nil,
 				options,
 			)
@@ -1635,8 +1633,6 @@ func Test_querier_Traces_runWindowBasedListQueryAsc(t *testing.T) {
 				telemetryStore,
 				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
 				"",
-				time.Duration(time.Second),
-				nil,
 				nil,
 				options,
 			)
@@ -1936,8 +1932,6 @@ func Test_querier_Logs_runWindowBasedListQueryDesc(t *testing.T) {
 				telemetryStore,
 				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
 				"",
-				time.Duration(time.Second),
-				nil,
 				nil,
 				options,
 			)
@@ -2164,8 +2158,6 @@ func Test_querier_Logs_runWindowBasedListQueryAsc(t *testing.T) {
 				telemetryStore,
 				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
 				"",
-				time.Duration(time.Second),
-				nil,
 				nil,
 				options,
 			)

pkg/query-service/app/querier/v2/querier_test.go

@@ -1461,8 +1461,6 @@ func Test_querier_Traces_runWindowBasedListQueryDesc(t *testing.T) {
 				telemetryStore,
 				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
 				"",
-				time.Duration(time.Second),
-				nil,
 				nil,
 				options,
 			)
@@ -1687,8 +1685,6 @@ func Test_querier_Traces_runWindowBasedListQueryAsc(t *testing.T) {
 				telemetryStore,
 				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
 				"",
-				time.Duration(time.Second),
-				nil,
 				nil,
 				options,
 			)
@@ -1987,8 +1983,6 @@ func Test_querier_Logs_runWindowBasedListQueryDesc(t *testing.T) {
 				telemetryStore,
 				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
 				"",
-				time.Duration(time.Second),
-				nil,
 				nil,
 				options,
 			)
@@ -2215,8 +2209,6 @@ func Test_querier_Logs_runWindowBasedListQueryAsc(t *testing.T) {
 				telemetryStore,
 				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
 				"",
-				time.Duration(time.Second),
-				nil,
 				nil,
 				options,
 			)

pkg/query-service/app/server.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"slices"
 
-	"github.com/SigNoz/signoz/pkg/cache/memorycache"
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/queryparser"
 
@@ -16,7 +15,6 @@ import (
 	"github.com/rs/cors"
 	"github.com/soheilhy/cmux"
 
-	"github.com/SigNoz/signoz/pkg/cache"
 	"github.com/SigNoz/signoz/pkg/http/middleware"
 	"github.com/SigNoz/signoz/pkg/licensing/nooplicensing"
 	"github.com/SigNoz/signoz/pkg/query-service/agentConf"
@@ -60,25 +58,12 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz) (*Server, error) {
 		return nil, err
 	}
 
-	cacheForTraceDetail, err := memorycache.New(context.TODO(), signoz.Instrumentation.ToProviderSettings(), cache.Config{
-		Provider: "memory",
-		Memory: cache.Memory{
-			NumCounters: 10 * 10000,
-			MaxCost:     1 << 27, // 128 MB
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-
 	reader := clickhouseReader.NewReader(
 		signoz.Instrumentation.Logger(),
 		signoz.SQLStore,
 		signoz.TelemetryStore,
 		signoz.Prometheus,
 		signoz.TelemetryStore.Cluster(),
-		config.Querier.FluxInterval,
-		cacheForTraceDetail,
 		signoz.Cache,
 		nil,
 	)

pkg/query-service/app/traces/tracedetail/flamegraph.go

@@ -1,199 +0,0 @@
-package tracedetail
-
-import (
-	"sort"
-
-	"github.com/SigNoz/signoz/pkg/query-service/model"
-)
-
-var (
-	flamegraphSpanLevelLimit      float64 = 50
-	flamegraphSpanLimitPerLevel   int     = 100
-	flamegraphSamplingBucketCount int     = 50
-	flamegraphTopLatencySpanCount int     = 5
-
-	MaxLimitWithoutSampling uint = 120_000
-)
-
-func ContainsFlamegraphSpan(slice []*model.FlamegraphSpan, item *model.FlamegraphSpan) bool {
-	for _, v := range slice {
-		if v.SpanID == item.SpanID {
-			return true
-		}
-	}
-	return false
-}
-
-func BfsTraversalForTrace(span *model.FlamegraphSpan, level int64) map[int64][]*model.FlamegraphSpan {
-	bfs := map[int64][]*model.FlamegraphSpan{}
-	bfs[level] = []*model.FlamegraphSpan{span}
-
-	for _, child := range span.Children {
-		childBfsMap := BfsTraversalForTrace(child, level+1)
-		for _level, nodes := range childBfsMap {
-			bfs[_level] = append(bfs[_level], nodes...)
-		}
-	}
-	span.Level = level
-	span.Children = make([]*model.FlamegraphSpan, 0)
-
-	return bfs
-}
-
-func FindIndexForSelectedSpan(spans [][]*model.FlamegraphSpan, selectedSpanId string) int {
-	var selectedSpanLevel int = 0
-
-	for index, _spans := range spans {
-		for _, span := range _spans {
-			if span.SpanID == selectedSpanId {
-				selectedSpanLevel = index
-				break
-			}
-		}
-	}
-
-	return selectedSpanLevel
-}
-
-// GetAllSpansForFlamegraph groups all spans as per their level
-func GetAllSpansForFlamegraph(traceRoots []*model.FlamegraphSpan, spanIdToSpanNodeMap map[string]*model.FlamegraphSpan) [][]*model.FlamegraphSpan {
-
-	var traceIdLevelledFlamegraph = map[string]map[int64][]*model.FlamegraphSpan{}
-	selectedSpans := [][]*model.FlamegraphSpan{}
-
-	// sort the trace roots to add missing spans at the right order
-	sort.Slice(traceRoots, func(i, j int) bool {
-		if traceRoots[i].TimeUnixNano == traceRoots[j].TimeUnixNano {
-			return traceRoots[i].Name < traceRoots[j].Name
-		}
-		return traceRoots[i].TimeUnixNano < traceRoots[j].TimeUnixNano
-	})
-
-	for _, rootSpanID := range traceRoots {
-		if rootNode, exists := spanIdToSpanNodeMap[rootSpanID.SpanID]; exists {
-			bfsMapForTrace := BfsTraversalForTrace(rootNode, 0)
-			traceIdLevelledFlamegraph[rootSpanID.SpanID] = bfsMapForTrace
-		}
-	}
-
-	for _, trace := range traceRoots {
-		keys := make([]int64, 0, len(traceIdLevelledFlamegraph[trace.SpanID]))
-		for key := range traceIdLevelledFlamegraph[trace.SpanID] {
-			keys = append(keys, key)
-		}
-
-		sort.Slice(keys, func(i, j int) bool {
-			return keys[i] < keys[j]
-		})
-
-		for _, level := range keys {
-			if ok, exists := traceIdLevelledFlamegraph[trace.SpanID][level]; exists {
-				selectedSpans = append(selectedSpans, ok)
-			}
-		}
-	}
-
-	return selectedSpans
-}
-
-func getLatencyAndTimestampBucketedSpans(spans []*model.FlamegraphSpan, selectedSpanID string, isSelectedSpanIDPresent bool, startTime uint64, endTime uint64) []*model.FlamegraphSpan {
-	var sampledSpans []*model.FlamegraphSpan
-	// sort the spans by latency for latency filtering
-	sort.Slice(spans, func(i, j int) bool {
-		return spans[i].DurationNano > spans[j].DurationNano
-	})
-
-	// pick the top 5 latency spans
-	for idx := range flamegraphTopLatencySpanCount {
-		sampledSpans = append(sampledSpans, spans[idx])
-	}
-
-	// always add the selectedSpan
-	if isSelectedSpanIDPresent {
-		idx := -1
-		for _idx, span := range spans {
-			if span.SpanID == selectedSpanID {
-				idx = _idx
-			}
-		}
-		if idx != -1 {
-			sampledSpans = append(sampledSpans, spans[idx])
-		}
-	}
-
-	bucketSize := (endTime - startTime) / uint64(flamegraphSamplingBucketCount)
-	if bucketSize == 0 {
-		bucketSize = 1
-	}
-
-	bucketedSpans := make([][]*model.FlamegraphSpan, flamegraphSamplingBucketCount)
-
-	for _, span := range spans {
-		if span.TimeUnixNano >= startTime && span.TimeUnixNano <= endTime {
-			bucketIndex := int((span.TimeUnixNano - startTime) / bucketSize)
-			if bucketIndex >= 0 && bucketIndex < flamegraphSamplingBucketCount {
-				bucketedSpans[bucketIndex] = append(bucketedSpans[bucketIndex], span)
-			}
-		}
-	}
-
-	for i := range bucketedSpans {
-		if len(bucketedSpans[i]) > 2 {
-			// Keep only the first 2 spans
-			bucketedSpans[i] = bucketedSpans[i][:2]
-		}
-	}
-
-	// Flatten the bucketed spans into a single slice
-	for _, bucket := range bucketedSpans {
-		sampledSpans = append(sampledSpans, bucket...)
-	}
-
-	return sampledSpans
-}
-
-func GetSelectedSpansForFlamegraphForRequest(selectedSpanID string, selectedSpans [][]*model.FlamegraphSpan, startTime uint64, endTime uint64) [][]*model.FlamegraphSpan {
-	var selectedSpansForRequest = make([][]*model.FlamegraphSpan, 0)
-	var selectedIndex = 0
-
-	if selectedSpanID != "" {
-		selectedIndex = FindIndexForSelectedSpan(selectedSpans, selectedSpanID)
-	}
-
-	lowerLimit := selectedIndex - int(flamegraphSpanLevelLimit*0.4)
-	upperLimit := selectedIndex + int(flamegraphSpanLevelLimit*0.6)
-
-	if lowerLimit < 0 {
-		upperLimit = upperLimit - lowerLimit
-		lowerLimit = 0
-	}
-
-	if upperLimit > len(selectedSpans) {
-		lowerLimit = lowerLimit - (upperLimit - len(selectedSpans))
-		upperLimit = len(selectedSpans)
-	}
-
-	if lowerLimit < 0 {
-		lowerLimit = 0
-	}
-
-	for i := lowerLimit; i < upperLimit; i++ {
-		if len(selectedSpans[i]) > flamegraphSpanLimitPerLevel {
-			_spans := getLatencyAndTimestampBucketedSpans(selectedSpans[i], selectedSpanID, i == selectedIndex, startTime, endTime)
-			selectedSpansForRequest = append(selectedSpansForRequest, _spans)
-		} else {
-			selectedSpansForRequest = append(selectedSpansForRequest, selectedSpans[i])
-		}
-	}
-
-	return selectedSpansForRequest
-}
-
-func GetTotalSpanCount(spans [][]*model.FlamegraphSpan) uint64 {
-	levelCount := len(spans)
-	spanCount := uint64(0)
-	for i := range levelCount {
-		spanCount += uint64(len(spans[i]))
-	}
-	return spanCount
-}

pkg/query-service/interfaces/interface.go

@@ -43,8 +43,6 @@ type Reader interface {
 
 	// Search Interfaces
 	SearchTraces(ctx context.Context, params *model.SearchTracesParams) (*[]model.SearchSpansResult, error)
-	GetFlamegraphSpansForTrace(ctx context.Context, orgID valuer.UUID, traceID string, req *model.GetFlamegraphSpansForTraceParams) (*model.GetFlamegraphSpansForTraceResponse, error)
-
 	// Setter Interfaces
 	SetTTL(ctx context.Context, orgID string, ttlParams *retentiontypes.TTLParams) (*retentiontypes.SetTTLResponseItem, *model.ApiError)
 	SetTTLV2(ctx context.Context, orgID string, params *retentiontypes.CustomRetentionTTLParams) (*retentiontypes.CustomRetentionTTLResponse, error)

pkg/query-service/model/cacheable.go

@@ -1,42 +0,0 @@
-package model
-
-import (
-	"encoding/json"
-
-	"github.com/SigNoz/signoz/pkg/types/cachetypes"
-)
-
-type GetFlamegraphSpansForTraceCache struct {
-	StartTime     uint64              `json:"startTime"`
-	EndTime       uint64              `json:"endTime"`
-	DurationNano  uint64              `json:"durationNano"`
-	SelectedSpans [][]*FlamegraphSpan `json:"selectedSpans"`
-	TraceRoots    []*FlamegraphSpan   `json:"traceRoots"`
-}
-
-func (c *GetFlamegraphSpansForTraceCache) Clone() cachetypes.Cacheable {
-	return &GetFlamegraphSpansForTraceCache{
-		StartTime:     c.StartTime,
-		EndTime:       c.EndTime,
-		DurationNano:  c.DurationNano,
-		SelectedSpans: c.SelectedSpans,
-		TraceRoots:    c.TraceRoots,
-	}
-}
-
-func (c *GetFlamegraphSpansForTraceCache) Cost() int64 {
-	const perSpanBytes = 128
-	var spans int64
-	for _, row := range c.SelectedSpans {
-		spans += int64(len(row))
-	}
-	spans += int64(len(c.TraceRoots))
-	return spans * perSpanBytes
-}
-
-func (c *GetFlamegraphSpansForTraceCache) MarshalBinary() (data []byte, err error) {
-	return json.Marshal(c)
-}
-func (c *GetFlamegraphSpansForTraceCache) UnmarshalBinary(data []byte) error {
-	return json.Unmarshal(data, c)
-}

pkg/query-service/model/queryParams.go

@@ -2,8 +2,6 @@ package model
 
 import (
 	"time"
-
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )
 
 type InstantQueryMetricsParams struct {
@@ -331,14 +329,6 @@ type SearchTracesParams struct {
 	MaxSpansInTrace  int    `json:"maxSpansInTrace"`
 }
 
-type GetFlamegraphSpansForTraceParams struct {
-	SelectedSpanID  string                             `json:"selectedSpanId"`
-	Limit           uint                               `json:"limit"`
-	BoundaryStartTS uint64                             `json:"boundaryStartTsMilli"`
-	BoundaryEndTS   uint64                             `json:"boundarEndTsMilli"`
-	SelectFields    []telemetrytypes.TelemetryFieldKey `json:"selectFields"`
-}
-
 type SpanFilterParams struct {
 	TraceID            []string `json:"traceID"`
 	Status             []string `json:"status"`

pkg/query-service/model/response.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/prometheus/prometheus/util/stats"
@@ -240,13 +239,6 @@ type SearchSpanDBResponseItem struct {
 	Model     string    `ch:"model"`
 }
 
-type Event struct {
-	Name         string                 `json:"name,omitempty"`
-	TimeUnixNano uint64                 `json:"timeUnixNano,omitempty"`
-	AttributeMap map[string]interface{} `json:"attributeMap,omitempty"`
-	IsError      bool                   `json:"isError,omitempty"`
-}
-
 //easyjson:json
 type SearchSpanResponseItem struct {
 	TimeUnixNano     uint64            `json:"timestamp"`
@@ -267,79 +259,6 @@ type SearchSpanResponseItem struct {
 	SpanKind         string            `json:"spanKind"`
 }
 
-type Span struct {
-	TimeUnixNano     uint64            `json:"timestamp"`
-	DurationNano     uint64            `json:"durationNano"`
-	SpanID           string            `json:"spanId"`
-	RootSpanID       string            `json:"rootSpanId"`
-	TraceID          string            `json:"traceId"`
-	HasError         bool              `json:"hasError"`
-	Kind             int32             `json:"kind"`
-	ServiceName      string            `json:"serviceName"`
-	Name             string            `json:"name"`
-	References       []OtelSpanRef     `json:"references,omitempty"`
-	TagMap           map[string]string `json:"tagMap"`
-	Events           []Event           `json:"event"`
-	RootName         string            `json:"rootName"`
-	StatusMessage    string            `json:"statusMessage"`
-	StatusCodeString string            `json:"statusCodeString"`
-	SpanKind         string            `json:"spanKind"`
-	Children         []*Span           `json:"children"`
-
-	// the below two fields are for frontend to render the spans
-	SubTreeNodeCount uint64 `json:"subTreeNodeCount"`
-	HasChildren      bool   `json:"hasChildren"`
-	HasSiblings      bool   `json:"hasSiblings"`
-	Level            uint64 `json:"level"`
-}
-
-type FlamegraphSpan struct {
-	TimeUnixNano uint64            `json:"timestamp"`
-	DurationNano uint64            `json:"durationNano"`
-	SpanID       string            `json:"spanId"`
-	TraceID      string            `json:"traceId"`
-	HasError     bool              `json:"hasError"`
-	ServiceName  string            `json:"serviceName"`
-	Name         string            `json:"name"`
-	Level        int64             `json:"level"`
-	Events       []Event           `json:"event"`
-	References   []OtelSpanRef     `json:"references,omitempty"`
-	Children     []*FlamegraphSpan `json:"children"`
-	Attributes   map[string]any    `json:"attributes,omitempty"`
-	Resource     map[string]string `json:"resource,omitempty"`
-}
-
-// SetRequestedFields extracts the requested attribute/resource fields from item into s.
-// This can eventually support missing fieldContext by checking both
-func (s *FlamegraphSpan) SetRequestedFields(item SpanItemV2, fields []telemetrytypes.TelemetryFieldKey) {
-	for _, field := range fields {
-		switch field.FieldContext {
-		case telemetrytypes.FieldContextResource:
-			if v, ok := item.Resources_string[field.Name]; ok && v != "" {
-				if s.Resource == nil {
-					s.Resource = make(map[string]string)
-				}
-				s.Resource[field.Name] = v
-			}
-		case telemetrytypes.FieldContextAttribute:
-			if v := item.AttributeValue(field.Name); v != nil {
-				if s.Attributes == nil {
-					s.Attributes = make(map[string]any)
-				}
-				s.Attributes[field.Name] = v
-			}
-		}
-	}
-}
-
-type GetFlamegraphSpansForTraceResponse struct {
-	StartTimestampMillis uint64              `json:"startTimestampMillis"`
-	EndTimestampMillis   uint64              `json:"endTimestampMillis"`
-	DurationNano         uint64              `json:"durationNano"`
-	Spans                [][]*FlamegraphSpan `json:"spans"`
-	HasMore              bool                `json:"hasMore"`
-}
-
 type OtelSpanRef struct {
 	TraceId string `json:"traceId,omitempty"`
 	SpanId  string `json:"spanId,omitempty"`

pkg/signoz/handler.go

@@ -49,8 +49,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/querier"
 	"github.com/SigNoz/signoz/pkg/ruler"
 	"github.com/SigNoz/signoz/pkg/ruler/signozruler"
-	"github.com/SigNoz/signoz/pkg/statsreporter"
-	"github.com/SigNoz/signoz/pkg/telemetrystore"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/SigNoz/signoz/pkg/zeus"
 )
@@ -82,7 +80,6 @@ type Handlers struct {
 	TraceDetail             tracedetail.Handler
 	RulerHandler            ruler.Handler
 	LLMPricingRuleHandler   llmpricingrule.Handler
-	StatsReporter           statsreporter.Handler
 }
 
 func NewHandlers(
@@ -100,7 +97,6 @@ func NewHandlers(
 	registryHandler factory.Handler,
 	alertmanagerService alertmanager.Alertmanager,
 	rulerService ruler.Ruler,
-	telemetryStore telemetrystore.TelemetryStore,
 ) Handlers {
 	return Handlers{
 		SavedView:               implsavedview.NewHandler(modules.SavedView),
@@ -129,11 +125,5 @@ func NewHandlers(
 		TraceDetail:             impltracedetail.NewHandler(modules.TraceDetail),
 		RulerHandler:            signozruler.NewHandler(rulerService),
 		LLMPricingRuleHandler:   impllmpricingrule.NewHandler(modules.LLMPricingRule),
-		StatsReporter: statsreporter.NewHandler(telemetryStore, statsreporter.OrgContextCollectors{
-			Rules:      rulerService,
-			Dashboards: modules.Dashboard,
-			SavedViews: modules.SavedView,
-			Licensing:  licensing,
-		}),
 	}
 }

pkg/signoz/handler_test.go

@@ -63,7 +63,7 @@ func TestNewHandlers(t *testing.T) {
 
 	querierHandler := querier.NewHandler(providerSettings, nil, nil)
 	registryHandler := factory.NewHandler(nil)
-	handlers := NewHandlers(modules, providerSettings, nil, querierHandler, nil, nil, nil, nil, nil, nil, nil, registryHandler, alertmanager, nil, nil)
+	handlers := NewHandlers(modules, providerSettings, nil, querierHandler, nil, nil, nil, nil, nil, nil, nil, registryHandler, alertmanager, nil)
 	reflectVal := reflect.ValueOf(handlers)
 	for i := 0; i < reflectVal.NumField(); i++ {
 		f := reflectVal.Field(i)

pkg/signoz/openapi.go

@@ -36,7 +36,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/user"
 	"github.com/SigNoz/signoz/pkg/querier"
 	"github.com/SigNoz/signoz/pkg/ruler"
-	"github.com/SigNoz/signoz/pkg/statsreporter"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/zeus"
 	"github.com/swaggest/jsonschema-go"
@@ -71,7 +70,6 @@ func NewOpenAPI(ctx context.Context, instrumentation instrumentation.Instrumenta
 		struct{ inframonitoring.Handler }{},
 		struct{ gateway.Handler }{},
 		struct{ fields.Handler }{},
-		struct{ statsreporter.Handler }{},
 		struct{ authz.Handler }{},
 		struct{ rawdataexport.Handler }{},
 		struct{ zeus.Handler }{},

pkg/signoz/provider.go

@@ -294,7 +294,6 @@ func NewAPIServerProviderFactories(orgGetter organization.Getter, authz authz.Au
 			handlers.InfraMonitoring,
 			handlers.GatewayHandler,
 			handlers.Fields,
-			handlers.StatsReporter,
 			handlers.AuthzHandler,
 			handlers.RawDataExport,
 			handlers.ZeusHandler,

pkg/signoz/signoz.go

@@ -535,7 +535,7 @@ func New(
 
 	// Initialize all handlers for the modules
 	registryHandler := factory.NewHandler(registry)
-	handlers := NewHandlers(modules, providerSettings, analytics, querierHandler, licensing, global, flagger, gateway, telemetryMetadataStore, authz, zeus, registryHandler, alertmanager, rulerInstance, telemetrystore)
+	handlers := NewHandlers(modules, providerSettings, analytics, querierHandler, licensing, global, flagger, gateway, telemetryMetadataStore, authz, zeus, registryHandler, alertmanager, rulerInstance)
 
 	// Initialize the API server (after registry so it can access service health)
 	apiserverInstance, err := factory.NewProviderFromNamedMap(

pkg/statsreporter/analyticsstatsreporter/provider.go

@@ -250,16 +250,20 @@ func (provider *provider) collectOrg(ctx context.Context, orgID valuer.UUID) map
 		stats["telemetry.metrics.count"] = metrics
 	}
 
-	// Shared with the org-context handler; the epoch-to-now window preserves
-	// the previous all-time semantics at the 6h reporting cadence.
-	if tracesLastSeenAt, err := statsreporter.LastObservedTraces(ctx, provider.telemetryStore, time.Unix(0, 0), time.Now()); err == nil && tracesLastSeenAt != nil {
-		stats["telemetry.traces.last_observed.time"] = tracesLastSeenAt.UTC()
-		stats["telemetry.traces.last_observed.time_unix"] = tracesLastSeenAt.Unix()
+	var tracesLastSeenAt time.Time
+	if err := provider.telemetryStore.ClickhouseDB().QueryRow(ctx, "SELECT max(timestamp) FROM signoz_traces.distributed_signoz_index_v3").Scan(&tracesLastSeenAt); err == nil {
+		if tracesLastSeenAt.Unix() != 0 {
+			stats["telemetry.traces.last_observed.time"] = tracesLastSeenAt.UTC()
+			stats["telemetry.traces.last_observed.time_unix"] = tracesLastSeenAt.Unix()
+		}
 	}
 
-	if logsLastSeenAt, err := statsreporter.LastObservedLogs(ctx, provider.telemetryStore, time.Unix(0, 0), time.Now()); err == nil && logsLastSeenAt != nil {
-		stats["telemetry.logs.last_observed.time"] = logsLastSeenAt.UTC()
-		stats["telemetry.logs.last_observed.time_unix"] = logsLastSeenAt.Unix()
+	var logsLastSeenAt time.Time
+	if err := provider.telemetryStore.ClickhouseDB().QueryRow(ctx, "SELECT fromUnixTimestamp64Nano(max(timestamp)) FROM signoz_logs.distributed_logs_v2").Scan(&logsLastSeenAt); err == nil {
+		if logsLastSeenAt.Unix() != 0 {
+			stats["telemetry.logs.last_observed.time"] = logsLastSeenAt.UTC()
+			stats["telemetry.logs.last_observed.time_unix"] = logsLastSeenAt.Unix()
+		}
 	}
 
 	var metricsLastSeenAt time.Time

pkg/statsreporter/handler.go

@@ -1,214 +0,0 @@
-package statsreporter
-
-import (
-	"context"
-	"net/http"
-	"strings"
-	"time"
-
-	"golang.org/x/sync/errgroup"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/http/render"
-	"github.com/SigNoz/signoz/pkg/telemetrystore"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
-	"github.com/SigNoz/signoz/pkg/types/emptystatetypes"
-	"github.com/SigNoz/signoz/pkg/types/licensetypes"
-	"github.com/SigNoz/signoz/pkg/types/ruletypes"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type Handler interface {
-	GetOrgContext(rw http.ResponseWriter, req *http.Request)
-}
-
-// OrgContextCollectors are the collectors the org context signals are sourced from.
-type OrgContextCollectors struct {
-	Rules      StatsCollector
-	Dashboards StatsCollector
-	SavedViews StatsCollector
-	Licensing  StatsCollector
-}
-
-type handler struct {
-	telemetryStore telemetrystore.TelemetryStore
-	collectors     OrgContextCollectors
-}
-
-func NewHandler(telemetryStore telemetrystore.TelemetryStore, collectors OrgContextCollectors) Handler {
-	return &handler{
-		telemetryStore: telemetryStore,
-		collectors:     collectors,
-	}
-}
-
-func (h *handler) GetOrgContext(rw http.ResponseWriter, req *http.Request) {
-	claims, err := authtypes.ClaimsFromContext(req.Context())
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	orgContext, err := h.getOrgContext(req.Context(), valuer.MustNewUUID(claims.OrgID))
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	render.Success(rw, http.StatusOK, orgContext)
-}
-
-func (h *handler) getOrgContext(ctx context.Context, orgID valuer.UUID) (*emptystatetypes.OrgContext, error) {
-	now := time.Now()
-
-	var logsLastIngestedAt *time.Time
-	var tracesLastIngestedAt *time.Time
-	var metricsLastIngestedAt *time.Time
-	var hasInfraMetrics bool
-	var alertsCount int
-	var dashboardsCount int
-	var savedViewsCount int
-	licenseStatus := emptystatetypes.LicenseStatusUnknown
-
-	g, gCtx := errgroup.WithContext(ctx)
-
-	g.Go(func() error {
-		lastIngestedAt, err := h.getLastIngestedAt(gCtx, h.logsLastIngested, now)
-		if err != nil {
-			return err
-		}
-
-		logsLastIngestedAt = lastIngestedAt
-		return nil
-	})
-
-	g.Go(func() error {
-		lastIngestedAt, err := h.getLastIngestedAt(gCtx, h.tracesLastIngested, now)
-		if err != nil {
-			return err
-		}
-
-		tracesLastIngestedAt = lastIngestedAt
-		return nil
-	})
-
-	g.Go(func() error {
-		lastIngestedAt, err := h.getLastIngestedAt(gCtx, h.metricsLastIngested, now)
-		if err != nil {
-			return err
-		}
-
-		metricsLastIngestedAt = lastIngestedAt
-		return nil
-	})
-
-	g.Go(func() error {
-		var err error
-		hasInfraMetrics, err = h.getHasInfraMetrics(gCtx, now)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	g.Go(func() error {
-		var err error
-		alertsCount, err = h.getCollectedCount(gCtx, h.collectors.Rules, ruletypes.StatKeyRuleCount, orgID)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	g.Go(func() error {
-		var err error
-		dashboardsCount, err = h.getCollectedCount(gCtx, h.collectors.Dashboards, dashboardtypes.StatKeyDashboardCount, orgID)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	g.Go(func() error {
-		var err error
-		savedViewsCount, err = h.getCollectedCount(gCtx, h.collectors.SavedViews, savedviewtypes.StatKeySavedViewCount, orgID)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	g.Go(func() error {
-		licenseStatus = h.getLicenseStatus(gCtx, orgID)
-		return nil
-	})
-
-	if err := g.Wait(); err != nil {
-		return nil, err
-	}
-
-	lastIngestedAt := emptystatetypes.LastIngestedAt{
-		Logs:    logsLastIngestedAt,
-		Traces:  tracesLastIngestedAt,
-		Metrics: metricsLastIngestedAt,
-	}
-
-	return &emptystatetypes.OrgContext{
-		HasIngestedData: lastIngestedAt.Logs != nil || lastIngestedAt.Traces != nil || lastIngestedAt.Metrics != nil,
-		LastIngestedAt:  lastIngestedAt,
-		HasInfraMetrics: hasInfraMetrics,
-		AlertsCount:     alertsCount,
-		DashboardsCount: dashboardsCount,
-		SavedViewsCount: savedViewsCount,
-		LicenseStatus:   licenseStatus,
-	}, nil
-}
-
-func (h *handler) getCollectedCount(ctx context.Context, collector StatsCollector, key string, orgID valuer.UUID) (int, error) {
-	if collector == nil {
-		return 0, errors.NewInternalf(errors.CodeInternal, "collector for %q is not configured", key)
-	}
-
-	stats, err := collector.Collect(ctx, orgID)
-	if err != nil {
-		return 0, errors.WrapInternalf(err, errors.CodeInternal, "failed to collect %q", key)
-	}
-
-	count, ok := stats[key].(int64)
-	if !ok {
-		return 0, errors.NewInternalf(errors.CodeInternal, "stat %q is missing from collector output", key)
-	}
-
-	return int(count), nil
-}
-
-// License stats degrade to UNKNOWN: community wires nooplicensing (empty stats)
-// and a licensing outage must not fail the endpoint.
-func (h *handler) getLicenseStatus(ctx context.Context, orgID valuer.UUID) emptystatetypes.LicenseStatus {
-	if h.collectors.Licensing == nil {
-		return emptystatetypes.LicenseStatusUnknown
-	}
-
-	stats, err := h.collectors.Licensing.Collect(ctx, orgID)
-	if err != nil {
-		return emptystatetypes.LicenseStatusUnknown
-	}
-
-	return licenseStatusFromStats(stats)
-}
-
-func licenseStatusFromStats(stats map[string]any) emptystatetypes.LicenseStatus {
-	state, ok := stats[licensetypes.StatKeyLicenseStateName].(string)
-	if !ok || strings.TrimSpace(state) == "" {
-		return emptystatetypes.LicenseStatusUnknown
-	}
-
-	// Verbatim passthrough: trimming above is only for blank detection.
-	return emptystatetypes.LicenseStatus(state)
-}

pkg/statsreporter/handler_test.go

@@ -1,425 +0,0 @@
-package statsreporter
-
-import (
-	"context"
-	"regexp"
-	"testing"
-	"time"
-
-	"github.com/DATA-DOG/go-sqlmock"
-	cmock "github.com/SigNoz/clickhouse-go-mock"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/SigNoz/signoz/pkg/telemetrystore"
-	"github.com/SigNoz/signoz/pkg/telemetrystore/telemetrystoretest"
-	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
-	"github.com/SigNoz/signoz/pkg/types/emptystatetypes"
-	"github.com/SigNoz/signoz/pkg/types/inframonitoringtypes"
-	"github.com/SigNoz/signoz/pkg/types/licensetypes"
-	"github.com/SigNoz/signoz/pkg/types/ruletypes"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-var testOrgID = valuer.MustNewUUID("00000000-0000-0000-0000-000000000001")
-
-type fakeCollector struct {
-	stats map[string]any
-	err   error
-}
-
-func (f *fakeCollector) Collect(context.Context, valuer.UUID) (map[string]any, error) {
-	return f.stats, f.err
-}
-
-func okCollectors() OrgContextCollectors {
-	return OrgContextCollectors{
-		Rules:      &fakeCollector{stats: map[string]any{ruletypes.StatKeyRuleCount: int64(0)}},
-		Dashboards: &fakeCollector{stats: map[string]any{dashboardtypes.StatKeyDashboardCount: int64(0)}},
-		SavedViews: &fakeCollector{stats: map[string]any{savedviewtypes.StatKeySavedViewCount: int64(0)}},
-		Licensing:  &fakeCollector{stats: map[string]any{}},
-	}
-}
-
-func TestLicenseStatusFromStats(t *testing.T) {
-	knownStates := []string{
-		"DEFAULTED",
-		"ACTIVATED",
-		"EXPIRED",
-		"ISSUED",
-		"EVALUATING",
-		"EVALUATION_EXPIRED",
-		"TERMINATED",
-		"CANCELLED",
-	}
-
-	for _, state := range knownStates {
-		t.Run(state, func(t *testing.T) {
-			status := licenseStatusFromStats(map[string]any{licensetypes.StatKeyLicenseStateName: state})
-			assert.Equal(t, emptystatetypes.LicenseStatus(state), status)
-		})
-	}
-
-	t.Run("novel state passes through", func(t *testing.T) {
-		status := licenseStatusFromStats(map[string]any{licensetypes.StatKeyLicenseStateName: "FUTURE_STATE"})
-		assert.Equal(t, emptystatetypes.LicenseStatus("FUTURE_STATE"), status)
-	})
-
-	t.Run("missing key returns unknown", func(t *testing.T) {
-		status := licenseStatusFromStats(map[string]any{})
-		assert.Equal(t, emptystatetypes.LicenseStatusUnknown, status)
-	})
-
-	t.Run("blank state returns unknown", func(t *testing.T) {
-		status := licenseStatusFromStats(map[string]any{licensetypes.StatKeyLicenseStateName: "  "})
-		assert.Equal(t, emptystatetypes.LicenseStatusUnknown, status)
-	})
-
-	t.Run("non-string state returns unknown", func(t *testing.T) {
-		status := licenseStatusFromStats(map[string]any{licensetypes.StatKeyLicenseStateName: 42})
-		assert.Equal(t, emptystatetypes.LicenseStatusUnknown, status)
-	})
-}
-
-func TestGetLicenseStatusDegradesToUnknown(t *testing.T) {
-	t.Run("collector error", func(t *testing.T) {
-		h := &handler{collectors: OrgContextCollectors{Licensing: &fakeCollector{err: assert.AnError}}}
-
-		status := h.getLicenseStatus(context.Background(), testOrgID)
-
-		assert.Equal(t, emptystatetypes.LicenseStatusUnknown, status)
-	})
-
-	t.Run("nil collector", func(t *testing.T) {
-		h := &handler{}
-
-		status := h.getLicenseStatus(context.Background(), testOrgID)
-
-		assert.Equal(t, emptystatetypes.LicenseStatusUnknown, status)
-	})
-}
-
-func TestGetCollectedCount(t *testing.T) {
-	h := &handler{}
-
-	t.Run("returns count from collector output", func(t *testing.T) {
-		count, err := h.getCollectedCount(context.Background(), &fakeCollector{stats: map[string]any{ruletypes.StatKeyRuleCount: int64(7)}}, ruletypes.StatKeyRuleCount, testOrgID)
-
-		require.NoError(t, err)
-		assert.Equal(t, 7, count)
-	})
-
-	t.Run("missing key fails", func(t *testing.T) {
-		_, err := h.getCollectedCount(context.Background(), &fakeCollector{stats: map[string]any{}}, ruletypes.StatKeyRuleCount, testOrgID)
-
-		assert.Error(t, err)
-	})
-
-	t.Run("collector error fails", func(t *testing.T) {
-		_, err := h.getCollectedCount(context.Background(), &fakeCollector{err: assert.AnError}, ruletypes.StatKeyRuleCount, testOrgID)
-
-		assert.Error(t, err)
-	})
-
-	t.Run("nil collector fails", func(t *testing.T) {
-		_, err := h.getCollectedCount(context.Background(), nil, ruletypes.StatKeyRuleCount, testOrgID)
-
-		assert.Error(t, err)
-	})
-}
-
-func TestGetLastIngestedAtStagesWindows(t *testing.T) {
-	h := &handler{}
-	now := time.Unix(100000, 0)
-	lastIngested := time.Unix(99900, 0)
-
-	type probeWindow struct {
-		from time.Time
-		to   time.Time
-	}
-
-	t.Run("recent window answer skips the full lookback", func(t *testing.T) {
-		var windows []probeWindow
-
-		got, err := h.getLastIngestedAt(context.Background(), func(_ context.Context, from time.Time, to time.Time) (*time.Time, error) {
-			windows = append(windows, probeWindow{from: from, to: to})
-			return &lastIngested, nil
-		}, now)
-
-		require.NoError(t, err)
-		require.NotNil(t, got)
-		assert.Equal(t, lastIngested, *got)
-		require.Len(t, windows, 1)
-		assert.Equal(t, probeWindow{from: now.Add(-time.Hour), to: now}, windows[0])
-	})
-
-	t.Run("falls back to the full lookback when the recent window is empty", func(t *testing.T) {
-		var windows []probeWindow
-
-		got, err := h.getLastIngestedAt(context.Background(), func(_ context.Context, from time.Time, to time.Time) (*time.Time, error) {
-			windows = append(windows, probeWindow{from: from, to: to})
-			if len(windows) == 2 {
-				return &lastIngested, nil
-			}
-			return nil, nil //nolint:nilnil
-		}, now)
-
-		require.NoError(t, err)
-		require.NotNil(t, got)
-		assert.Equal(t, lastIngested, *got)
-		require.Len(t, windows, 2)
-		assert.Equal(t, probeWindow{from: now.Add(-time.Hour), to: now}, windows[0])
-		assert.Equal(t, probeWindow{from: now.Add(-emptystatetypes.LastIngestedLookback), to: now}, windows[1])
-	})
-
-	t.Run("nil when both windows are empty", func(t *testing.T) {
-		got, err := h.getLastIngestedAt(context.Background(), func(context.Context, time.Time, time.Time) (*time.Time, error) {
-			return nil, nil //nolint:nilnil
-		}, now)
-
-		require.NoError(t, err)
-		assert.Nil(t, got)
-	})
-}
-
-func TestLastObservedLogsQueryBoundsWindowOnBothSides(t *testing.T) {
-	ts := telemetrystoretest.New(telemetrystore.Config{}, sqlmock.QueryMatcherRegexp)
-	now := time.Unix(2000, 0)
-	lastIngested := time.Unix(1999, 0).UTC()
-
-	ts.Mock().
-		ExpectQueryRow(`fromUnixTimestamp64Nano\(max\(timestamp\)\).*ts_bucket_start >= \? AND ts_bucket_start <= \? AND timestamp >= \? AND timestamp <= \?`).
-		WillReturnRow(cmock.NewRow([]cmock.ColumnType{{Name: "max(timestamp)", Type: "DateTime64(9)"}}, []any{lastIngested}))
-
-	got, err := LastObservedLogs(context.Background(), ts, now.Add(-time.Hour), now)
-
-	require.NoError(t, err)
-	require.NotNil(t, got)
-	assert.Equal(t, lastIngested, *got)
-	assert.NoError(t, ts.Mock().ExpectationsWereMet())
-}
-
-func TestLastObservedTracesQueryBoundsWindowOnBothSides(t *testing.T) {
-	ts := telemetrystoretest.New(telemetrystore.Config{}, sqlmock.QueryMatcherRegexp)
-	now := time.Unix(2000, 0)
-	lastIngested := time.Unix(1999, 0).UTC()
-
-	ts.Mock().
-		ExpectQueryRow(`max\(timestamp\).*signoz_index_v3.*ts_bucket_start >= \? AND ts_bucket_start <= \? AND timestamp >= \? AND timestamp <= \?`).
-		WillReturnRow(cmock.NewRow([]cmock.ColumnType{{Name: "max(timestamp)", Type: "DateTime64(9)"}}, []any{lastIngested}))
-
-	got, err := LastObservedTraces(context.Background(), ts, now.Add(-time.Hour), now)
-
-	require.NoError(t, err)
-	require.NotNil(t, got)
-	assert.Equal(t, lastIngested, *got)
-	assert.NoError(t, ts.Mock().ExpectationsWereMet())
-}
-
-func TestLastObservedMetricsExcludesSpanGeneratedMetrics(t *testing.T) {
-	ts := telemetrystoretest.New(telemetrystore.Config{}, sqlmock.QueryMatcherRegexp)
-	now := time.Unix(2000, 0)
-	cutoff := now.Add(-time.Hour)
-	lastIngested := time.Unix(1999, 0).UTC()
-
-	ts.Mock().
-		ExpectQueryRow(`last_reported_unix_milli >= \? AND last_reported_unix_milli <= \? AND metric_name NOT LIKE \?`).
-		WillReturnRow(cmock.NewRow([]cmock.ColumnType{{Name: "max(last_reported_unix_milli)", Type: "Int64"}}, []any{lastIngested.UnixMilli()}))
-
-	got, err := LastObservedMetrics(context.Background(), ts, cutoff, now)
-
-	require.NoError(t, err)
-	require.NotNil(t, got)
-	assert.Equal(t, lastIngested, *got)
-	// LIKE-escaped so the underscore matches literally, not as a wildcard.
-	assert.Equal(t, `signoz\_%`, spanGeneratedMetricsLikePattern)
-	assert.NoError(t, ts.Mock().ExpectationsWereMet())
-}
-
-func TestGetHasInfraMetricsProbesInfraMetricNames(t *testing.T) {
-	ts := telemetrystoretest.New(telemetrystore.Config{}, sqlmock.QueryMatcherRegexp)
-	h := &handler{telemetryStore: ts}
-	now := time.Unix(2000, 0)
-
-	ts.Mock().
-		ExpectQueryRow(`metric_name IN`).
-		WillReturnRow(cmock.NewRow([]cmock.ColumnType{{Name: "exists", Type: "UInt8"}}, []any{uint8(1)}))
-
-	hasInfraMetrics, err := h.getHasInfraMetrics(context.Background(), now)
-
-	require.NoError(t, err)
-	assert.True(t, hasInfraMetrics)
-	// The probe list spans host/pod/node tables in both dot and underscore forms.
-	assert.Contains(t, infraMetricNames, "k8s.node.cpu.usage")
-	assert.Contains(t, infraMetricNames, "k8s_node_cpu_usage")
-	assert.Contains(t, infraMetricNames, "k8s.pod.cpu.usage")
-	assert.Contains(t, infraMetricNames, inframonitoringtypes.HostsTableMetricNames[0])
-	assert.NoError(t, ts.Mock().ExpectationsWereMet())
-}
-
-func TestGetOrgContextDerivesAggregates(t *testing.T) {
-	lastIngested := time.Unix(5000, 0).UTC()
-
-	cases := []struct {
-		name    string
-		logs    bool
-		traces  bool
-		metrics bool
-	}{
-		{name: "logs only", logs: true},
-		{name: "traces only", traces: true},
-		{name: "metrics only", metrics: true},
-		{name: "nothing ingested"},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			h, chMock := newOrgContextTestHandler(t, OrgContextCollectors{
-				Rules:      &fakeCollector{stats: map[string]any{ruletypes.StatKeyRuleCount: int64(2)}},
-				Dashboards: &fakeCollector{stats: map[string]any{dashboardtypes.StatKeyDashboardCount: int64(1)}},
-				SavedViews: &fakeCollector{stats: map[string]any{savedviewtypes.StatKeySavedViewCount: int64(3)}},
-				Licensing:  &fakeCollector{stats: map[string]any{licensetypes.StatKeyLicenseStateName: "ACTIVATED"}},
-			})
-
-			// A signal with data answers from the recent window (one probe);
-			// an empty signal probes the recent window and the full lookback.
-			if tc.logs {
-				expectLogsLastIngested(chMock, lastIngested)
-			} else {
-				expectLogsLastIngested(chMock, time.Time{})
-				expectLogsLastIngested(chMock, time.Time{})
-			}
-			if tc.traces {
-				expectTracesLastIngested(chMock, lastIngested)
-			} else {
-				expectTracesLastIngested(chMock, time.Time{})
-				expectTracesLastIngested(chMock, time.Time{})
-			}
-			if tc.metrics {
-				expectMetricsLastIngested(chMock, lastIngested.UnixMilli())
-			} else {
-				expectMetricsLastIngested(chMock, 0)
-				expectMetricsLastIngested(chMock, 0)
-			}
-			expectInfraMetrics(chMock, false)
-
-			orgContext, err := h.getOrgContext(context.Background(), testOrgID)
-
-			require.NoError(t, err)
-			assert.Equal(t, tc.logs || tc.traces || tc.metrics, orgContext.HasIngestedData)
-			assertLastIngested(t, tc.logs, orgContext.LastIngestedAt.Logs, lastIngested)
-			assertLastIngested(t, tc.traces, orgContext.LastIngestedAt.Traces, lastIngested)
-			assertLastIngested(t, tc.metrics, orgContext.LastIngestedAt.Metrics, lastIngested)
-			assert.False(t, orgContext.HasInfraMetrics)
-			assert.Equal(t, 2, orgContext.AlertsCount)
-			assert.Equal(t, 1, orgContext.DashboardsCount)
-			assert.Equal(t, 3, orgContext.SavedViewsCount)
-			assert.Equal(t, emptystatetypes.LicenseStatus("ACTIVATED"), orgContext.LicenseStatus)
-			assert.NoError(t, chMock.ExpectationsWereMet())
-		})
-	}
-}
-
-func assertLastIngested(t *testing.T, ingested bool, got *time.Time, want time.Time) {
-	t.Helper()
-
-	if !ingested {
-		assert.Nil(t, got)
-		return
-	}
-
-	require.NotNil(t, got)
-	assert.Equal(t, want, *got)
-}
-
-func TestGetOrgContextLicenseErrorDoesNotFail(t *testing.T) {
-	collectors := okCollectors()
-	collectors.Licensing = &fakeCollector{err: assert.AnError}
-	h, chMock := newOrgContextTestHandler(t, collectors)
-
-	expectTelemetryQuiet(chMock)
-
-	orgContext, err := h.getOrgContext(context.Background(), testOrgID)
-
-	require.NoError(t, err)
-	assert.Equal(t, emptystatetypes.LicenseStatusUnknown, orgContext.LicenseStatus)
-	assert.NoError(t, chMock.ExpectationsWereMet())
-}
-
-func TestGetOrgContextCollectorErrorFails(t *testing.T) {
-	collectors := okCollectors()
-	collectors.Rules = &fakeCollector{err: assert.AnError}
-	h, chMock := newOrgContextTestHandler(t, collectors)
-
-	expectTelemetryQuiet(chMock)
-
-	orgContext, err := h.getOrgContext(context.Background(), testOrgID)
-
-	assert.Error(t, err)
-	assert.Nil(t, orgContext)
-}
-
-func TestGetOrgContextClickHouseErrorFails(t *testing.T) {
-	h, chMock := newOrgContextTestHandler(t, okCollectors())
-
-	chMock.ExpectQueryRow(regexp.QuoteMeta("signoz_logs.distributed_logs_v2")).
-		WillReturnRow(cmock.NewRow([]cmock.ColumnType{{Name: "max(timestamp)", Type: "DateTime64(9)"}}, nil)).
-		WillReturnError(assert.AnError)
-	expectTracesLastIngested(chMock, time.Time{})
-	expectTracesLastIngested(chMock, time.Time{})
-	expectMetricsLastIngested(chMock, 0)
-	expectMetricsLastIngested(chMock, 0)
-	expectInfraMetrics(chMock, false)
-
-	orgContext, err := h.getOrgContext(context.Background(), testOrgID)
-
-	assert.Error(t, err)
-	assert.Nil(t, orgContext)
-}
-
-func newOrgContextTestHandler(t *testing.T, collectors OrgContextCollectors) (*handler, cmock.ClickConnMockCommon) {
-	t.Helper()
-
-	ts := telemetrystoretest.New(telemetrystore.Config{}, sqlmock.QueryMatcherRegexp)
-	ts.Mock().MatchExpectationsInOrder(false)
-
-	return &handler{
-		telemetryStore: ts,
-		collectors:     collectors,
-	}, ts.Mock()
-}
-
-func expectTelemetryQuiet(mock cmock.ClickConnMockCommon) {
-	expectLogsLastIngested(mock, time.Time{})
-	expectLogsLastIngested(mock, time.Time{})
-	expectTracesLastIngested(mock, time.Time{})
-	expectTracesLastIngested(mock, time.Time{})
-	expectMetricsLastIngested(mock, 0)
-	expectMetricsLastIngested(mock, 0)
-	expectInfraMetrics(mock, false)
-}
-
-func expectLogsLastIngested(mock cmock.ClickConnMockCommon, lastIngestedAt time.Time) {
-	mock.ExpectQueryRow(regexp.QuoteMeta("signoz_logs.distributed_logs_v2")).
-		WillReturnRow(cmock.NewRow([]cmock.ColumnType{{Name: "max(timestamp)", Type: "DateTime64(9)"}}, []any{lastIngestedAt}))
-}
-
-func expectTracesLastIngested(mock cmock.ClickConnMockCommon, lastIngestedAt time.Time) {
-	mock.ExpectQueryRow(regexp.QuoteMeta("signoz_traces.distributed_signoz_index_v3")).
-		WillReturnRow(cmock.NewRow([]cmock.ColumnType{{Name: "max(timestamp)", Type: "DateTime64(9)"}}, []any{lastIngestedAt}))
-}
-
-func expectMetricsLastIngested(mock cmock.ClickConnMockCommon, lastIngestedMilli int64) {
-	mock.ExpectQueryRow(`max\(last_reported_unix_milli\)`).
-		WillReturnRow(cmock.NewRow([]cmock.ColumnType{{Name: "max(last_reported_unix_milli)", Type: "Int64"}}, []any{lastIngestedMilli}))
-}
-
-func expectInfraMetrics(mock cmock.ClickConnMockCommon, exists bool) {
-	row := cmock.NewRow([]cmock.ColumnType{{Name: "exists", Type: "UInt8"}}, nil)
-	if exists {
-		row = cmock.NewRow([]cmock.ColumnType{{Name: "exists", Type: "UInt8"}}, []any{uint8(1)})
-	}
-
-	mock.ExpectQueryRow(`metric_name IN`).WillReturnRow(row)
-}

pkg/statsreporter/telemetry.go

@@ -1,192 +0,0 @@
-package statsreporter
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-	"slices"
-	"strings"
-	"time"
-
-	"github.com/huandu/go-sqlbuilder"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/querybuilder"
-	"github.com/SigNoz/signoz/pkg/telemetrylogs"
-	"github.com/SigNoz/signoz/pkg/telemetrymetrics"
-	"github.com/SigNoz/signoz/pkg/telemetrystore"
-	"github.com/SigNoz/signoz/pkg/telemetrytraces"
-	"github.com/SigNoz/signoz/pkg/types/emptystatetypes"
-	"github.com/SigNoz/signoz/pkg/types/inframonitoringtypes"
-)
-
-var infraMetricNames = withUnderscoreMetricNames(slices.Concat(
-	inframonitoringtypes.HostsTableMetricNames,
-	inframonitoringtypes.PodsTableMetricNames,
-	inframonitoringtypes.NodesTableMetricNames,
-))
-
-// Span-derived metrics (signoz_calls_total, signoz_latency, ...) come from the
-// collector's spanmetrics processor, so they must not count as metrics ingestion.
-const spanGeneratedMetricsLikePattern = `signoz\_%`
-
-// recentIngestWindow is probed before the full lookback: active tenants answer
-// from one hour of data instead of seven days.
-const recentIngestWindow = time.Hour
-
-// Probe both dot-form and underscore-normalized names (dot_metrics_enabled).
-func withUnderscoreMetricNames(metricNames []string) []string {
-	seen := make(map[string]struct{}, len(metricNames)*2)
-	normalized := make([]string, 0, len(metricNames)*2)
-
-	for _, metricName := range metricNames {
-		for _, candidate := range []string{metricName, strings.ReplaceAll(metricName, ".", "_")} {
-			if _, ok := seen[candidate]; ok {
-				continue
-			}
-
-			seen[candidate] = struct{}{}
-			normalized = append(normalized, candidate)
-		}
-	}
-
-	return normalized
-}
-
-// Last-observed queries are shared by the periodic reporter (epoch-to-now
-// window) and the org-context handler (bounded windows, per request). They are
-// deployment-scoped (telemetry tables have no org_id) and bounded on both
-// sides so future-dated rows cannot surface as last observed.
-
-func LastObservedLogs(ctx context.Context, telemetryStore telemetrystore.TelemetryStore, from time.Time, to time.Time) (*time.Time, error) {
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("fromUnixTimestamp64Nano(max(timestamp))")
-	sb.From(fmt.Sprintf("%s.%s", telemetrylogs.DBName, telemetrylogs.LogsV2TableName))
-	sb.Where(
-		sb.GE("ts_bucket_start", max(from.Unix()-querybuilder.BucketAdjustment, 0)),
-		sb.LE("ts_bucket_start", to.Unix()),
-		sb.GE("timestamp", fmt.Sprintf("%d", from.UnixNano())),
-		sb.LE("timestamp", fmt.Sprintf("%d", to.UnixNano())),
-	)
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-	return scanLastObserved(ctx, telemetryStore, "logs", query, args...)
-}
-
-func LastObservedTraces(ctx context.Context, telemetryStore telemetrystore.TelemetryStore, from time.Time, to time.Time) (*time.Time, error) {
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("max(timestamp)")
-	sb.From(fmt.Sprintf("%s.%s", telemetrytraces.DBName, telemetrytraces.SpanIndexV3TableName))
-	sb.Where(
-		sb.GE("ts_bucket_start", max(from.Unix()-querybuilder.BucketAdjustment, 0)),
-		sb.LE("ts_bucket_start", to.Unix()),
-		sb.GE("timestamp", fmt.Sprintf("%d", from.UnixNano())),
-		sb.LE("timestamp", fmt.Sprintf("%d", to.UnixNano())),
-	)
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-	return scanLastObserved(ctx, telemetryStore, "traces", query, args...)
-}
-
-// LastObservedMetrics reads the attributes metadata table, a maintained
-// per-metric last-seen that is far cheaper than scanning samples.
-func LastObservedMetrics(ctx context.Context, telemetryStore telemetrystore.TelemetryStore, from time.Time, to time.Time) (*time.Time, error) {
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("max(last_reported_unix_milli)")
-	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.AttributesMetadataTableName))
-	sb.Where(
-		sb.GE("last_reported_unix_milli", from.UnixMilli()),
-		sb.LE("last_reported_unix_milli", to.UnixMilli()),
-		sb.NotLike("metric_name", spanGeneratedMetricsLikePattern),
-	)
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-
-	var lastObservedMilli sql.NullInt64
-	err := telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&lastObservedMilli)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return nil, nil //nolint:nilnil
-		}
-
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to check metrics last observed")
-	}
-
-	if !lastObservedMilli.Valid || lastObservedMilli.Int64 == 0 {
-		return nil, nil //nolint:nilnil
-	}
-
-	lastObservedAt := time.UnixMilli(lastObservedMilli.Int64).UTC()
-	return &lastObservedAt, nil
-}
-
-func scanLastObserved(ctx context.Context, telemetryStore telemetrystore.TelemetryStore, signal string, query string, args ...any) (*time.Time, error) {
-	var lastObserved time.Time
-	err := telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&lastObserved)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return nil, nil //nolint:nilnil
-		}
-
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to check %s last observed", signal)
-	}
-
-	if lastObserved.Unix() <= 0 {
-		return nil, nil //nolint:nilnil
-	}
-
-	lastObservedAt := lastObserved.UTC()
-	return &lastObservedAt, nil
-}
-
-func (h *handler) getLastIngestedAt(ctx context.Context, lastIngested func(context.Context, time.Time, time.Time) (*time.Time, error), now time.Time) (*time.Time, error) {
-	recent, err := lastIngested(ctx, now.Add(-recentIngestWindow), now)
-	if err != nil {
-		return nil, err
-	}
-	if recent != nil {
-		return recent, nil
-	}
-
-	return lastIngested(ctx, now.Add(-emptystatetypes.LastIngestedLookback), now)
-}
-
-func (h *handler) logsLastIngested(ctx context.Context, from time.Time, to time.Time) (*time.Time, error) {
-	return LastObservedLogs(ctx, h.telemetryStore, from, to)
-}
-
-func (h *handler) tracesLastIngested(ctx context.Context, from time.Time, to time.Time) (*time.Time, error) {
-	return LastObservedTraces(ctx, h.telemetryStore, from, to)
-}
-
-func (h *handler) metricsLastIngested(ctx context.Context, from time.Time, to time.Time) (*time.Time, error) {
-	return LastObservedMetrics(ctx, h.telemetryStore, from, to)
-}
-
-func (h *handler) getHasInfraMetrics(ctx context.Context, now time.Time) (bool, error) {
-	cutoff := now.Add(-emptystatetypes.LastIngestedLookback)
-
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("1")
-	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.AttributesMetadataTableName))
-	sb.Where(
-		sb.GE("last_reported_unix_milli", cutoff.UnixMilli()),
-		sb.LE("last_reported_unix_milli", now.UnixMilli()),
-		sb.In("metric_name", sqlbuilder.List(infraMetricNames)),
-	)
-	sb.Limit(1)
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-
-	var exists uint8
-	err := h.telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&exists)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return false, nil
-		}
-
-		return false, errors.WrapInternalf(err, errors.CodeInternal, "failed to check infra metrics presence")
-	}
-
-	return true, nil
-}

pkg/types/cloudintegrationtypes/serviceid.go

@@ -27,8 +27,6 @@ var (
 	// Azure services.
 	AzureServiceStorageAccountsBlob = ServiceID{valuer.NewString("storageaccountsblob")}
 	AzureServiceCDNProfile          = ServiceID{valuer.NewString("cdnprofile")}
-	AzureServiceVirtualMachine      = ServiceID{valuer.NewString("virtualmachine")}
-	AzureServiceAppService          = ServiceID{valuer.NewString("appservice")}
 	AzureServiceContainerApp        = ServiceID{valuer.NewString("containerapp")}
 	AzureServiceAKS                 = ServiceID{valuer.NewString("aks")}
 )
@@ -50,8 +48,6 @@ func (ServiceID) Enum() []any {
 		AWSServiceSQS,
 		AzureServiceStorageAccountsBlob,
 		AzureServiceCDNProfile,
-		AzureServiceVirtualMachine,
-		AzureServiceAppService,
 		AzureServiceContainerApp,
 		AzureServiceAKS,
 	}
@@ -77,8 +73,6 @@ var SupportedServices = map[CloudProviderType][]ServiceID{
 	CloudProviderTypeAzure: {
 		AzureServiceStorageAccountsBlob,
 		AzureServiceCDNProfile,
-		AzureServiceVirtualMachine,
-		AzureServiceAppService,
 		AzureServiceContainerApp,
 		AzureServiceAKS,
 	},

pkg/types/dashboardtypes/dashboard.go

@@ -168,9 +168,6 @@ func NewGettableDashboardFromDashboard(dashboard *Dashboard) (*GettableDashboard
 	}, nil
 }
 
-// StatKeyDashboardCount is the dashboard count stat key shared by the stats reporter and its API consumers.
-const StatKeyDashboardCount = "dashboard.count"
-
 func NewStatsFromStorableDashboards(dashboards []*StorableDashboard) map[string]any {
 	stats := make(map[string]any)
 	stats["dashboard.panels.count"] = int64(0)
@@ -181,7 +178,7 @@ func NewStatsFromStorableDashboards(dashboards []*StorableDashboard) map[string]
 		addStatsFromStorableDashboard(dashboard, stats)
 	}
 
-	stats[StatKeyDashboardCount] = int64(len(dashboards))
+	stats["dashboard.count"] = int64(len(dashboards))
 	return stats
 }
 

pkg/types/emptystatetypes/orgcontext.go

@@ -1,31 +0,0 @@
-package emptystatetypes
-
-import "time"
-
-// LastIngestedLookback bounds how far back the last-ingested probes search; older data reports null.
-const LastIngestedLookback = 7 * 24 * time.Hour
-
-type LicenseStatus string
-
-const LicenseStatusUnknown LicenseStatus = "UNKNOWN"
-
-func (status LicenseStatus) StringValue() string {
-	return string(status)
-}
-
-type OrgContext struct {
-	HasIngestedData bool           `json:"hasIngestedData" required:"true"`
-	LastIngestedAt  LastIngestedAt `json:"lastIngestedAt" required:"true"`
-	HasInfraMetrics bool           `json:"hasInfraMetrics" required:"true"`
-	AlertsCount     int            `json:"alertsCount" required:"true"`
-	DashboardsCount int            `json:"dashboardsCount" required:"true"`
-	SavedViewsCount int            `json:"savedViewsCount" required:"true"`
-	LicenseStatus   LicenseStatus  `json:"licenseStatus" required:"true" description:"Raw Zeus license state. Known values include DEFAULTED, ACTIVATED, EXPIRED, ISSUED, EVALUATING, EVALUATION_EXPIRED, TERMINATED, CANCELLED. UNKNOWN is emitted when no license state is available."`
-}
-
-// LastIngestedAt carries per-signal last ingest times; null means no data inside the lookback window.
-type LastIngestedAt struct {
-	Logs    *time.Time `json:"logs" required:"true" description:"Null when no logs were ingested in the last 7 days."`
-	Traces  *time.Time `json:"traces" required:"true" description:"Null when no traces were ingested in the last 7 days."`
-	Metrics *time.Time `json:"metrics" required:"true" description:"Null when no metrics were ingested in the last 7 days. Excludes span-generated metrics (signoz_ prefix), which only prove traces ingestion."`
-}

pkg/types/emptystatetypes/orgcontext_test.go

@@ -1,40 +0,0 @@
-package emptystatetypes
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestLicenseStatusMarshalJSON(t *testing.T) {
-	tests := []struct {
-		name   string
-		status LicenseStatus
-		want   string
-	}{
-		{
-			name:   "known zeus state preserves case",
-			status: LicenseStatus("ACTIVATED"),
-			want:   `"ACTIVATED"`,
-		},
-		{
-			name:   "unknown sentinel preserves case",
-			status: LicenseStatusUnknown,
-			want:   `"UNKNOWN"`,
-		},
-		{
-			name:   "novel state passes through",
-			status: LicenseStatus("FUTURE_STATE"),
-			want:   `"FUTURE_STATE"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := json.Marshal(tt.status)
-			assert.NoError(t, err)
-			assert.Equal(t, tt.want, string(got))
-		})
-	}
-}

pkg/types/inframonitoringtypes/hosts_constants.go

@@ -22,14 +22,6 @@ func (HostStatus) Enum() []any {
 
 const HostNameAttrKey = "host.name"
 
-// HostsTableMetricNames drives host presence checks (infra monitoring, empty-state).
-var HostsTableMetricNames = []string{
-	"system.cpu.time",
-	"system.memory.usage",
-	"system.cpu.load_average.15m",
-	"system.filesystem.usage",
-}
-
 const (
 	HostsOrderByCPU       = "cpu"
 	HostsOrderByMemory    = "memory"

pkg/types/inframonitoringtypes/nodes_constants.go

@@ -29,16 +29,6 @@ const (
 
 const NodeNameAttrKey = "k8s.node.name"
 
-// NodesTableMetricNames drives node presence checks; includes condition_ready and k8s.pod.phase.
-var NodesTableMetricNames = []string{
-	"k8s.node.cpu.usage",
-	"k8s.node.allocatable_cpu",
-	"k8s.node.memory.working_set",
-	"k8s.node.allocatable_memory",
-	"k8s.node.condition_ready",
-	"k8s.pod.phase",
-}
-
 const (
 	NodesOrderByCPU               = "cpu"
 	NodesOrderByCPUAllocatable    = "cpu_allocatable"