Merge branch 'main' into nv/6204

.prettierrc

@@ -1,3 +0,0 @@
-{
-  "trailingComma": "none"
-}

.vscode/settings.json

@@ -1,25 +1,23 @@
 {
-  "eslint.workingDirectories": ["./frontend"],
-  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  },
-  "prettier.requireConfig": true,
-  "[go]": {
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "golang.go"
-  },
-  "[sql]": {
-    "editor.defaultFormatter": "adpyke.vscode-sql-formatter"
-  },
-  "[html]": {
-    "editor.defaultFormatter": "vscode.html-language-features"
-  },
-  "python-envs.defaultEnvManager": "ms-python.python:system",
-  "python-envs.pythonProjects": [],
-  "editor.tokenColorCustomizations": {
-    "comments": "",
-    "textMateRules": []
-  }
+	"eslint.workingDirectories": [
+		"./frontend"
+	],
+	"editor.formatOnSave": true,
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit"
+	},
+	"prettier.requireConfig": true,
+	"[go]": {
+		"editor.formatOnSave": true,
+		"editor.defaultFormatter": "golang.go"
+	},
+	"[sql]": {
+		"editor.defaultFormatter": "adpyke.vscode-sql-formatter"
+	},
+	"[html]": {
+		"editor.defaultFormatter": "vscode.html-language-features"
+	},
+	"python-envs.defaultEnvManager": "ms-python.python:system",
+	"python-envs.pythonProjects": []
 }

conf/example.yaml

@@ -144,8 +144,6 @@ telemetrystore:
 
 ##################### Prometheus #####################
 prometheus:
-  # The maximum time a PromQL query is allowed to run before being aborted.
-  timeout: 2m
   active_query_tracker:
     # Whether to enable the active query tracker.
     enabled: true

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.117.0
+    image: signoz/signoz:v0.116.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.117.0
+    image: signoz/signoz:v0.116.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.117.0}
+    image: signoz/signoz:${VERSION:-v0.116.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.117.0}
+    image: signoz/signoz:${VERSION:-v0.116.1}
     container_name: signoz
     ports:
       - "8080:8080" # signoz port

docs/api/openapi.yml

@@ -342,409 +342,6 @@ components:
         config:
           $ref: '#/components/schemas/AuthtypesAuthDomainConfig'
       type: object
-    CloudintegrationtypesAWSAccountConfig:
-      properties:
-        regions:
-          items:
-            type: string
-          type: array
-      required:
-      - regions
-      type: object
-    CloudintegrationtypesAWSCollectionStrategy:
-      properties:
-        aws_logs:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSLogsStrategy'
-        aws_metrics:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSMetricsStrategy'
-        s3_buckets:
-          additionalProperties:
-            items:
-              type: string
-            type: array
-          type: object
-      type: object
-    CloudintegrationtypesAWSConnectionArtifact:
-      properties:
-        connectionURL:
-          type: string
-      required:
-      - connectionURL
-      type: object
-    CloudintegrationtypesAWSConnectionArtifactRequest:
-      properties:
-        deploymentRegion:
-          type: string
-        regions:
-          items:
-            type: string
-          type: array
-      required:
-      - deploymentRegion
-      - regions
-      type: object
-    CloudintegrationtypesAWSIntegrationConfig:
-      properties:
-        enabledRegions:
-          items:
-            type: string
-          type: array
-        telemetry:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSCollectionStrategy'
-      required:
-      - enabledRegions
-      - telemetry
-      type: object
-    CloudintegrationtypesAWSLogsStrategy:
-      properties:
-        cloudwatch_logs_subscriptions:
-          items:
-            properties:
-              filter_pattern:
-                type: string
-              log_group_name_prefix:
-                type: string
-            type: object
-          nullable: true
-          type: array
-      type: object
-    CloudintegrationtypesAWSMetricsStrategy:
-      properties:
-        cloudwatch_metric_stream_filters:
-          items:
-            properties:
-              MetricNames:
-                items:
-                  type: string
-                type: array
-              Namespace:
-                type: string
-            type: object
-          nullable: true
-          type: array
-      type: object
-    CloudintegrationtypesAWSServiceConfig:
-      properties:
-        logs:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSServiceLogsConfig'
-        metrics:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSServiceMetricsConfig'
-      type: object
-    CloudintegrationtypesAWSServiceLogsConfig:
-      properties:
-        enabled:
-          type: boolean
-        s3_buckets:
-          additionalProperties:
-            items:
-              type: string
-            type: array
-          type: object
-      type: object
-    CloudintegrationtypesAWSServiceMetricsConfig:
-      properties:
-        enabled:
-          type: boolean
-      type: object
-    CloudintegrationtypesAccount:
-      properties:
-        agentReport:
-          $ref: '#/components/schemas/CloudintegrationtypesAgentReport'
-        config:
-          $ref: '#/components/schemas/CloudintegrationtypesAccountConfig'
-        createdAt:
-          format: date-time
-          type: string
-        id:
-          type: string
-        orgId:
-          type: string
-        provider:
-          type: string
-        providerAccountId:
-          nullable: true
-          type: string
-        removedAt:
-          format: date-time
-          nullable: true
-          type: string
-        updatedAt:
-          format: date-time
-          type: string
-      required:
-      - id
-      - providerAccountId
-      - provider
-      - removedAt
-      - agentReport
-      - orgId
-      - config
-      type: object
-    CloudintegrationtypesAccountConfig:
-      properties:
-        aws:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSAccountConfig'
-      required:
-      - aws
-      type: object
-    CloudintegrationtypesAgentReport:
-      nullable: true
-      properties:
-        data:
-          additionalProperties: {}
-          nullable: true
-          type: object
-        timestampMillis:
-          format: int64
-          type: integer
-      required:
-      - timestampMillis
-      - data
-      type: object
-    CloudintegrationtypesAssets:
-      properties:
-        dashboards:
-          items:
-            $ref: '#/components/schemas/CloudintegrationtypesDashboard'
-          nullable: true
-          type: array
-      type: object
-    CloudintegrationtypesCollectedLogAttribute:
-      properties:
-        name:
-          type: string
-        path:
-          type: string
-        type:
-          type: string
-      type: object
-    CloudintegrationtypesCollectedMetric:
-      properties:
-        description:
-          type: string
-        name:
-          type: string
-        type:
-          type: string
-        unit:
-          type: string
-      type: object
-    CloudintegrationtypesCollectionStrategy:
-      properties:
-        aws:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSCollectionStrategy'
-      required:
-      - aws
-      type: object
-    CloudintegrationtypesConnectionArtifact:
-      properties:
-        aws:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSConnectionArtifact'
-      required:
-      - aws
-      type: object
-    CloudintegrationtypesConnectionArtifactRequest:
-      properties:
-        aws:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSConnectionArtifactRequest'
-      required:
-      - aws
-      type: object
-    CloudintegrationtypesDashboard:
-      properties:
-        definition:
-          $ref: '#/components/schemas/DashboardtypesStorableDashboardData'
-        description:
-          type: string
-        id:
-          type: string
-        title:
-          type: string
-      type: object
-    CloudintegrationtypesDataCollected:
-      properties:
-        logs:
-          items:
-            $ref: '#/components/schemas/CloudintegrationtypesCollectedLogAttribute'
-          nullable: true
-          type: array
-        metrics:
-          items:
-            $ref: '#/components/schemas/CloudintegrationtypesCollectedMetric'
-          nullable: true
-          type: array
-      type: object
-    CloudintegrationtypesGettableAccountWithArtifact:
-      properties:
-        connectionArtifact:
-          $ref: '#/components/schemas/CloudintegrationtypesConnectionArtifact'
-        id:
-          type: string
-      required:
-      - id
-      - connectionArtifact
-      type: object
-    CloudintegrationtypesGettableAccounts:
-      properties:
-        accounts:
-          items:
-            $ref: '#/components/schemas/CloudintegrationtypesAccount'
-          type: array
-      required:
-      - accounts
-      type: object
-    CloudintegrationtypesGettableAgentCheckInResponse:
-      properties:
-        account_id:
-          type: string
-        cloud_account_id:
-          type: string
-        cloudIntegrationId:
-          type: string
-        integration_config:
-          $ref: '#/components/schemas/CloudintegrationtypesIntegrationConfig'
-        integrationConfig:
-          $ref: '#/components/schemas/CloudintegrationtypesProviderIntegrationConfig'
-        providerAccountId:
-          type: string
-        removed_at:
-          format: date-time
-          nullable: true
-          type: string
-        removedAt:
-          format: date-time
-          nullable: true
-          type: string
-      required:
-      - account_id
-      - cloud_account_id
-      - integration_config
-      - removed_at
-      - cloudIntegrationId
-      - providerAccountId
-      - integrationConfig
-      - removedAt
-      type: object
-    CloudintegrationtypesGettableServicesMetadata:
-      properties:
-        services:
-          items:
-            $ref: '#/components/schemas/CloudintegrationtypesServiceMetadata'
-          type: array
-      required:
-      - services
-      type: object
-    CloudintegrationtypesIntegrationConfig:
-      nullable: true
-      properties:
-        enabled_regions:
-          items:
-            type: string
-          type: array
-        telemetry:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSCollectionStrategy'
-      required:
-      - enabled_regions
-      - telemetry
-      type: object
-    CloudintegrationtypesPostableAgentCheckInRequest:
-      properties:
-        account_id:
-          type: string
-        cloud_account_id:
-          type: string
-        cloudIntegrationId:
-          type: string
-        data:
-          additionalProperties: {}
-          nullable: true
-          type: object
-        providerAccountId:
-          type: string
-      required:
-      - data
-      type: object
-    CloudintegrationtypesProviderIntegrationConfig:
-      properties:
-        aws:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSIntegrationConfig'
-      required:
-      - aws
-      type: object
-    CloudintegrationtypesService:
-      properties:
-        assets:
-          $ref: '#/components/schemas/CloudintegrationtypesAssets'
-        dataCollected:
-          $ref: '#/components/schemas/CloudintegrationtypesDataCollected'
-        icon:
-          type: string
-        id:
-          type: string
-        overview:
-          type: string
-        serviceConfig:
-          $ref: '#/components/schemas/CloudintegrationtypesServiceConfig'
-        supported_signals:
-          $ref: '#/components/schemas/CloudintegrationtypesSupportedSignals'
-        telemetryCollectionStrategy:
-          $ref: '#/components/schemas/CloudintegrationtypesCollectionStrategy'
-        title:
-          type: string
-      required:
-      - id
-      - title
-      - icon
-      - overview
-      - assets
-      - supported_signals
-      - dataCollected
-      - telemetryCollectionStrategy
-      type: object
-    CloudintegrationtypesServiceConfig:
-      properties:
-        aws:
-          $ref: '#/components/schemas/CloudintegrationtypesAWSServiceConfig'
-      required:
-      - aws
-      type: object
-    CloudintegrationtypesServiceMetadata:
-      properties:
-        enabled:
-          type: boolean
-        icon:
-          type: string
-        id:
-          type: string
-        title:
-          type: string
-      required:
-      - id
-      - title
-      - icon
-      - enabled
-      type: object
-    CloudintegrationtypesSupportedSignals:
-      properties:
-        logs:
-          type: boolean
-        metrics:
-          type: boolean
-      type: object
-    CloudintegrationtypesUpdatableAccount:
-      properties:
-        config:
-          $ref: '#/components/schemas/CloudintegrationtypesAccountConfig'
-      required:
-      - config
-      type: object
-    CloudintegrationtypesUpdatableService:
-      properties:
-        config:
-          $ref: '#/components/schemas/CloudintegrationtypesServiceConfig'
-      required:
-      - config
-      type: object
     DashboardtypesDashboard:
       properties:
         createdAt:
@@ -2887,551 +2484,6 @@ paths:
       summary: Change password
       tags:
       - users
-  /api/v1/cloud-integrations/{cloud_provider}/agent-check-in:
-    post:
-      deprecated: true
-      description: '[Deprecated] This endpoint is called by the deployed agent to
-        check in'
-      operationId: AgentCheckInDeprecated
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/CloudintegrationtypesPostableAgentCheckInRequest'
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/CloudintegrationtypesGettableAgentCheckInResponse'
-                  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: Agent check-in
-      tags:
-      - cloudintegration
-  /api/v1/cloud_integrations/{cloud_provider}/accounts:
-    get:
-      deprecated: false
-      description: This endpoint lists the accounts for the specified cloud provider
-      operationId: ListAccounts
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/CloudintegrationtypesGettableAccounts'
-                  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:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: List accounts
-      tags:
-      - cloudintegration
-    post:
-      deprecated: false
-      description: This endpoint creates a new cloud integration account for the specified
-        cloud provider
-      operationId: CreateAccount
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/CloudintegrationtypesConnectionArtifactRequest'
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/CloudintegrationtypesGettableAccountWithArtifact'
-                  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:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: Create account
-      tags:
-      - cloudintegration
-  /api/v1/cloud_integrations/{cloud_provider}/accounts/{id}:
-    delete:
-      deprecated: false
-      description: This endpoint disconnects an account for the specified cloud provider
-      operationId: DisconnectAccount
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-      responses:
-        "204":
-          description: No Content
-        "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:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: Disconnect account
-      tags:
-      - cloudintegration
-    get:
-      deprecated: false
-      description: This endpoint gets an account for the specified cloud provider
-      operationId: GetAccount
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/CloudintegrationtypesAccount'
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Not Found
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: Get account
-      tags:
-      - cloudintegration
-    put:
-      deprecated: false
-      description: This endpoint updates an account for the specified cloud provider
-      operationId: UpdateAccount
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/CloudintegrationtypesUpdatableAccount'
-      responses:
-        "204":
-          description: No Content
-        "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:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: Update account
-      tags:
-      - cloudintegration
-  /api/v1/cloud_integrations/{cloud_provider}/accounts/check_in:
-    post:
-      deprecated: false
-      description: This endpoint is called by the deployed agent to check in
-      operationId: AgentCheckIn
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/CloudintegrationtypesPostableAgentCheckInRequest'
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/CloudintegrationtypesGettableAgentCheckInResponse'
-                  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: Agent check-in
-      tags:
-      - cloudintegration
-  /api/v1/cloud_integrations/{cloud_provider}/services:
-    get:
-      deprecated: false
-      description: This endpoint lists the services metadata for the specified cloud
-        provider
-      operationId: ListServicesMetadata
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/CloudintegrationtypesGettableServicesMetadata'
-                  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:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: List services metadata
-      tags:
-      - cloudintegration
-  /api/v1/cloud_integrations/{cloud_provider}/services/{service_id}:
-    get:
-      deprecated: false
-      description: This endpoint gets a service for the specified cloud provider
-      operationId: GetService
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      - in: path
-        name: service_id
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/CloudintegrationtypesService'
-                  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:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: Get service
-      tags:
-      - cloudintegration
-    put:
-      deprecated: false
-      description: This endpoint updates a service for the specified cloud provider
-      operationId: UpdateService
-      parameters:
-      - in: path
-        name: cloud_provider
-        required: true
-        schema:
-          type: string
-      - in: path
-        name: service_id
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/CloudintegrationtypesUpdatableService'
-      responses:
-        "204":
-          description: No Content
-        "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:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: Update service
-      tags:
-      - cloudintegration
   /api/v1/complete/google:
     get:
       deprecated: false

ee/query-service/app/server.go

@@ -136,7 +136,6 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz) (*Server, error) {
 	logParsingPipelineController, err := logparsingpipeline.NewLogParsingPipelinesController(
 		signoz.SQLStore,
 		integrationsController.GetPipelinesForInstalledIntegrations,
-		reader,
 	)
 	if err != nil {
 		return nil, err

ee/query-service/rules/manager_test.go

@@ -257,7 +257,7 @@ func TestManager_TestNotification_SendUnmatched_PromRule(t *testing.T) {
 						WillReturnRows(samplesRows)
 
 					// Create Prometheus provider for this test
-					promProvider = prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, store)
+					promProvider = prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, store)
 				},
 				ManagerOptionsHook: func(opts *rules.ManagerOptions) {
 					// Set Prometheus provider for PromQL queries

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

@@ -437,436 +437,6 @@ export interface AuthtypesUpdateableAuthDomainDTO {
 	config?: AuthtypesAuthDomainConfigDTO;
 }
 
-export interface CloudintegrationtypesAWSAccountConfigDTO {
-	/**
-	 * @type array
-	 */
-	regions: string[];
-}
-
-export type CloudintegrationtypesAWSCollectionStrategyDTOS3Buckets = {
-	[key: string]: string[];
-};
-
-export interface CloudintegrationtypesAWSCollectionStrategyDTO {
-	aws_logs?: CloudintegrationtypesAWSLogsStrategyDTO;
-	aws_metrics?: CloudintegrationtypesAWSMetricsStrategyDTO;
-	/**
-	 * @type object
-	 */
-	s3_buckets?: CloudintegrationtypesAWSCollectionStrategyDTOS3Buckets;
-}
-
-export interface CloudintegrationtypesAWSConnectionArtifactDTO {
-	/**
-	 * @type string
-	 */
-	connectionURL: string;
-}
-
-export interface CloudintegrationtypesAWSConnectionArtifactRequestDTO {
-	/**
-	 * @type string
-	 */
-	deploymentRegion: string;
-	/**
-	 * @type array
-	 */
-	regions: string[];
-}
-
-export interface CloudintegrationtypesAWSIntegrationConfigDTO {
-	/**
-	 * @type array
-	 */
-	enabledRegions: string[];
-	telemetry: CloudintegrationtypesAWSCollectionStrategyDTO;
-}
-
-export type CloudintegrationtypesAWSLogsStrategyDTOCloudwatchLogsSubscriptionsItem = {
-	/**
-	 * @type string
-	 */
-	filter_pattern?: string;
-	/**
-	 * @type string
-	 */
-	log_group_name_prefix?: string;
-};
-
-export interface CloudintegrationtypesAWSLogsStrategyDTO {
-	/**
-	 * @type array
-	 * @nullable true
-	 */
-	cloudwatch_logs_subscriptions?:
-		| CloudintegrationtypesAWSLogsStrategyDTOCloudwatchLogsSubscriptionsItem[]
-		| null;
-}
-
-export type CloudintegrationtypesAWSMetricsStrategyDTOCloudwatchMetricStreamFiltersItem = {
-	/**
-	 * @type array
-	 */
-	MetricNames?: string[];
-	/**
-	 * @type string
-	 */
-	Namespace?: string;
-};
-
-export interface CloudintegrationtypesAWSMetricsStrategyDTO {
-	/**
-	 * @type array
-	 * @nullable true
-	 */
-	cloudwatch_metric_stream_filters?:
-		| CloudintegrationtypesAWSMetricsStrategyDTOCloudwatchMetricStreamFiltersItem[]
-		| null;
-}
-
-export interface CloudintegrationtypesAWSServiceConfigDTO {
-	logs?: CloudintegrationtypesAWSServiceLogsConfigDTO;
-	metrics?: CloudintegrationtypesAWSServiceMetricsConfigDTO;
-}
-
-export type CloudintegrationtypesAWSServiceLogsConfigDTOS3Buckets = {
-	[key: string]: string[];
-};
-
-export interface CloudintegrationtypesAWSServiceLogsConfigDTO {
-	/**
-	 * @type boolean
-	 */
-	enabled?: boolean;
-	/**
-	 * @type object
-	 */
-	s3_buckets?: CloudintegrationtypesAWSServiceLogsConfigDTOS3Buckets;
-}
-
-export interface CloudintegrationtypesAWSServiceMetricsConfigDTO {
-	/**
-	 * @type boolean
-	 */
-	enabled?: boolean;
-}
-
-export interface CloudintegrationtypesAccountDTO {
-	agentReport: CloudintegrationtypesAgentReportDTO;
-	config: CloudintegrationtypesAccountConfigDTO;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	createdAt?: Date;
-	/**
-	 * @type string
-	 */
-	id: string;
-	/**
-	 * @type string
-	 */
-	orgId: string;
-	/**
-	 * @type string
-	 */
-	provider: string;
-	/**
-	 * @type string
-	 * @nullable true
-	 */
-	providerAccountId: string | null;
-	/**
-	 * @type string
-	 * @format date-time
-	 * @nullable true
-	 */
-	removedAt: Date | null;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	updatedAt?: Date;
-}
-
-export interface CloudintegrationtypesAccountConfigDTO {
-	aws: CloudintegrationtypesAWSAccountConfigDTO;
-}
-
-/**
- * @nullable
- */
-export type CloudintegrationtypesAgentReportDTOData = {
-	[key: string]: unknown;
-} | null;
-
-/**
- * @nullable
- */
-export type CloudintegrationtypesAgentReportDTO = {
-	/**
-	 * @type object
-	 * @nullable true
-	 */
-	data: CloudintegrationtypesAgentReportDTOData;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	timestampMillis: number;
-} | null;
-
-export interface CloudintegrationtypesAssetsDTO {
-	/**
-	 * @type array
-	 * @nullable true
-	 */
-	dashboards?: CloudintegrationtypesDashboardDTO[] | null;
-}
-
-export interface CloudintegrationtypesCollectedLogAttributeDTO {
-	/**
-	 * @type string
-	 */
-	name?: string;
-	/**
-	 * @type string
-	 */
-	path?: string;
-	/**
-	 * @type string
-	 */
-	type?: string;
-}
-
-export interface CloudintegrationtypesCollectedMetricDTO {
-	/**
-	 * @type string
-	 */
-	description?: string;
-	/**
-	 * @type string
-	 */
-	name?: string;
-	/**
-	 * @type string
-	 */
-	type?: string;
-	/**
-	 * @type string
-	 */
-	unit?: string;
-}
-
-export interface CloudintegrationtypesCollectionStrategyDTO {
-	aws: CloudintegrationtypesAWSCollectionStrategyDTO;
-}
-
-export interface CloudintegrationtypesConnectionArtifactDTO {
-	aws: CloudintegrationtypesAWSConnectionArtifactDTO;
-}
-
-export interface CloudintegrationtypesConnectionArtifactRequestDTO {
-	aws: CloudintegrationtypesAWSConnectionArtifactRequestDTO;
-}
-
-export interface CloudintegrationtypesDashboardDTO {
-	definition?: DashboardtypesStorableDashboardDataDTO;
-	/**
-	 * @type string
-	 */
-	description?: string;
-	/**
-	 * @type string
-	 */
-	id?: string;
-	/**
-	 * @type string
-	 */
-	title?: string;
-}
-
-export interface CloudintegrationtypesDataCollectedDTO {
-	/**
-	 * @type array
-	 * @nullable true
-	 */
-	logs?: CloudintegrationtypesCollectedLogAttributeDTO[] | null;
-	/**
-	 * @type array
-	 * @nullable true
-	 */
-	metrics?: CloudintegrationtypesCollectedMetricDTO[] | null;
-}
-
-export interface CloudintegrationtypesGettableAccountWithArtifactDTO {
-	connectionArtifact: CloudintegrationtypesConnectionArtifactDTO;
-	/**
-	 * @type string
-	 */
-	id: string;
-}
-
-export interface CloudintegrationtypesGettableAccountsDTO {
-	/**
-	 * @type array
-	 */
-	accounts: CloudintegrationtypesAccountDTO[];
-}
-
-export interface CloudintegrationtypesGettableAgentCheckInResponseDTO {
-	/**
-	 * @type string
-	 */
-	account_id: string;
-	/**
-	 * @type string
-	 */
-	cloud_account_id: string;
-	/**
-	 * @type string
-	 */
-	cloudIntegrationId: string;
-	integration_config: CloudintegrationtypesIntegrationConfigDTO;
-	integrationConfig: CloudintegrationtypesProviderIntegrationConfigDTO;
-	/**
-	 * @type string
-	 */
-	providerAccountId: string;
-	/**
-	 * @type string
-	 * @format date-time
-	 * @nullable true
-	 */
-	removed_at: Date | null;
-	/**
-	 * @type string
-	 * @format date-time
-	 * @nullable true
-	 */
-	removedAt: Date | null;
-}
-
-export interface CloudintegrationtypesGettableServicesMetadataDTO {
-	/**
-	 * @type array
-	 */
-	services: CloudintegrationtypesServiceMetadataDTO[];
-}
-
-/**
- * @nullable
- */
-export type CloudintegrationtypesIntegrationConfigDTO = {
-	/**
-	 * @type array
-	 */
-	enabled_regions: string[];
-	telemetry: CloudintegrationtypesAWSCollectionStrategyDTO;
-} | null;
-
-/**
- * @nullable
- */
-export type CloudintegrationtypesPostableAgentCheckInRequestDTOData = {
-	[key: string]: unknown;
-} | null;
-
-export interface CloudintegrationtypesPostableAgentCheckInRequestDTO {
-	/**
-	 * @type string
-	 */
-	account_id?: string;
-	/**
-	 * @type string
-	 */
-	cloud_account_id?: string;
-	/**
-	 * @type string
-	 */
-	cloudIntegrationId?: string;
-	/**
-	 * @type object
-	 * @nullable true
-	 */
-	data: CloudintegrationtypesPostableAgentCheckInRequestDTOData;
-	/**
-	 * @type string
-	 */
-	providerAccountId?: string;
-}
-
-export interface CloudintegrationtypesProviderIntegrationConfigDTO {
-	aws: CloudintegrationtypesAWSIntegrationConfigDTO;
-}
-
-export interface CloudintegrationtypesServiceDTO {
-	assets: CloudintegrationtypesAssetsDTO;
-	dataCollected: CloudintegrationtypesDataCollectedDTO;
-	/**
-	 * @type string
-	 */
-	icon: string;
-	/**
-	 * @type string
-	 */
-	id: string;
-	/**
-	 * @type string
-	 */
-	overview: string;
-	serviceConfig?: CloudintegrationtypesServiceConfigDTO;
-	supported_signals: CloudintegrationtypesSupportedSignalsDTO;
-	telemetryCollectionStrategy: CloudintegrationtypesCollectionStrategyDTO;
-	/**
-	 * @type string
-	 */
-	title: string;
-}
-
-export interface CloudintegrationtypesServiceConfigDTO {
-	aws: CloudintegrationtypesAWSServiceConfigDTO;
-}
-
-export interface CloudintegrationtypesServiceMetadataDTO {
-	/**
-	 * @type boolean
-	 */
-	enabled: boolean;
-	/**
-	 * @type string
-	 */
-	icon: string;
-	/**
-	 * @type string
-	 */
-	id: string;
-	/**
-	 * @type string
-	 */
-	title: string;
-}
-
-export interface CloudintegrationtypesSupportedSignalsDTO {
-	/**
-	 * @type boolean
-	 */
-	logs?: boolean;
-	/**
-	 * @type boolean
-	 */
-	metrics?: boolean;
-}
-
-export interface CloudintegrationtypesUpdatableAccountDTO {
-	config: CloudintegrationtypesAccountConfigDTO;
-}
-
-export interface CloudintegrationtypesUpdatableServiceDTO {
-	config: CloudintegrationtypesServiceConfigDTO;
-}
-
 export interface DashboardtypesDashboardDTO {
 	/**
 	 * @type string
@@ -3288,97 +2858,6 @@ export type AuthzResources200 = {
 export type ChangePasswordPathParameters = {
 	id: string;
 };
-export type AgentCheckInDeprecatedPathParameters = {
-	cloudProvider: string;
-};
-export type AgentCheckInDeprecated200 = {
-	data: CloudintegrationtypesGettableAgentCheckInResponseDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type ListAccountsPathParameters = {
-	cloudProvider: string;
-};
-export type ListAccounts200 = {
-	data: CloudintegrationtypesGettableAccountsDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type CreateAccountPathParameters = {
-	cloudProvider: string;
-};
-export type CreateAccount200 = {
-	data: CloudintegrationtypesGettableAccountWithArtifactDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type DisconnectAccountPathParameters = {
-	cloudProvider: string;
-	id: string;
-};
-export type GetAccountPathParameters = {
-	cloudProvider: string;
-	id: string;
-};
-export type GetAccount200 = {
-	data: CloudintegrationtypesAccountDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type UpdateAccountPathParameters = {
-	cloudProvider: string;
-	id: string;
-};
-export type AgentCheckInPathParameters = {
-	cloudProvider: string;
-};
-export type AgentCheckIn200 = {
-	data: CloudintegrationtypesGettableAgentCheckInResponseDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type ListServicesMetadataPathParameters = {
-	cloudProvider: string;
-};
-export type ListServicesMetadata200 = {
-	data: CloudintegrationtypesGettableServicesMetadataDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type GetServicePathParameters = {
-	cloudProvider: string;
-	serviceId: string;
-};
-export type GetService200 = {
-	data: CloudintegrationtypesServiceDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type UpdateServicePathParameters = {
-	cloudProvider: string;
-	serviceId: string;
-};
 export type CreateSessionByGoogleCallback303 = {
 	data: AuthtypesGettableTokenDTO;
 	/**

frontend/src/container/DashboardContainer/DashboardDescription/index.tsx

@@ -577,6 +577,11 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 				open={isPanelNameModalOpen}
 				title="New Section"
 				rootClassName="section-naming"
+				onOk={(): void => handleAddRow()}
+				onCancel={(): void => {
+					setIsPanelNameModalOpen(false);
+					setSectionName(DEFAULT_ROW_NAME);
+				}}
 				footer={
 					<div className="dashboard-rename">
 						<Button

frontend/src/container/InfraMonitoringK8s/Volumes/VolumeDetails/constants.ts

@@ -62,6 +62,9 @@ export const getVolumeQueryPayload = (
 	const k8sPVCNameKey = dotMetricsEnabled
 		? 'k8s.persistentvolumeclaim.name'
 		: 'k8s_persistentvolumeclaim_name';
+	const legendTemplate = dotMetricsEnabled
+		? '{{k8s.namespace.name}}-{{k8s.pod.name}}'
+		: '{{k8s_namespace_name}}-{{k8s_pod_name}}';
 
 	return [
 		{
@@ -133,7 +136,7 @@ export const getVolumeQueryPayload = (
 							functions: [],
 							groupBy: [],
 							having: [],
-							legend: 'Available',
+							legend: legendTemplate,
 							limit: null,
 							orderBy: [],
 							queryName: 'A',
@@ -225,7 +228,7 @@ export const getVolumeQueryPayload = (
 							functions: [],
 							groupBy: [],
 							having: [],
-							legend: 'Capacity',
+							legend: legendTemplate,
 							limit: null,
 							orderBy: [],
 							queryName: 'A',
@@ -316,7 +319,7 @@ export const getVolumeQueryPayload = (
 							},
 							groupBy: [],
 							having: [],
-							legend: 'Inodes Used',
+							legend: legendTemplate,
 							limit: null,
 							orderBy: [],
 							queryName: 'A',
@@ -408,7 +411,7 @@ export const getVolumeQueryPayload = (
 							},
 							groupBy: [],
 							having: [],
-							legend: 'Total Inodes',
+							legend: legendTemplate,
 							limit: null,
 							orderBy: [],
 							queryName: 'A',
@@ -500,7 +503,7 @@ export const getVolumeQueryPayload = (
 							},
 							groupBy: [],
 							having: [],
-							legend: 'Inodes Free',
+							legend: legendTemplate,
 							limit: null,
 							orderBy: [],
 							queryName: 'A',

frontend/src/container/InfraMonitoringK8s/__tests__/Volumes/K8sVolumesList.test.tsx

@@ -1,390 +0,0 @@
-import { QueryClient, QueryClientProvider } from 'react-query';
-// eslint-disable-next-line no-restricted-imports
-import { MemoryRouter } from 'react-router-dom-v5-compat';
-import { FeatureKeys } from 'constants/features';
-import K8sVolumesList from 'container/InfraMonitoringK8s/Volumes/K8sVolumesList';
-import { rest, server } from 'mocks-server/server';
-import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import { IAppContext, IUser } from 'providers/App/types';
-import { QueryBuilderProvider } from 'providers/QueryBuilder';
-// eslint-disable-next-line no-restricted-imports
-import { applyMiddleware, legacy_createStore as createStore } from 'redux';
-import thunk from 'redux-thunk';
-import reducers from 'store/reducers';
-import { act, render, screen, userEvent, waitFor } from 'tests/test-utils';
-import { UPDATE_TIME_INTERVAL } from 'types/actions/globalTime';
-import { LicenseResModel } from 'types/api/licensesV3/getActive';
-
-import { INFRA_MONITORING_K8S_PARAMS_KEYS } from '../../constants';
-
-const SERVER_URL = 'http://localhost/api';
-
-// jsdom does not implement IntersectionObserver — provide a no-op stub
-const mockObserver = {
-	observe: jest.fn(),
-	unobserve: jest.fn(),
-	disconnect: jest.fn(),
-};
-global.IntersectionObserver = jest
-	.fn()
-	.mockImplementation(() => mockObserver) as any;
-
-const mockVolume = {
-	persistentVolumeClaimName: 'test-pvc',
-	volumeAvailable: 1000000,
-	volumeCapacity: 5000000,
-	volumeInodes: 100,
-	volumeInodesFree: 50,
-	volumeInodesUsed: 50,
-	volumeUsage: 4000000,
-	meta: {
-		k8s_cluster_name: 'test-cluster',
-		k8s_namespace_name: 'test-namespace',
-		k8s_node_name: 'test-node',
-		k8s_persistentvolumeclaim_name: 'test-pvc',
-		k8s_pod_name: 'test-pod',
-		k8s_pod_uid: 'test-pod-uid',
-		k8s_statefulset_name: '',
-	},
-};
-
-const mockVolumesResponse = {
-	status: 'success',
-	data: {
-		type: '',
-		records: [mockVolume],
-		groups: null,
-		total: 1,
-		sentAnyHostMetricsData: false,
-		isSendingK8SAgentMetrics: false,
-	},
-};
-
-/** Renders K8sVolumesList with a real Redux store so dispatched actions affect state. */
-function renderWithRealStore(
-	initialEntries?: Record<string, any>,
-): { testStore: ReturnType<typeof createStore> } {
-	const testStore = createStore(reducers, applyMiddleware(thunk as any));
-	const queryClient = new QueryClient({
-		defaultOptions: { queries: { retry: false } },
-	});
-
-	render(
-		<NuqsTestingAdapter searchParams={initialEntries}>
-			<QueryClientProvider client={queryClient}>
-				<QueryBuilderProvider>
-					<MemoryRouter>
-						<K8sVolumesList
-							isFiltersVisible={false}
-							handleFilterVisibilityChange={jest.fn()}
-							quickFiltersLastUpdated={-1}
-						/>
-					</MemoryRouter>
-				</QueryBuilderProvider>
-			</QueryClientProvider>
-		</NuqsTestingAdapter>,
-	);
-
-	return { testStore };
-}
-
-describe('K8sVolumesList - useGetAggregateKeys Category Regression', () => {
-	let requestsMade: Array<{
-		url: string;
-		params: URLSearchParams;
-		body?: any;
-	}> = [];
-
-	beforeEach(() => {
-		requestsMade = [];
-
-		server.use(
-			rest.get(`${SERVER_URL}/v3/autocomplete/attribute_keys`, (req, res, ctx) => {
-				const url = req.url.toString();
-				const params = req.url.searchParams;
-
-				requestsMade.push({
-					url,
-					params,
-				});
-
-				return res(
-					ctx.status(200),
-					ctx.json({
-						status: 'success',
-						data: {
-							attributeKeys: [],
-						},
-					}),
-				);
-			}),
-			rest.post(`${SERVER_URL}/v1/pvcs/list`, (req, res, ctx) =>
-				res(
-					ctx.status(200),
-					ctx.json({
-						status: 'success',
-						data: {
-							type: 'list',
-							records: [],
-							groups: null,
-							total: 0,
-							sentAnyHostMetricsData: false,
-							isSendingK8SAgentMetrics: false,
-						},
-					}),
-				),
-			),
-		);
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('should call aggregate keys API with k8s_volume_capacity', async () => {
-		renderWithRealStore();
-
-		await waitFor(() => {
-			expect(requestsMade.length).toBeGreaterThan(0);
-		});
-
-		// Find the attribute_keys request
-		const attributeKeysRequest = requestsMade.find((req) =>
-			req.url.includes('/autocomplete/attribute_keys'),
-		);
-
-		expect(attributeKeysRequest).toBeDefined();
-
-		const aggregateAttribute = attributeKeysRequest?.params.get(
-			'aggregateAttribute',
-		);
-
-		expect(aggregateAttribute).toBe('k8s_volume_capacity');
-	});
-
-	it('should call aggregate keys API with k8s.volume.capacity when dotMetrics enabled', async () => {
-		jest
-			.spyOn(await import('providers/App/App'), 'useAppContext')
-			.mockReturnValue({
-				featureFlags: [
-					{
-						name: FeatureKeys.DOT_METRICS_ENABLED,
-						active: true,
-						usage: 0,
-						usage_limit: 0,
-						route: '',
-					},
-				],
-				user: { role: 'ADMIN' } as IUser,
-				activeLicense: (null as unknown) as LicenseResModel,
-			} as IAppContext);
-
-		renderWithRealStore();
-
-		await waitFor(() => {
-			expect(requestsMade.length).toBeGreaterThan(0);
-		});
-
-		const attributeKeysRequest = requestsMade.find((req) =>
-			req.url.includes('/autocomplete/attribute_keys'),
-		);
-
-		expect(attributeKeysRequest).toBeDefined();
-
-		const aggregateAttribute = attributeKeysRequest?.params.get(
-			'aggregateAttribute',
-		);
-
-		expect(aggregateAttribute).toBe('k8s.volume.capacity');
-	});
-});
-
-describe('K8sVolumesList', () => {
-	beforeEach(() => {
-		server.use(
-			rest.post('http://localhost/api/v1/pvcs/list', (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(mockVolumesResponse)),
-			),
-			rest.get(
-				'http://localhost/api/v3/autocomplete/attribute_keys',
-				(_req, res, ctx) =>
-					res(ctx.status(200), ctx.json({ data: { attributeKeys: [] } })),
-			),
-		);
-	});
-
-	it('renders volume rows from API response', async () => {
-		renderWithRealStore();
-
-		await waitFor(async () => {
-			const elements = await screen.findAllByText('test-pvc');
-
-			expect(elements.length).toBeGreaterThan(0);
-		});
-	});
-
-	it('opens VolumeDetails when a volume row is clicked', async () => {
-		const user = userEvent.setup();
-		renderWithRealStore();
-
-		const pvcCells = await screen.findAllByText('test-pvc');
-		expect(pvcCells.length).toBeGreaterThan(0);
-
-		const row = pvcCells[0].closest('tr');
-		expect(row).not.toBeNull();
-		await user.click(row!);
-
-		await waitFor(async () => {
-			const cells = await screen.findAllByText('test-pvc');
-			expect(cells.length).toBeGreaterThan(1);
-		});
-	});
-
-	it('closes VolumeDetails when the close button is clicked', async () => {
-		const user = userEvent.setup();
-		renderWithRealStore();
-
-		const pvcCells = await screen.findAllByText('test-pvc');
-		expect(pvcCells.length).toBeGreaterThan(0);
-
-		const row = pvcCells[0].closest('tr');
-		await user.click(row!);
-
-		await waitFor(() => {
-			expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
-		});
-
-		await user.click(screen.getByRole('button', { name: 'Close' }));
-
-		await waitFor(() => {
-			expect(
-				screen.queryByRole('button', { name: 'Close' }),
-			).not.toBeInTheDocument();
-		});
-	});
-
-	it('does not re-fetch the volumes list when time range changes after selecting a volume', async () => {
-		const user = userEvent.setup();
-		let apiCallCount = 0;
-		server.use(
-			rest.post('http://localhost/api/v1/pvcs/list', async (_req, res, ctx) => {
-				apiCallCount += 1;
-				return res(ctx.status(200), ctx.json(mockVolumesResponse));
-			}),
-		);
-
-		const { testStore } = renderWithRealStore();
-
-		await waitFor(() => expect(apiCallCount).toBe(1));
-
-		const pvcCells = await screen.findAllByText('test-pvc');
-		const row = pvcCells[0].closest('tr');
-		await user.click(row!);
-		await waitFor(async () => {
-			const cells = await screen.findAllByText('test-pvc');
-			expect(cells.length).toBeGreaterThan(1);
-		});
-
-		// Wait for nuqs URL state to fully propagate to the component
-		// The selectedVolumeUID is managed via nuqs (async URL state),
-		// so we need to ensure the state has settled before dispatching time changes
-		await act(async () => {
-			await new Promise((resolve) => {
-				setTimeout(resolve, 0);
-			});
-		});
-
-		const countAfterClick = apiCallCount;
-
-		// There's a specific component causing the min/max time to be updated
-		// After the volume loads, it triggers the change again
-		// And then the query to fetch data for the selected volume enters in a loop
-		act(() => {
-			testStore.dispatch({
-				type: UPDATE_TIME_INTERVAL,
-				payload: {
-					minTime: Date.now() * 1000000 - 30 * 60 * 1000 * 1000000,
-					maxTime: Date.now() * 1000000,
-					selectedTime: '30m',
-				},
-			} as any);
-		});
-
-		// Allow any potential re-fetch to settle
-		await new Promise((resolve) => {
-			setTimeout(resolve, 500);
-		});
-
-		expect(apiCallCount).toBe(countAfterClick);
-	});
-
-	it('does not re-fetch groupedByRowData when time range changes after expanding a volume row with groupBy', async () => {
-		const user = userEvent.setup();
-		const groupByValue = [{ key: 'k8s_namespace_name' }];
-
-		let groupedByRowDataCallCount = 0;
-		server.use(
-			rest.post('http://localhost/api/v1/pvcs/list', async (req, res, ctx) => {
-				const body = await req.json();
-				// Check for both underscore and dot notation keys since dotMetricsEnabled
-				// may be true or false depending on test order
-				const isGroupedByRowDataRequest = body.filters?.items?.some(
-					(item: { key?: { key?: string }; value?: string }) =>
-						(item.key?.key === 'k8s_namespace_name' ||
-							item.key?.key === 'k8s.namespace.name') &&
-						item.value === 'test-namespace',
-				);
-				if (isGroupedByRowDataRequest) {
-					groupedByRowDataCallCount += 1;
-				}
-				return res(ctx.status(200), ctx.json(mockVolumesResponse));
-			}),
-			rest.get(
-				'http://localhost/api/v3/autocomplete/attribute_keys',
-				(_req, res, ctx) =>
-					res(
-						ctx.status(200),
-						ctx.json({
-							data: {
-								attributeKeys: [{ key: 'k8s_namespace_name', dataType: 'string' }],
-							},
-						}),
-					),
-			),
-		);
-
-		const { testStore } = renderWithRealStore({
-			[INFRA_MONITORING_K8S_PARAMS_KEYS.GROUP_BY]: JSON.stringify(groupByValue),
-		});
-
-		await waitFor(async () => {
-			const elements = await screen.findAllByText('test-namespace');
-			return expect(elements.length).toBeGreaterThan(0);
-		});
-
-		const row = (await screen.findAllByText('test-namespace'))[0].closest('tr');
-		expect(row).not.toBeNull();
-		user.click(row as HTMLElement);
-		await waitFor(() => expect(groupedByRowDataCallCount).toBe(1));
-
-		const countAfterExpand = groupedByRowDataCallCount;
-
-		act(() => {
-			testStore.dispatch({
-				type: UPDATE_TIME_INTERVAL,
-				payload: {
-					minTime: Date.now() * 1000000 - 30 * 60 * 1000 * 1000000,
-					maxTime: Date.now() * 1000000,
-					selectedTime: '30m',
-				},
-			} as any);
-		});
-
-		// Allow any potential re-fetch to settle
-		await new Promise((resolve) => {
-			setTimeout(resolve, 500);
-		});
-
-		expect(groupedByRowDataCallCount).toBe(countAfterExpand);
-	});
-});

frontend/src/container/NewWidget/types.ts

@@ -16,10 +16,8 @@ export interface NewWidgetProps {
 }
 
 export interface WidgetGraphProps {
-	// this should be inside the querier plugin definition
 	selectedLogFields: Widgets['selectedLogFields'];
 	setSelectedLogFields?: Dispatch<SetStateAction<Widgets['selectedLogFields']>>;
-	// this should be inside the querier plugin definition
 	selectedTracesFields: Widgets['selectedTracesFields'];
 	setSelectedTracesFields?: Dispatch<
 		SetStateAction<Widgets['selectedTracesFields']>

frontend/src/types/api/dashboard/getAll.ts

@@ -118,6 +118,7 @@ export interface IBaseWidget {
 	opacity: string;
 	nullZeroValues: string;
 	timePreferance: timePreferenceType;
+	stepSize?: number;
 	yAxisUnit?: string;
 	decimalPrecision?: PrecisionOption; // number of decimals or 'full precision'
 	stackedBarChart?: boolean;

perses/common/common.cue

@@ -1,120 +0,0 @@
-package common
-
-// ──────────────────────────────────────────────
-// Shared types
-// ──────────────────────────────────────────────
-
-#TelemetryFieldKey: {
-    name:           string
-    key?:           string
-    description?:   string
-    unit?:          string
-    signal?:        string
-    fieldContext?:   string
-    fieldDataType?: string
-    materialized?:  bool
-    isIndexed?:     bool
-}
-
-// ──────────────────────────────────────────────
-// Panel types
-// ──────────────────────────────────────────────
-
-#ContextLinkProps: {
-    url:   string
-    label: string
-}
-
-#TimePreference: *"globalTime" | "last5Min" | "last15Min" | "last30Min" | "last1Hr" | "last6Hr" | "last1Day" | "last3Days" | "last1Week" | "last1Month"
-
-#PrecisionOption: *2 | 0 | 1 | 3 | 4 | "full"
-
-// how is this undefined and null? Would like to avoid undefined if possible
-// also bools can required always?
-#Axes: {
-    softMin?:    number | *null
-    softMax?:    number | *null
-    isLogScale?: bool | *false
-}
-
-#LegendPosition: *"bottom" | "right"
-
-#ThresholdWithLabel: {
-    value:  number
-    unit?:  string
-    color:  string
-    // What is this?
-    format: "Text" | "Background"
-    label?: string
-}
-
-// where is this used
-#ComparisonThreshold: {
-    value:    number
-    operator: ">" | "<" | ">=" | "<=" | "="
-    unit?:    string
-    color:    string
-    format:   "Text" | "Background"
-}
-
-// ──────────────────────────────────────────────
-// Query types
-// ──────────────────────────────────────────────
-
-#QueryName: =~"^[A-Za-z][A-Za-z0-9_]*$"
-
-#Limit: int & >=0 & <=10000
-
-#Offset: int & >=0
-
-#ReduceTo: "sum" | "count" | "avg" | "min" | "max" | "last" | "median"
-
-#MetricAggregation: close({
-    metricName:       string & !=""
-    timeAggregation:  "latest" | "sum" | "avg" | "min" | "max" | "count" | "rate" | "increase"
-    spaceAggregation: "sum" | "avg" | "min" | "max" | "count" | "p50" | "p75" | "p90" | "p95" | "p99"
-    reduceTo?:        #ReduceTo
-    // should unspecified be the default?
-    temporality?:     "delta" | "cumulative" | "unspecified"
-})
-
-#ExpressionAggregation: close({
-    expression: string & !=""
-    alias?:     string
-})
-
-#Aggregation: #MetricAggregation | #ExpressionAggregation
-
-#FilterExpression: close({
-    expression: string
-})
-
-#GroupByItem: close({
-    name:           string & !=""
-    fieldDataType?: string
-    fieldContext?:   string
-})
-
-#OrderByItem: close({
-    columnName: string & !=""
-    order:      "asc" | "desc"
-})
-
-#HavingExpression: close({
-    expression: string
-})
-
-#Function: close({
-    name: "cutOffMin" | "cutOffMax" | "clampMin" | "clampMax" |
-        "absolute" | "runningDiff" | "log2" | "log10" |
-        "cumulativeSum" | "ewma3" | "ewma5" | "ewma7" |
-        "median3" | "median5" | "median7" | "timeShift" |
-        "anomaly" | "fillZero"
-    args?: [...close({value: number | string | bool})]
-})
-
-// ──────────────────────────────────────────────
-// Variable types
-// ──────────────────────────────────────────────
-
-#VariableSortOrder: *"disabled" | "asc" | "desc"

perses/cue.mod/module.cue

@@ -1,4 +0,0 @@
-module: "github.com/signoz"
-language: {
-	version: "v0.12.0"
-}

perses/examples/perses.json

@@ -1,926 +0,0 @@
-{
-  "kind": "Dashboard",
-  "metadata": {
-    "name": "the-everything-dashboard",
-    "project": "signoz" // should this be an id? What is this project exactly?
-    // where would createdAt, updatedAt, createdBy, updatedBy be used?
-    // where would dashboardID or organizationID go
-    // where is locked going to come in
-    // can we have public path here as well? default time range and
-
-    // where would version go?
-    // where would image value go?
-    // where would tags go?
-
-    // we have uploadedGrafana. What is uploadedGrafana used for?
-
-    // ! all above looks like we need a plugin for the root dashboard as well
-
-    // how is panelMap and widgets translated to layout? Is layout the same as before?
-    // where is timePreferance set up
-    // collapsed?
-    // ? https://github.com/react-grid-layout/react-grid-layout?tab=readme-ov-file#layout-item
-  },
-  "spec": {
-    "display": {
-      "name": "The everything dashboard", // this is duplicate?
-      "description": "Trying to cover as many concepts here as possible"
-    },
-    "duration": "1h", // is this required?
-    "datasources": {
-      "SigNozDatasource": {
-        "default": true,
-        "plugin": {
-          "kind": "SigNozDatasource",
-          "spec": {}
-        }
-      }
-    },
-    "variables": [
-      {
-        // what is a ListVariable
-        "kind": "ListVariable",
-        "spec": {
-          "name": "serviceName",
-          "display": {
-            "name": "serviceName"
-          },
-          "allowAllValue": true,
-          "allowMultiple": false,
-          "plugin": {
-            "kind": "SigNozDynamicVariable",
-            "spec": {
-              "name": "service.name",
-              "source": "Metrics",
-              "sort": "disabled"
-            }
-          }
-        }
-      },
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "name": "statusCodesFromQuery",
-          "display": {
-            "name": "statusCodesFromQuery"
-          },
-          "allowAllValue": true,
-          "allowMultiple": true,
-          "plugin": {
-            "kind": "SigNozQueryVariable",
-            "spec": {
-              // missing defaultValue for these list variables
-              "queryValue": "SELECT JSONExtractString(labels, 'http.status_code') AS status_code FROM signoz_metrics.distributed_time_series_v4_1day WHERE status_code != '' GROUP BY status_code",
-              "sort": "asc"
-            }
-          }
-        }
-      },
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "name": "limit",
-          "display": {
-            "name": "limit"
-          },
-          "allowAllValue": false,
-          "allowMultiple": false,
-          "plugin": {
-            "kind": "SigNozCustomVariable",
-            "spec": {
-              // defaultValue missing
-              "customValue": "1,10,20,40,80,160,200",
-              "sort": "disabled"
-            }
-          }
-        }
-      },
-      {
-        // do we need uuid for id here? Do we need id at all?
-        // migration will require cleanup from localstorage as it is all saved with ids right now
-        "kind": "TextVariable",
-        "spec": {
-          "name": "textboxvar",
-          "display": {
-            "name": "textboxvar"
-          },
-          "value": "defaultvaluegoeshere",
-          "plugin": {
-            // just to confirm, this would be the type right?
-            "kind": "SigNozTextboxVariable",
-            "spec": {
-              // How should selectedValue be handled on share?
-              // we should have an option for selectedValue here
-              // should go in for all variables
-              // should be auto filled with the default or with the queried value. All for multi, first for single
-              // if selectedValue goes in, then we will need allSelected as well
-            }
-          }
-        }
-      }
-    ],
-    "panels": {
-      // need metadata inside this for section creation
-      // maybe another key just for sections. much easier
-      "24e2697b": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "total resp size",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "fillSpans": true
-              },
-              "formatting": {
-                "unit": "By",
-                "decimalPrecision": 3
-              },
-              "axes": {
-                "softMax": 800,
-                "isLogScale": true
-              },
-              "legend": {
-                "position": "right",
-                "customColors": {
-                  "{service.name=\"sampleapp-gateway\"}": "#9ea5f7"
-                }
-              },
-              "contextLinks": [
-                {
-                  "label": "View service details",
-                  "url": "http://localhost:8080/{{_service.name}}?dfddf=%7B%7Blimit%7D%7D"
-                }
-              ],
-              "thresholds": [
-                {
-                  "value": 1024,
-                  "unit": "By",
-                  "color": "Red",
-                  "format": "Text",
-                  "label": "upper limit"
-                },
-                {
-                  "value": 100,
-                  "unit": "By",
-                  "color": "Orange",
-                  "format": "Text",
-                  "label": "kinda bad"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "metricName": "http.server.response.body.size.sum",
-                        "reduceTo": "sum",
-                        "spaceAggregation": "sum",
-                        "timeAggregation": "rate"
-                      }
-                    ],
-                    "filter": {
-                      "expression": "http.response.status_code IN $statusCodesFromQuery"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "service.name",
-                        "fieldDataType": "string",
-                        "fieldContext": "tag"
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "ff2f72f1": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "fraction of calls",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "fillSpans": true
-              },
-              "formatting": {
-                "decimalPrecision": 1
-              },
-              "thresholds": [
-                {
-                  "value": 1,
-                  "color": "Blue",
-                  "format": "Background",
-                  "label": "max possible"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozCompositeQuery",
-                  "spec": {
-                    "queries": [
-                      {
-                        "type": "builder_query",
-                        "spec": {
-                          "name": "A",
-                          "signal": "metrics",
-                          "expression": "A",
-                          "disabled": true,
-                          "aggregations": [
-                            {
-                              "metricName": "signoz_calls_total",
-                              "reduceTo": "sum",
-                              "spaceAggregation": "sum",
-                              "timeAggregation": "rate"
-                            }
-                          ],
-                          "filter": {
-                            "expression": "service.name IN $serviceName  AND http.status_code IN $statusCodesFromQuery"
-                          }
-                        }
-                      },
-                      {
-                        "type": "builder_query",
-                        "spec": {
-                          "name": "B",
-                          "signal": "metrics",
-                          "expression": "B",
-                          "disabled": true,
-                          "aggregations": [
-                            {
-                              "metricName": "signoz_calls_total",
-                              "reduceTo": "sum",
-                              "spaceAggregation": "sum",
-                              "timeAggregation": "rate"
-                            }
-                          ],
-                          "filter": {
-                            "expression": "service.name in $serviceName"
-                          }
-                        }
-                      },
-                      {
-                        "type": "builder_formula",
-                        "spec": {
-                          "name": "F1",
-                          "expression": "A / B"
-                        }
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "011605e7": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "total resp size"
-          },
-          "plugin": {
-            "kind": "SigNozBarChartPanel",
-            "spec": {
-              "visualization": {
-                "stackedBarChart": false
-              },
-              "formatting": {
-                "unit": "By"
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "metricName": "http.server.response.body.size.sum",
-                        "reduceTo": "sum",
-                        "spaceAggregation": "sum",
-                        "timeAggregation": "rate"
-                      }
-                    ],
-                    "filter": {
-                      "expression": "http.response.status_code IN $statusCodesFromQuery"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "service.name",
-                        "fieldDataType": "string",
-                        "fieldContext": "tag"
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "e23516fc": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "num traces for service"
-          },
-          "plugin": {
-            "kind": "SigNozNumberPanel",
-            "spec": {
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": 1
-              },
-              "thresholds": [
-                {
-                  "value": 1200000,
-                  "operator": ">",
-                  "unit": "none",
-                  "color": "Red",
-                  "format": "Text"
-                },
-                {
-                  "value": 1200000,
-                  "operator": "<=",
-                  "unit": "none",
-                  "color": "Green",
-                  "format": "Text"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "traces",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "expression": "count() "
-                      }
-                    ],
-                    "filter": {
-                      "expression": "service.name = $serviceName "
-                    }
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "130c8d6b": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "num logs for service"
-          },
-          "plugin": {
-            "kind": "SigNozNumberPanel",
-            "spec": {
-              "formatting": {
-                "unit": "none",
-                "decimalPrecision": 1
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "logs",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "expression": "count() "
-                      }
-                    ],
-                    "filter": {
-                      "expression": "service.name = $serviceName "
-                    }
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "246f7c6d": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "num traces for service per resp code"
-          },
-          "plugin": {
-            "kind": "SigNozPieChartPanel",
-            "spec": {
-              "formatting": {
-                "decimalPrecision": 1
-              },
-              "legend": {
-                "customColors": {
-                  "\"201\"": "#2bc051",
-                  "\"400\"": "#cc462e",
-                  "\"500\"": "#ff0000"
-                }
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "traces",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "expression": "count() "
-                      }
-                    ],
-                    "filter": {
-                      "expression": "service.name = $serviceName isEntryPoint = 'true'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "http.response.status_code",
-                        "fieldDataType": "float64",
-                        "fieldContext": "tag"
-                      }
-                    ],
-                    "legend": "\"{{http.response.status_code}}\""
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "21f7d4d0": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "average latency per service"
-          },
-          "plugin": {
-            "kind": "SigNozTablePanel",
-            "spec": {
-              "formatting": {
-                "columnUnits": {
-                  "A": "s"
-                }
-              },
-              "thresholds": [
-                {
-                  "value": 1,
-                  "operator": ">",
-                  "unit": "min",
-                  "color": "Red",
-                  "format": "Text",
-                  "tableOptions": "A"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozClickHouseSQL",
-                  "spec": {
-                    "name": "A",
-                    "query": "WITH\n    __spatial_aggregation_cte AS\n    (\n        SELECT\n            toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(60)) AS ts,\n            `service.name`,\n            le,\n            sum(value) / 60 AS value\n        FROM signoz_metrics.distributed_samples_v4 AS points\n        INNER JOIN\n        (\n            SELECT\n                fingerprint,\n                JSONExtractString(labels, 'service.name') AS `service.name`,\n                JSONExtractString(labels, 'le') AS le\n            FROM signoz_metrics.time_series_v4\n            WHERE (metric_name IN ('signoz_latency.bucket')) AND (LOWER(temporality) LIKE LOWER('delta')) AND (__normalized = 0)\n            GROUP BY\n                fingerprint,\n                `service.name`,\n                le\n        ) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint\n        WHERE metric_name IN ('signoz_latency.bucket')\n        GROUP BY\n            ts,\n            `service.name`,\n            le\n    ),\n    __histogramCTE AS\n    (\n        SELECT\n            ts,\n            `service.name`,\n            histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.9) AS value\n        FROM __spatial_aggregation_cte\n        GROUP BY\n            `service.name`,\n            ts\n        ORDER BY\n            `service.name` ASC,\n            ts ASC\n    )\nSELECT\n    `service.name` AS service,\n    avg(value) AS A\nFROM __histogramCTE\nGROUP BY `service.name`"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "ad5fd556": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "logs from service"
-          },
-          "plugin": {
-            "kind": "SigNozListPanel",
-            "spec": {
-              "selectedLogFields": [
-                {
-                  "name": "timestamp",
-                  "type": "log",
-                  "dataType": ""
-                },
-                {
-                  "name": "body",
-                  "type": "log",
-                  "dataType": ""
-                },
-                {
-                  "name": "error",
-                  "type": "",
-                  "dataType": "string"
-                }
-              ]
-            }
-          },
-          "queries": [
-            {
-              "kind": "LogQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "logs",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "expression": "count() "
-                      }
-                    ],
-                    "filter": {
-                      "expression": "service.name = $serviceName"
-                    },
-                    "groupBy": [],
-                    "order": [
-                      {
-                        "columnName": "timestamp",
-                        "order": "desc"
-                      },
-                      {
-                        "columnName": "id",
-                        "order": "desc"
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "f07b59ee": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "response size buckets"
-          },
-          "plugin": {
-            "kind": "SigNozHistogramPanel",
-            "spec": {
-              "histogramBuckets": {
-                "bucketCount": 60,
-                "mergeAllActiveQueries": true
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozBuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "expression": "A",
-                    "aggregations": [
-                      {
-                        "metricName": "http.server.response.body.size.bucket",
-                        "reduceTo": "avg",
-                        "spaceAggregation": "p90",
-                        "timeAggregation": "rate"
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "e1a41831": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "trace operator",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {
-              "legend": {
-                "position": "right"
-              }
-            }
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozCompositeQuery",
-                  "spec": {
-                    "queries": [
-                      {
-                        "type": "builder_query",
-                        "spec": {
-                          "name": "A",
-                          "signal": "traces",
-                          "expression": "A",
-                          "aggregations": [
-                            {
-                              "expression": "count() "
-                            }
-                          ],
-                          "filter": {
-                            "expression": "service.name = 'sampleapp-gateway' "
-                          },
-                          "legend": "Gateway"
-                        }
-                      },
-                      {
-                        "type": "builder_query",
-                        "spec": {
-                          "name": "B",
-                          "signal": "traces",
-                          "expression": "B",
-                          "aggregations": [
-                            {
-                              "expression": "count() "
-                            }
-                          ],
-                          "filter": {
-                            "expression": "http.response.status_code = 200"
-                          },
-                          "legend": "$serviceName"
-                        }
-                      },
-                      {
-                        "type": "builder_trace_operator",
-                        "spec": {
-                          "name": "T1",
-                          "expression": "A -> B ",
-                          "aggregations": [
-                            {
-                              "expression": "count()",
-                              "alias": "request_count"
-                            }
-                          ]
-                        }
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "f0d70491": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "no results in this promql",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {}
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozCompositeQuery",
-                  "spec": {
-                    "queries": [
-                      {
-                        "type": "promql",
-                        "spec": {
-                          "name": "A",
-                          "query": "sum(rate(flask_exporter_info[5m]))"
-                        }
-                      },
-                      {
-                        "type": "promql",
-                        "spec": {
-                          "name": "B",
-                          "query": "sum(increase(flask_exporter_info[5m]))"
-                        }
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "0e6eb4ca": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "no results in this promql",
-            "description": ""
-          },
-          "plugin": {
-            "kind": "SigNozTimeSeriesPanel",
-            "spec": {}
-          },
-          "queries": [
-            {
-              "kind": "TimeSeriesQuery",
-              "spec": {
-                "plugin": {
-                  "kind": "SigNozPromQLQuery",
-                  "spec": {
-                    "name": "A",
-                    "query": "sum(rate(flask_exporter_info[5m]))"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    "layouts": [
-      {
-        "kind": "Grid",
-        "spec": {
-          // ! where is row header?
-          // w: 12,
-          // 	minW: 12,
-          // 	minH: 1,
-          // 	maxH: 1,
-          // 	x: 0,
-          // 	h: 1,
-          // 	y: 0,
-          // These above properties are required for the headers only
-          // need collapsed state for a section
-          "items": [
-            {
-              // we need id here. could be injected from the frontend
-              "x": 0,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              // how easy would it be to introduce more here? like maxW, minW, static, etc. Do we want to introduce those from the start?
-              // "moved" might need experimenting
-              "content": {
-                "$ref": "#/spec/panels/24e2697b"
-              }
-            },
-            {
-              "x": 6,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/ff2f72f1"
-              }
-            },
-            {
-              "x": 0,
-              "y": 6,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/011605e7"
-              }
-            },
-            {
-              "x": 6,
-              "y": 6,
-              "width": 6,
-              "height": 3,
-              "content": {
-                "$ref": "#/spec/panels/e23516fc"
-              }
-            },
-            {
-              "x": 6,
-              "y": 9,
-              "width": 6,
-              "height": 3,
-              "content": {
-                "$ref": "#/spec/panels/130c8d6b"
-              }
-            },
-            {
-              "x": 0,
-              "y": 12,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/246f7c6d"
-              }
-            },
-            {
-              "x": 6,
-              "y": 12,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/21f7d4d0"
-              }
-            },
-            {
-              "x": 0,
-              "y": 18,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/ad5fd556"
-              }
-            },
-            {
-              "x": 6,
-              "y": 18,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/f07b59ee"
-              }
-            },
-            {
-              "x": 0,
-              "y": 24,
-              "width": 12,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/e1a41831"
-              }
-            },
-            {
-              "x": 0,
-              "y": 30,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/f0d70491"
-              }
-            },
-            {
-              "x": 6,
-              "y": 30,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/0e6eb4ca"
-              }
-            }
-          ]
-        }
-      }
-    ]
-  }
-}

perses/howToDefineAPanel.md

@@ -1,140 +0,0 @@
-# Adding a new panel plugin
-
-This guide is for developers adding a new panel kind to the Perses schema. It covers the file structure you need to create, the shared types available in `common.cue`, and how to compose them into your panel's spec.
-
----
-
-## 1. File structure
-
-Create a new directory under `schemas-wrapper/schemas/` named after your panel:
-
-```
-schemas-wrapper/schemas/your-panel-name/
-├── your-panel-name.cue    # Schema definition
-└── example.json           # Example JSON that validates against the schema
-```
-
-The CUE file must use `package model` and declare a `kind` and `spec`:
-
-```cue
-package model
-
-import "github.com/signoz/common"
-
-kind: "YourPanelName"
-spec: close({
-    // your fields here
-})
-```
-
-Register the panel in `schemas-wrapper/schemas/package.json` by adding an entry to the `plugins` array:
-
-```json
-{
-    "kind": "Panel",
-    "spec": {
-        "name": "YourPanelName"
-    }
-}
-```
-
----
-
-## 2. Available shared types from `common.cue`
-
-These types are defined in `common/common.cue` and can be used via `import "github.com/signoz/common"`. Use them instead of redefining the same structures in your panel.
-
-## 3. Defining your spec
-
-Your spec is a `close({})` block containing the fields relevant to your panel. Pick from the shared types above and add panel-specific types as needed. Every field should be optional (suffixed with `?`) since a panel should be valid with just defaults.
-
-### Typical patterns
-
-**Panel with graphs** (has axes, legend, thresholds as reference lines):
-
-```cue
-spec: close({
-    visualization?:  #Visualization
-    formatting?:     #Formatting
-    axes?:           common.#Axes
-    legend?:         #Legend
-    contextLinks?:   [...common.#ContextLinkProps]
-    thresholds?:     [...common.#ThresholdWithLabel]
-})
-```
-
-**Panel with a single value** (no axes/legend, thresholds as conditional formatting):
-
-```cue
-spec: close({
-    visualization?:  #Visualization
-    formatting?:     #Formatting
-    contextLinks?:   [...common.#ContextLinkProps]
-    thresholds?:     [...common.#ComparisonThreshold]
-})
-```
-
-**Panel with custom data structure** (panel-specific fields only):
-
-```cue
-spec: close({
-    yourCustomConfig?: #YourCustomConfig
-    contextLinks?:     [...common.#ContextLinkProps]
-})
-```
-
-### Defining panel-local types
-
-Types that are specific to your panel (not reusable) should be defined in your CUE file, not in common. For example, `#Visualization` varies per panel because each panel has different rendering options:
-
-```cue
-#Visualization: {
-    timePreference?: common.#TimePreference
-    yourCustomFlag?: bool | *false
-}
-```
-
-If your panel needs a threshold type that extends a common one, embed it:
-
-```cue
-#YourThreshold: {
-    common.#ComparisonThreshold
-    extraField: string
-}
-```
-
----
-
-## 4. Writing the example JSON
-
-Create an `example.json` that exercises all fields in your spec. This file is used for validation — `./validate.sh` will check it against your schema.
-
-```json
-{
-    "kind": "YourPanelName",
-    "spec": {
-        ...
-    }
-}
-```
-
-Also add at least one panel using your new kind to `examples/perses.json` so it gets validated as part of a full dashboard.
-
----
-
-## 5. Validation
-
-Run `./validate.sh` from the `perses/` directory. It lints `examples/perses.json` against all registered schemas. If your schema or example has issues, the error will point to the specific field.
-
----
-
-## Quick reference: existing panels and what they use
-
-| Field | Time-series | Bar-chart | Number | Pie | Table | Histogram | List |
-|-------|:-----------:|:---------:|:------:|:---:|:-----:|:---------:|:----:|
-| `visualization` | yes | yes | yes | yes | yes | — | — |
-| `formatting` | yes | yes | yes | yes | yes | — | — |
-| `axes` | yes | yes | — | — | — | — | — |
-| `legend` | yes | yes | — | yes | — | yes | — |
-| `contextLinks` | yes | yes | yes | yes | yes | yes | — |
-| `thresholds` | yes | yes | yes | — | yes | — | — |

perses/schemas-wrapper/schemas/mf-manifest.json

@@ -1,9 +0,0 @@
-{
-  "id": "signoz",
-  "name": "signoz",
-  "metaData": {
-    "buildInfo": {
-      "buildVersion": "0.0.1"
-    }
-  }
-}

perses/schemas-wrapper/schemas/package.json

@@ -1,136 +0,0 @@
-{
-  "name": "@signoz/signoz-schemas",
-  "version": "0.0.1",
-  "description": "SigNoz schema plugins",
-  "perses": {
-    "schemasPath": ".",
-    "plugins": [
-      {
-        "kind": "Datasource",
-        "spec": {
-          "name": "SigNozDatasource"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozTimeSeriesPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozBarChartPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozNumberPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozPieChartPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozTablePanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozHistogramPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozListPanel"
-        }
-      },
-      {
-        "kind": "Panel",
-        "spec": {
-          "name": "SigNozIgnoredFieldsChart"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozBuilderQuery"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozClickHouseSQL"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozPromQLQuery"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozCompositeQuery"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozTraceOperator"
-        }
-      },
-      {
-        "kind": "TimeSeriesQuery",
-        "spec": {
-          "name": "SigNozFormula"
-        }
-      },
-      {
-        "kind": "LogQuery",
-        "spec": {
-          "name": "SigNozBuilderQuery"
-        }
-      },
-      {
-        "kind": "TraceQuery",
-        "spec": {
-          "name": "SigNozBuilderQuery"
-        }
-      },
-      {
-        "kind": "Variable",
-        "spec": {
-          "name": "SigNozCustomVariable"
-        }
-      },
-      {
-        "kind": "Variable",
-        "spec": {
-          "name": "SigNozDynamicVariable"
-        }
-      },
-      {
-        "kind": "Variable",
-        "spec": {
-          "name": "SigNozQueryVariable"
-        }
-      },
-      {
-        "kind": "Variable",
-        "spec": {
-          "name": "SigNozTextboxVariable"
-        }
-      }
-    ]
-  }
-}

perses/schemas-wrapper/schemas/review-panels.md

@@ -1,20 +0,0 @@
-which panel type only caters to specific signals?
-metrics has no option for list panel type. also, no other querying types
-
-should the panel definition be linked to the query type?
-
-| type        | QB  | P   | CH  |
-| ----------- | --- | --- | --- |
-| Time Series | ✅  | ✅  | ✅  |
-| Number      | ✅  | ✅  | ✅  |
-| Table       | ✅  | ❌  | ✅  |
-| List        | ✅  | ❌  | ❌  |
-| Bar         | ✅  | ✅  | ✅  |
-| Pie         | ✅  | ❌  | ✅  |
-| Histogram   | ✅  | ✅  | ✅  |
-
-- unsure where this is used
-  stepSize - can be removed
-  renderColumnCell - used though - only table
-  customColumTitles - used though - only table
-  hiddenColumns - used though - only table

perses/schemas-wrapper/schemas/review.md

@@ -1 +0,0 @@
-creating folders based on type is helpful instead of a flat folder structure. It is how you would visualise the dashboard as components

perses/schemas-wrapper/schemas/signoz-bar-chart-panel/example.json

@@ -1,40 +0,0 @@
-{
-    "kind": "SigNozBarChartPanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime",
-            "fillSpans": false,
-            "stackedBarChart": false
-        },
-        "formatting": {
-            "unit": "By",
-            "decimalPrecision": 2
-        },
-        "axes": {
-            "softMin": 0,
-            "softMax": 1000,
-            "isLogScale": false
-        },
-        "legend": {
-            "position": "bottom",
-            "customColors": {
-                "series-A": "#9ea5f7"
-            }
-        },
-        "contextLinks": [
-            {
-                "label": "View details",
-                "url": "http://localhost:8080/{{_service.name}}"
-            }
-        ],
-        "thresholds": [
-            {
-                "value": 500,
-                "unit": "By",
-                "color": "Red",
-                "format": "Text",
-                "label": "upper limit"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-bar-chart-panel/signoz-bar-chart-panel.cue

@@ -1,31 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozBarChartPanel"
-spec: close({
-    // need to put more thought into this being optional?
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    axes?:                 common.#Axes
-    legend?:               #Legend
-    contextLinks?:         [...common.#ContextLinkProps]
-    thresholds?:           [...common.#ThresholdWithLabel]
-})
-
-#Visualization: {
-    timePreference?:  common.#TimePreference
-    fillSpans?:       bool | *false
-    stackedBarChart?: bool | *true
-}
-
-#Formatting: {
-    unit?:             string | *""
-    decimalPrecision?: common.#PrecisionOption
-}
-
-// can this be more composable?
-#Legend: {
-    position?:     common.#LegendPosition
-    customColors?: [string]: string
-}

perses/schemas-wrapper/schemas/signoz-builder-query/signoz-builder-query.cue

@@ -1,35 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/builder_query.go — QueryBuilderQuery
-kind: "SigNozBuilderQuery"
-spec: close({
-	name:       common.#QueryName
-	signal:     "metrics" | "logs" | "traces"
-	expression: string
-	disabled?:  bool | *false
-
-	aggregations?:   [...common.#Aggregation]
-	filter?:         common.#FilterExpression
-	groupBy?:        [...common.#GroupByItem]
-	order?:          [...common.#OrderByItem]
-	selectFields?:   [...common.#TelemetryFieldKey]
-	limit?:          common.#Limit
-	limitBy?:        #LimitBy
-	offset?:         common.#Offset
-	cursor?:         string
-	having?:         common.#HavingExpression
-	// secondaryAggregations not added — not yet implemented.
-	functions?:      [...common.#Function]
-	legend?:         string
-	stepInterval?:   number
-	reduceTo?:       common.#ReduceTo
-	pageSize?:       int & >=1
-	source?:         string
-})
-
-#LimitBy: close({
-	keys:  [...string]
-	value: string
-})

perses/schemas-wrapper/schemas/signoz-builder-query/signoz-builder-query.json

@@ -1,24 +0,0 @@
-{
-    "kind": "SigNozBuilderQuery",
-    "spec": {
-        "name": "A",
-        "signal": "metrics",
-        "expression": "A",
-        "aggregations": [
-            {
-                "metricName": "redis_keyspace_hits",
-                "timeAggregation": "rate",
-                "spaceAggregation": "sum",
-                "reduceTo": "sum"
-            }
-        ],
-        "filter": {
-            "expression": "host_name IN $host_name"
-        },
-        "groupBy": [],
-        "order": [],
-        "disabled": false,
-        "legend": "Hit/s across all hosts",
-        "stepInterval": 60
-    }
-}

perses/schemas-wrapper/schemas/signoz-clickhouse-sql/signoz-clickhouse-sql.cue

@@ -1,13 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/clickhouse_query.go — ClickHouseQuery
-kind: "SigNozClickHouseSQL"
-spec: close({
-	name:      common.#QueryName
-	query:     string & !=""
-	// required / optional
-	disabled?: bool | *false
-	legend?:   string
-})

perses/schemas-wrapper/schemas/signoz-clickhouse-sql/signoz-clickhouse-sql.json

@@ -1,9 +0,0 @@
-{
-    "kind": "SigNozClickHouseSQL",
-    "spec": {
-        "name": "A",
-        "query": "SELECT toStartOfInterval(timestamp, INTERVAL 1 MINUTE) AS ts, count() AS total FROM signoz_logs.distributed_logs GROUP BY ts ORDER BY ts",
-        "disabled": false,
-        "legend": "Log count"
-    }
-}

perses/schemas-wrapper/schemas/signoz-composite-query/signoz-composite-query.cue

@@ -1,47 +0,0 @@
-package model
-
-import (
-	bq "github.com/signoz/schemas-wrapper/schemas/signoz-builder-query:model"
-	f "github.com/signoz/schemas-wrapper/schemas/signoz-formula:model"
-	to "github.com/signoz/schemas-wrapper/schemas/signoz-trace-operator:model"
-	pql "github.com/signoz/schemas-wrapper/schemas/signoz-promql:model"
-	ch "github.com/signoz/schemas-wrapper/schemas/signoz-clickhouse-sql:model"
-)
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/req.go — CompositeQuery
-// SigNozCompositeQuery groups multiple query plugins into a single
-// query request. Each entry is a typed envelope whose spec is
-// validated by the corresponding plugin schema.
-
-// this is to be used when there are multiple queries in a panel
-// in most cases, there will be only one query, and there it is a better idea to 
-// use the corresponding kind for that query instead of this composite query
-kind: "SigNozCompositeQuery"
-spec: close({
-	queries: [...#QueryEnvelope]
-})
-
-// QueryEnvelope wraps a single query plugin with a type discriminator.
-
-// need to verify the types internally are marked required where necessary, so that we can make them optional here and not have to worry about it at the top level
-#QueryEnvelope:
-	close({
-		type: "builder_query",
-		spec: bq.spec
-	}) |
-	close({
-		type: "builder_formula",
-		spec: f.spec
-	}) |
-	close({
-		type: "builder_trace_operator",
-		spec: to.spec
-	}) |
-	close({
-		type: "promql",
-		spec: pql.spec
-	}) |
-	close({
-		type: "clickhouse_sql",
-		spec: ch.spec
-	})

perses/schemas-wrapper/schemas/signoz-composite-query/signoz-composite-query.json

@@ -1,53 +0,0 @@
-{
-    "kind": "SigNozCompositeQuery",
-    "spec": {
-        "queries": [
-            {
-                "type": "builder_query",
-                "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "expression": "A",
-                    "aggregations": [
-                        {
-                            "metricName": "redis_keyspace_hits",
-                            "timeAggregation": "rate",
-                            "spaceAggregation": "sum",
-                            "reduceTo": "sum"
-                        }
-                    ],
-                    "filter": {
-                        "expression": "host_name IN $host_name"
-                    }
-                }
-            },
-            {
-                "type": "builder_query",
-                "spec": {
-                    "name": "B",
-                    "signal": "metrics",
-                    "expression": "B",
-                    "aggregations": [
-                        {
-                            "metricName": "redis_keyspace_misses",
-                            "timeAggregation": "rate",
-                            "spaceAggregation": "sum",
-                            "reduceTo": "sum"
-                        }
-                    ],
-                    "filter": {
-                        "expression": "host_name IN $host_name"
-                    }
-                }
-            },
-            {
-                "type": "builder_formula",
-                "spec": {
-                    "name": "F1",
-                    "expression": "A / (A + B) * 100",
-                    "legend": "Hit rate %"
-                }
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-custom-variable/signoz-custom-variable.cue

@@ -1,10 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// defaultValue lives on the Perses ListVariable wrapper (spec level).
-kind: "SigNozCustomVariable"
-spec: close({
-	customValue: =~"^[^,]+(,[^,]+)*$"
-	sort?:       common.#VariableSortOrder
-})

perses/schemas-wrapper/schemas/signoz-custom-variable/signoz-custom-variable.json

@@ -1,7 +0,0 @@
-{
-    "kind": "SigNozCustomVariable",
-    "spec": {
-        "customValue": "production,staging,development",
-        "sort": "disabled"
-    }
-}

perses/schemas-wrapper/schemas/signoz-datasource/signoz-datasource.cue

@@ -1,11 +0,0 @@
-package model
-
-kind: "SigNozDatasource"
-
-// SigNoz has a single built-in backend — the frontend already knows
-// the API endpoint, so there is no connection config to validate.
-// Add fields here if SigNoz ever supports multiple backends or
-// configurable API versions.
-spec: close({})
-
- // this is required to override the default that always requires a spec

perses/schemas-wrapper/schemas/signoz-datasource/signoz-datasource.json

@@ -1,4 +0,0 @@
-{
-    "kind": "SigNozDatasource",
-    "spec": {}
-}

perses/schemas-wrapper/schemas/signoz-dynamic-variable/signoz-dynamic-variable.cue

@@ -1,12 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// defaultValue lives on the Perses ListVariable wrapper (spec level).
-kind: "SigNozDynamicVariable"
-spec: close({
-	name: string
-	source:    string
-	sort?: common.#VariableSortOrder
-	// where does attribute go here?
-})

perses/schemas-wrapper/schemas/signoz-dynamic-variable/signoz-dynamic-variable.json

@@ -1,8 +0,0 @@
-{
-    "kind": "SigNozDynamicVariable",
-    "spec": {
-        "name": "host_name",
-        "source": "metrics",
-        "sort": "asc"
-    }
-}

perses/schemas-wrapper/schemas/signoz-everything-chart/signoz-everything-chart.cue

@@ -1,26 +0,0 @@
-package model
-
-// Fields from IBaseWidget that are NOT in any dedicated panel CUE file.
-// This file exists as a reference only and will be removed in the end.
-// Needs to be removed from package.json as well.
-
-kind: "SigNozIgnoredFieldsChart"
-spec: close({
-    opacity?:              string        // not wired to chart rendering
-    nullZeroValues?:       string        // not wired to chart rendering
-    stepSize?:             number
-    columnWidths?:         [string]: number // not a config choice — persisted user-resized column widths
-    // "Chart Appearance" section in UI — could not find this section in the app.
-    // This is behind a boolean flag right now. Can help reproduce locally
-    // These 4 fields are gated behind panelTypeVs* constants (TIME_SERIES only).
-    lineInterpolation?:    #LineInterpolation
-    showPoints?:           bool
-    lineStyle?:            #LineStyle
-    fillMode?:             #FillMode
-})
-
-#LineInterpolation: "linear" | "spline" | "stepAfter" | "stepBefore"
-
-#LineStyle: "solid" | "dashed"
-
-#FillMode: "solid" | "gradient" | "none"

perses/schemas-wrapper/schemas/signoz-formula/signoz-formula.cue

@@ -1,17 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/formula.go — QueryBuilderFormula
-kind: "SigNozFormula"
-spec: close({
-	name:          common.#QueryName
-	expression:    string
-	disabled?:     bool | *false
-	legend?:       string
-	limit?:        common.#Limit
-	having?:       common.#HavingExpression
-	stepInterval?: number
-	order?:        [...common.#OrderByItem]
-	functions?:      [...common.#Function]
-})

perses/schemas-wrapper/schemas/signoz-formula/signoz-formula.json

@@ -1,8 +0,0 @@
-{
-    "kind": "SigNozFormula",
-    "spec": {
-        "name": "F1",
-        "expression": "A / B * 100",
-        "legend": "Hit rate %"
-    }
-}

perses/schemas-wrapper/schemas/signoz-histogram-panel/example.json

@@ -1,21 +0,0 @@
-{
-    "kind": "SigNozHistogramPanel",
-    "spec": {
-        "histogramBuckets": {
-            "bucketCount": 60,
-            "bucketWidth": 100,
-            "mergeAllActiveQueries": true
-        },
-        "legend": {
-            "customColors": {
-                "series-A": "#9ea5f7"
-            }
-        },
-        "contextLinks": [
-            {
-                "label": "View histogram details",
-                "url": "http://localhost:8080/histogram"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-histogram-panel/signoz-histogram-panel.cue

@@ -1,20 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozHistogramPanel"
-spec: close({
-    histogramBuckets?:     #HistogramBuckets
-    legend?:               #Legend
-    contextLinks?:         [...common.#ContextLinkProps]
-})
-
-#HistogramBuckets: {
-    bucketCount?:          number | *30
-    bucketWidth?:          number | *0
-    mergeAllActiveQueries?: bool | *false
-}
-
-#Legend: {
-    customColors?: [string]: string
-}

perses/schemas-wrapper/schemas/signoz-list-panel/example.json

@@ -1,54 +0,0 @@
-{
-    "kind": "SigNozListPanel",
-    "spec": {
-        "selectedLogFields": [
-            {
-                "name": "timestamp",
-                "type": "log",
-                "dataType": ""
-            },
-            {
-                "name": "body",
-                "type": "log",
-                "dataType": ""
-            },
-            {
-                "name": "error",
-                "type": "",
-                "dataType": "string"
-            }
-        ],
-        "selectedTracesFields": [
-            {
-                "name": "service.name",
-                "signal": "traces",
-                "fieldContext": "resource",
-                "fieldDataType": "string"
-            },
-            {
-                "name": "name",
-                "signal": "traces",
-                "fieldContext": "span",
-                "fieldDataType": "string"
-            },
-            {
-                "name": "duration_nano",
-                "signal": "traces",
-                "fieldContext": "span",
-                "fieldDataType": ""
-            },
-            {
-                "name": "http_method",
-                "signal": "traces",
-                "fieldContext": "span",
-                "fieldDataType": ""
-            },
-            {
-                "name": "response_status_code",
-                "signal": "traces",
-                "fieldContext": "span",
-                "fieldDataType": ""
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-list-panel/signoz-list-panel.cue

@@ -1,15 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozListPanel"
-spec: close({
-    selectedLogFields?:    [...#LogField]
-    selectedTracesFields?: [...common.#TelemetryFieldKey]
-})
-
-#LogField: {
-    name:     string
-    type:     string
-    dataType: string
-}

perses/schemas-wrapper/schemas/signoz-number-panel/example.json

@@ -1,34 +0,0 @@
-{
-    "kind": "SigNozNumberPanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime"
-        },
-        "formatting": {
-            "unit": "none",
-            "decimalPrecision": 1
-        },
-        "contextLinks": [
-            {
-                "label": "View details",
-                "url": "http://localhost:8080/details"
-            }
-        ],
-        "thresholds": [
-            {
-                "value": 1200000,
-                "operator": ">",
-                "unit": "none",
-                "color": "Red",
-                "format": "Text"
-            },
-            {
-                "value": 1200000,
-                "operator": "<=",
-                "unit": "none",
-                "color": "Green",
-                "format": "Text"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-number-panel/signoz-number-panel.cue

@@ -1,23 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozNumberPanel"
-spec: close({
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    contextLinks?:         [...common.#ContextLinkProps]
-    thresholds?:           [...common.#ComparisonThreshold]
-})
-
-#Visualization: {
-    timePreference?: common.#TimePreference
-}
-
-// where to store if alerts can be added or not?
-
-#Formatting: {
-    // mainly need to discuss optional fields
-    unit?:             string | *""
-    decimalPrecision?: common.#PrecisionOption
-}

perses/schemas-wrapper/schemas/signoz-pie-chart-panel/example.json

@@ -1,25 +0,0 @@
-{
-    "kind": "SigNozPieChartPanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime"
-        },
-        "formatting": {
-            "unit": "none",
-            "decimalPrecision": 1
-        },
-        "legend": {
-            "customColors": {
-                "\"201\"": "#2bc051",
-                "\"400\"": "#cc462e",
-                "\"500\"": "#ff0000"
-            }
-        },
-        "contextLinks": [
-            {
-                "label": "View breakdown",
-                "url": "http://localhost:8080/breakdown"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-pie-chart-panel/signoz-pie-chart-panel.cue

@@ -1,24 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozPieChartPanel"
-spec: close({
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    legend?:               #Legend
-    contextLinks?:         [...common.#ContextLinkProps]
-})
-
-#Visualization: {
-    timePreference?: common.#TimePreference
-}
-
-#Formatting: {
-    unit?:             string | *""
-    decimalPrecision?: common.#PrecisionOption
-}
-
-#Legend: {
-    customColors?: [string]: string
-}

perses/schemas-wrapper/schemas/signoz-promql/signoz-promql.cue

@@ -1,15 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/prom_query.go — PromQuery
-kind: "SigNozPromQLQuery"
-spec: close({
-	name:      common.#QueryName
-	query:     string & !=""
-	disabled?: bool | *false
-	legend?:   string
-	// where are the below items coming from? Don't see types for it. How to arrive at this?
-	step?:     =~"^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$" | number
-	stats?:    bool
-})

perses/schemas-wrapper/schemas/signoz-promql/signoz-promql.json

@@ -1,9 +0,0 @@
-{
-    "kind": "SigNozPromQLQuery",
-    "spec": {
-        "name": "A",
-        "query": "rate(http_requests_total{status=\"200\"}[5m])",
-        "disabled": false,
-        "legend": "{{method}} {{path}}"
-    }
-}

perses/schemas-wrapper/schemas/signoz-query-variable/signoz-query-variable.cue

@@ -1,13 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// defaultValue lives on the Perses ListVariable wrapper (spec level).
-kind: "SigNozQueryVariable"
-spec: close({
-	queryValue: string
-	sort?:      common.#VariableSortOrder
-	// This should not be optional
-	// what happens to the existing https://perses.dev/perses/docs/dac/go/variable/#sortingby inside the ListVariable spec? Do we move that to the plugin spec level?
-	// same for other list variable cues
-})

perses/schemas-wrapper/schemas/signoz-query-variable/signoz-query-variable.json

@@ -1,7 +0,0 @@
-{
-    "kind": "SigNozQueryVariable",
-    "spec": {
-        "queryValue": "SELECT DISTINCT host_name FROM signoz_metrics.distributed_time_series_v4_1day WHERE metric_name = 'redis_cpu_time'",
-        "sort": "asc"
-    }
-}

perses/schemas-wrapper/schemas/signoz-table-panel/example.json

@@ -1,30 +0,0 @@
-{
-    "kind": "SigNozTablePanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime"
-        },
-        "formatting": {
-            "columnUnits": {
-                "A": "s"
-            },
-            "decimalPrecision": 2
-        },
-        "contextLinks": [
-            {
-                "label": "View trace",
-                "url": "http://localhost:8080/trace/{{traceID}}"
-            }
-        ],
-        "thresholds": [
-            {
-                "value": 1,
-                "operator": ">",
-                "unit": "min",
-                "color": "Red",
-                "format": "Text",
-                "tableOptions": "A"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-table-panel/signoz-table-panel.cue

@@ -1,31 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozTablePanel"
-spec: close({
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    contextLinks?:         [...common.#ContextLinkProps]
-    thresholds?:           [...#TableThreshold]
-})
-
-#Visualization: {
-    timePreference?: common.#TimePreference
-}
-
-#Formatting: {
-    columnUnits?:      [string]: string
-    decimalPrecision?: common.#PrecisionOption
-}
-
-#TableThreshold: {
-    common.#ComparisonThreshold
-    tableOptions: string
-}
-
-// missing
-columnWidths
-customColumnTitles
-hiddenColumns
-renderColumnCell - can be FE

perses/schemas-wrapper/schemas/signoz-textbox-variable/signoz-textbox-variable.cue

@@ -1,7 +0,0 @@
-package model
-
-// Shouldn't the below line be TextVariable?
-// are any of the variables inside this required? How would that validation work?
-// defaultValue lives on the Perses ListVariable wrapper (spec level).
-kind: "SigNozTextboxVariable"
-spec: close({})

perses/schemas-wrapper/schemas/signoz-textbox-variable/signoz-textbox-variable.json

@@ -1,4 +0,0 @@
-{
-    "kind": "SigNozTextboxVariable",
-    "spec": {}
-}

perses/schemas-wrapper/schemas/signoz-time-series-panel/example.json

@@ -1,46 +0,0 @@
-{
-    "kind": "SigNozTimeSeriesPanel",
-    "spec": {
-        "visualization": {
-            "timePreference": "globalTime",
-            "fillSpans": true
-        },
-        "formatting": {
-            "unit": "By",
-            "decimalPrecision": 3
-        },
-        "axes": {
-            "softMin": 0,
-            "softMax": 800,
-            "isLogScale": true
-        },
-        "legend": {
-            "position": "right",
-            "customColors": {
-                "{service.name=\"sampleapp-gateway\"}": "#9ea5f7"
-            }
-        },
-        "contextLinks": [
-            {
-                "label": "View service details",
-                "url": "http://localhost:8080/{{_service.name}}?dfddf=%7B%7Blimit%7D%7D"
-            }
-        ],
-        "thresholds": [
-            {
-                "value": 1024,
-                "unit": "By",
-                "color": "Red",
-                "format": "Text",
-                "label": "upper limit"
-            },
-            {
-                "value": 100,
-                "unit": "By",
-                "color": "Orange",
-                "format": "Text",
-                "label": "kinda bad"
-            }
-        ]
-    }
-}

perses/schemas-wrapper/schemas/signoz-time-series-panel/signoz-time-series-panel.cue

@@ -1,36 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-kind: "SigNozTimeSeriesPanel"
-spec: close({
-    visualization?:        #Visualization
-    formatting?:           #Formatting
-    axes?:                 common.#Axes
-    legend?:               #Legend
-    contextLinks?:         [...common.#ContextLinkProps]
-    thresholds?:           [...common.#ThresholdWithLabel]
-})
-
-#Visualization: {
-    timePreference?: common.#TimePreference
-    fillSpans?:      bool | *false
-}
-
-#Formatting: {
-    unit?:             string | *""
-    decimalPrecision?: common.#PrecisionOption
-}
-
-#Legend: {
-    position?:     common.#LegendPosition
-    // why call it customColors?
-    customColors?: [string]: string
-}
-
-// chart appearance
- - fill mode
- - line style
- - line interpolation
- - show points
- - span gaps

perses/schemas-wrapper/schemas/signoz-trace-operator/signoz-trace-operator.cue

@@ -1,31 +0,0 @@
-package model
-
-import "github.com/signoz/common"
-
-// Source: pkg/types/querybuildertypes/querybuildertypesv5/trace_operator.go — QueryBuilderTraceOperator
-// SigNozTraceOperator composes multiple trace BuilderQueries using
-// relational operators (=>, ->, &&, ||, NOT) to query trace relationships.
-// Signal is implicitly "traces" — all referenced queries must be trace queries.
-kind: "SigNozTraceOperator"
-spec: close({
-	name:       common.#QueryName
-	// Operator expression composing trace queries, e.g. "A => B && C".
-	expression: string & !=""
-	disabled?:  bool | *false
-
-	// Which query's spans to return (must be a query referenced in expression).
-	returnSpansFrom?: common.#QueryName
-
-	aggregations?: [...common.#ExpressionAggregation]
-	filter?:       common.#FilterExpression
-	groupBy?:      [...common.#GroupByItem]
-	order?:        [...common.#OrderByItem]
-	limit?:        common.#Limit
-	offset?:       common.#Offset
-	cursor?:       string
-	functions?:    [...common.#Function]
-	stepInterval?: number
-	having?:       common.#HavingExpression
-	legend?:       string
-	selectFields?: [...common.#TelemetryFieldKey]
-})

perses/schemas-wrapper/schemas/signoz-trace-operator/signoz-trace-operator.json

@@ -1,19 +0,0 @@
-{
-    "kind": "SigNozTraceOperator",
-    "spec": {
-        "name": "T1",
-        "expression": "A => B",
-        "returnSpansFrom": "A",
-        "aggregations": [
-            {
-                "expression": "count()",
-                "alias": "request_count"
-            }
-        ],
-        "filter": {
-            "expression": "service.name = 'frontend'"
-        },
-        "groupBy": [],
-        "order": []
-    }
-}

perses/validate.sh

@@ -1,2 +0,0 @@
-percli lint -f ./examples/perses.json --plugin.path ./schemas-wrapper
-rm ./schemas-wrapper/plugin-modules.json

pkg/apiserver/signozapiserver/cloudintegration.go

@@ -1,216 +0,0 @@
-package signozapiserver
-
-import (
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/http/handler"
-	"github.com/SigNoz/signoz/pkg/types"
-	citypes "github.com/SigNoz/signoz/pkg/types/cloudintegrationtypes"
-	"github.com/gorilla/mux"
-)
-
-func (provider *provider) addCloudIntegrationRoutes(router *mux.Router) error {
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/accounts", handler.New(
-		provider.authZ.AdminAccess(provider.cloudIntegrationHandler.CreateAccount),
-		handler.OpenAPIDef{
-			ID:                  "CreateAccount",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "Create account",
-			Description:         "This endpoint creates a new cloud integration account for the specified cloud provider",
-			Request:             new(citypes.PostableConnectionArtifact),
-			RequestContentType:  "application/json",
-			Response:            new(citypes.GettableAccountWithArtifact),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
-		},
-	)).Methods(http.MethodPost).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/accounts", handler.New(
-		provider.authZ.AdminAccess(provider.cloudIntegrationHandler.ListAccounts),
-		handler.OpenAPIDef{
-			ID:                  "ListAccounts",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "List accounts",
-			Description:         "This endpoint lists the accounts for the specified cloud provider",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            new(citypes.GettableAccounts),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
-		},
-	)).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/accounts/{id}", handler.New(
-		provider.authZ.AdminAccess(provider.cloudIntegrationHandler.GetAccount),
-		handler.OpenAPIDef{
-			ID:                  "GetAccount",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "Get account",
-			Description:         "This endpoint gets an account for the specified cloud provider",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            new(citypes.GettableAccount),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
-		},
-	)).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/accounts/{id}", handler.New(
-		provider.authZ.AdminAccess(provider.cloudIntegrationHandler.UpdateAccount),
-		handler.OpenAPIDef{
-			ID:                  "UpdateAccount",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "Update account",
-			Description:         "This endpoint updates an account for the specified cloud provider",
-			Request:             new(citypes.UpdatableAccount),
-			RequestContentType:  "application/json",
-			Response:            nil,
-			ResponseContentType: "",
-			SuccessStatusCode:   http.StatusNoContent,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
-		},
-	)).Methods(http.MethodPut).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/accounts/{id}", handler.New(
-		provider.authZ.AdminAccess(provider.cloudIntegrationHandler.DisconnectAccount),
-		handler.OpenAPIDef{
-			ID:                  "DisconnectAccount",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "Disconnect account",
-			Description:         "This endpoint disconnects an account for the specified cloud provider",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            nil,
-			ResponseContentType: "",
-			SuccessStatusCode:   http.StatusNoContent,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
-		},
-	)).Methods(http.MethodDelete).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/services", handler.New(
-		provider.authZ.AdminAccess(provider.cloudIntegrationHandler.ListServicesMetadata),
-		handler.OpenAPIDef{
-			ID:                  "ListServicesMetadata",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "List services metadata",
-			Description:         "This endpoint lists the services metadata for the specified cloud provider",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            new(citypes.GettableServicesMetadata),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
-		},
-	)).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/services/{service_id}", handler.New(
-		provider.authZ.AdminAccess(provider.cloudIntegrationHandler.GetService),
-		handler.OpenAPIDef{
-			ID:                  "GetService",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "Get service",
-			Description:         "This endpoint gets a service for the specified cloud provider",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            new(citypes.GettableService),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
-		},
-	)).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/services/{service_id}", handler.New(
-		provider.authZ.AdminAccess(provider.cloudIntegrationHandler.UpdateService),
-		handler.OpenAPIDef{
-			ID:                  "UpdateService",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "Update service",
-			Description:         "This endpoint updates a service for the specified cloud provider",
-			Request:             new(citypes.UpdatableService),
-			RequestContentType:  "application/json",
-			Response:            nil,
-			ResponseContentType: "",
-			SuccessStatusCode:   http.StatusNoContent,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
-		},
-	)).Methods(http.MethodPut).GetError(); err != nil {
-		return err
-	}
-
-	// Agent check-in endpoint is kept same as older one to maintain backward compatibility with already deployed agents.
-	// In the future, this endpoint will be deprecated and a new endpoint will be introduced for consistency with above endpoints.
-	if err := router.Handle("/api/v1/cloud-integrations/{cloud_provider}/agent-check-in", handler.New(
-		provider.authZ.ViewAccess(provider.cloudIntegrationHandler.AgentCheckIn),
-		handler.OpenAPIDef{
-			ID:                  "AgentCheckInDeprecated",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "Agent check-in",
-			Description:         "[Deprecated] This endpoint is called by the deployed agent to check in",
-			Request:             new(citypes.PostableAgentCheckInRequest),
-			RequestContentType:  "application/json",
-			Response:            new(citypes.GettableAgentCheckInResponse),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          true,                                 // this endpoint will be deprecated in future
-			SecuritySchemes:     newSecuritySchemes(types.RoleViewer), // agent role is viewer
-		},
-	)).Methods(http.MethodPost).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/cloud_integrations/{cloud_provider}/accounts/check_in", handler.New(
-		provider.authZ.ViewAccess(provider.cloudIntegrationHandler.AgentCheckIn),
-		handler.OpenAPIDef{
-			ID:                  "AgentCheckIn",
-			Tags:                []string{"cloudintegration"},
-			Summary:             "Agent check-in",
-			Description:         "This endpoint is called by the deployed agent to check in",
-			Request:             new(citypes.PostableAgentCheckInRequest),
-			RequestContentType:  "application/json",
-			Response:            new(citypes.GettableAgentCheckInResponse),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleViewer), // agent role is viewer
-		},
-	)).Methods(http.MethodPost).GetError(); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/apiserver/signozapiserver/provider.go

@@ -12,7 +12,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/http/handler"
 	"github.com/SigNoz/signoz/pkg/http/middleware"
 	"github.com/SigNoz/signoz/pkg/modules/authdomain"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/fields"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
@@ -31,30 +30,29 @@ import (
 )
 
 type provider struct {
-	config                  apiserver.Config
-	settings                factory.ScopedProviderSettings
-	router                  *mux.Router
-	authZ                   *middleware.AuthZ
-	orgHandler              organization.Handler
-	userHandler             user.Handler
-	sessionHandler          session.Handler
-	authDomainHandler       authdomain.Handler
-	preferenceHandler       preference.Handler
-	globalHandler           global.Handler
-	promoteHandler          promote.Handler
-	flaggerHandler          flagger.Handler
-	dashboardModule         dashboard.Module
-	dashboardHandler        dashboard.Handler
-	metricsExplorerHandler  metricsexplorer.Handler
-	gatewayHandler          gateway.Handler
-	fieldsHandler           fields.Handler
-	authzHandler            authz.Handler
-	rawDataExportHandler    rawdataexport.Handler
-	zeusHandler             zeus.Handler
-	querierHandler          querier.Handler
-	serviceAccountHandler   serviceaccount.Handler
-	factoryHandler          factory.Handler
-	cloudIntegrationHandler cloudintegration.Handler
+	config                 apiserver.Config
+	settings               factory.ScopedProviderSettings
+	router                 *mux.Router
+	authZ                  *middleware.AuthZ
+	orgHandler             organization.Handler
+	userHandler            user.Handler
+	sessionHandler         session.Handler
+	authDomainHandler      authdomain.Handler
+	preferenceHandler      preference.Handler
+	globalHandler          global.Handler
+	promoteHandler         promote.Handler
+	flaggerHandler         flagger.Handler
+	dashboardModule        dashboard.Module
+	dashboardHandler       dashboard.Handler
+	metricsExplorerHandler metricsexplorer.Handler
+	gatewayHandler         gateway.Handler
+	fieldsHandler          fields.Handler
+	authzHandler           authz.Handler
+	rawDataExportHandler   rawdataexport.Handler
+	zeusHandler            zeus.Handler
+	querierHandler         querier.Handler
+	serviceAccountHandler  serviceaccount.Handler
+	factoryHandler         factory.Handler
 }
 
 func NewFactory(
@@ -79,7 +77,6 @@ func NewFactory(
 	querierHandler querier.Handler,
 	serviceAccountHandler serviceaccount.Handler,
 	factoryHandler factory.Handler,
-	cloudIntegrationHandler cloudintegration.Handler,
 ) factory.ProviderFactory[apiserver.APIServer, apiserver.Config] {
 	return factory.NewProviderFactory(factory.MustNewName("signoz"), func(ctx context.Context, providerSettings factory.ProviderSettings, config apiserver.Config) (apiserver.APIServer, error) {
 		return newProvider(
@@ -107,7 +104,6 @@ func NewFactory(
 			querierHandler,
 			serviceAccountHandler,
 			factoryHandler,
-			cloudIntegrationHandler,
 		)
 	})
 }
@@ -137,35 +133,33 @@ func newProvider(
 	querierHandler querier.Handler,
 	serviceAccountHandler serviceaccount.Handler,
 	factoryHandler factory.Handler,
-	cloudIntegrationHandler cloudintegration.Handler,
 ) (apiserver.APIServer, error) {
 	settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/apiserver/signozapiserver")
 	router := mux.NewRouter().UseEncodedPath()
 
 	provider := &provider{
-		config:                  config,
-		settings:                settings,
-		router:                  router,
-		orgHandler:              orgHandler,
-		userHandler:             userHandler,
-		sessionHandler:          sessionHandler,
-		authDomainHandler:       authDomainHandler,
-		preferenceHandler:       preferenceHandler,
-		globalHandler:           globalHandler,
-		promoteHandler:          promoteHandler,
-		flaggerHandler:          flaggerHandler,
-		dashboardModule:         dashboardModule,
-		dashboardHandler:        dashboardHandler,
-		metricsExplorerHandler:  metricsExplorerHandler,
-		gatewayHandler:          gatewayHandler,
-		fieldsHandler:           fieldsHandler,
-		authzHandler:            authzHandler,
-		rawDataExportHandler:    rawDataExportHandler,
-		zeusHandler:             zeusHandler,
-		querierHandler:          querierHandler,
-		serviceAccountHandler:   serviceAccountHandler,
-		factoryHandler:          factoryHandler,
-		cloudIntegrationHandler: cloudIntegrationHandler,
+		config:                 config,
+		settings:               settings,
+		router:                 router,
+		orgHandler:             orgHandler,
+		userHandler:            userHandler,
+		sessionHandler:         sessionHandler,
+		authDomainHandler:      authDomainHandler,
+		preferenceHandler:      preferenceHandler,
+		globalHandler:          globalHandler,
+		promoteHandler:         promoteHandler,
+		flaggerHandler:         flaggerHandler,
+		dashboardModule:        dashboardModule,
+		dashboardHandler:       dashboardHandler,
+		metricsExplorerHandler: metricsExplorerHandler,
+		gatewayHandler:         gatewayHandler,
+		fieldsHandler:          fieldsHandler,
+		authzHandler:           authzHandler,
+		rawDataExportHandler:   rawDataExportHandler,
+		zeusHandler:            zeusHandler,
+		querierHandler:         querierHandler,
+		serviceAccountHandler:  serviceAccountHandler,
+		factoryHandler:         factoryHandler,
 	}
 
 	provider.authZ = middleware.NewAuthZ(settings.Logger(), orgGetter, authz)
@@ -258,10 +252,6 @@ func (provider *provider) AddToRouter(router *mux.Router) error {
 		return err
 	}
 
-	if err := provider.addCloudIntegrationRoutes(router); err != nil {
-		return err
-	}
-
 	return nil
 }
 

pkg/modules/cloudintegration/cloudintegration.go

@@ -53,7 +53,7 @@ type Module interface {
 }
 
 type Handler interface {
-	CreateAccount(http.ResponseWriter, *http.Request)
+	GetConnectionArtifact(http.ResponseWriter, *http.Request)
 	ListAccounts(http.ResponseWriter, *http.Request)
 	GetAccount(http.ResponseWriter, *http.Request)
 	UpdateAccount(http.ResponseWriter, *http.Request)

pkg/modules/cloudintegration/implcloudintegration/handler.go

@@ -1,58 +0,0 @@
-package implcloudintegration
-
-import (
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-)
-
-type handler struct{}
-
-func NewHandler() cloudintegration.Handler {
-	return &handler{}
-}
-
-func (handler *handler) CreateAccount(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (handler *handler) ListAccounts(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (handler *handler) GetAccount(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (handler *handler) UpdateAccount(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (handler *handler) DisconnectAccount(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (handler *handler) ListServicesMetadata(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (handler *handler) GetService(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (handler *handler) UpdateService(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (handler *handler) AgentCheckIn(writer http.ResponseWriter, request *http.Request) {
-	// TODO implement me
-	panic("implement me")
-}

pkg/prometheus/config.go

@@ -3,7 +3,6 @@ package prometheus
 import (
 	"time"
 
-	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/factory"
 )
 
@@ -21,9 +20,6 @@ type Config struct {
 	//
 	// If not set, the prometheus default is used (currently 5m).
 	LookbackDelta time.Duration `mapstructure:"lookback_delta"`
-
-	// Timeout is the maximum time a query is allowed to run before being aborted.
-	Timeout time.Duration `mapstructure:"timeout"`
 }
 
 func NewConfigFactory() factory.ConfigFactory {
@@ -37,14 +33,10 @@ func newConfig() factory.Config {
 			Path:          "",
 			MaxConcurrent: 20,
 		},
-		Timeout: 2 * time.Minute,
 	}
 }
 
 func (c Config) Validate() error {
-	if c.Timeout <= 0 {
-		return errors.Newf(errors.TypeInvalidInput, errors.CodeInvalidInput, "prometheus::timeout must be greater than 0")
-	}
 	return nil
 }
 

pkg/prometheus/constants.go

@@ -0,0 +1,3 @@
+package prometheus
+
+const FingerprintAsPromLabelName = "fingerprint"

pkg/prometheus/engine.go

@@ -2,6 +2,7 @@ package prometheus
 
 import (
 	"log/slog"
+	"time"
 
 	"github.com/prometheus/prometheus/promql"
 )
@@ -20,7 +21,7 @@ func NewEngine(logger *slog.Logger, cfg Config) *Engine {
 		Logger:             logger,
 		Reg:                nil,
 		MaxSamples:         5_0000_000,
-		Timeout:            cfg.Timeout,
+		Timeout:            2 * time.Minute,
 		ActiveQueryTracker: activeQueryTracker,
 		LookbackDelta:      cfg.LookbackDelta,
 	})

pkg/prometheus/utils.go

@@ -6,8 +6,6 @@ import (
 	"github.com/prometheus/prometheus/promql"
 )
 
-const FingerprintAsPromLabelName string = "fingerprint"
-
 func RemoveExtraLabels(res *promql.Result, labelsToRemove ...string) error {
 	if len(labelsToRemove) == 0 || res == nil {
 		return nil

pkg/querier/builder_query.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"log/slog"
 	"strconv"
 	"strings"
 	"time"
@@ -12,7 +11,6 @@ import (
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
-	"github.com/SigNoz/signoz/pkg/telemetrytraces"
 	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	"github.com/SigNoz/signoz/pkg/types/instrumentationtypes"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
@@ -20,7 +18,6 @@ import (
 )
 
 type builderQuery[T any] struct {
-	logger         *slog.Logger
 	telemetryStore telemetrystore.TelemetryStore
 	stmtBuilder    qbtypes.StatementBuilder[T]
 	spec           qbtypes.QueryBuilderQuery[T]
@@ -34,7 +31,6 @@ type builderQuery[T any] struct {
 var _ qbtypes.Query = (*builderQuery[any])(nil)
 
 func newBuilderQuery[T any](
-	logger *slog.Logger,
 	telemetryStore telemetrystore.TelemetryStore,
 	stmtBuilder qbtypes.StatementBuilder[T],
 	spec qbtypes.QueryBuilderQuery[T],
@@ -43,7 +39,6 @@ func newBuilderQuery[T any](
 	variables map[string]qbtypes.VariableItem,
 ) *builderQuery[T] {
 	return &builderQuery[T]{
-		logger:         logger,
 		telemetryStore: telemetryStore,
 		stmtBuilder:    stmtBuilder,
 		spec:           spec,
@@ -310,45 +305,6 @@ func (q *builderQuery[T]) executeWindowList(ctx context.Context) (*qbtypes.Resul
 	totalBytes := uint64(0)
 	start := time.Now()
 
-	// Check if filter contains trace_id(s) and optimize time range if needed
-	if q.spec.Signal == telemetrytypes.SignalTraces &&
-		q.spec.Filter != nil && q.spec.Filter.Expression != "" {
-
-		traceIDs, found := telemetrytraces.ExtractTraceIDsFromFilter(q.spec.Filter.Expression)
-		if found && len(traceIDs) > 0 {
-			finder := telemetrytraces.NewTraceTimeRangeFinder(q.telemetryStore)
-
-			traceStart, traceEnd, ok := finder.GetTraceTimeRangeMulti(ctx, traceIDs)
-			traceStartMS := uint64(traceStart) / 1_000_000
-			traceEndMS := uint64(traceEnd) / 1_000_000
-			if !ok {
-				q.logger.DebugContext(ctx, "failed to get trace time range", slog.Any("trace_ids", traceIDs))
-			} else if traceStartMS > 0 && traceEndMS > 0 {
-				// no overlap — nothing to return
-				if uint64(traceStartMS) > toMS || uint64(traceEndMS) < fromMS {
-					return &qbtypes.Result{
-						Type: qbtypes.RequestTypeRaw,
-						Value: &qbtypes.RawData{
-							QueryName: q.spec.Name,
-						},
-						Stats: qbtypes.ExecStats{
-							DurationMS: uint64(time.Since(start).Milliseconds()),
-						},
-					}, nil
-				}
-
-				// clamp window to trace time range before bucketing
-				if uint64(traceStartMS) > fromMS {
-					fromMS = uint64(traceStartMS)
-				}
-				if uint64(traceEndMS) < toMS {
-					toMS = uint64(traceEndMS)
-				}
-				q.logger.DebugContext(ctx, "optimized time range for traces", slog.Any("trace_ids", traceIDs), slog.Uint64("start", fromMS), slog.Uint64("end", toMS))
-			}
-		}
-	}
-
 	// Get buckets and reverse them for ascending order
 	buckets := makeBuckets(fromMS, toMS)
 	if isAsc {

pkg/querier/consume.go

@@ -68,6 +68,7 @@ func readAsTimeSeries(rows driver.Rows, queryWindow *qbtypes.TimeRange, step qbt
 		key string // deterministic join of label values
 	}
 	seriesMap := map[sKey]*qbtypes.TimeSeries{}
+	var keyOrder []sKey // preserves ClickHouse row-arrival order
 
 	stepMs := uint64(step.Duration.Milliseconds())
 
@@ -218,6 +219,7 @@ func readAsTimeSeries(rows driver.Rows, queryWindow *qbtypes.TimeRange, step qbt
 			if !ok {
 				series = &qbtypes.TimeSeries{Labels: lblObjs}
 				seriesMap[key] = series
+				keyOrder = append(keyOrder, key)
 			}
 			series.Values = append(series.Values, &qbtypes.TimeSeriesValue{
 				Timestamp: ts,
@@ -249,8 +251,8 @@ func readAsTimeSeries(rows driver.Rows, queryWindow *qbtypes.TimeRange, step qbt
 			Alias: "__result_" + strconv.Itoa(i),
 		}
 	}
-	for k, s := range seriesMap {
-		buckets[k.agg].Series = append(buckets[k.agg].Series, s)
+	for _, k := range keyOrder {
+		buckets[k.agg].Series = append(buckets[k.agg].Series, seriesMap[k])
 	}
 
 	var nonEmpty []*qbtypes.AggregationBucket

pkg/querier/postprocess.go

@@ -188,22 +188,6 @@ func postProcessMetricQuery(
 	query qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation],
 	req *qbtypes.QueryRangeRequest,
 ) *qbtypes.Result {
-
-	config := query.Aggregations[0]
-	spaceAggOrderBy := fmt.Sprintf("%s(%s)", config.SpaceAggregation.StringValue(), config.MetricName)
-	timeAggOrderBy := fmt.Sprintf("%s(%s)", config.TimeAggregation.StringValue(), config.MetricName)
-	timeSpaceAggOrderBy := fmt.Sprintf("%s(%s(%s))", config.SpaceAggregation.StringValue(), config.TimeAggregation.StringValue(), config.MetricName)
-
-	for idx := range query.Order {
-		if query.Order[idx].Key.Name == spaceAggOrderBy ||
-			query.Order[idx].Key.Name == timeAggOrderBy ||
-			query.Order[idx].Key.Name == timeSpaceAggOrderBy {
-			query.Order[idx].Key.Name = qbtypes.DefaultOrderByKey
-		}
-	}
-
-	result = q.applySeriesLimit(result, query.Limit, query.Order)
-
 	if len(query.Functions) > 0 {
 		step := query.StepInterval.Duration.Milliseconds()
 		functions := q.prepareFillZeroArgsWithStep(query.Functions, req, step)

pkg/querier/promql_query.go

@@ -36,28 +36,6 @@ var unquotedDottedNamePattern = regexp.MustCompile(`(?:^|[{,(\s])([a-zA-Z_][a-zA
 // This is a common mistake when migrating to UTF-8 syntax.
 var quotedMetricOutsideBracesPattern = regexp.MustCompile(`"([^"]+)"\s*\{`)
 
-// tryEnhancePromQLExecError attempts to convert a PromQL execution error into
-// a properly typed error. Returns nil if the error is not a recognized execution error.
-func tryEnhancePromQLExecError(execErr error) error {
-	var eqc promql.ErrQueryCanceled
-	var eqt promql.ErrQueryTimeout
-	var es promql.ErrStorage
-	switch {
-	case errors.As(execErr, &eqc):
-		return errors.Newf(errors.TypeCanceled, errors.CodeCanceled, "query canceled").WithAdditional(eqc.Error())
-	case errors.As(execErr, &eqt):
-		return errors.Newf(errors.TypeTimeout, errors.CodeTimeout, "query timed out").WithAdditional(eqt.Error())
-	case errors.Is(execErr, context.DeadlineExceeded):
-		return errors.Newf(errors.TypeTimeout, errors.CodeTimeout, "query timed out")
-	case errors.Is(execErr, context.Canceled):
-		return errors.Newf(errors.TypeCanceled, errors.CodeCanceled, "query canceled")
-	case errors.As(execErr, &es):
-		return errors.Newf(errors.TypeInternal, errors.CodeInternal, "query execution error: %v", execErr)
-	default:
-		return nil
-	}
-}
-
 // enhancePromQLError adds helpful context to PromQL parse errors,
 // particularly for UTF-8 syntax migration issues where metric and label
 // names containing dots need to be quoted.
@@ -235,20 +213,27 @@ func (q *promqlQuery) Execute(ctx context.Context) (*qbv5.Result, error) {
 		time.Unix(0, end),
 		q.query.Step.Duration,
 	)
-	if err != nil {
-		// NewRangeQuery can fail with execution errors (e.g. context deadline exceeded)
-		// during the query queue/scheduling stage, not just parse errors.
-		if err := tryEnhancePromQLExecError(err); err != nil {
-			return nil, err
-		}
 
+	if err != nil {
 		return nil, enhancePromQLError(query, err)
 	}
 
 	res := qry.Exec(ctx)
 	if res.Err != nil {
-		if err := tryEnhancePromQLExecError(res.Err); err != nil {
-			return nil, err
+		var eqc promql.ErrQueryCanceled
+		var eqt promql.ErrQueryTimeout
+		var es promql.ErrStorage
+		switch {
+		case errors.As(res.Err, &eqc):
+			return nil, errors.Newf(errors.TypeCanceled, errors.CodeCanceled, "query canceled")
+		case errors.As(res.Err, &eqt):
+			return nil, errors.Newf(errors.TypeTimeout, errors.CodeTimeout, "query timeout")
+		case errors.As(res.Err, &es):
+			return nil, errors.Newf(errors.TypeInternal, errors.CodeInternal, "query execution error: %v", res.Err)
+		}
+
+		if errors.Is(res.Err, context.Canceled) {
+			return nil, errors.Newf(errors.TypeCanceled, errors.CodeCanceled, "query canceled")
 		}
 
 		return nil, errors.Newf(errors.TypeInternal, errors.CodeInternal, "query execution error: %v", res.Err)

pkg/querier/querier.go

@@ -353,13 +353,13 @@ func (q *querier) QueryRange(ctx context.Context, orgID valuer.UUID, req *qbtype
 			case qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]:
 				spec.ShiftBy = extractShiftFromBuilderQuery(spec)
 				timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, req.RequestType)
-				bq := newBuilderQuery(q.logger, q.telemetryStore, q.traceStmtBuilder, spec, timeRange, req.RequestType, tmplVars)
+				bq := newBuilderQuery(q.telemetryStore, q.traceStmtBuilder, spec, timeRange, req.RequestType, tmplVars)
 				queries[spec.Name] = bq
 				steps[spec.Name] = spec.StepInterval
 			case qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]:
 				spec.ShiftBy = extractShiftFromBuilderQuery(spec)
 				timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: req.Start, To: req.End}, req.RequestType)
-				bq := newBuilderQuery(q.logger, q.telemetryStore, q.logStmtBuilder, spec, timeRange, req.RequestType, tmplVars)
+				bq := newBuilderQuery(q.telemetryStore, q.logStmtBuilder, spec, timeRange, req.RequestType, tmplVars)
 				queries[spec.Name] = bq
 				steps[spec.Name] = spec.StepInterval
 			case qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]:
@@ -397,9 +397,9 @@ func (q *querier) QueryRange(ctx context.Context, orgID valuer.UUID, req *qbtype
 
 				if spec.Source == telemetrytypes.SourceMeter {
 					event.Source = telemetrytypes.SourceMeter.StringValue()
-					bq = newBuilderQuery(q.logger, q.telemetryStore, q.meterStmtBuilder, spec, timeRange, req.RequestType, tmplVars)
+					bq = newBuilderQuery(q.telemetryStore, q.meterStmtBuilder, spec, timeRange, req.RequestType, tmplVars)
 				} else {
-					bq = newBuilderQuery(q.logger, q.telemetryStore, q.metricStmtBuilder, spec, timeRange, req.RequestType, tmplVars)
+					bq = newBuilderQuery(q.telemetryStore, q.metricStmtBuilder, spec, timeRange, req.RequestType, tmplVars)
 				}
 
 				queries[spec.Name] = bq
@@ -509,7 +509,7 @@ func (q *querier) QueryRawStream(ctx context.Context, orgID valuer.UUID, req *qb
 		case <-tick:
 			// timestamp end is not specified here
 			timeRange := adjustTimeRangeForShift(spec, qbtypes.TimeRange{From: tsStart}, req.RequestType)
-			bq := newBuilderQuery(q.logger, q.telemetryStore, q.logStmtBuilder, spec, timeRange, req.RequestType, map[string]qbtypes.VariableItem{
+			bq := newBuilderQuery(q.telemetryStore, q.logStmtBuilder, spec, timeRange, req.RequestType, map[string]qbtypes.VariableItem{
 				"id": {
 					Value: updatedLogID,
 				},
@@ -801,22 +801,22 @@ func (q *querier) createRangedQuery(originalQuery qbtypes.Query, timeRange qbtyp
 		specCopy := qt.spec.Copy()
 		specCopy.ShiftBy = extractShiftFromBuilderQuery(specCopy)
 		adjustedTimeRange := adjustTimeRangeForShift(specCopy, timeRange, qt.kind)
-		return newBuilderQuery(q.logger, q.telemetryStore, q.traceStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
+		return newBuilderQuery(q.telemetryStore, q.traceStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
 
 	case *builderQuery[qbtypes.LogAggregation]:
 		specCopy := qt.spec.Copy()
 		specCopy.ShiftBy = extractShiftFromBuilderQuery(specCopy)
 		adjustedTimeRange := adjustTimeRangeForShift(specCopy, timeRange, qt.kind)
-		return newBuilderQuery(q.logger, q.telemetryStore, q.logStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
+		return newBuilderQuery(q.telemetryStore, q.logStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
 
 	case *builderQuery[qbtypes.MetricAggregation]:
 		specCopy := qt.spec.Copy()
 		specCopy.ShiftBy = extractShiftFromBuilderQuery(specCopy)
 		adjustedTimeRange := adjustTimeRangeForShift(specCopy, timeRange, qt.kind)
 		if qt.spec.Source == telemetrytypes.SourceMeter {
-			return newBuilderQuery(q.logger, q.telemetryStore, q.meterStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
+			return newBuilderQuery(q.telemetryStore, q.meterStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
 		}
-		return newBuilderQuery(q.logger, q.telemetryStore, q.metricStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
+		return newBuilderQuery(q.telemetryStore, q.metricStmtBuilder, specCopy, adjustedTimeRange, qt.kind, qt.variables)
 	case *traceOperatorQuery:
 		specCopy := qt.spec.Copy()
 		return &traceOperatorQuery{

pkg/query-service/app/logparsingpipeline/controller.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"maps"
 	"slices"
 	"strings"
 
@@ -13,7 +12,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/query-service/agentConf"
 	"github.com/SigNoz/signoz/pkg/query-service/constants"
-	"github.com/SigNoz/signoz/pkg/query-service/interfaces"
 	"github.com/SigNoz/signoz/pkg/query-service/model"
 	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
 	"github.com/SigNoz/signoz/pkg/query-service/utils"
@@ -36,101 +34,19 @@ type LogParsingPipelineController struct {
 	Repo
 
 	GetIntegrationPipelines func(context.Context, string) ([]pipelinetypes.GettablePipeline, error)
-	// TODO(Piyush): remove with qbv5 migration
-	reader interfaces.Reader
 }
 
 func NewLogParsingPipelinesController(
 	sqlStore sqlstore.SQLStore,
 	getIntegrationPipelines func(context.Context, string) ([]pipelinetypes.GettablePipeline, error),
-	reader interfaces.Reader,
 ) (*LogParsingPipelineController, error) {
 	repo := NewRepo(sqlStore)
 	return &LogParsingPipelineController{
 		Repo:                    repo,
 		GetIntegrationPipelines: getIntegrationPipelines,
-		reader:                  reader,
 	}, nil
 }
 
-// enrichPipelinesFilters resolves the type (tag vs resource) for filter keys that are
-// missing type info, by looking them up in the store.
-//
-// TODO(Piyush): remove with qbv5 migration
-func (pc *LogParsingPipelineController) enrichPipelinesFilters(
-	ctx context.Context, pipelines []pipelinetypes.GettablePipeline,
-) ([]pipelinetypes.GettablePipeline, error) {
-	// Collect names of non-static keys that are missing type info.
-	// Static fields (body, trace_id, etc.) are intentionally Unspecified and map
-	// to top-level OTEL fields — they do not need enrichment.
-	unspecifiedNames := map[string]struct{}{}
-	for _, p := range pipelines {
-		if p.Filter != nil {
-			for _, item := range p.Filter.Items {
-				if item.Key.Type == v3.AttributeKeyTypeUnspecified {
-					// Skip static fields
-					if _, isStatic := constants.StaticFieldsLogsV3[item.Key.Key]; isStatic {
-						continue
-					}
-					// Skip enrich body.* fields
-					if strings.HasPrefix(item.Key.Key, "body.") {
-						continue
-					}
-					unspecifiedNames[item.Key.Key] = struct{}{}
-				}
-			}
-		}
-	}
-	if len(unspecifiedNames) == 0 {
-		return pipelines, nil
-	}
-
-	logFields, apiErr := pc.reader.GetLogFieldsFromNames(ctx, slices.Collect(maps.Keys(unspecifiedNames)))
-	if apiErr != nil {
-		slog.ErrorContext(ctx, "failed to fetch log fields for pipeline filter enrichment", "error", apiErr)
-		return pipelines, apiErr
-	}
-
-	// Build a simple name → AttributeKeyType map from the response.
-	fieldTypes := map[string]v3.AttributeKeyType{}
-	for _, f := range append(logFields.Selected, logFields.Interesting...) {
-		switch f.Type {
-		case constants.Resources:
-			fieldTypes[f.Name] = v3.AttributeKeyTypeResource
-		case constants.Attributes:
-			fieldTypes[f.Name] = v3.AttributeKeyTypeTag
-		}
-	}
-
-	// Set the resolved type on each untyped filter key in-place.
-	for i := range pipelines {
-		if pipelines[i].Filter != nil {
-			for j := range pipelines[i].Filter.Items {
-				key := &pipelines[i].Filter.Items[j].Key
-				if key.Type == v3.AttributeKeyTypeUnspecified {
-					// Skip static fields
-					if _, isStatic := constants.StaticFieldsLogsV3[key.Key]; isStatic {
-						continue
-					}
-					// Skip enrich body.* fields
-					if strings.HasPrefix(key.Key, "body.") {
-						continue
-					}
-
-					if t, ok := fieldTypes[key.Key]; ok {
-						key.Type = t
-					} else {
-						// default to attribute
-						key.Type = v3.AttributeKeyTypeTag
-					}
-				}
-			}
-		}
-	}
-
-	return pipelines, nil
-}
-
 // PipelinesResponse is used to prepare http response for pipelines config related requests
 type PipelinesResponse struct {
 	*opamptypes.AgentConfigVersion
@@ -340,12 +256,7 @@ func (ic *LogParsingPipelineController) PreviewLogsPipelines(
 	ctx context.Context,
 	request *PipelinesPreviewRequest,
 ) (*PipelinesPreviewResponse, error) {
-	pipelines, err := ic.enrichPipelinesFilters(ctx, request.Pipelines)
-	if err != nil {
-		return nil, err
-	}
-
-	result, collectorLogs, err := SimulatePipelinesProcessing(ctx, pipelines, request.Logs)
+	result, collectorLogs, err := SimulatePipelinesProcessing(ctx, request.Pipelines, request.Logs)
 	if err != nil {
 		return nil, err
 	}
@@ -382,8 +293,10 @@ func (pc *LogParsingPipelineController) RecommendAgentConfig(
 	if configVersion != nil {
 		pipelinesVersion = configVersion.Version
 	}
-	ctx := context.Background()
-	pipelinesResp, err := pc.GetPipelinesByVersion(ctx, orgId, pipelinesVersion)
+
+	pipelinesResp, err := pc.GetPipelinesByVersion(
+		context.Background(), orgId, pipelinesVersion,
+	)
 	if err != nil {
 		return nil, "", err
 	}
@@ -393,17 +306,12 @@ func (pc *LogParsingPipelineController) RecommendAgentConfig(
 		return nil, "", errors.WrapInternalf(err, CodeRawPipelinesMarshalFailed, "could not serialize pipelines to JSON")
 	}
 
-	enrichedPipelines, err := pc.enrichPipelinesFilters(ctx, pipelinesResp.Pipelines)
-	if err != nil {
-		return nil, "", err
-	}
-
 	if querybuilder.BodyJSONQueryEnabled {
 		// add default normalize pipeline at the beginning, only for sending to collector
-		enrichedPipelines = append([]pipelinetypes.GettablePipeline{pc.getNormalizePipeline()}, enrichedPipelines...)
+		pipelinesResp.Pipelines = append([]pipelinetypes.GettablePipeline{pc.getNormalizePipeline()}, pipelinesResp.Pipelines...)
 	}
 
-	updatedConf, err := GenerateCollectorConfigWithPipelines(currentConfYaml, enrichedPipelines)
+	updatedConf, err := GenerateCollectorConfigWithPipelines(currentConfYaml, pipelinesResp.Pipelines)
 	if err != nil {
 		return nil, "", err
 	}

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

@@ -1407,7 +1407,7 @@ func Test_querier_Traces_runWindowBasedListQueryDesc(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore),
 				"",
 				time.Duration(time.Second),
 				nil,
@@ -1633,7 +1633,7 @@ func Test_querier_Traces_runWindowBasedListQueryAsc(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore),
 				"",
 				time.Duration(time.Second),
 				nil,
@@ -1934,7 +1934,7 @@ func Test_querier_Logs_runWindowBasedListQueryDesc(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore),
 				"",
 				time.Duration(time.Second),
 				nil,
@@ -2162,7 +2162,7 @@ func Test_querier_Logs_runWindowBasedListQueryAsc(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore),
 				"",
 				time.Duration(time.Second),
 				nil,

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

@@ -1459,7 +1459,7 @@ func Test_querier_Traces_runWindowBasedListQueryDesc(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore),
 				"",
 				time.Duration(time.Second),
 				nil,
@@ -1685,7 +1685,7 @@ func Test_querier_Traces_runWindowBasedListQueryAsc(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore),
 				"",
 				time.Duration(time.Second),
 				nil,
@@ -1985,7 +1985,7 @@ func Test_querier_Logs_runWindowBasedListQueryDesc(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore),
 				"",
 				time.Duration(time.Second),
 				nil,
@@ -2213,7 +2213,7 @@ func Test_querier_Logs_runWindowBasedListQueryAsc(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore),
 				"",
 				time.Duration(time.Second),
 				nil,

pkg/query-service/app/server.go

@@ -121,7 +121,6 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz) (*Server, error) {
 	logParsingPipelineController, err := logparsingpipeline.NewLogParsingPipelinesController(
 		signoz.SQLStore,
 		integrationsController.GetPipelinesForInstalledIntegrations,
-		reader,
 	)
 	if err != nil {
 		return nil, err

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

@@ -67,7 +67,7 @@ func getPathFromRootToSelectedSpanId(node *model.Span, selectedSpanId string, un
 	spansFromRootToNode := []string{}
 
 	if node.SpanID == selectedSpanId {
-		if isSelectedSpanIDUnCollapsed && !slices.Contains(uncollapsedSpans, node.SpanID) {
+		if isSelectedSpanIDUnCollapsed {
 			spansFromRootToNode = append(spansFromRootToNode, node.SpanID)
 		}
 		return true, spansFromRootToNode
@@ -88,15 +88,7 @@ func getPathFromRootToSelectedSpanId(node *model.Span, selectedSpanId string, un
 	return isPresentInSubtreeForTheNode, spansFromRootToNode
 }
 
-// traverseOpts holds the traversal configuration that remains constant
-// throughout the recursion. Per-call state (level, isPartOfPreOrder, etc.)
-// is passed as direct arguments.
-type traverseOpts struct {
-	uncollapsedSpans []string
-	selectedSpanID   string
-}
-
-func traverseTrace(span *model.Span, opts traverseOpts, level uint64, isPartOfPreOrder bool, hasSibling bool) []*model.Span {
+func traverseTrace(span *model.Span, uncollapsedSpans []string, level uint64, isPartOfPreOrder bool, hasSibling bool, selectedSpanId string) []*model.Span {
 	preOrderTraversal := []*model.Span{}
 
 	// sort the children to maintain the order across requests
@@ -134,9 +126,8 @@ func traverseTrace(span *model.Span, opts traverseOpts, level uint64, isPartOfPr
 		preOrderTraversal = append(preOrderTraversal, &nodeWithoutChildren)
 	}
 
-	isAlreadyUncollapsed := slices.Contains(opts.uncollapsedSpans, span.SpanID)
 	for index, child := range span.Children {
-		_childTraversal := traverseTrace(child, opts, level+1, isPartOfPreOrder && isAlreadyUncollapsed, index != (len(span.Children)-1))
+		_childTraversal := traverseTrace(child, uncollapsedSpans, level+1, isPartOfPreOrder && slices.Contains(uncollapsedSpans, span.SpanID), index != (len(span.Children)-1), selectedSpanId)
 		preOrderTraversal = append(preOrderTraversal, _childTraversal...)
 		nodeWithoutChildren.SubTreeNodeCount += child.SubTreeNodeCount + 1
 		span.SubTreeNodeCount += child.SubTreeNodeCount + 1
@@ -177,11 +168,7 @@ func GetSelectedSpans(uncollapsedSpans []string, selectedSpanID string, traceRoo
 			_, spansFromRootToNode := getPathFromRootToSelectedSpanId(rootNode, selectedSpanID, updatedUncollapsedSpans, isSelectedSpanIDUnCollapsed)
 			updatedUncollapsedSpans = append(updatedUncollapsedSpans, spansFromRootToNode...)
 
-			opts := traverseOpts{
-				uncollapsedSpans: updatedUncollapsedSpans,
-				selectedSpanID:   selectedSpanID,
-			}
-			_preOrderTraversal := traverseTrace(rootNode, opts, 0, true, false)
+			_preOrderTraversal := traverseTrace(rootNode, updatedUncollapsedSpans, 0, true, false, selectedSpanID)
 			_selectedSpanIndex := findIndexForSelectedSpanFromPreOrder(_preOrderTraversal, selectedSpanID)
 
 			if _selectedSpanIndex != -1 {

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

@@ -1,355 +0,0 @@
-// Package tracedetail tests — waterfall
-//
-// # Background
-//
-// The waterfall view renders a trace as a scrollable list of spans in
-// pre-order (parent before children, siblings left-to-right). Because a trace
-// can have thousands of spans, only a window of ~500 is returned per request.
-// The window is centred on the selected span.
-//
-// # Key concepts
-//
-// uncollapsedSpans
-//
-//	The set of span IDs the user has manually expanded in the UI.
-//	Only the direct children of an uncollapsed span are included in the
-//	output; grandchildren stay hidden until their parent is also uncollapsed.
-//	When multiple spans are uncollapsed their children are all visible at once.
-//
-// selectedSpanID
-//
-//	The span currently focused — set when the user clicks a span in the
-//	waterfall or selects one from the flamegraph.  The output window is always
-//	centred on this span.  The path from the trace root down to the selected
-//	span is automatically uncollapsed so ancestors are visible even if they are
-//	not in uncollapsedSpans.
-//
-// isSelectedSpanIDUnCollapsed
-//
-//	Controls whether the selected span's own children are shown:
-//	  true  — user expanded the span (click-to-open in waterfall or flamegraph);
-//	          direct children of the selected span are included.
-//	  false — user selected without expanding;
-//	          the span is visible but its children remain hidden.
-//
-// traceRoots
-//
-//	Root spans of the trace — spans with no parent in the current dataset.
-//	Normally one, but multiple roots are common when upstream services are
-//	not instrumented or their spans were not sampled/exported.
-
-package tracedetail
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/SigNoz/signoz/pkg/query-service/model"
-	"github.com/stretchr/testify/assert"
-)
-
-// Pre-order traversal is preserved: parent before children, siblings left-to-right.
-func TestGetSelectedSpans_PreOrderTraversal(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("child1", "svc", mkSpan("grandchild", "svc")),
-		mkSpan("child2", "svc"),
-	)
-	spanMap := buildSpanMap(root)
-	spans, _, _, _ := GetSelectedSpans([]string{"root", "child1"}, "root", []*model.Span{root}, spanMap, false)
-
-	assert.Equal(t, []string{"root", "child1", "grandchild", "child2"}, spanIDs(spans))
-}
-
-// Multiple roots: both trees are flattened into a single pre-order list with
-// root1's subtree before root2's. Service/entry-point come from the first root.
-//
-//	root1 svc-a          ← selected
-//	  └─ child1
-//	root2 svc-b
-//	  └─ child2
-//
-// Expected output order: root1 → child1 → root2 → child2
-func TestGetSelectedSpans_MultipleRoots(t *testing.T) {
-	root1 := mkSpan("root1", "svc-a", mkSpan("child1", "svc-a"))
-	root2 := mkSpan("root2", "svc-b", mkSpan("child2", "svc-b"))
-	spanMap := buildSpanMap(root1, root2)
-
-	spans, _, svcName, entryPoint := GetSelectedSpans([]string{"root1", "root2"}, "root1", []*model.Span{root1, root2}, spanMap, false)
-
-	assert.Equal(t, []string{"root1", "child1", "root2", "child2"}, spanIDs(spans), "root1 subtree must precede root2 subtree")
-	assert.Equal(t, "svc-a", svcName, "metadata comes from first root")
-	assert.Equal(t, "root1-op", entryPoint, "metadata comes from first root")
-}
-
-// isSelectedSpanIDUnCollapsed=true opens only the selected span's direct children,
-// not deeper descendants.
-//
-//	root → selected (expanded)
-//	          ├─ child1 ✓
-//	          │    └─ grandchild ✗  (only one level opened)
-//	          └─ child2 ✓
-func TestGetSelectedSpans_ExpandedSelectedSpan(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("selected", "svc",
-			mkSpan("child1", "svc", mkSpan("grandchild", "svc")),
-			mkSpan("child2", "svc"),
-		),
-	)
-	spanMap := buildSpanMap(root)
-	spans, _, _, _ := GetSelectedSpans([]string{}, "selected", []*model.Span{root}, spanMap, true)
-
-	// root and selected are on the auto-uncollapsed path; child1/child2 are direct
-	// children of the expanded selected span; grandchild stays hidden.
-	assert.Equal(t, []string{"root", "selected", "child1", "child2"}, spanIDs(spans))
-}
-
-// Multiple spans uncollapsed simultaneously: children of all uncollapsed spans
-// are visible at once.
-//
-//	root
-//	  ├─ childA (uncollapsed) → grandchildA ✓
-//	  └─ childB (uncollapsed) → grandchildB ✓
-func TestGetSelectedSpans_MultipleUncollapsed(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("childA", "svc", mkSpan("grandchildA", "svc")),
-		mkSpan("childB", "svc", mkSpan("grandchildB", "svc")),
-	)
-	spanMap := buildSpanMap(root)
-	spans, _, _, _ := GetSelectedSpans([]string{"root", "childA", "childB"}, "root", []*model.Span{root}, spanMap, false)
-
-	assert.Equal(t, []string{"root", "childA", "grandchildA", "childB", "grandchildB"}, spanIDs(spans))
-}
-
-// Collapsing a span with other uncollapsed spans
-//
-// root
-// ├─ childA  (previously expanded — in uncollapsedSpans)
-// │    ├─ grandchild1 ✓
-// │    │    └─ greatGrandchild ✗  (grandchild1 not in uncollapsedSpans)
-// │    └─ grandchild2 ✓
-// └─ childB                        ← selected (not expanded)
-func TestGetSelectedSpans_ManualUncollapse(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("childA", "svc",
-			mkSpan("grandchild1", "svc", mkSpan("greatGrandchild", "svc")),
-			mkSpan("grandchild2", "svc"),
-		),
-		mkSpan("childB", "svc"),
-	)
-	spanMap := buildSpanMap(root)
-	// childA was expanded in a previous interaction; childB is now selected without expanding
-	spans, _, _, _ := GetSelectedSpans([]string{"childA"}, "childB", []*model.Span{root}, spanMap, false)
-
-	// path to childB auto-uncollpases root → childA and childB appear; childA is in
-	// uncollapsedSpans so its children appear; greatGrandchild stays hidden.
-	assert.Equal(t, []string{"root", "childA", "grandchild1", "grandchild2", "childB"}, spanIDs(spans))
-}
-
-// A collapsed span hides all children.
-func TestGetSelectedSpans_CollapsedSpan(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("child1", "svc"),
-		mkSpan("child2", "svc"),
-	)
-	spanMap := buildSpanMap(root)
-	spans, _, _, _ := GetSelectedSpans([]string{}, "root", []*model.Span{root}, spanMap, false)
-
-	assert.Equal(t, []string{"root"}, spanIDs(spans))
-}
-
-// Selecting a span auto-uncollpases the path from root to that span so it is visible.
-//
-//	root → parent → selected
-func TestGetSelectedSpans_PathToSelectedIsUncollapsed(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("parent", "svc",
-			mkSpan("selected", "svc"),
-		),
-	)
-	spanMap := buildSpanMap(root)
-	// no manually uncollapsed spans — path should still be opened
-	spans, _, _, _ := GetSelectedSpans([]string{}, "selected", []*model.Span{root}, spanMap, false)
-
-	assert.Equal(t, []string{"root", "parent", "selected"}, spanIDs(spans))
-}
-
-// The path-to-selected spans are returned in updatedUncollapsedSpans.
-func TestGetSelectedSpans_PathReturnedInUncollapsed(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("parent", "svc",
-			mkSpan("selected", "svc"),
-		),
-	)
-	spanMap := buildSpanMap(root)
-	spans, uncollapsed, _, _ := GetSelectedSpans([]string{}, "selected", []*model.Span{root}, spanMap, false)
-
-	assert.Equal(t, []string{"root", "parent"}, uncollapsed)
-	assert.Equal(t, []string{"root", "parent", "selected"}, spanIDs(spans))
-}
-
-// Siblings of ancestors are rendered as collapsed nodes but their subtrees
-// must NOT be expanded.
-//
-//	root
-//	  ├─ unrelated → unrelated-child (✗)
-//	  └─ parent → selected
-func TestGetSelectedSpans_SiblingsNotExpanded(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("unrelated", "svc", mkSpan("unrelated-child", "svc")),
-		mkSpan("parent", "svc",
-			mkSpan("selected", "svc"),
-		),
-	)
-	spanMap := buildSpanMap(root)
-	spans, uncollapsed, _, _ := GetSelectedSpans([]string{}, "selected", []*model.Span{root}, spanMap, false)
-
-	// children of root sort alphabetically: parent < unrelated; unrelated-child stays hidden
-	assert.Equal(t, []string{"root", "parent", "selected", "unrelated"}, spanIDs(spans))
-	// only the path nodes are tracked as uncollapsed — unrelated is not
-	assert.Equal(t, []string{"root", "parent"}, uncollapsed)
-}
-
-// An unknown selectedSpanID must not panic; returns a window from index 0.
-func TestGetSelectedSpans_UnknownSelectedSpan(t *testing.T) {
-	root := mkSpan("root", "svc", mkSpan("child", "svc"))
-	spanMap := buildSpanMap(root)
-	spans, _, _, _ := GetSelectedSpans([]string{}, "nonexistent", []*model.Span{root}, spanMap, false)
-	assert.Equal(t, []string{"root"}, spanIDs(spans))
-}
-
-// Test to check if Level, HasChildren, HasSiblings, and SubTreeNodeCount are populated correctly.
-//
-//	root          level=0, hasChildren=true,  hasSiblings=false, subTree=4
-//	  child1      level=1, hasChildren=true,  hasSiblings=true,  subTree=2
-//	    grandchild level=2, hasChildren=false, hasSiblings=false, subTree=1
-//	  child2      level=1, hasChildren=false, hasSiblings=false, subTree=1
-func TestGetSelectedSpans_SpanMetadata(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("child1", "svc", mkSpan("grandchild", "svc")),
-		mkSpan("child2", "svc"),
-	)
-	spanMap := buildSpanMap(root)
-	spans, _, _, _ := GetSelectedSpans([]string{"root", "child1"}, "root", []*model.Span{root}, spanMap, false)
-
-	byID := map[string]*model.Span{}
-	for _, s := range spans {
-		byID[s.SpanID] = s
-	}
-
-	assert.Equal(t, uint64(0), byID["root"].Level)
-	assert.Equal(t, uint64(1), byID["child1"].Level)
-	assert.Equal(t, uint64(1), byID["child2"].Level)
-	assert.Equal(t, uint64(2), byID["grandchild"].Level)
-
-	assert.True(t, byID["root"].HasChildren)
-	assert.True(t, byID["child1"].HasChildren)
-	assert.False(t, byID["child2"].HasChildren)
-	assert.False(t, byID["grandchild"].HasChildren)
-
-	assert.False(t, byID["root"].HasSiblings, "root has no siblings")
-	assert.True(t, byID["child1"].HasSiblings, "child1 has sibling child2")
-	assert.False(t, byID["child2"].HasSiblings, "child2 is the last child")
-	assert.False(t, byID["grandchild"].HasSiblings, "grandchild has no siblings")
-
-	assert.Equal(t, uint64(4), byID["root"].SubTreeNodeCount)
-	assert.Equal(t, uint64(2), byID["child1"].SubTreeNodeCount)
-	assert.Equal(t, uint64(1), byID["grandchild"].SubTreeNodeCount)
-	assert.Equal(t, uint64(1), byID["child2"].SubTreeNodeCount)
-}
-
-// If the selected span is already in uncollapsedSpans AND isSelectedSpanIDUnCollapsed=true,
-func TestGetSelectedSpans_DuplicateInUncollapsed(t *testing.T) {
-	root := mkSpan("root", "svc",
-		mkSpan("selected", "svc", mkSpan("child", "svc")),
-	)
-	spanMap := buildSpanMap(root)
-	_, uncollapsed, _, _ := GetSelectedSpans(
-		[]string{"selected"}, // already present
-		"selected",
-		[]*model.Span{root}, spanMap,
-		true,
-	)
-
-	count := 0
-	for _, id := range uncollapsed {
-		if id == "selected" {
-			count++
-		}
-	}
-	assert.Equal(t, 1, count, "should appear once")
-}
-
-// makeChain builds a linear trace: span0 → span1 → … → span(n-1).
-// All span IDs are "span0", "span1", … so the caller can reference them by index.
-func makeChain(n int) (*model.Span, map[string]*model.Span, []string) {
-	spans := make([]*model.Span, n)
-	for i := n - 1; i >= 0; i-- {
-		if i == n-1 {
-			spans[i] = mkSpan(fmt.Sprintf("span%d", i), "svc")
-		} else {
-			spans[i] = mkSpan(fmt.Sprintf("span%d", i), "svc", spans[i+1])
-		}
-	}
-	uncollapsed := make([]string, n)
-	for i := range spans {
-		uncollapsed[i] = fmt.Sprintf("span%d", i)
-	}
-	return spans[0], buildSpanMap(spans[0]), uncollapsed
-}
-
-// The selected span is centred: 200 spans before it, 300 after (0.4 / 0.6 split).
-func TestGetSelectedSpans_WindowCentredOnSelected(t *testing.T) {
-	root, spanMap, uncollapsed := makeChain(600)
-	spans, _, _, _ := GetSelectedSpans(uncollapsed, "span300", []*model.Span{root}, spanMap, false)
-
-	assert.Equal(t, 500, len(spans), "window should be 500 spans")
-	// window is [100, 600): span300 lands at position 200 (300 - 100)
-	assert.Equal(t, "span100", spans[0].SpanID, "window starts 200 before selected")
-	assert.Equal(t, "span300", spans[200].SpanID, "selected span at position 200 in window")
-	assert.Equal(t, "span599", spans[499].SpanID, "window ends 300 after selected")
-}
-
-// When the selected span is near the start, the window shifts right so no
-// negative index is used — the result is still 500 spans.
-func TestGetSelectedSpans_WindowShiftsAtStart(t *testing.T) {
-	root, spanMap, uncollapsed := makeChain(600)
-	spans, _, _, _ := GetSelectedSpans(uncollapsed, "span10", []*model.Span{root}, spanMap, false)
-
-	assert.Equal(t, 500, len(spans))
-	assert.Equal(t, "span0", spans[0].SpanID, "window clamped to start of trace")
-	assert.Equal(t, "span10", spans[10].SpanID, "selected span still in window")
-}
-
-func mkSpan(id, service string, children ...*model.Span) *model.Span {
-	return &model.Span{
-		SpanID:      id,
-		ServiceName: service,
-		Name:        id + "-op",
-		Children:    children,
-	}
-}
-
-// spanIDs returns SpanIDs in order.
-func spanIDs(spans []*model.Span) []string {
-	ids := make([]string, len(spans))
-	for i, s := range spans {
-		ids[i] = s.SpanID
-	}
-	return ids
-}
-
-// buildSpanMap indexes every span in a set of trees by SpanID.
-func buildSpanMap(roots ...*model.Span) map[string]*model.Span {
-	m := map[string]*model.Span{}
-	var walk func(*model.Span)
-	walk = func(s *model.Span) {
-		m[s.SpanID] = s
-		for _, c := range s.Children {
-			walk(c)
-		}
-	}
-	for _, r := range roots {
-		walk(r)
-	}
-	return m
-}

pkg/query-service/rules/base_rule_test.go

@@ -698,7 +698,7 @@ func TestBaseRule_FilterNewSeries(t *testing.T) {
 				slog.Default(),
 				nil,
 				telemetryStore,
-				prometheustest.New(context.Background(), settings, prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore),
+				prometheustest.New(context.Background(), settings, prometheus.Config{}, telemetryStore),
 				"",
 				time.Second,
 				nil,

pkg/query-service/rules/manager_test.go

@@ -253,7 +253,7 @@ func TestManager_TestNotification_SendUnmatched_PromRule(t *testing.T) {
 						WillReturnRows(samplesRows)
 
 					// Create Prometheus provider for this test
-					promProvider = prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, store)
+					promProvider = prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, store)
 				},
 				ManagerOptionsHook: func(opts *ManagerOptions) {
 					// Set Prometheus provider for PromQL queries

pkg/query-service/rules/managertestfactory.go

@@ -99,7 +99,7 @@ func NewTestManager(t *testing.T, testOpts *TestManagerOptions) *Manager {
 
 	options := clickhouseReader.NewOptions("", "", "archiveNamespace")
 	providerSettings := instrumentationtest.New().ToProviderSettings()
-	prometheus := prometheustest.New(context.Background(), providerSettings, prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore)
+	prometheus := prometheustest.New(context.Background(), providerSettings, prometheus.Config{}, telemetryStore)
 	reader := clickhouseReader.NewReader(
 		instrumentationtest.New().Logger(),
 		nil,

pkg/query-service/rules/prom_rule_test.go

@@ -940,7 +940,7 @@ func TestPromRuleUnitCombinations(t *testing.T) {
 			).
 			WillReturnRows(samplesRows)
 
-		promProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore)
+		promProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore)
 
 		postableRule.RuleCondition.CompareOp = ruletypes.CompareOp(c.compareOp)
 		postableRule.RuleCondition.MatchType = ruletypes.MatchType(c.matchType)
@@ -1061,7 +1061,7 @@ func _Enable_this_after_9146_issue_fix_is_merged_TestPromRuleNoData(t *testing.T
 			WithArgs("test_metric", "__name__", "test_metric").
 			WillReturnRows(fingerprintRows)
 
-		promProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore)
+		promProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore)
 
 		var target float64 = 0
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
@@ -1281,7 +1281,7 @@ func TestMultipleThresholdPromRule(t *testing.T) {
 			).
 			WillReturnRows(samplesRows)
 
-		promProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore)
+		promProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore)
 
 		postableRule.RuleCondition.CompareOp = ruletypes.CompareOp(c.compareOp)
 		postableRule.RuleCondition.MatchType = ruletypes.MatchType(c.matchType)
@@ -1441,7 +1441,7 @@ func TestPromRule_NoData(t *testing.T) {
 			promProvider := prometheustest.New(
 				context.Background(),
 				instrumentationtest.New().ToProviderSettings(),
-				prometheus.Config{Timeout: 2 * time.Minute},
+				prometheus.Config{},
 				telemetryStore,
 			)
 			defer func() {
@@ -1590,7 +1590,7 @@ func TestPromRule_NoData_AbsentFor(t *testing.T) {
 			promProvider := prometheustest.New(
 				context.Background(),
 				instrumentationtest.New().ToProviderSettings(),
-				prometheus.Config{Timeout: 2 * time.Minute},
+				prometheus.Config{},
 				telemetryStore,
 			)
 			defer func() {
@@ -1748,7 +1748,7 @@ func TestPromRuleEval_RequireMinPoints(t *testing.T) {
 			promProvider := prometheustest.New(
 				context.Background(),
 				instrumentationtest.New().ToProviderSettings(),
-				prometheus.Config{Timeout: 2 * time.Minute, LookbackDelta: lookBackDelta},
+				prometheus.Config{LookbackDelta: lookBackDelta},
 				telemetryStore,
 			)
 			defer func() {

pkg/query-service/rules/threshold_rule_test.go

@@ -779,7 +779,7 @@ func TestThresholdRuleUnitCombinations(t *testing.T) {
 			},
 		)
 		require.NoError(t, err)
-		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore), "", time.Duration(time.Second), nil, readerCache, options)
+		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore), "", time.Duration(time.Second), nil, readerCache, options)
 		rule, err := NewThresholdRule("69", valuer.GenerateUUID(), &postableRule, reader, nil, logger)
 		rule.TemporalityMap = map[string]map[v3.Temporality]bool{
 			"signoz_calls_total": {
@@ -894,7 +894,7 @@ func TestThresholdRuleNoData(t *testing.T) {
 		)
 		assert.NoError(t, err)
 		options := clickhouseReader.NewOptions("", "", "archiveNamespace")
-		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore), "", time.Duration(time.Second), nil, readerCache, options)
+		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore), "", time.Duration(time.Second), nil, readerCache, options)
 
 		rule, err := NewThresholdRule("69", valuer.GenerateUUID(), &postableRule, reader, nil, logger)
 		rule.TemporalityMap = map[string]map[v3.Temporality]bool{
@@ -1014,7 +1014,7 @@ func TestThresholdRuleTracesLink(t *testing.T) {
 		}
 
 		options := clickhouseReader.NewOptions("", "", "archiveNamespace")
-		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore), "", time.Duration(time.Second), nil, nil, options)
+		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore), "", time.Duration(time.Second), nil, nil, options)
 
 		rule, err := NewThresholdRule("69", valuer.GenerateUUID(), &postableRule, reader, nil, logger)
 		rule.TemporalityMap = map[string]map[v3.Temporality]bool{
@@ -1151,7 +1151,7 @@ func TestThresholdRuleLogsLink(t *testing.T) {
 		}
 
 		options := clickhouseReader.NewOptions("", "", "archiveNamespace")
-		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore), "", time.Duration(time.Second), nil, nil, options)
+		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore), "", time.Duration(time.Second), nil, nil, options)
 
 		rule, err := NewThresholdRule("69", valuer.GenerateUUID(), &postableRule, reader, nil, logger)
 		rule.TemporalityMap = map[string]map[v3.Temporality]bool{
@@ -1418,7 +1418,7 @@ func TestMultipleThresholdRule(t *testing.T) {
 			},
 		)
 		require.NoError(t, err)
-		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore), "", time.Second, nil, readerCache, options)
+		reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore), "", time.Second, nil, readerCache, options)
 		rule, err := NewThresholdRule("69", valuer.GenerateUUID(), &postableRule, reader, nil, logger)
 		rule.TemporalityMap = map[string]map[v3.Temporality]bool{
 			"signoz_calls_total": {
@@ -2220,7 +2220,7 @@ func TestThresholdEval_RequireMinPoints(t *testing.T) {
 			)
 			require.NoError(t, err)
 
-			prometheusProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore)
+			prometheusProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{}, telemetryStore)
 			reader := clickhouseReader.NewReader(slog.Default(), nil, telemetryStore, prometheusProvider, "", time.Second, nil, readerCache, options)
 
 			rule, err := NewThresholdRule("some-id", valuer.GenerateUUID(), &postableRule, reader, nil, logger)

pkg/signoz/handler.go

@@ -12,8 +12,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/licensing"
 	"github.com/SigNoz/signoz/pkg/modules/apdex"
 	"github.com/SigNoz/signoz/pkg/modules/apdex/implapdex"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration/implcloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
 	"github.com/SigNoz/signoz/pkg/modules/fields"
@@ -40,25 +38,24 @@ import (
 )
 
 type Handlers struct {
-	SavedView               savedview.Handler
-	Apdex                   apdex.Handler
-	Dashboard               dashboard.Handler
-	QuickFilter             quickfilter.Handler
-	TraceFunnel             tracefunnel.Handler
-	RawDataExport           rawdataexport.Handler
-	SpanPercentile          spanpercentile.Handler
-	Services                services.Handler
-	MetricsExplorer         metricsexplorer.Handler
-	Global                  global.Handler
-	FlaggerHandler          flagger.Handler
-	GatewayHandler          gateway.Handler
-	Fields                  fields.Handler
-	AuthzHandler            authz.Handler
-	ZeusHandler             zeus.Handler
-	QuerierHandler          querier.Handler
-	ServiceAccountHandler   serviceaccount.Handler
-	RegistryHandler         factory.Handler
-	CloudIntegrationHandler cloudintegration.Handler
+	SavedView             savedview.Handler
+	Apdex                 apdex.Handler
+	Dashboard             dashboard.Handler
+	QuickFilter           quickfilter.Handler
+	TraceFunnel           tracefunnel.Handler
+	RawDataExport         rawdataexport.Handler
+	SpanPercentile        spanpercentile.Handler
+	Services              services.Handler
+	MetricsExplorer       metricsexplorer.Handler
+	Global                global.Handler
+	FlaggerHandler        flagger.Handler
+	GatewayHandler        gateway.Handler
+	Fields                fields.Handler
+	AuthzHandler          authz.Handler
+	ZeusHandler           zeus.Handler
+	QuerierHandler        querier.Handler
+	ServiceAccountHandler serviceaccount.Handler
+	RegistryHandler       factory.Handler
 }
 
 func NewHandlers(
@@ -76,24 +73,23 @@ func NewHandlers(
 	registryHandler factory.Handler,
 ) Handlers {
 	return Handlers{
-		SavedView:               implsavedview.NewHandler(modules.SavedView),
-		Apdex:                   implapdex.NewHandler(modules.Apdex),
-		Dashboard:               impldashboard.NewHandler(modules.Dashboard, providerSettings),
-		QuickFilter:             implquickfilter.NewHandler(modules.QuickFilter),
-		TraceFunnel:             impltracefunnel.NewHandler(modules.TraceFunnel),
-		RawDataExport:           implrawdataexport.NewHandler(modules.RawDataExport),
-		Services:                implservices.NewHandler(modules.Services),
-		MetricsExplorer:         implmetricsexplorer.NewHandler(modules.MetricsExplorer),
-		SpanPercentile:          implspanpercentile.NewHandler(modules.SpanPercentile),
-		Global:                  signozglobal.NewHandler(global),
-		FlaggerHandler:          flagger.NewHandler(flaggerService),
-		GatewayHandler:          gateway.NewHandler(gatewayService),
-		Fields:                  implfields.NewHandler(providerSettings, telemetryMetadataStore),
-		AuthzHandler:            signozauthzapi.NewHandler(authz),
-		ZeusHandler:             zeus.NewHandler(zeusService, licensing),
-		QuerierHandler:          querierHandler,
-		ServiceAccountHandler:   implserviceaccount.NewHandler(modules.ServiceAccount),
-		RegistryHandler:         registryHandler,
-		CloudIntegrationHandler: implcloudintegration.NewHandler(),
+		SavedView:             implsavedview.NewHandler(modules.SavedView),
+		Apdex:                 implapdex.NewHandler(modules.Apdex),
+		Dashboard:             impldashboard.NewHandler(modules.Dashboard, providerSettings),
+		QuickFilter:           implquickfilter.NewHandler(modules.QuickFilter),
+		TraceFunnel:           impltracefunnel.NewHandler(modules.TraceFunnel),
+		RawDataExport:         implrawdataexport.NewHandler(modules.RawDataExport),
+		Services:              implservices.NewHandler(modules.Services),
+		MetricsExplorer:       implmetricsexplorer.NewHandler(modules.MetricsExplorer),
+		SpanPercentile:        implspanpercentile.NewHandler(modules.SpanPercentile),
+		Global:                signozglobal.NewHandler(global),
+		FlaggerHandler:        flagger.NewHandler(flaggerService),
+		GatewayHandler:        gateway.NewHandler(gatewayService),
+		Fields:                implfields.NewHandler(providerSettings, telemetryMetadataStore),
+		AuthzHandler:          signozauthzapi.NewHandler(authz),
+		ZeusHandler:           zeus.NewHandler(zeusService, licensing),
+		QuerierHandler:        querierHandler,
+		ServiceAccountHandler: implserviceaccount.NewHandler(modules.ServiceAccount),
+		RegistryHandler:       registryHandler,
 	}
 }

pkg/signoz/openapi.go

@@ -17,7 +17,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/http/handler"
 	"github.com/SigNoz/signoz/pkg/instrumentation"
 	"github.com/SigNoz/signoz/pkg/modules/authdomain"
-	"github.com/SigNoz/signoz/pkg/modules/cloudintegration"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/fields"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
@@ -66,7 +65,6 @@ func NewOpenAPI(ctx context.Context, instrumentation instrumentation.Instrumenta
 		struct{ querier.Handler }{},
 		struct{ serviceaccount.Handler }{},
 		struct{ factory.Handler }{},
-		struct{ cloudintegration.Handler }{},
 	).New(ctx, instrumentation.ToProviderSettings(), apiserver.Config{})
 	if err != nil {
 		return nil, err

pkg/signoz/provider.go

@@ -279,7 +279,6 @@ func NewAPIServerProviderFactories(orgGetter organization.Getter, authz authz.Au
 			handlers.QuerierHandler,
 			handlers.ServiceAccountHandler,
 			handlers.RegistryHandler,
-			handlers.CloudIntegrationHandler,
 		),
 	)
 }

pkg/telemetrymeter/stmt_builder_test.go

@@ -51,7 +51,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __temporal_aggregation_cte AS (SELECT ts, `service.name`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(86400)) AS ts, JSONExtractString(labels, 'service.name') AS `service.name`, max(value) AS per_series_value FROM signoz_meter.distributed_samples AS points WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? AND JSONExtractString(labels, 'service.name') = ? AND LOWER(temporality) LIKE LOWER(?) GROUP BY fingerprint, ts, `service.name` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `service.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `service.name`, ts",
+				Query: "WITH __temporal_aggregation_cte AS (SELECT ts, `service.name`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(86400)) AS ts, JSONExtractString(labels, 'service.name') AS `service.name`, max(value) AS per_series_value FROM signoz_meter.distributed_samples AS points WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? AND JSONExtractString(labels, 'service.name') = ? AND LOWER(temporality) LIKE LOWER(?) GROUP BY fingerprint, ts, `service.name` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `service.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte WHERE (`service.name`) IN (SELECT `service.name` FROM __spatial_aggregation_cte GROUP BY `service.name` ORDER BY avg(value) DESC LIMIT 10) ORDER BY avg(value) OVER (PARTITION BY `service.name`) DESC, `service.name`, ts ASC",
 				Args:  []any{"signoz_calls_total", uint64(1747785600000), uint64(1747983420000), "cartservice", "cumulative", 0},
 			},
 			expectedErr: nil,
@@ -84,7 +84,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __spatial_aggregation_cte AS (SELECT toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(86400)) AS ts, JSONExtractString(labels, 'service.name') AS `service.name`, sum(value)/86400 AS value FROM signoz_meter.distributed_samples AS points WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? AND JSONExtractString(labels, 'service.name') = ? AND LOWER(temporality) LIKE LOWER(?) GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `service.name`, ts",
+				Query: "WITH __spatial_aggregation_cte AS (SELECT toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(86400)) AS ts, JSONExtractString(labels, 'service.name') AS `service.name`, sum(value)/86400 AS value FROM signoz_meter.distributed_samples AS points WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? AND JSONExtractString(labels, 'service.name') = ? AND LOWER(temporality) LIKE LOWER(?) GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte WHERE (`service.name`) IN (SELECT `service.name` FROM __spatial_aggregation_cte GROUP BY `service.name` ORDER BY avg(value) DESC LIMIT 10) ORDER BY avg(value) OVER (PARTITION BY `service.name`) DESC, `service.name`, ts ASC",
 				Args:  []any{"signoz_calls_total", uint64(1747872000000), uint64(1747983420000), "cartservice", "delta"},
 			},
 			expectedErr: nil,
@@ -117,7 +117,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __temporal_aggregation_cte AS (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(86400)) AS ts, JSONExtractString(labels, 'service.name') AS `service.name`, sum(value)/86400 AS per_series_value FROM signoz_meter.distributed_samples AS points WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? AND JSONExtractString(labels, 'service.name') = ? AND LOWER(temporality) LIKE LOWER(?) GROUP BY fingerprint, ts, `service.name` ORDER BY fingerprint, ts), __spatial_aggregation_cte AS (SELECT ts, `service.name`, avg(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `service.name`, ts",
+				Query: "WITH __temporal_aggregation_cte AS (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(86400)) AS ts, JSONExtractString(labels, 'service.name') AS `service.name`, sum(value)/86400 AS per_series_value FROM signoz_meter.distributed_samples AS points WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? AND JSONExtractString(labels, 'service.name') = ? AND LOWER(temporality) LIKE LOWER(?) GROUP BY fingerprint, ts, `service.name` ORDER BY fingerprint, ts), __spatial_aggregation_cte AS (SELECT ts, `service.name`, avg(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte WHERE (`service.name`) IN (SELECT `service.name` FROM __spatial_aggregation_cte GROUP BY `service.name` ORDER BY avg(value) DESC LIMIT 10) ORDER BY avg(value) OVER (PARTITION BY `service.name`) DESC, `service.name`, ts ASC",
 				Args:  []any{"signoz_calls_total", uint64(1747872000000), uint64(1747983420000), "cartservice", "delta", 0},
 			},
 			expectedErr: nil,
@@ -150,7 +150,7 @@ func TestStatementBuilder(t *testing.T) {
 				},
 			},
 			expected: qbtypes.Statement{
-				Query: "WITH __temporal_aggregation_cte AS (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(86400)) AS ts, JSONExtractString(labels, 'host.name') AS `host.name`, avg(value) AS per_series_value FROM signoz_meter.distributed_samples AS points WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? AND JSONExtractString(labels, 'host.name') = ? AND LOWER(temporality) LIKE LOWER(?) GROUP BY fingerprint, ts, `host.name` ORDER BY fingerprint, ts), __spatial_aggregation_cte AS (SELECT ts, `host.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `host.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `host.name`, ts",
+				Query: "WITH __temporal_aggregation_cte AS (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(86400)) AS ts, JSONExtractString(labels, 'host.name') AS `host.name`, avg(value) AS per_series_value FROM signoz_meter.distributed_samples AS points WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? AND JSONExtractString(labels, 'host.name') = ? AND LOWER(temporality) LIKE LOWER(?) GROUP BY fingerprint, ts, `host.name` ORDER BY fingerprint, ts), __spatial_aggregation_cte AS (SELECT ts, `host.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `host.name`) SELECT * FROM __spatial_aggregation_cte WHERE (`host.name`) IN (SELECT `host.name` FROM __spatial_aggregation_cte GROUP BY `host.name` ORDER BY avg(value) DESC LIMIT 10) ORDER BY avg(value) OVER (PARTITION BY `host.name`) DESC, `host.name`, ts ASC",
 				Args:  []any{"system.memory.usage", uint64(1747872000000), uint64(1747983420000), "big-data-node-1", "unspecified", 0},
 			},
 			expectedErr: nil,

pkg/telemetrymetrics/statement_builder.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"strings"
 
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/flagger"
@@ -539,6 +540,13 @@ func (b *MetricQueryStatementBuilder) buildSpatialAggregationCTE(
 	return fmt.Sprintf("__spatial_aggregation_cte AS (%s)", q), args
 }
 
+func isMetricAggOrderByKey(key string, config qbtypes.MetricAggregation) bool {
+	spaceAggOrderBy := fmt.Sprintf("%s(%s)", config.SpaceAggregation.StringValue(), config.MetricName)
+	timeAggOrderBy := fmt.Sprintf("%s(%s)", config.TimeAggregation.StringValue(), config.MetricName)
+	timeSpaceAggOrderBy := fmt.Sprintf("%s(%s(%s))", config.SpaceAggregation.StringValue(), config.TimeAggregation.StringValue(), config.MetricName)
+	return key == spaceAggOrderBy || key == timeAggOrderBy || key == timeSpaceAggOrderBy
+}
+
 func (b *MetricQueryStatementBuilder) BuildFinalSelect(
 	cteFragments []string,
 	cteArgs [][]any,
@@ -546,73 +554,159 @@ func (b *MetricQueryStatementBuilder) BuildFinalSelect(
 ) (*qbtypes.Statement, error) {
 	metricType := query.Aggregations[0].Type
 	spaceAgg := query.Aggregations[0].SpaceAggregation
+	finalCTE := "__spatial_aggregation_cte"
+	if metricType == metrictypes.HistogramType {
+		histogramCTE, histogramCTEArgs, err := b.buildHistogramCTE(query)
+		if err != nil {
+			return nil, err
+		}
+		cteFragments = append(cteFragments, histogramCTE)
+		cteArgs = append(cteArgs, histogramCTEArgs)
+		finalCTE = "__histogram_cte"
+	}
+
+	groupByKeys := querybuilder.GroupByKeys(query.GroupBy)
+	hasGroupBy := len(groupByKeys) > 0
+
+	if hasGroupBy {
+		cteWithAvgColumn := b.buildCTEWithAvgColumn(query, finalCTE)
+		cteFragments = append(cteFragments, cteWithAvgColumn)
+
+		cteWithGroupRankColumn := b.buildCTEWithGroupRank(query)
+		cteFragments = append(cteFragments, cteWithGroupRankColumn)
+		finalCTE = "__with_group_rank_cte"
+	}
 
 	combined := querybuilder.CombineCTEs(cteFragments)
-
 	var args []any
 	for _, a := range cteArgs {
 		args = append(args, a...)
 	}
 
 	sb := sqlbuilder.NewSelectBuilder()
+	sb.Select("ts")
+	if metricType == metrictypes.HistogramType && spaceAgg == metrictypes.SpaceAggregationCount && query.Aggregations[0].ComparisonSpaceAggregationParam == nil {
+		sb.SelectMore("le")
+	}
+	sb.SelectMore(groupByKeys...)
+	sb.SelectMore("value")
+	sb.From(finalCTE)
+	if query.Having != nil && query.Having.Expression != "" {
+		rewriter := querybuilder.NewHavingExpressionRewriter()
+		rewrittenExpr := rewriter.RewriteForMetrics(query.Having.Expression, query.Aggregations)
+		sb.Where(rewrittenExpr)
+	}
 
-	if metricType == metrictypes.HistogramType && spaceAgg.IsPercentile() {
-		quantile := query.Aggregations[0].SpaceAggregation.Percentile()
-		sb.Select("ts")
-		for _, g := range query.GroupBy {
-			sb.SelectMore(fmt.Sprintf("`%s`", g.TelemetryFieldKey.Name))
-		}
-		sb.SelectMore(fmt.Sprintf(
-			"histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), %.3f) AS value",
-			quantile,
-		))
-		sb.From("__spatial_aggregation_cte")
-		sb.GroupBy(querybuilder.GroupByKeys(query.GroupBy)...)
-		sb.GroupBy("ts")
-		if query.Having != nil && query.Having.Expression != "" {
-			rewriter := querybuilder.NewHavingExpressionRewriter()
-			rewrittenExpr := rewriter.RewriteForMetrics(query.Having.Expression, query.Aggregations)
-			sb.Having(rewrittenExpr)
-		}
-	} else if metricType == metrictypes.HistogramType && spaceAgg == metrictypes.SpaceAggregationCount && query.Aggregations[0].ComparisonSpaceAggregationParam != nil {
-		sb.Select("ts")
-
-		for _, g := range query.GroupBy {
-			sb.SelectMore(fmt.Sprintf("`%s`", g.TelemetryFieldKey.Name))
-		}
-
-		aggQuery, err := AggregationQueryForHistogramCountWithParams(query.Aggregations[0].ComparisonSpaceAggregationParam)
-		if err != nil {
-			return nil, err
-		}
-		sb.SelectMore(aggQuery)
-
-		sb.From("__spatial_aggregation_cte")
-
-		sb.GroupBy(querybuilder.GroupByKeys(query.GroupBy)...)
-		sb.GroupBy("ts")
-
-		if query.Having != nil && query.Having.Expression != "" {
-			rewriter := querybuilder.NewHavingExpressionRewriter()
-			rewrittenExpr := rewriter.RewriteForMetrics(query.Having.Expression, query.Aggregations)
-			sb.Having(rewrittenExpr)
-		}
-	} else {
-		// for count aggregation on histograms with no params, the exact result of spatial aggregation can be sent forward
-		sb.Select("*")
-		sb.From("__spatial_aggregation_cte")
-		if query.Having != nil && query.Having.Expression != "" {
-			rewriter := querybuilder.NewHavingExpressionRewriter()
-			rewrittenExpr := rewriter.RewriteForMetrics(query.Having.Expression, query.Aggregations)
-			sb.Where(rewrittenExpr)
+	if hasGroupBy {
+		sb.OrderBy("group_rank")
+		if query.Limit > 0 {
+			sb.Where(fmt.Sprintf("group_rank <= %d", query.Limit))
 		}
 	}
-	sb.OrderBy(querybuilder.GroupByKeys(query.GroupBy)...)
-	sb.OrderBy("ts")
 	if metricType == metrictypes.HistogramType && spaceAgg == metrictypes.SpaceAggregationCount && query.Aggregations[0].ComparisonSpaceAggregationParam == nil {
 		sb.OrderBy("toFloat64(le)")
 	}
+	sb.OrderBy("ts ASC")
 
 	q, a := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
 	return &qbtypes.Statement{Query: combined + q, Args: append(args, a...)}, nil
 }
+
+func (b *MetricQueryStatementBuilder) buildHistogramCTE(
+	query qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation],
+) (string, []any, error) {
+	spaceAgg := query.Aggregations[0].SpaceAggregation
+	histogramCTEQueryBuilder := sqlbuilder.NewSelectBuilder()
+	if spaceAgg.IsPercentile() {
+		histogramCTEQueryBuilder.Select("ts")
+		for _, g := range query.GroupBy {
+			histogramCTEQueryBuilder.SelectMore(fmt.Sprintf("`%s`", g.TelemetryFieldKey.Name))
+		}
+		quantile := spaceAgg.Percentile()
+		histogramCTEQueryBuilder.SelectMore(fmt.Sprintf(
+			"histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), %.3f) AS value",
+			quantile,
+		))
+		histogramCTEQueryBuilder.From("__spatial_aggregation_cte")
+		histogramCTEQueryBuilder.GroupBy(querybuilder.GroupByKeys(query.GroupBy)...)
+		histogramCTEQueryBuilder.GroupBy("ts")
+	} else if spaceAgg == metrictypes.SpaceAggregationCount && query.Aggregations[0].ComparisonSpaceAggregationParam != nil {
+		histogramCTEQueryBuilder.Select("ts")
+		for _, g := range query.GroupBy {
+			histogramCTEQueryBuilder.SelectMore(fmt.Sprintf("`%s`", g.TelemetryFieldKey.Name))
+		}
+		aggQuery, err := AggregationQueryForHistogramCountWithParams(query.Aggregations[0].ComparisonSpaceAggregationParam)
+		if err != nil {
+			return "", nil, err
+		}
+		histogramCTEQueryBuilder.SelectMore(aggQuery)
+		histogramCTEQueryBuilder.From("__spatial_aggregation_cte")
+		histogramCTEQueryBuilder.GroupBy(querybuilder.GroupByKeys(query.GroupBy)...)
+		histogramCTEQueryBuilder.GroupBy("ts")
+	} else {
+		// for count aggregation on histograms with no params, the exact result of spatial aggregation can be sent forward
+		histogramCTEQueryBuilder.Select("*")
+		histogramCTEQueryBuilder.From("__spatial_aggregation_cte")
+	}
+	histogramQueryCTE, histogramQueryCTEArgs := histogramCTEQueryBuilder.BuildWithFlavor(sqlbuilder.ClickHouse)
+	histogramCTE := fmt.Sprintf("__histogram_cte AS (%s)", histogramQueryCTE)
+
+	return histogramCTE, histogramQueryCTEArgs, nil
+}
+
+/*
+this receives a CTE (__spatial_aggregation_cte or __histogram_cte) that has columns ts, value, and a column each for all the group by keys
+it creates a CTE (__with_avg_cte) that adds a column avg_val which has the avg value for the group the row belongs in
+*/
+func (b *MetricQueryStatementBuilder) buildCTEWithAvgColumn(
+	query qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation],
+	latestCTE string,
+) string {
+	withAvgCTEBuilder := sqlbuilder.NewSelectBuilder()
+	withAvgCTEBuilder.Select("*")
+	groupByKeys := querybuilder.GroupByKeys(query.GroupBy)
+	withAvgCTEBuilder.SelectMore(fmt.Sprintf("avgIf(value, isNaN(value) = 0) OVER (PARTITION BY %s) AS avg_val", strings.Join(groupByKeys, ",")))
+	withAvgCTEBuilder.From(latestCTE)
+	withAvgCTEQuery, _ := withAvgCTEBuilder.BuildWithFlavor(sqlbuilder.ClickHouse) // no args so second return param is ignored
+	withAvgCTE := fmt.Sprintf("__with_avg_cte AS (%s)", withAvgCTEQuery)
+	return withAvgCTE
+}
+
+/*
+this receives the __with_avg_cte that has columns ts, value, a column each for all the group by keys, and avg_val which has the avg value for the group the row belongs in
+it creates a CTE (__with_group_rank_cte) that adds a column group_rank that ranks each group based on the order by keys (or by avg val if there are none)
+*/
+func (b *MetricQueryStatementBuilder) buildCTEWithGroupRank(
+	query qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation],
+) string {
+	withGroupByCTEBuilder := sqlbuilder.NewSelectBuilder()
+	withGroupByCTEBuilder.Select("*")
+
+	windowOrder := []string{}
+	orderedKeys := map[string]struct{}{} // this will be used to add the remaining keys as tie breakers in the end
+	if len(query.Order) > 0 {
+		for _, o := range query.Order {
+			key := o.Key.Name
+			if isMetricAggOrderByKey(key, query.Aggregations[0]) {
+				windowOrder = append(windowOrder, fmt.Sprintf("avg_val %s", o.Direction.StringValue()))
+			} else {
+				windowOrder = append(windowOrder, fmt.Sprintf("`%s` %s", key, o.Direction.StringValue()))
+				orderedKeys[fmt.Sprintf("`%s`", key)] = struct{}{}
+			}
+		}
+	} else {
+		windowOrder = append(windowOrder, "avg_val DESC")
+	}
+	groupByKeys := querybuilder.GroupByKeys(query.GroupBy)
+	for _, gk := range groupByKeys { // keys that haven't been added via order by keys will be added at the end as tie breakers
+		if _, ok := orderedKeys[gk]; !ok {
+			windowOrder = append(windowOrder, fmt.Sprintf("%s ASC", gk))
+		}
+	}
+	withGroupByCTEBuilder.SelectMore(fmt.Sprintf("dense_rank() OVER (ORDER BY %s) AS group_rank", strings.Join(windowOrder, ",")))
+
+	withGroupByCTEBuilder.From("__with_avg_cte")
+	withGroupRankCTEQuery, _ := withGroupByCTEBuilder.BuildWithFlavor(sqlbuilder.ClickHouse) // no args so second return param is ignored
+	withGroupRankCTE := fmt.Sprintf("__with_group_rank_cte AS (%s)", withGroupRankCTEQuery)
+	return withGroupRankCTE
+}

pkg/telemetrymetrics/stmt_builder_test.go

@@ -15,16 +15,17 @@ import (
 )
 
 func TestStatementBuilder(t *testing.T) {
-	cases := []struct {
-		name        string
-		requestType qbtypes.RequestType
-		query       qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]
-		expected    qbtypes.Statement
-		expectedErr error
-	}{
+	type baseQuery struct {
+		name     string
+		query    qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]
+		orderKey string
+		args     []any
+		cte      string
+	}
+
+	bases := []baseQuery{
 		{
-			name:        "test_cumulative_rate_sum",
-			requestType: qbtypes.RequestTypeTimeSeries,
+			name: "cumulative_rate_sum",
 			query: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
 				Signal:       telemetrytypes.SignalMetrics,
 				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
@@ -40,24 +41,16 @@ func TestStatementBuilder(t *testing.T) {
 				Filter: &qbtypes.Filter{
 					Expression: "service.name = 'cartservice'",
 				},
-				Limit: 10,
 				GroupBy: []qbtypes.GroupByKey{
-					{
-						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-							Name: "service.name",
-						},
-					},
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}},
 				},
 			},
-			expected: qbtypes.Statement{
-				Query: "WITH __temporal_aggregation_cte AS (SELECT ts, `service.name`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, max(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND JSONExtractString(labels, 'service.name') = ? GROUP BY fingerprint, `service.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `service.name` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `service.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `service.name`, ts",
-				Args:  []any{"signoz_calls_total", uint64(1747936800000), uint64(1747983420000), "cumulative", false, "cartservice", "signoz_calls_total", uint64(1747947360000), uint64(1747983420000), 0},
-			},
-			expectedErr: nil,
+			orderKey: "service.name",
+			args:     []any{"signoz_calls_total", uint64(1747936800000), uint64(1747983420000), "cumulative", false, "cartservice", "signoz_calls_total", uint64(1747947360000), uint64(1747983420000), 0},
+			cte:      "WITH __temporal_aggregation_cte AS (SELECT ts, `service.name`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, max(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND JSONExtractString(labels, 'service.name') = ? GROUP BY fingerprint, `service.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `service.name` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `service.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`)",
 		},
 		{
-			name:        "test_cumulative_rate_sum_with_mat_column",
-			requestType: qbtypes.RequestTypeTimeSeries,
+			name: "cumulative_rate_sum_with_mat_column",
 			query: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
 				Signal:       telemetrytypes.SignalMetrics,
 				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
@@ -73,24 +66,16 @@ func TestStatementBuilder(t *testing.T) {
 				Filter: &qbtypes.Filter{
 					Expression: "materialized.key.name REGEXP 'cartservice' OR service.name = 'cartservice'",
 				},
-				Limit: 10,
 				GroupBy: []qbtypes.GroupByKey{
-					{
-						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-							Name: "service.name",
-						},
-					},
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}},
 				},
 			},
-			expected: qbtypes.Statement{
-				Query: "WITH __temporal_aggregation_cte AS (SELECT ts, `service.name`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, max(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND (match(JSONExtractString(labels, 'materialized.key.name'), ?) OR JSONExtractString(labels, 'service.name') = ?) GROUP BY fingerprint, `service.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `service.name` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `service.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `service.name`, ts",
-				Args:  []any{"signoz_calls_total", uint64(1747936800000), uint64(1747983420000), "cumulative", false, "cartservice", "cartservice", "signoz_calls_total", uint64(1747947360000), uint64(1747983420000), 0},
-			},
-			expectedErr: nil,
+			orderKey: "service.name",
+			args:     []any{"signoz_calls_total", uint64(1747936800000), uint64(1747983420000), "cumulative", false, "cartservice", "cartservice", "signoz_calls_total", uint64(1747947360000), uint64(1747983420000), 0},
+			cte:      "WITH __temporal_aggregation_cte AS (SELECT ts, `service.name`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, max(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND (match(JSONExtractString(labels, 'materialized.key.name'), ?) OR JSONExtractString(labels, 'service.name') = ?) GROUP BY fingerprint, `service.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `service.name` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `service.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`)",
 		},
 		{
-			name:        "test_delta_rate_sum",
-			requestType: qbtypes.RequestTypeTimeSeries,
+			name: "delta_rate_sum",
 			query: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
 				Signal:       telemetrytypes.SignalMetrics,
 				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
@@ -106,24 +91,16 @@ func TestStatementBuilder(t *testing.T) {
 				Filter: &qbtypes.Filter{
 					Expression: "service.name = 'cartservice'",
 				},
-				Limit: 10,
 				GroupBy: []qbtypes.GroupByKey{
-					{
-						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-							Name: "service.name",
-						},
-					},
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}},
 				},
 			},
-			expected: qbtypes.Statement{
-				Query: "WITH __spatial_aggregation_cte AS (SELECT toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, sum(value)/30 AS value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND JSONExtractString(labels, 'service.name') = ? GROUP BY fingerprint, `service.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY ts, `service.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `service.name`, ts",
-				Args:  []any{"signoz_calls_total", uint64(1747936800000), uint64(1747983420000), "delta", false, "cartservice", "signoz_calls_total", uint64(1747947390000), uint64(1747983420000)},
-			},
-			expectedErr: nil,
+			orderKey: "service.name",
+			args:     []any{"signoz_calls_total", uint64(1747936800000), uint64(1747983420000), "delta", false, "cartservice", "signoz_calls_total", uint64(1747947390000), uint64(1747983420000)},
+			cte:      "WITH __spatial_aggregation_cte AS (SELECT toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, sum(value)/30 AS value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND JSONExtractString(labels, 'service.name') = ? GROUP BY fingerprint, `service.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY ts, `service.name`)",
 		},
 		{
-			name:        "test_histogram_percentile1",
-			requestType: qbtypes.RequestTypeTimeSeries,
+			name: "histogram_percentile1",
 			query: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
 				Signal:       telemetrytypes.SignalMetrics,
 				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
@@ -139,24 +116,38 @@ func TestStatementBuilder(t *testing.T) {
 				Filter: &qbtypes.Filter{
 					Expression: "service.name = 'cartservice'",
 				},
-				Limit: 10,
 				GroupBy: []qbtypes.GroupByKey{
-					{
-						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-							Name: "service.name",
-						},
-					},
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}},
 				},
 			},
-			expected: qbtypes.Statement{
-				Query: "WITH __spatial_aggregation_cte AS (SELECT toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, `le`, sum(value)/30 AS value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name`, JSONExtractString(labels, 'le') AS `le` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND JSONExtractString(labels, 'service.name') = ? GROUP BY fingerprint, `service.name`, `le`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY ts, `service.name`, `le`) SELECT ts, `service.name`, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.950) AS value FROM __spatial_aggregation_cte GROUP BY `service.name`, ts ORDER BY `service.name`, ts",
-				Args:  []any{"signoz_latency", uint64(1747936800000), uint64(1747983420000), "delta", false, "cartservice", "signoz_latency", uint64(1747947390000), uint64(1747983420000)},
-			},
-			expectedErr: nil,
+			orderKey: "service.name",
+			args:     []any{"signoz_latency", uint64(1747936800000), uint64(1747983420000), "delta", false, "cartservice", "signoz_latency", uint64(1747947390000), uint64(1747983420000)},
+			cte:      "WITH __spatial_aggregation_cte AS (SELECT toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, `le`, sum(value)/30 AS value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name`, JSONExtractString(labels, 'le') AS `le` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND JSONExtractString(labels, 'service.name') = ? GROUP BY fingerprint, `service.name`, `le`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY ts, `service.name`, `le`), __histogram_cte AS (SELECT ts, `service.name`, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.950) AS value FROM __spatial_aggregation_cte GROUP BY `service.name`, ts)",
 		},
 		{
-			name:        "test_gauge_avg_sum",
-			requestType: qbtypes.RequestTypeTimeSeries,
+			name: "histogram_percentile2",
+			query: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+				Signal:       telemetrytypes.SignalMetrics,
+				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
+				Aggregations: []qbtypes.MetricAggregation{
+					{
+						MetricName:       "http_server_duration_bucket",
+						Type:             metrictypes.HistogramType,
+						Temporality:      metrictypes.Cumulative,
+						TimeAggregation:  metrictypes.TimeAggregationRate,
+						SpaceAggregation: metrictypes.SpaceAggregationPercentile95,
+					},
+				},
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}},
+				},
+			},
+			orderKey: "service.name",
+			args:     []any{"http_server_duration_bucket", uint64(1747936800000), uint64(1747983420000), "cumulative", false, "http_server_duration_bucket", uint64(1747947360000), uint64(1747983420000), 0},
+			cte:      "WITH __temporal_aggregation_cte AS (SELECT ts, `service.name`, `le`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, `le`, max(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name`, JSONExtractString(labels, 'le') AS `le` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? GROUP BY fingerprint, `service.name`, `le`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `service.name`, `le` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `service.name`, `le`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`, `le`), __histogram_cte AS (SELECT ts, `service.name`, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.950) AS value FROM __spatial_aggregation_cte GROUP BY `service.name`, ts)",
+		},
+		{
+			name: "gauge_avg_sum",
 			query: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
 				Signal:       telemetrytypes.SignalMetrics,
 				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
@@ -172,53 +163,83 @@ func TestStatementBuilder(t *testing.T) {
 				Filter: &qbtypes.Filter{
 					Expression: "host.name = 'big-data-node-1'",
 				},
-				Limit: 10,
 				GroupBy: []qbtypes.GroupByKey{
-					{
-						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-							Name: "host.name",
-						},
-					},
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "host.name"}},
 				},
 			},
-			expected: qbtypes.Statement{
-				Query: "WITH __temporal_aggregation_cte AS (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `host.name`, avg(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'host.name') AS `host.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND JSONExtractString(labels, 'host.name') = ? GROUP BY fingerprint, `host.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `host.name` ORDER BY fingerprint, ts), __spatial_aggregation_cte AS (SELECT ts, `host.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `host.name`) SELECT * FROM __spatial_aggregation_cte ORDER BY `host.name`, ts",
-				Args:  []any{"system.memory.usage", uint64(1747936800000), uint64(1747983420000), "unspecified", false, "big-data-node-1", "system.memory.usage", uint64(1747947390000), uint64(1747983420000), 0},
-			},
-			expectedErr: nil,
-		},
-		{
-			name:        "test_histogram_percentile2",
-			requestType: qbtypes.RequestTypeTimeSeries,
-			query: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-				Signal:       telemetrytypes.SignalMetrics,
-				StepInterval: qbtypes.Step{Duration: 30 * time.Second},
-				Aggregations: []qbtypes.MetricAggregation{
-					{
-						MetricName:       "http_server_duration_bucket",
-						Type:             metrictypes.HistogramType,
-						Temporality:      metrictypes.Cumulative,
-						TimeAggregation:  metrictypes.TimeAggregationRate,
-						SpaceAggregation: metrictypes.SpaceAggregationPercentile95,
-					},
-				},
-				Limit: 10,
-				GroupBy: []qbtypes.GroupByKey{
-					{
-						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-							Name: "service.name",
-						},
-					},
-				},
-			},
-			expected: qbtypes.Statement{
-				Query: "WITH __temporal_aggregation_cte AS (SELECT ts, `service.name`, `le`, multiIf(row_number() OVER rate_window = 1, nan, (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) < 0, per_series_value / (ts - lagInFrame(ts, 1) OVER rate_window), (per_series_value - lagInFrame(per_series_value, 1) OVER rate_window) / (ts - lagInFrame(ts, 1) OVER rate_window)) AS per_series_value FROM (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `service.name`, `le`, max(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'service.name') AS `service.name`, JSONExtractString(labels, 'le') AS `le` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? GROUP BY fingerprint, `service.name`, `le`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `service.name`, `le` ORDER BY fingerprint, ts) WINDOW rate_window AS (PARTITION BY fingerprint ORDER BY fingerprint, ts)), __spatial_aggregation_cte AS (SELECT ts, `service.name`, `le`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `service.name`, `le`) SELECT ts, `service.name`, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), 0.950) AS value FROM __spatial_aggregation_cte GROUP BY `service.name`, ts ORDER BY `service.name`, ts",
-				Args:  []any{"http_server_duration_bucket", uint64(1747936800000), uint64(1747983420000), "cumulative", false, "http_server_duration_bucket", uint64(1747947360000), uint64(1747983420000), 0},
-			},
-			expectedErr: nil,
+			orderKey: "host.name",
+			args:     []any{"system.memory.usage", uint64(1747936800000), uint64(1747983420000), "unspecified", false, "big-data-node-1", "system.memory.usage", uint64(1747947390000), uint64(1747983420000), 0},
+			cte:      "WITH __temporal_aggregation_cte AS (SELECT fingerprint, toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalSecond(30)) AS ts, `host.name`, avg(value) AS per_series_value FROM signoz_metrics.distributed_samples_v4 AS points INNER JOIN (SELECT fingerprint, JSONExtractString(labels, 'host.name') AS `host.name` FROM signoz_metrics.time_series_v4_6hrs WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli <= ? AND LOWER(temporality) LIKE LOWER(?) AND __normalized = ? AND JSONExtractString(labels, 'host.name') = ? GROUP BY fingerprint, `host.name`) AS filtered_time_series ON points.fingerprint = filtered_time_series.fingerprint WHERE metric_name IN (?) AND unix_milli >= ? AND unix_milli < ? GROUP BY fingerprint, ts, `host.name` ORDER BY fingerprint, ts), __spatial_aggregation_cte AS (SELECT ts, `host.name`, sum(per_series_value) AS value FROM __temporal_aggregation_cte WHERE isNaN(per_series_value) = ? GROUP BY ts, `host.name`)",
 		},
 	}
 
+	type variant struct {
+		name     string
+		limit    int
+		hasOrder bool
+	}
+
+	variants := []variant{
+		{"with_limits", 10, false},
+		{"without_limits", 0, false},
+		{"with_order_by", 0, true},
+		{"with_order_by_and_limits", 10, true},
+	}
+
+	sumMetricsFinalSelects := map[string]string{
+		"with_limits":              " SELECT * FROM __spatial_aggregation_cte WHERE (`service.name`) IN (SELECT `service.name` FROM __spatial_aggregation_cte GROUP BY `service.name` ORDER BY avg(value) DESC LIMIT 10) ORDER BY avg(value) OVER (PARTITION BY `service.name`) DESC, `service.name`, ts ASC",
+		"without_limits":           " SELECT * FROM __spatial_aggregation_cte ORDER BY avg(value) OVER (PARTITION BY `service.name`) DESC, `service.name`, ts ASC",
+		"with_order_by":            " SELECT * FROM __spatial_aggregation_cte ORDER BY `service.name` asc, ts ASC",
+		"with_order_by_and_limits": " SELECT * FROM __spatial_aggregation_cte WHERE (`service.name`) IN (SELECT `service.name` FROM __spatial_aggregation_cte GROUP BY `service.name` ORDER BY `service.name` asc LIMIT 10) ORDER BY `service.name` asc, ts ASC",
+	}
+
+	histogramMetricsFinalSelects := map[string]string{
+		"with_limits":              " SELECT * FROM __histogram_cte WHERE (`service.name`) IN (SELECT `service.name` FROM __histogram_cte GROUP BY `service.name` ORDER BY avg(value) DESC LIMIT 10) ORDER BY avg(value) OVER (PARTITION BY `service.name`) DESC, `service.name`, ts ASC",
+		"without_limits":           " SELECT * FROM __histogram_cte ORDER BY avg(value) OVER (PARTITION BY `service.name`) DESC, `service.name`, ts ASC",
+		"with_order_by":            " SELECT * FROM __histogram_cte ORDER BY `service.name` asc, ts ASC",
+		"with_order_by_and_limits": " SELECT * FROM __histogram_cte WHERE (`service.name`) IN (SELECT `service.name` FROM __histogram_cte GROUP BY `service.name` ORDER BY `service.name` asc LIMIT 10) ORDER BY `service.name` asc, ts ASC",
+	}
+
+	// expectedFinalSelects maps "base/variant" to the final SELECT portion after the CTE.
+	// The full expected query is: base.cte + expectedFinalSelects[name]
+	expectedFinalSelects := map[string]string{
+		// cumulative_rate_sum
+		"cumulative_rate_sum/with_limits":              sumMetricsFinalSelects["with_limits"],
+		"cumulative_rate_sum/without_limits":           sumMetricsFinalSelects["without_limits"],
+		"cumulative_rate_sum/with_order_by":            sumMetricsFinalSelects["with_order_by"],
+		"cumulative_rate_sum/with_order_by_and_limits": sumMetricsFinalSelects["with_order_by_and_limits"],
+
+		// cumulative_rate_sum_with_mat_column
+		"cumulative_rate_sum_with_mat_column/with_limits":              sumMetricsFinalSelects["with_limits"],
+		"cumulative_rate_sum_with_mat_column/without_limits":           sumMetricsFinalSelects["without_limits"],
+		"cumulative_rate_sum_with_mat_column/with_order_by":            sumMetricsFinalSelects["with_order_by"],
+		"cumulative_rate_sum_with_mat_column/with_order_by_and_limits": sumMetricsFinalSelects["with_order_by_and_limits"],
+
+		// delta_rate_sum
+		"delta_rate_sum/with_limits":              sumMetricsFinalSelects["with_limits"],
+		"delta_rate_sum/without_limits":           sumMetricsFinalSelects["without_limits"],
+		"delta_rate_sum/with_order_by":            sumMetricsFinalSelects["with_order_by"],
+		"delta_rate_sum/with_order_by_and_limits": sumMetricsFinalSelects["with_order_by_and_limits"],
+
+		// histogram_percentile1
+		"histogram_percentile1/with_limits":              histogramMetricsFinalSelects["with_limits"],
+		"histogram_percentile1/without_limits":           histogramMetricsFinalSelects["without_limits"],
+		"histogram_percentile1/with_order_by":            histogramMetricsFinalSelects["with_order_by"],
+		"histogram_percentile1/with_order_by_and_limits": histogramMetricsFinalSelects["with_order_by_and_limits"],
+
+		// histogram_percentile2
+		"histogram_percentile2/with_limits":              histogramMetricsFinalSelects["with_limits"],
+		"histogram_percentile2/without_limits":           histogramMetricsFinalSelects["without_limits"],
+		"histogram_percentile2/with_order_by":            histogramMetricsFinalSelects["with_order_by"],
+		"histogram_percentile2/with_order_by_and_limits": histogramMetricsFinalSelects["with_order_by_and_limits"],
+
+		// gauge_avg_sum
+		"gauge_avg_sum/with_limits":              " SELECT * FROM __spatial_aggregation_cte WHERE (`host.name`) IN (SELECT `host.name` FROM __spatial_aggregation_cte GROUP BY `host.name` ORDER BY avg(value) DESC LIMIT 10) ORDER BY avg(value) OVER (PARTITION BY `host.name`) DESC, `host.name`, ts ASC",
+		"gauge_avg_sum/without_limits":           " SELECT * FROM __spatial_aggregation_cte ORDER BY avg(value) OVER (PARTITION BY `host.name`) DESC, `host.name`, ts ASC",
+		"gauge_avg_sum/with_order_by":            " SELECT * FROM __spatial_aggregation_cte ORDER BY `host.name` asc, ts ASC",
+		"gauge_avg_sum/with_order_by_and_limits": " SELECT * FROM __spatial_aggregation_cte WHERE (`host.name`) IN (SELECT `host.name` FROM __spatial_aggregation_cte GROUP BY `host.name` ORDER BY `host.name` asc LIMIT 10) ORDER BY `host.name` asc, ts ASC",
+	}
+
 	fm := NewFieldMapper()
 	cb := NewConditionBuilder(fm)
 	mockMetadataStore := telemetrytypestest.NewMockMetadataStore()
@@ -227,15 +248,13 @@ func TestStatementBuilder(t *testing.T) {
 		t.Fatalf("failed to load field keys: %v", err)
 	}
 	mockMetadataStore.KeysMap = keys
-	// NOTE: LoadFieldKeysFromJSON doesn't set Materialized field
-	// for keys, so we have to set it manually here for testing
 	if _, ok := mockMetadataStore.KeysMap["materialized.key.name"]; ok {
 		if len(mockMetadataStore.KeysMap["materialized.key.name"]) > 0 {
 			mockMetadataStore.KeysMap["materialized.key.name"][0].Materialized = true
 		}
 	}
 
-	flagger, err := flagger.New(context.Background(), instrumentationtest.New().ToProviderSettings(), flagger.Config{}, flagger.MustNewRegistry())
+	fl, err := flagger.New(context.Background(), instrumentationtest.New().ToProviderSettings(), flagger.Config{}, flagger.MustNewRegistry())
 	if err != nil {
 		t.Fatalf("failed to create flagger: %v", err)
 	}
@@ -245,23 +264,30 @@ func TestStatementBuilder(t *testing.T) {
 		mockMetadataStore,
 		fm,
 		cb,
-		flagger,
+		fl,
 	)
 
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
+	for _, b := range bases {
+		for _, v := range variants {
+			name := b.name + "/" + v.name
+			t.Run(name, func(t *testing.T) {
+				q := b.query
+				q.Limit = v.limit
+				if v.hasOrder {
+					q.Order = []qbtypes.OrderBy{
+						{
+							Key:       qbtypes.OrderByKey{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: b.orderKey}},
+							Direction: qbtypes.OrderDirectionAsc,
+						},
+					}
+				}
 
-			q, err := statementBuilder.Build(context.Background(), 1747947419000, 1747983448000, c.requestType, c.query, nil)
+				result, err := statementBuilder.Build(context.Background(), 1747947419000, 1747983448000, qbtypes.RequestTypeTimeSeries, q, nil)
 
-			if c.expectedErr != nil {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), c.expectedErr.Error())
-			} else {
 				require.NoError(t, err)
-				require.Equal(t, c.expected.Query, q.Query)
-				require.Equal(t, c.expected.Args, q.Args)
-				require.Equal(t, c.expected.Warnings, q.Warnings)
-			}
-		})
+				require.Equal(t, b.cte+expectedFinalSelects[name], result.Query)
+				require.Equal(t, b.args, result.Args)
+			})
+		}
 	}
 }

pkg/telemetrytraces/statement_builder.go

@@ -111,6 +111,23 @@ func (b *traceQueryStatementBuilder) Build(
 
 	query = b.adjustKeys(ctx, keys, query, requestType)
 
+	// Check if filter contains trace_id(s) and optimize time range if needed
+	if query.Filter != nil && query.Filter.Expression != "" && b.telemetryStore != nil {
+		traceIDs, found := ExtractTraceIDsFromFilter(query.Filter.Expression)
+		if found && len(traceIDs) > 0 {
+			finder := NewTraceTimeRangeFinder(b.telemetryStore)
+
+			traceStart, traceEnd, ok := finder.GetTraceTimeRangeMulti(ctx, traceIDs)
+			if !ok {
+				b.logger.DebugContext(ctx, "failed to get trace time range", slog.Any("trace_ids", traceIDs))
+			} else if traceStart > 0 && traceEnd > 0 {
+				start = uint64(traceStart)
+				end = uint64(traceEnd)
+				b.logger.DebugContext(ctx, "optimized time range for traces", slog.Any("trace_ids", traceIDs), slog.Uint64("start", start), slog.Uint64("end", end))
+			}
+		}
+	}
+
 	// Create SQL builder
 	q := sqlbuilder.NewSelectBuilder()
 

pkg/types/cloudintegrationtypes/account.go

@@ -10,35 +10,34 @@ import (
 type Account struct {
 	types.Identifiable
 	types.TimeAuditable
-	ProviderAccountID *string           `json:"providerAccountId" required:"true" nullable:"true"`
-	Provider          CloudProviderType `json:"provider" required:"true"`
-	RemovedAt         *time.Time        `json:"removedAt" required:"true" nullable:"true"`
-	AgentReport       *AgentReport      `json:"agentReport" required:"true" nullable:"true"`
-	OrgID             valuer.UUID       `json:"orgId" required:"true"`
-	Config            *AccountConfig    `json:"config" required:"true" nullable:"false"`
+	ProviderAccountId *string           `json:"providerAccountID,omitempty"`
+	Provider          CloudProviderType `json:"provider"`
+	RemovedAt         *time.Time        `json:"removedAt,omitempty"`
+	AgentReport       *AgentReport      `json:"agentReport,omitempty"`
+	OrgID             valuer.UUID       `json:"orgID"`
+	Config            *AccountConfig    `json:"config,omitempty"`
 }
 
 // AgentReport represents heartbeats sent by the agent.
 type AgentReport struct {
-	TimestampMillis int64          `json:"timestampMillis" required:"true"`
-	Data            map[string]any `json:"data" required:"true" nullable:"true"`
-}
-
-type AccountConfig struct {
-	// required till new providers are added
-	AWS *AWSAccountConfig `json:"aws" required:"true" nullable:"false"`
+	TimestampMillis int64          `json:"timestampMillis"`
+	Data            map[string]any `json:"data"`
 }
 
 type GettableAccounts struct {
-	Accounts []*Account `json:"accounts" required:"true" nullable:"false"`
+	Accounts []*Account `json:"accounts"`
 }
 
 type GettableAccount = Account
 
 type UpdatableAccount struct {
-	Config *AccountConfig `json:"config" required:"true" nullable:"false"`
+	Config *AccountConfig `json:"config"`
+}
+
+type AccountConfig struct {
+	AWS *AWSAccountConfig `json:"aws,omitempty"`
 }
 
 type AWSAccountConfig struct {
-	Regions []string `json:"regions" required:"true" nullable:"false"`
+	Regions []string `json:"regions"`
 }

pkg/types/cloudintegrationtypes/connection.go

@@ -1,81 +1,88 @@
 package cloudintegrationtypes
 
-import (
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
+import "github.com/SigNoz/signoz/pkg/types/integrationtypes"
 
 type ConnectionArtifactRequest struct {
-	// required till new providers are added
-	Aws *AWSConnectionArtifactRequest `json:"aws" required:"true" nullable:"false"`
+	Aws *AWSConnectionArtifactRequest `json:"aws"`
 }
 
 type AWSConnectionArtifactRequest struct {
-	DeploymentRegion string   `json:"deploymentRegion" required:"true"`
-	Regions          []string `json:"regions" required:"true" nullable:"false"`
+	DeploymentRegion string   `json:"deploymentRegion"`
+	Regions          []string `json:"regions"`
 }
 
 type PostableConnectionArtifact = ConnectionArtifactRequest
 
 type ConnectionArtifact struct {
-	// required till new providers are added
-	Aws *AWSConnectionArtifact `json:"aws" required:"true" nullable:"false"`
+	Aws *AWSConnectionArtifact `json:"aws"`
 }
 
 type AWSConnectionArtifact struct {
-	ConnectionURL string `json:"connectionURL" required:"true"`
+	ConnectionUrl string `json:"connectionURL"`
 }
 
-type GettableAccountWithArtifact struct {
-	ID       valuer.UUID         `json:"id" required:"true"`
-	Artifact *ConnectionArtifact `json:"connectionArtifact" required:"true"`
+type GettableConnectionArtifact = ConnectionArtifact
+
+type AccountStatus struct {
+	Id                string                         `json:"id"`
+	ProviderAccountId *string                        `json:"providerAccountID,omitempty"`
+	Status            integrationtypes.AccountStatus `json:"status"`
 }
 
+type GettableAccountStatus = AccountStatus
+
 type AgentCheckInRequest struct {
-	ProviderAccountID  string `json:"providerAccountId" required:"false"`
-	CloudIntegrationID string `json:"cloudIntegrationId" required:"false"`
+	// older backward compatible fields are mapped to new fields
+	// CloudIntegrationId string `json:"cloudIntegrationId"`
+	// AccountId          string `json:"accountId"`
 
-	Data map[string]any `json:"data" required:"true" nullable:"true"`
+	// New fields
+	ProviderAccountId string `json:"providerAccountId"`
+	CloudAccountId    string `json:"cloudAccountId"`
+
+	Data map[string]any `json:"data,omitempty"`
 }
 
 type PostableAgentCheckInRequest struct {
 	AgentCheckInRequest
 	// following are backward compatible fields for older running agents
 	// which gets mapped to new fields in AgentCheckInRequest
-	ID        string `json:"account_id" required:"false"`       // => CloudIntegrationID
-	AccountID string `json:"cloud_account_id" required:"false"` // => ProviderAccountID
-}
-
-type AgentCheckInResponse struct {
-	CloudIntegrationID string                     `json:"cloudIntegrationId" required:"true"`
-	ProviderAccountID  string                     `json:"providerAccountId" required:"true"`
-	IntegrationConfig  *ProviderIntegrationConfig `json:"integrationConfig" required:"true"`
-	RemovedAt          *time.Time                 `json:"removedAt" required:"true" nullable:"true"`
+	CloudIntegrationId string `json:"cloud_integration_id"`
+	CloudAccountId     string `json:"cloud_account_id"`
 }
 
 type GettableAgentCheckInResponse struct {
-	// Older fields for backward compatibility with existing AWS agents
-	AccountID              string             `json:"account_id" required:"true"`
-	CloudAccountID         string             `json:"cloud_account_id" required:"true"`
-	OlderIntegrationConfig *IntegrationConfig `json:"integration_config" required:"true" nullable:"true"`
-	OlderRemovedAt         *time.Time         `json:"removed_at" required:"true" nullable:"true"`
-
 	AgentCheckInResponse
+
+	// For backward compatibility
+	CloudIntegrationId string `json:"cloud_integration_id"`
+	AccountId          string `json:"account_id"`
+}
+
+type AgentCheckInResponse struct {
+	// Older fields for backward compatibility are mapped to new fields below
+	// CloudIntegrationId string `json:"cloud_integration_id"`
+	// AccountId          string `json:"account_id"`
+
+	// New fields
+	ProviderAccountId string `json:"providerAccountId"`
+	CloudAccountId    string `json:"cloudAccountId"`
+
+	// IntegrationConfig populates data related to integration that is required for an agent
+	// to start collecting telemetry data
+	// keeping JSON key snake_case for backward compatibility
+	IntegrationConfig *IntegrationConfig `json:"integration_config,omitempty"`
 }
 
-// IntegrationConfig older integration config struct for backward compatibility,
-// this will be eventually removed once agents are updated to use new struct.
 type IntegrationConfig struct {
-	EnabledRegions []string               `json:"enabled_regions" required:"true" nullable:"false"` // backward compatible
-	Telemetry      *AWSCollectionStrategy `json:"telemetry" required:"true" nullable:"false"`       // backward compatible
-}
+	EnabledRegions []string               `json:"enabledRegions"`      // backward compatible
+	Telemetry      *AWSCollectionStrategy `json:"telemetry,omitempty"` // backward compatible
 
-type ProviderIntegrationConfig struct {
-	AWS *AWSIntegrationConfig `json:"aws" required:"true" nullable:"false"`
+	// new fields
+	AWS *AWSIntegrationConfig `json:"aws,omitempty"`
 }
 
 type AWSIntegrationConfig struct {
-	EnabledRegions []string               `json:"enabledRegions" required:"true" nullable:"false"`
-	Telemetry      *AWSCollectionStrategy `json:"telemetry" required:"true" nullable:"false"`
+	EnabledRegions []string               `json:"enabledRegions"`
+	Telemetry      *AWSCollectionStrategy `json:"telemetry,omitempty"`
 }

pkg/types/cloudintegrationtypes/service.go

@@ -10,19 +10,20 @@ import (
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
-var ErrCodeInvalidServiceID = errors.MustNewCode("invalid_service_id")
+var (
+	S3Sync = valuer.NewString("s3sync")
+	// ErrCodeInvalidServiceID is the error code for invalid service id.
+	ErrCodeInvalidServiceID = errors.MustNewCode("invalid_service_id")
+)
+
+type ServiceID struct{ valuer.String }
 
 type CloudIntegrationService struct {
 	types.Identifiable
 	types.TimeAuditable
 	Type               ServiceID      `json:"type"`
 	Config             *ServiceConfig `json:"config"`
-	CloudIntegrationID valuer.UUID    `json:"cloudIntegrationId"`
-}
-
-type ServiceConfig struct {
-	// required till new providers are added
-	AWS *AWSServiceConfig `json:"aws" required:"true" nullable:"false"`
+	CloudIntegrationID valuer.UUID    `json:"cloudIntegrationID"`
 }
 
 // ServiceMetadata helps to quickly list available services and whether it is enabled or not.
@@ -31,56 +32,26 @@ type ServiceConfig struct {
 type ServiceMetadata struct {
 	ServiceDefinitionMetadata
 	// if the service is enabled for the account
-	Enabled bool `json:"enabled" required:"true"`
-}
-
-// ServiceDefinitionMetadata represents service definition metadata. This is useful for showing service tab in frontend.
-type ServiceDefinitionMetadata struct {
-	ID    string `json:"id" required:"true"`
-	Title string `json:"title" required:"true"`
-	Icon  string `json:"icon" required:"true"`
+	Enabled bool `json:"enabled"`
 }
 
 type GettableServicesMetadata struct {
-	Services []*ServiceMetadata `json:"services" required:"true" nullable:"false"`
+	Services []*ServiceMetadata `json:"services"`
 }
 
 type Service struct {
 	ServiceDefinition
-	ServiceConfig *ServiceConfig `json:"serviceConfig" required:"false" nullable:"false"`
+	ServiceConfig *ServiceConfig `json:"serviceConfig"`
 }
 
 type GettableService = Service
 
 type UpdatableService struct {
-	Config *ServiceConfig `json:"config" required:"true" nullable:"false"`
+	Config *ServiceConfig `json:"config"`
 }
 
-type ServiceDefinition struct {
-	ServiceDefinitionMetadata
-	Overview         string              `json:"overview" required:"true"` // markdown
-	Assets           Assets              `json:"assets" required:"true"`
-	SupportedSignals SupportedSignals    `json:"supported_signals" required:"true"`
-	DataCollected    DataCollected       `json:"dataCollected" required:"true"`
-	Strategy         *CollectionStrategy `json:"telemetryCollectionStrategy" required:"true" nullable:"false"`
-}
-
-// SupportedSignals for cloud provider's service.
-type SupportedSignals struct {
-	Logs    bool `json:"logs"`
-	Metrics bool `json:"metrics"`
-}
-
-// DataCollected is curated static list of metrics and logs, this is shown as part of service overview.
-type DataCollected struct {
-	Logs    []CollectedLogAttribute `json:"logs"`
-	Metrics []CollectedMetric       `json:"metrics"`
-}
-
-// CollectionStrategy is cloud provider specific configuration for signal collection,
-// this is used by agent to understand the nitty-gritty for collecting telemetry for the cloud provider.
-type CollectionStrategy struct {
-	AWS *AWSCollectionStrategy `json:"aws" required:"true" nullable:"false"`
+type ServiceConfig struct {
+	AWS *AWSServiceConfig `json:"aws,omitempty"`
 }
 
 type AWSServiceConfig struct {
@@ -99,11 +70,45 @@ type AWSServiceMetricsConfig struct {
 	Enabled bool `json:"enabled"`
 }
 
+// ServiceDefinitionMetadata represents service definition metadata. This is useful for showing service tab in frontend.
+type ServiceDefinitionMetadata struct {
+	Id    string `json:"id"`
+	Title string `json:"title"`
+	Icon  string `json:"icon"`
+}
+
+type ServiceDefinition struct {
+	ServiceDefinitionMetadata
+	Overview         string              `json:"overview"` // markdown
+	Assets           Assets              `json:"assets"`
+	SupportedSignals SupportedSignals    `json:"supported_signals"`
+	DataCollected    DataCollected       `json:"dataCollected"`
+	Strategy         *CollectionStrategy `json:"telemetryCollectionStrategy"`
+}
+
+// CollectionStrategy is cloud provider specific configuration for signal collection,
+// this is used by agent to understand the nitty-gritty for collecting telemetry for the cloud provider.
+type CollectionStrategy struct {
+	AWS *AWSCollectionStrategy `json:"aws,omitempty"`
+}
+
 // Assets represents the collection of dashboards.
 type Assets struct {
 	Dashboards []Dashboard `json:"dashboards"`
 }
 
+// SupportedSignals for cloud provider's service.
+type SupportedSignals struct {
+	Logs    bool `json:"logs"`
+	Metrics bool `json:"metrics"`
+}
+
+// DataCollected is curated static list of metrics and logs, this is shown as part of service overview.
+type DataCollected struct {
+	Logs    []CollectedLogAttribute `json:"logs"`
+	Metrics []CollectedMetric       `json:"metrics"`
+}
+
 // CollectedLogAttribute represents a log attribute that is present in all log entries for a service,
 // this is shown as part of service overview.
 type CollectedLogAttribute struct {
@@ -164,23 +169,56 @@ type AWSLogsStrategy struct {
 // This is used to show available pre-made dashboards for a service,
 // hence has additional fields like id, title and description
 type Dashboard struct {
-	ID          string                               `json:"id"`
+	Id          string                               `json:"id"`
 	Title       string                               `json:"title"`
 	Description string                               `json:"description"`
 	Definition  dashboardtypes.StorableDashboardData `json:"definition,omitempty"`
 }
 
+// SupportedServices is the map of supported services for each cloud provider.
+var SupportedServices = map[CloudProviderType][]ServiceID{
+	CloudProviderTypeAWS: {
+		{valuer.NewString("alb")},
+		{valuer.NewString("api-gateway")},
+		{valuer.NewString("dynamodb")},
+		{valuer.NewString("ec2")},
+		{valuer.NewString("ecs")},
+		{valuer.NewString("eks")},
+		{valuer.NewString("elasticache")},
+		{valuer.NewString("lambda")},
+		{valuer.NewString("msk")},
+		{valuer.NewString("rds")},
+		{valuer.NewString("s3sync")},
+		{valuer.NewString("sns")},
+		{valuer.NewString("sqs")},
+	},
+}
+
+// NewServiceID returns a new ServiceID from a string, validated against the supported services for the given cloud provider.
+func NewServiceID(provider CloudProviderType, service string) (ServiceID, error) {
+	services, ok := SupportedServices[provider]
+	if !ok {
+		return ServiceID{}, errors.NewInvalidInputf(ErrCodeInvalidServiceID, "no services defined for cloud provider: %s", provider)
+	}
+	for _, s := range services {
+		if s.StringValue() == service {
+			return s, nil
+		}
+	}
+	return ServiceID{}, errors.NewInvalidInputf(ErrCodeInvalidServiceID, "invalid service id %q for cloud provider %s", service, provider)
+}
+
 // UTILS
 
 // GetCloudIntegrationDashboardID returns the dashboard id for a cloud integration, given the cloud provider, service id, and dashboard id.
 // This is used to generate unique dashboard ids for cloud integration, and also to parse the dashboard id to get the cloud provider and service id when needed.
-func GetCloudIntegrationDashboardID(cloudProvider CloudProviderType, svcID, dashboardID string) string {
-	return fmt.Sprintf("cloud-integration--%s--%s--%s", cloudProvider, svcID, dashboardID)
+func GetCloudIntegrationDashboardID(cloudProvider CloudProviderType, svcId, dashboardId string) string {
+	return fmt.Sprintf("cloud-integration--%s--%s--%s", cloudProvider, svcId, dashboardId)
 }
 
 // GetDashboardsFromAssets returns the list of dashboards for the cloud provider service from definition.
 func GetDashboardsFromAssets(
-	svcID string,
+	svcId string,
 	orgID valuer.UUID,
 	cloudProvider CloudProviderType,
 	createdAt time.Time,
@@ -191,7 +229,7 @@ func GetDashboardsFromAssets(
 	for _, d := range assets.Dashboards {
 		author := fmt.Sprintf("%s-integration", cloudProvider)
 		dashboards = append(dashboards, &dashboardtypes.Dashboard{
-			ID:     GetCloudIntegrationDashboardID(cloudProvider, svcID, d.ID),
+			ID:     GetCloudIntegrationDashboardID(cloudProvider, svcId, d.Id),
 			Locked: true,
 			OrgID:  orgID,
 			Data:   d.Definition,