Merge branch 'main' into issue_5602

commit 6d0b607f41b80583b2f4dc015c728d57fd0a3f6a
Author: nityanandagohain <nityanandagohain@gmail.com>
Date:   Wed Jul 15 10:30:43 2026 +0530

    fix: update tests

commit 20f42474b0901e49cc745155a2c70bb829988a94
Merge: 36dca5dab0 31efe177a4
Author: nityanandagohain <nityanandagohain@gmail.com>
Date:   Tue Jul 14 23:09:00 2026 +0530

    Merge branch 'issue_5601': scoped-trace builder package + port aggregations

    Merges the telemetryscopedtraces refactor (generic scoped-trace topology moved
    out of telemetryai, feature-flagged gen_ai key enrichment, tracefield. context
    classification) and ports the scalar/time-series work onto it:

    - trace_aggregation.go / trace_having.go now live in telemetryscopedtraces
    - trace-level HAVING resolution composes the canonical pkg/variables
      replacement (dynamic __all__ drops a condition for any operator) with the
      standard filter pipeline, so values still bind as args
    - buildPerTraceScan adopts the merged embedExpr placeholder/arg checking
    - ColumnProvider gains ActivityGateAlias; gen_ai provider gates trace-level
      aggregations on llm_call_count

commit 36dca5dab0c0abb08aeb2645fee07f28cc764eb8
Author: nityanandagohain <nityanandagohain@gmail.com>
Date:   Tue Jul 14 23:09:00 2026 +0530

    feat: trace-level aggregations for scalar/time-series and trace-scoped span list

    - trace.-prefixed aggregations (avg(trace.output_tokens), count(trace.trace_id),
      arithmetic) run over window-clipped per-trace values via a native CTE pipeline
    - a trace-level filter condition qualifies traces in scalar/time-series/raw via
      __qualified / __trace_scope, resource-fingerprint pruned like the trace list
    - trace-level filter conditions resolve through the standard filter pipeline
      (bound args, operators, query variables) against the per-trace column aliases
    - per-trace rows with no LLM span in the window are dropped from trace-level
      aggregations (LLM-activity gate)
    - targeted rejections for group-by/order-by on trace-level columns

.claude/rules/comments.md

@@ -1,11 +0,0 @@
-# Comments
-
-Applies to everything in the repo — code, config, workflows.
-
-- **No unnecessary comments.** Do not comment where the code is self-explanatory; never restate what the code already says.
-- **Document only** non-obvious behavior, constraints, formats, and edge cases.
-- **Rationale goes in prose, not source.** Why a version is pinned, why a job exists, how a subsystem fits together — that belongs in the README or the PR.
-- **Never remove pre-existing comments** when editing code. The bar above applies to comments you write, not comments already there.
-- **Never talk to the reviewer.** No comments about where a change came from, what was changed, or why the change is correct — that belongs in the PR description and is noise the moment it merges.
-
-Language rules build on this one: [`go-comments`](go-comments.md), [`py-comments`](py-comments.md).

.claude/rules/go-comments.md

@@ -1,12 +0,0 @@
----
-paths:
-  - "**/*.go"
----
-
-# Go comments
-
-The bar is the [`comments`](comments.md) rule: nothing where the code is self-explanatory.
-
-- **Names carry the meaning.** Make function, type, and variable names self-explanatory so the comment is unnecessary in the first place. If a comment is needed to explain what a function does, fix the name, not the comment.
-- **Godoc**: Skip comments that merely restate the identifier. Document only non-obvious behavior, constraints, formats, and edge cases.
-- **Generated code**: If the comment is emitted by an external codegen tool, leave it as-is — do not add or trim comments in generated files.

.claude/rules/pull-requests.md

@@ -1,7 +0,0 @@
-# Pull requests
-
-- **Follow the template** (`.github/pull_request_template.md`): fill in its headings (Description / Issues closed by this PR / Screenshots / Additional Information). Don't add sections the template doesn't have.
-- **Keep only the headings that apply.** Delete every heading that has nothing under it, along with its `<!--...-->` placeholder comment. The body must never contain an empty heading — if only Description applies, the body has exactly that one heading.
-- **Keep the description concise and human-readable.** A few plain bullets saying what changed and why, for a reviewer skimming it — not a wall of text, not a restatement of the diff, not generated boilerplate.
-- **Reference issues with `Closes #issue-number`** under "Issues closed by this PR" so they auto-close on merge. This goes in the PR description only — never in commit messages.
-- **AI assistance in commits may optionally be disclosed with an `Assisted-by:` trailer** naming the model (e.g. `Assisted-by: Claude Opus 4.5`) — do NOT use a `Co-authored-by:` trailer for this.

.claude/rules/py-comments.md

@@ -1,13 +0,0 @@
----
-paths:
-  - "**/*.py"
----
-
-# Python comments
-
-The bar is the [`comments`](comments.md) rule: nothing where the code is self-explanatory.
-
-- **Names carry the meaning.** Make function and variable names self-explanatory so the comment or docstring is unnecessary in the first place. If a docstring is needed to explain what a function does, fix the name, not the docstring.
-- **No file-level docstring.** The filename says what the module is for — `tool_bin.py` gets the tool binary. A module docstring restating that is noise, and a paragraph of design prose at the top of a file goes stale where nobody is looking. A constraint belongs next to the code it constrains, not in a preamble.
-- **Docstrings**: only when they say something the name and signature don't — drop them otherwise. Keep them short. A contract that genuinely needs a few lines (interacting flags, retry semantics, an edge case) is fine; a narrative is not.
-- **No song and dance.** Comment the constraint or the edge case. Not the narrative, not the rationale, not what the next line does.

.github/pull_request_template.md

@@ -1,13 +1,85 @@
-<!--A few plain bullets saying what changed and why, for a reviewer skimming it - not a wall of text, not a restatement of the diff, not generated boilerplate.-->
-#### Description
+## Pull Request
+
+---
+
+### 📄 Summary
+> Why does this change exist?  
+> What problem does it solve, and why is this the right approach?
+
+
+
+#### Screenshots / Screen Recordings (if applicable)
+> Include screenshots or screen recordings that clearly show the behavior before the change and the result after the change. This helps reviewers quickly understand the impact and verify the update.
+
 
-<!--Reference issues using `Closes #issue-number` to enable automatic closure on merge. -->
 #### Issues closed by this PR
+> Reference issues using `Closes #issue-number` to enable automatic closure on merge.
 
-<!--If applicable, include screenshots or screen recordings that clearly show the behavior before the change and the result after the change. -->
-#### Screenshots / Screen Recordings
+---
 
-<!--Anything reviewers should keep in mind while reviewing -->
-#### Additional Information
+### ✅ Change Type
+_Select all that apply_
 
-<!--Please delete paragraphs that you did not use before submitting.-->
+- [ ] ✨ Feature
+- [ ] 🐛 Bug fix
+- [ ] ♻️ Refactor
+- [ ] 🛠️ Infra / Tooling
+- [ ] 🧪 Test-only
+
+---
+
+### 🐛 Bug Context
+> Required if this PR fixes a bug
+
+#### Root Cause
+> What caused the issue?  
+> Regression, faulty assumption, edge case, refactor, etc.
+
+#### Fix Strategy
+> How does this PR address the root cause?
+
+---
+
+### 🧪 Testing Strategy
+> How was this change validated?
+
+- Tests added/updated:
+- Manual verification:
+- Edge cases covered:
+
+---
+
+### ⚠️ Risk & Impact Assessment
+> What could break? How do we recover?
+
+- Blast radius:
+- Potential regressions:
+- Rollback plan:
+
+---
+
+### 📝 Changelog
+> Fill only if this affects users, APIs, UI, or documented behavior  
+> Use **N/A** for internal or non-user-facing changes
+
+| Field | Value |
+|------|-------|
+| Deployment Type | Cloud / OSS / Enterprise |
+| Change Type | Feature / Bug Fix / Maintenance |
+| Description | User-facing summary |
+
+---
+
+### 📋 Checklist
+- [ ] Tests added or explicitly not required
+- [ ] Manually tested
+- [ ] Breaking changes documented
+- [ ] Backward compatibility considered
+
+---
+
+## 👀 Notes for Reviewers
+
+<!-- Anything reviewers should keep in mind while reviewing -->
+
+---

.github/workflows/docs.yml

@@ -0,0 +1,83 @@
+name: "Update PR labels and Block PR until related docs are shipped for the feature"
+
+on:
+  pull_request:
+    branches:
+      - main
+    types: [opened, edited, labeled, unlabeled]
+
+permissions:
+  pull-requests: write
+  contents: read
+
+jobs:
+  docs_label_check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR Title and Manage Labels
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const prTitle = context.payload.pull_request.title;
+            const prNumber = context.payload.pull_request.number;
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+
+            // Fetch the current PR details to get labels
+            const pr = await github.rest.pulls.get({
+              owner,
+              repo,
+              pull_number: prNumber
+            });
+
+            const labels = pr.data.labels.map(label => label.name);
+
+            if (prTitle.startsWith('feat:')) {
+              const hasDocsRequired = labels.includes('docs required');
+              const hasDocsShipped = labels.includes('docs shipped');
+              const hasDocsNotRequired = labels.includes('docs not required');
+
+              // If "docs not required" is present, skip the checks
+              if (hasDocsNotRequired && !hasDocsRequired) {
+                console.log("Skipping checks due to 'docs not required' label.");
+                return; // Exit the script early
+              }
+              
+              // If "docs shipped" is present, remove "docs required" if it exists
+              if (hasDocsShipped && hasDocsRequired) {
+                await github.rest.issues.removeLabel({
+                  owner,
+                  repo,
+                  issue_number: prNumber,
+                  name: 'docs required'
+                });
+                console.log("Removed 'docs required' label.");
+              }
+
+              // Add "docs required" label if neither "docs shipped" nor "docs required" are present
+              if (!hasDocsRequired && !hasDocsShipped) {
+                await github.rest.issues.addLabels({
+                  owner,
+                  repo,
+                  issue_number: prNumber,
+                  labels: ['docs required']
+                });
+                console.log("Added 'docs required' label.");
+              }
+            }
+
+            // Fetch the updated labels after any changes
+            const updatedPr = await github.rest.pulls.get({
+              owner,
+              repo,
+              pull_number: prNumber
+            });
+
+            const updatedLabels = updatedPr.data.labels.map(label => label.name);
+            const updatedHasDocsRequired = updatedLabels.includes('docs required');
+            const updatedHasDocsShipped = updatedLabels.includes('docs shipped');
+
+            // Block PR if "docs required" is still present and "docs shipped" is missing
+            if (updatedHasDocsRequired && !updatedHasDocsShipped) {
+              core.setFailed("This PR requires documentation. Please remove the 'docs required' label and add the 'docs shipped' label to proceed.");
+            }

.github/workflows/goci.yaml

@@ -53,21 +53,6 @@ jobs:
     with:
       PRIMUS_REF: main
       GO_VERSION: 1.24
-  semconv-generated:
-    if: |
-      github.event_name == 'merge_group' ||
-      (github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork && github.event.pull_request.user.login != 'dependabot[bot]' && ! contains(github.event.pull_request.labels.*.name, 'safe-to-test')) ||
-      (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'safe-to-test'))
-    runs-on: ubuntu-latest
-    steps:
-      - name: self-checkout
-        uses: actions/checkout@v4
-      - name: go-install
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.24"
-      - name: check-semconv-generated-files
-        run: go run ./scripts/semconv -check
   build:
     if: |
       github.event_name == 'merge_group' ||

.gitignore

@@ -90,6 +90,8 @@ queries.active
 .devenv/**/tmp/**
 .qodo
 
+.dev
+
 ### Python ###
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -229,6 +231,4 @@ cython_debug/
 # LSP config files
 pyrightconfig.json
 
-# dev
-.dev/
-.claude/worktrees/
+

Makefile

@@ -233,10 +233,6 @@ py-clean: ## Clear all pycache and pytest cache from tests directory recursively
 ##############################################################
 # generate commands
 ##############################################################
-.PHONY: semconv-generate
-semconv-generate: ## Regenerate semantic-convention families for Go and TypeScript
-	@go run ./scripts/semconv
-
 .PHONY: gen-mocks
 gen-mocks:
 	@echo ">> Generating mocks"

docs/api/openapi.yml

@@ -7759,112 +7759,6 @@ components:
       enum:
       - basic
       type: string
-    SavedviewtypesDisplay:
-      properties:
-        color:
-          type: string
-        fontSize:
-          type: string
-        format:
-          type: string
-        maxLines:
-          type: integer
-      type: object
-    SavedviewtypesPanelType:
-      enum:
-      - value
-      - graph
-      - table
-      - list
-      - trace
-      type: string
-    SavedviewtypesPostableSavedView:
-      properties:
-        data:
-          $ref: '#/components/schemas/SavedviewtypesSavedViewData'
-        generateName:
-          type: boolean
-        name:
-          type: string
-        source:
-          $ref: '#/components/schemas/SavedviewtypesSource'
-      required:
-      - source
-      - data
-      type: object
-    SavedviewtypesSavedView:
-      properties:
-        createdAt:
-          format: date-time
-          type: string
-        createdBy:
-          type: string
-        data:
-          $ref: '#/components/schemas/SavedviewtypesSavedViewData'
-        id:
-          type: string
-        name:
-          type: string
-        source:
-          $ref: '#/components/schemas/SavedviewtypesSource'
-        updatedAt:
-          format: date-time
-          type: string
-        updatedBy:
-          type: string
-      required:
-      - id
-      type: object
-    SavedviewtypesSavedViewData:
-      properties:
-        schemaVersion:
-          type: string
-        spec:
-          $ref: '#/components/schemas/SavedviewtypesSavedViewSpec'
-      required:
-      - schemaVersion
-      - spec
-      type: object
-    SavedviewtypesSavedViewSpec:
-      properties:
-        display:
-          $ref: '#/components/schemas/SavedviewtypesDisplay'
-        displayName:
-          type: string
-        panelType:
-          $ref: '#/components/schemas/SavedviewtypesPanelType'
-        queries:
-          items:
-            $ref: '#/components/schemas/Querybuildertypesv5QueryEnvelope'
-          type: array
-        selectedFields:
-          items:
-            $ref: '#/components/schemas/TelemetrytypesTelemetryFieldKey'
-          type: array
-      required:
-      - displayName
-      - panelType
-      - queries
-      - selectedFields
-      - display
-      type: object
-    SavedviewtypesSource:
-      enum:
-      - traces
-      - logs
-      - metrics
-      - meter
-      type: string
-    SavedviewtypesUpdatableSavedView:
-      properties:
-        data:
-          $ref: '#/components/schemas/SavedviewtypesSavedViewData'
-        source:
-          $ref: '#/components/schemas/SavedviewtypesSource'
-      required:
-      - source
-      - data
-      type: object
     ServiceaccounttypesDeprecatedPostableServiceAccountRole:
       properties:
         id:
@@ -22765,298 +22659,6 @@ paths:
       summary: Test alert rule
       tags:
       - rules
-  /api/v2/saved_views:
-    get:
-      deprecated: false
-      description: Returns saved views, optionally filtered by source and name.
-      operationId: ListSavedViews
-      parameters:
-      - in: query
-        name: source
-        schema:
-          $ref: '#/components/schemas/SavedviewtypesSource'
-      - in: query
-        name: name
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    items:
-                      $ref: '#/components/schemas/SavedviewtypesSavedView'
-                    nullable: true
-                    type: array
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - saved-view:list
-      - tokenizer:
-        - saved-view:list
-      summary: List saved views
-      tags:
-      - saved_view
-    post:
-      deprecated: false
-      description: Persists a saved view for the explore page. Returns the id of the
-        created view.
-      operationId: CreateSavedView
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/SavedviewtypesPostableSavedView'
-      responses:
-        "201":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/TypesIdentifiable'
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: Created
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - saved-view:create
-      - tokenizer:
-        - saved-view:create
-      summary: Create saved view
-      tags:
-      - saved_view
-  /api/v2/saved_views/{id}:
-    delete:
-      deprecated: false
-      description: Deletes a saved view by id.
-      operationId: DeleteSavedView
-      parameters:
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-      responses:
-        "204":
-          description: No Content
-        "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:
-        - saved-view:delete
-      - tokenizer:
-        - saved-view:delete
-      summary: Delete saved view
-      tags:
-      - saved_view
-    get:
-      deprecated: false
-      description: Returns a saved view by id.
-      operationId: GetSavedView
-      parameters:
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/SavedviewtypesSavedView'
-                  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:
-        - saved-view:read
-      - tokenizer:
-        - saved-view:read
-      summary: Get saved view
-      tags:
-      - saved_view
-    put:
-      deprecated: false
-      description: Replaces a saved view's name and query.
-      operationId: UpdateSavedView
-      parameters:
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/SavedviewtypesUpdatableSavedView'
-      responses:
-        "204":
-          description: No Content
-        "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:
-        - saved-view:update
-      - tokenizer:
-        - saved-view:update
-      summary: Update saved view
-      tags:
-      - saved_view
   /api/v2/sessions:
     delete:
       deprecated: false

docs/contributing/prometheus.md

@@ -1,377 +1,123 @@
 # PromQL Serving — clickhouseprometheusv2
 
-This document gives the context for `pkg/prometheus/clickhouseprometheusv2`.
-This package is the second-generation ClickHouse-backed Prometheus provider.
-The document tells you why the package exists. It tells you the correctness
-rules that shaped it. It shows how we prove that each construct does not
-change results. Keep these invariants when you change the provider. If your
-change breaks an invariant, flag it and discuss it first.
+This document is the subsystem context for `pkg/prometheus/clickhouseprometheusv2`,
+the second-generation ClickHouse-backed Prometheus provider. It explains why the
+package exists, the correctness constraints that shaped it, and how each fetch
+reduction is proven not to change results. Any change to the provider must keep
+these invariants; if a change would violate one, it must be flagged and
+discussed.
 
 ---
 
 ## Why a second provider
 
-The v1 provider (`pkg/prometheus/clickhouseprometheus`) serves the promql
-engine through the remote-read protobuf adapter. It fetches every raw sample
-of a query's union window. It serializes all of them and gives them to the
-engine. The cost follows the ingested data, not the question. This is how a
-dashboard of PromQL panels can take an instance down.
+The v1 provider (`pkg/prometheus/clickhouseprometheus`) serves the promql engine
+through the remote-read protobuf adapter: every raw sample of a query's union
+window is fetched, serialized, and handed to the engine. The cost is a function
+of ingested data, not of the question asked — which is how a dashboard of PromQL
+panels can take an instance down.
 
-In v2, each query runs in one of two ways. The classifier decides per query:
+In v2 the stock promql engine evaluates over a native `storage.Querier`: no
+translation layer, per-selector fetch windows, and fetch reductions that are
+provably invisible to the engine.
 
-- **Transpiled**: ClickHouse evaluates the query. Only final (or near-final)
-  per-group grid arrays come back. The statements use the
-  `timeSeries*ToGrid` aggregate functions. The supported ClickHouse floor is
-  25.6 or later, so these functions are assumed available.
-- **Engine**: the stock promql engine evaluates over this package's native
-  `storage.Querier`. Every shape that does not transpile takes this path.
-
-**The core rule: a PromQL result that differs from upstream Prometheus is a
-lost user. A construct that cannot reproduce engine semantics exactly falls
-back. It does not approximate.** The conformance suite
+**The core constraint: every reduction either preserves engine semantics exactly
+or is not performed.** A PromQL result that differs from upstream Prometheus is
+a lost user. The conformance suite
 (`tests/integration/tests/promqlconformance/`) replays Prometheus' own test
-corpus against both providers. It is the arbiter. The classification golden
-(`testdata/classification_golden.json`) freezes the route of each corpus
-expression. The rest of this document is the PromQL-to-SQL story. That
-mapping is where correctness is won or lost.
+corpus against both providers and is the arbiter.
 
 ---
 
-## The evaluation model the SQL must reproduce
-
-A PromQL range query is an instant query evaluated at each grid point
-`t_i = start + i*step`, for `i = 0..(end-start)/step`. At each `t_i`:
-
-- An instant selector resolves to the latest sample in the left-open
-  lookback window `(t_i - lookback, t_i]`. If that latest sample is a stale
-  marker, the selector resolves to nothing. Older real samples in the window
-  do not change this.
-- A range selector `[r]` collects every sample in `(t_i - r, t_i]`. Stale
-  markers are excluded.
-- `offset d` shifts both windows to `(t_i - d - w, t_i - d]`.
-
-The transpilation invariant follows from this model. Each transpiled
-construct produces one array per output series. The array has exactly one
-slot per grid point. Slot `i` holds the value at `t_i`. NULL means absent.
-This makes composition correct, not only convenient. The engine evaluates
-these operators independently per `t_i`. A representation that gets every
-slot right gets the whole query right. Spatial aggregation over arrays is
-sound because it combines values that belong to the same `t_i` by
-construction. Scan time maps slot `i` back to `t_i = start + i*step`
-(`toMatrix`). The sections below fill those slots with exactly the numbers
-the engine computes. We validated each equivalence against the vendored
-engine on live data before its shape entered the allowlist. An unproven
-shape stays on the engine path.
-
-## Classification: finding what a statement can answer
-
-`classify` walks the parsed AST and looks for "core units". A core unit is a
-maximal subtree of this shape:
-
-	[agg by/without (...)] [fn(] selector[range] [offset d] [)] [op scalar]...
-
-`classifyCore` peels that chain from the outside in. It takes an optional
-sum/min/max/avg/count aggregation. It then takes one allowlisted function or
-a bare instant selector. It then takes the selector with its offset. On the
-way out, it collects number-literal arithmetic, comparisons (including
-`bool`), and unary minus into a scalar-op pipeline. A node qualifies only if
-its type, arguments, and children are in the proven set. This is an
-allowlist. An overlooked construct becomes a fallback, not a wrong number.
-
-Three unit kinds come out. Each kind has its own SQL form:
-
-- `unitRange`: rate, irate, increase, delta, idelta over a range selector.
-- `unitInstant`: instant vector selection, bare or comparison-filtered.
-- `unitOverTime`: avg/min/max/sum/count/last `_over_time`.
-
-If the whole tree is one unit, the plan is "full". The statement's rows are
-the query result. Otherwise, `rewrite` cuts out each maximal unit and puts a
-synthetic selector `__signoz_transpiled_N__` in its place. The engine then
-runs the rewritten expression over the units' materialized results. This is
-a "hybrid" plan. `histogram_quantile`, `topk`, `or`/`and`/`unless`, and
-vector matching keep exact engine semantics. Their expensive inputs were
-aggregated server-side.
-
-Classification refuses a shape when it cannot guarantee exact semantics
-server-side:
-
-- The `@` modifier, anywhere.
-- Default-resolution subqueries. Their resolution is a server runtime
-  setting that the transpiler cannot see.
-- Duration expressions (`offset step()`, `[range()]`, ...), anywhere. The
-  engine resolves them into the selector's static fields only at evaluation
-  time. At classification time those fields hold zero values. A transpile
-  would silently use the wrong offset or range.
-- Steps or ranges that are not whole seconds. The grid functions take
-  whole-second parameters.
-- Grouping by `__name__`, or matching on it, in hybrid plans. The synthetic
-  name would leak into results.
-- Name-keeping units in hybrid plans. Bare and comparison-filtered instant
-  selectors and `last_over_time` keep their real `__name__` (`keepsName`).
-  Substitution would replace that name. These units transpile only as full
-  plans.
-- Every function outside the allowlist: changes, resets,
-  quantile_over_time, absent, native-histogram functions, and more.
-
-Units inside a fixed-resolution subquery evaluate on the subquery's own
-grid, not the query grid. That grid is the set of epoch-aligned multiples of
-the resolution strictly after `outerStart - offset - range`, ending at
-`outer end - offset`. This is the exact derivation the engine uses. A grid
-shifted by one step changes which samples every window sees.
-
-## From one unit to one statement
-
-`buildUnitSQL` renders each unit as one statement. For
-`sum by (pod) (rate(m{job="api"}[5m]))` the skeleton is:
-
-	SELECT g0, sumForEach(grid) AS grid FROM (
-	    SELECT any(series.g0) AS g0,
-	           timeSeriesRateToGrid(<start>, <end>, <step>, <range>)(fromUnixTimestamp64Milli(unix_milli), value) AS grid
-	    FROM signoz_metrics.distributed_samples_v4 AS points
-	    INNER JOIN (
-	        SELECT fingerprint, JSONExtractString(labels, 'pod') AS g0
-	        FROM signoz_metrics.time_series_v4
-	        WHERE <series predicates>
-	        GROUP BY fingerprint, g0
-	    ) AS series ON points.fingerprint = series.fingerprint
-	    WHERE metric_name = ? AND temporality IN ['Cumulative', 'Unspecified']
-	      AND unix_milli > <start - range> AND unix_milli <= <end>
-	      AND bitAnd(flags, 1) = 0
-	    GROUP BY points.fingerprint
-	) GROUP BY g0
-	SETTINGS allow_experimental_ts_to_grid_aggregate_function = 1
-
-Read it from the inside out.
-
-**The time window** is the selector's semantics, verbatim. Strict `>` on the
-lower bound and `<=` on the upper bound is the left-open `(t - w, t]` rule.
-The offset shifts the whole window. `bitAnd(flags, 1) = 0` drops stale
-markers. PromQL excludes them from range vectors.
-
-**The inner GROUP BY** computes one grid array per series.
-`timeSeriesRateToGrid(start, end, step, range)` is a parametric aggregate.
-It takes (timestamp, value) pairs and produces `Array(Nullable(Float64))`
-with one slot per grid point. It is correct because it implements the
-engine's `extrapolatedRate`, decision for decision: counter resets, the
-zero-point clamp, the extrapolation thresholds, the two-samples rule, and
-the left-open window. We verified this: we fed identical samples to both and
-compared slot for slot. The only observed difference is the last bit.
-ClickHouse's C++ and Go round the same formula differently. That is the
-floating-point floor, not a semantic gap. irate/delta/idelta map to their
-own `timeSeries*ToGrid` functions, with the same verification. `increase`
-has no function of its own. We emit
-`arrayMap(x -> x * <range seconds>, <rate expr>)`. This is exact by
-definition: `extrapolatedRate` computes the same extrapolated delta for both
-and divides by the range only when `isRate`. The multiplication reverses it
-exactly. The grid parameters render as literals, not bound args. They are
-aggregate-function parameters. The experimental gate rides as a SETTINGS
-clause on the statement itself, so telemetrystore hooks cannot remove it.
-
-The group key is functionally dependent on the fingerprint: one fingerprint
-is the hash of one labelset. So the inner query groups by the fingerprint
-alone and reads the key columns with `any()`. This is exact, and it makes
-the per-row hash key smaller.
-
-**The join** gives each series its group key, in one of two forms.
-`by (...)` extracts each listed label as a plain column
-(`JSONExtractString(labels, 'pod') AS g0`) and groups on the columns. The
-projection is a known short list, and the label names live in Go. To build,
-sort, and stringify every label pair per row would be waste. This is correct
-because column-tuple equality is label-set equality on the projection. An
-extracted `''` means the label is absent. That is Prometheus semantics for
-`by()` over missing labels. The empties are skipped when the columns turn
-back into labels. `without` and no-aggregation project a label set that
-varies per series. They get the canonical key: `toJSONString` of the sorted
-[label, value] pairs that the unit projects. `without` excludes the listed
-labels plus `__name__`. No-aggregation keeps everything; the name comes off
-in Go, per the engine's name-dropping rules. Here the sort is load-bearing.
-Stored JSON key order is not canonical across fingerprints. Two orderings of
-the same labels must land in one group. Empty values are filtered for the
-same absent-label reason. The same string parses back into the output label
-set (`labelsFromGroupKey`).
-
-**The outer GROUP BY** is the spatial aggregation. sum/min/max/avg/count
-by/without become the `-ForEach` combinators. Element-wise aggregation over
-grid arrays is the engine's per-`t_i` aggregation: slot `i` of every input
-array refers to the same `t_i`. The combinators skip NULLs. That is the
-engine aggregating only the series present at `t_i`. An index where every
-series is absent stays NULL. Two edges need explicit handling. First,
-`countForEach` wraps in a map of 0 back to NULL. A count over an all-absent
-index is an absent point, not 0. Second, a unit without aggregation still
-passes through `maxForEach`. That is the identity for the common
-one-fingerprint group. It is a deterministic NULL-skipping merge when a
-regex `__name__` selector collapses distinct metrics onto one projected
-label set. One caveat is inherent: the summation order over series differs
-from the engine's. Spatial aggregates can differ in the last ULP. Float
-addition is not associative. No ordering reproduces the engine's result
-bit-exactly from inside a GROUP BY.
-
-## Instant selectors: staleness needs two aggregates
-
-`unitInstant` uses window = lookback. It must reproduce the shadowing rule:
-the point is absent when the latest in-window sample is a stale marker.
-`timeSeriesLastToGrid` alone cannot express that. To skip stale rows in
-WHERE would resurrect the older real sample that the marker buried. So stale
-rows stay in the scan for this kind only. The grid expression compares three
-aggregates per slot:
-
-	arrayMap((tall, tok, vok) -> if(tall IS NULL OR tok IS NULL OR tall != tok, NULL, vok),
-	         timeSeriesLastToGrid(...)(ts, toFloat64(unix_milli)),                           -- last sample overall
-	         timeSeriesLastToGridIf(...)(ts, toFloat64(unix_milli), bitAnd(flags, 1) = 0),   -- last non-stale, its timestamp
-	         timeSeriesLastToGridIf(...)(ts, value, bitAnd(flags, 1) = 0))                   -- last non-stale, its value
-
-This is correct by cases on a slot's window. No samples at all: both
-timestamp aggregates are NULL, so the slot is NULL. That is absent, as the
-engine says. Latest sample non-stale: it is the latest overall and the
-latest non-stale. The timestamps agree. The slot takes its value. That is
-the engine's pick. Latest sample stale: the last-overall timestamp is the
-marker's. The last-non-stale timestamp is older, or NULL when the window
-holds only markers. They disagree. The slot is NULL. The marker shadows,
-exactly as the engine's rule says. Timestamps are unique per series (ingest
-dedups). So timestamp equality identifies "the same sample" without
-ambiguity. We probed the `-If` combinator against these experimental
-aggregates before we trusted it.
-
-## Windowed *_over_time: whole buckets instead of a grid function
-
-avg/min/max/sum/count `_over_time` aggregate every raw sample in the window.
-No `timeSeries*ToGrid` function computes them. (`last_over_time` is the
-exception. The last sample of a range vector is exactly
-`timeSeriesLastToGrid`. PromQL excludes stale markers from range vectors; we
-exclude them in WHERE.) These shapes transpile only when the range is a
-whole multiple of the step. Then the window needs no per-sample fan-out.
-With `W = range/step`, the window `(t_k - range, t_k]` is exactly the union
-of W step buckets. Both are left-open on the same boundaries. So bucket
-membership fully determines window membership. Each sample lands in exactly
-one bucket:
-
-	intDiv(unix_milli - <start> + <range> - 1, <step>)
-
-This is `ceil((ts - start)/step)` shifted by W-1, so the earliest in-window
-sample sits at 0. Slot k's window is buckets in `[k, k+W-1]`. The
-alternative fans each sample into all W windows that cover it. That
-multiplies rows by W. For a long range over a short step, that is a row
-explosion measured in billions. The bucketed form's row count is
-series × buckets: the size of the output, for any W.
-
-Each series aggregates in one group. The `-Resample` combinator
-(`sumResample`, `countResample`) holds the dense per-bucket partials inside
-one group state: a bucket count, plus the function's value aggregate (sum
-for sum/avg, min, max). An earlier form grouped by (series, bucket) and
-assembled with `groupArrayInsertAt`. At scale that made 37M hash groups, and
-per-thread partials scaled memory with the thread count. The slide then
-combines each slot's at-most-W bucket partials by direct aggregation
-(`arraySum(arraySlice(...))`). Window sums are added the way the engine adds
-them. There is no prefix-sum differencing: its large-minus-large
-cancellation would drift past the shadow tolerance on counter-sized values.
-This is correct per slot because the bucket union is the exact window
-multiset, and avg/min/max/sum/count are order-insensitive on a multiset
-(sum/avg up to summation order; see the float caveat above). A slot with
-zero window count is absent. min/max filter their slices on the bucket
-counts. An empty bucket's default can never look like a value: a real sample
-can legitimately be +Inf.
-
-Two shapes fall back to the engine path, which is exact: a range that does
-not divide the step, and a window wider than `maxWindowBuckets` buckets (the
-slide costs W combines per slot). A range narrower than the step needs
-neither gate: the windows are pairwise disjoint, one bucket per slot, no
-slide. That form is exact only together with the window-sliver predicate
-below.
-
-## Scalar ops, full plans, hybrid plans
-
-The scalar-op pipeline runs in Go on the returned arrays
-(`applyScalarOps`), slot by slot. Arithmetic operators compute. Comparisons
-filter: the slot keeps the vector-side value or becomes NULL. Under `bool`
-they return 0/1. This is trivially correct. It is the same float64 operation
-the engine applies, to the same slot value, in the same operator order the
-AST dictates. Go instead of another SQL layer changes where, not what.
-
-A full plan's arrays map straight to the result matrix. A hybrid plan
-materializes each unit's arrays as synthetic series under its
-`__signoz_transpiled_N__` name. The engine evaluates the rewritten
-expression over a storage that serves synthetic names from memory and
-everything else live. Substitution is sound because a unit's output is a
-plain instant vector to the engine: same values at same timestamps, under a
-different name. The name cannot matter. Plans that group by or match on
-`__name__` were refused at classification. Name-keeping units are never
-substituted. One subtlety makes it exact: we write stale markers at absent
-grid points. Without them, the engine's lookback would resurrect a point
-from up to `lookback` earlier. The marker encodes "absent here" the way the
-engine itself encodes it. Units evaluate concurrently. Each unit is one
-series lookup plus one grid statement. A step of 0 is an instant query: a
-single evaluation at `end`.
-
-A note on the window sliver: when the window is narrower than the step, the
-grid windows cover only `window/step` of the timeline. A sample in a gap
-belongs to no window. It cannot move any grid point, but the grid aggregate
-would buffer it. A WHERE predicate keeps only the in-window rows:
-`positiveModulo(selStart - unix_milli, step) < window`, with the scan capped
-at the last grid point. The lattice anchors at the selector start, because
-the end can sit off-lattice on unaligned grids. This cut a 36k-series
-one-week rate from 74s/28GiB to 16s/4.3GiB on fleet data. Over slivered
-rows, `timeSeriesLastToGrid`'s window widening is harmless, so instant
-selectors and `last_over_time` transpile at window < step too.
-
 ## Series lookup
 
-Both paths resolve matchers the same way, once per selector
-(`selectSeries`). The series tables hold one row per (fingerprint, bucket)
-at 1h/6h/1d/1w granularities. The shared schema package
-(`pkg/telemetryschema/metricstelemetryschema`) picks the table whose bucket
-fits the window. It rounds the window start down to the bucket boundary, so
-a window that begins mid-bucket still matches the bucket's row. How matchers
-become SQL, and why regexes are anchored, is documented at
-`applySeriesConditions`. Empty-valued labels come off at this boundary. An
-empty value means "label absent" in Prometheus, but stored attribute JSON
-can carry them.
+Matchers resolve to series once per selector (`selectSeries`) against the series
+tables, which hold one row per (fingerprint, bucket) at 1h/6h/1d/1w
+granularities. Table selection and window rounding delegate to the shared
+metrics schema package (`pkg/telemetryschema/metricstelemetryschema`); the
+window start rounds down to the bucket boundary so a window beginning mid-bucket
+still matches the bucket's row.
 
-## The engine path
+How matchers become SQL is documented at `applySeriesConditions`. The rules that
+carry semantics:
 
-Queries that do not transpile run in the stock engine over this package's
-`storage.Querier`. This is still not the v1 path. Samples are fetched per
-selector with the engine's per-selector hints, not the query-wide union
-window. So `foo / foo offset 1d` reads two narrow windows, not the widest
-one twice. Instant selectors of subquery-free queries fetch only the last
-sample per step bucket (`lastSamplePerStep`). Buckets anchor at the
-selector's first evaluation timestamp. The code recovers it from the hints
-as `hints.Start + lookback - 1ms`, the inverse of how the engine derives
-`hints.Start`. Bucket boundaries then coincide with evaluation timestamps.
-A non-final sample of a bucket can never be the latest sample in
-`(t - lookback, t]` for any grid `t`. Real timestamps are preserved, so the
-engine's own lookback and staleness handling stay exact. Range selectors
-always fetch raw: every sample feeds the range function. The subquery-free
-proof travels in the context as `prometheus.QueryTraits`. Subquery selectors
-evaluate at the subquery's step, while the hints carry the top-level step.
-Row assembly maps stale flags to the engine's StaleNaN. It merges series
-with identical label sets (`sortAndMerge`): the engine assumes storages
-never emit duplicates.
+- `__name__` matchers (all four types) translate to the `metric_name` column.
+- Every other matcher becomes a `JSONExtractString` condition on the labels
+  column. An equality matcher against `""` matches series *without* the label,
+  mirroring PromQL, because `JSONExtractString` returns `""` for missing keys.
+- Regexes are anchored (`^(?:...)$`) before they reach `match()`: PromQL
+  matchers match the whole value, ClickHouse `match()` searches for a
+  substring.
+- The series-lookup upper bound is inclusive (`unix_milli <= end`) because the
+  exporter floors registration rows to the bucket start: a series first
+  registered in the bucket beginning exactly at `end` would otherwise be
+  invisible while its samples are in range.
+
+Empty-valued labels come off at this boundary: an empty value means "label
+absent" in Prometheus, but stored attribute JSON can carry them.
+
+---
+
+## Sample fetch
+
+Samples are fetched per selector using the engine's per-selector hints, not the
+query-wide union window — `foo / foo offset 1d` reads two narrow windows
+instead of the widest one twice.
+
+**Last-sample-per-step reduction.** Instant selectors of subquery-free queries
+fetch only the last sample per step bucket. The engine resolves an instant
+selector at each grid timestamp `t` to the latest sample in the left-open
+lookback window `(t − lookback, t]`. Buckets anchor at the selector's first
+evaluation timestamp — recovered from the hints as
+`hints.Start + lookback − 1ms`, the inverse of how the engine derives
+`hints.Start` — so bucket boundaries coincide with evaluation timestamps, and a
+non-final sample of a bucket can never be the latest sample in
+`(t − lookback, t]` for any grid `t`. Real timestamps are preserved, so the
+engine's own lookback and staleness handling stay exact.
+
+Range selectors always fetch raw — every sample feeds the range function. The
+subquery-free proof travels in the context as `prometheus.QueryTraits`, because
+subquery selectors evaluate at the subquery's step while the hints carry the
+top-level step; call sites that do not attach traits get the conservative raw
+fetch.
+
+**Row assembly** maps stale flags to the engine's `StaleNaN` and merges series
+with identical label sets (`sortAndMerge`) — the engine assumes storages never
+emit duplicates. Duplicate timestamps pass through as stored: uniqueness is
+ingest's job, and v1 feeds them to the engine as-is over the same data.
+
+**The fingerprint filter is a shard-local semi-join.** The samples query
+restricts to the matched series by re-running the series predicates as an
+`IN (SELECT fingerprint FROM <local series table> ...)` subquery, not a GLOBAL
+broadcast of the matched set. ClickHouse materializes the subquery's set per
+shard before the scan, so it still engages the fingerprint primary-key column.
+Because the subquery re-executes the predicates after the lookup ran, it can
+match series registered in between; sample rows whose fingerprint the lookup
+never saw are skipped — the lookup is the read snapshot.
+
+---
 
 ## Sharding
 
-`samples_v4` and `time_series_v4` (and all their rollups) shard on the same
-key: `cityHash64(env, temporality, metric_name, fingerprint)`. So a series'
-samples and catalog rows live on the same shard. The transpiled statement
-exploits that. The distributed samples table at the top-level FROM makes
-ClickHouse rewrite the whole inner query per shard. The join against the
-shard-local series table and the per-series grid aggregation run next to
-the data. The initiator only merges aggregate states and applies the
-spatial `-ForEach` step. This is the same layout as the telemetrymetrics
-statement builder. The group-key join alone restricts the transpiled scan
-to the matched series. The engine path's samples fetch restricts by the
-same predicates as a shard-local semi-join, not a GLOBAL broadcast of the
-matched set. The temporality filter on every samples statement is a
-semantic no-op: the matched fingerprints already come from those
-temporalities. It engages the leading samples primary-key column.
-Delta-temporality series stay invisible to PromQL here, exactly as in v1.
-The rollout gate is parity with v1. To make Delta visible is its own change
-with its own semantics to design. A Delta stream fed to `rate()`
+`samples_v4` and `time_series_v4` (and all their rollups) shard on the same key
+— `cityHash64(env, temporality, metric_name, fingerprint)` — so a series'
+samples and catalog rows live on the same shard. The semi-join above exploits
+that: each shard filters by its own series rows, which are exactly the series
+of that shard's samples.
+
+The temporality filter on every samples statement
+(`temporality IN ['Cumulative', 'Unspecified']`) is a semantic no-op — the
+matched fingerprints already come from those temporalities — that engages the
+leading samples primary-key column.
+
+Delta-temporality series stay invisible to PromQL exactly as they are in v1:
+the rollout gate is parity with v1, and a Delta stream fed to `rate()`
 as-if-cumulative would be wrong, not just new.
 
+---
+
 ## Observability
 
 Every statement carries a `log_comment` with
-`code.namespace=clickhouse-prometheus-v2` and `code.function.name` naming
-the call site (`selectSeries`, `selectSamples`, `transpiledUnit`,
-`LabelValues`, `LabelNames`). This provider's work is attributable in
-`system.query_log` without guessing from query text.
+`code.namespace=clickhouse-prometheus-v2` and `code.function.name` naming the
+call site, so this provider's work is attributable in `system.query_log`.

ee/query-service/app/api/featureFlags.go

@@ -98,6 +98,14 @@ func (ah *APIHandler) getFeatureFlags(w http.ResponseWriter, r *http.Request) {
 		Route:      "",
 	})
 
+	if constants.IsDotMetricsEnabled {
+		for idx, feature := range featureSet {
+			if feature.Name == licensetypes.DotMetricsEnabled {
+				featureSet[idx].Active = true
+			}
+		}
+	}
+
 	ah.Respond(w, featureSet)
 }
 

ee/query-service/constants/constants.go

@@ -17,3 +17,15 @@ func GetOrDefaultEnv(key string, fallback string) string {
 	}
 	return v
 }
+
+// constant functions that override env vars
+
+const DotMetricsEnabled = "DOT_METRICS_ENABLED"
+
+var IsDotMetricsEnabled = false
+
+func init() {
+	if GetOrDefaultEnv(DotMetricsEnabled, "true") == "true" {
+		IsDotMetricsEnabled = true
+	}
+}

frontend/src/AppRoutes/index.tsx

@@ -354,16 +354,6 @@ function App(): JSX.Element {
 					tunnel: window.signozBootData.settings.sentry.tunnel,
 					environment: process.env.ENVIRONMENT,
 					release: process.env.VERSION,
-					// A tab that outlived a deploy requests hashed assets the new build no longer
-					// has. `lazyRetry` recovers by reloading once, so this class is not worth
-					// reporting. The stylesheet message is Vite's own; the module ones are the
-					// same failure worded differently by Chromium, Firefox and Safari.
-					ignoreErrors: [
-						/Unable to preload CSS for/,
-						/Failed to fetch dynamically imported module/,
-						/error loading dynamically imported module/,
-						/Importing a module script failed/,
-					],
 					integrations: [
 						// Kept for the `transaction` tag used in routing, even though
 						// tracing is disabled. Ref: https://github.com/SigNoz/platform-pod/issues/2393#issuecomment-4603658055

frontend/src/api/generated/services/saved-view/index.ts

@@ -1,490 +0,0 @@
-/**
- * ! Do not edit manually
- * * The file has been auto-generated using Orval for SigNoz
- * * regenerate with 'pnpm generate:api'
- * SigNoz
- */
-import { useMutation, useQuery } from 'react-query';
-import type {
-	InvalidateOptions,
-	MutationFunction,
-	QueryClient,
-	QueryFunction,
-	QueryKey,
-	UseMutationOptions,
-	UseMutationResult,
-	UseQueryOptions,
-	UseQueryResult,
-} from 'react-query';
-
-import type {
-	CreateSavedView201,
-	DeleteSavedViewPathParameters,
-	GetSavedView200,
-	GetSavedViewPathParameters,
-	ListSavedViews200,
-	ListSavedViewsParams,
-	RenderErrorResponseDTO,
-	SavedviewtypesPostableSavedViewDTO,
-	SavedviewtypesUpdatableSavedViewDTO,
-	UpdateSavedViewPathParameters,
-} from '../sigNoz.schemas';
-
-import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
-import type { ErrorType, BodyType } from '../../../generatedAPIInstance';
-
-/**
- * Returns saved views, optionally filtered by source and name.
- * @summary List saved views
- */
-export const listSavedViews = (
-	params?: ListSavedViewsParams,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<ListSavedViews200>({
-		url: `/api/v2/saved_views`,
-		method: 'GET',
-		params,
-		signal,
-	});
-};
-
-export const getListSavedViewsQueryKey = (params?: ListSavedViewsParams) => {
-	return [`/api/v2/saved_views`, ...(params ? [params] : [])] as const;
-};
-
-export const getListSavedViewsQueryOptions = <
-	TData = Awaited<ReturnType<typeof listSavedViews>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	params?: ListSavedViewsParams,
-	options?: {
-		query?: UseQueryOptions<
-			Awaited<ReturnType<typeof listSavedViews>>,
-			TError,
-			TData
-		>;
-	},
-) => {
-	const { query: queryOptions } = options ?? {};
-
-	const queryKey = queryOptions?.queryKey ?? getListSavedViewsQueryKey(params);
-
-	const queryFn: QueryFunction<Awaited<ReturnType<typeof listSavedViews>>> = ({
-		signal,
-	}) => listSavedViews(params, signal);
-
-	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-		Awaited<ReturnType<typeof listSavedViews>>,
-		TError,
-		TData
-	> & { queryKey: QueryKey };
-};
-
-export type ListSavedViewsQueryResult = NonNullable<
-	Awaited<ReturnType<typeof listSavedViews>>
->;
-export type ListSavedViewsQueryError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary List saved views
- */
-
-export function useListSavedViews<
-	TData = Awaited<ReturnType<typeof listSavedViews>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	params?: ListSavedViewsParams,
-	options?: {
-		query?: UseQueryOptions<
-			Awaited<ReturnType<typeof listSavedViews>>,
-			TError,
-			TData
-		>;
-	},
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
-	const queryOptions = getListSavedViewsQueryOptions(params, options);
-
-	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-		queryKey: QueryKey;
-	};
-
-	return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary List saved views
- */
-export const invalidateListSavedViews = async (
-	queryClient: QueryClient,
-	params?: ListSavedViewsParams,
-	options?: InvalidateOptions,
-): Promise<QueryClient> => {
-	await queryClient.invalidateQueries(
-		{ queryKey: getListSavedViewsQueryKey(params) },
-		options,
-	);
-
-	return queryClient;
-};
-
-/**
- * Persists a saved view for the explore page. Returns the id of the created view.
- * @summary Create saved view
- */
-export const createSavedView = (
-	savedviewtypesPostableSavedViewDTO?: BodyType<SavedviewtypesPostableSavedViewDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<CreateSavedView201>({
-		url: `/api/v2/saved_views`,
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json' },
-		data: savedviewtypesPostableSavedViewDTO,
-		signal,
-	});
-};
-
-export const getCreateSavedViewMutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof createSavedView>>,
-		TError,
-		{ data?: BodyType<SavedviewtypesPostableSavedViewDTO> },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof createSavedView>>,
-	TError,
-	{ data?: BodyType<SavedviewtypesPostableSavedViewDTO> },
-	TContext
-> => {
-	const mutationKey = ['createSavedView'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof createSavedView>>,
-		{ data?: BodyType<SavedviewtypesPostableSavedViewDTO> }
-	> = (props) => {
-		const { data } = props ?? {};
-
-		return createSavedView(data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type CreateSavedViewMutationResult = NonNullable<
-	Awaited<ReturnType<typeof createSavedView>>
->;
-export type CreateSavedViewMutationBody =
-	| BodyType<SavedviewtypesPostableSavedViewDTO>
-	| undefined;
-export type CreateSavedViewMutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Create saved view
- */
-export const useCreateSavedView = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof createSavedView>>,
-		TError,
-		{ data?: BodyType<SavedviewtypesPostableSavedViewDTO> },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof createSavedView>>,
-	TError,
-	{ data?: BodyType<SavedviewtypesPostableSavedViewDTO> },
-	TContext
-> => {
-	return useMutation(getCreateSavedViewMutationOptions(options));
-};
-/**
- * Deletes a saved view by id.
- * @summary Delete saved view
- */
-export const deleteSavedView = (
-	{ id }: DeleteSavedViewPathParameters,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<void>({
-		url: `/api/v2/saved_views/${id}`,
-		method: 'DELETE',
-		signal,
-	});
-};
-
-export const getDeleteSavedViewMutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof deleteSavedView>>,
-		TError,
-		{ pathParams: DeleteSavedViewPathParameters },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof deleteSavedView>>,
-	TError,
-	{ pathParams: DeleteSavedViewPathParameters },
-	TContext
-> => {
-	const mutationKey = ['deleteSavedView'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof deleteSavedView>>,
-		{ pathParams: DeleteSavedViewPathParameters }
-	> = (props) => {
-		const { pathParams } = props ?? {};
-
-		return deleteSavedView(pathParams);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type DeleteSavedViewMutationResult = NonNullable<
-	Awaited<ReturnType<typeof deleteSavedView>>
->;
-
-export type DeleteSavedViewMutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Delete saved view
- */
-export const useDeleteSavedView = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof deleteSavedView>>,
-		TError,
-		{ pathParams: DeleteSavedViewPathParameters },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof deleteSavedView>>,
-	TError,
-	{ pathParams: DeleteSavedViewPathParameters },
-	TContext
-> => {
-	return useMutation(getDeleteSavedViewMutationOptions(options));
-};
-/**
- * Returns a saved view by id.
- * @summary Get saved view
- */
-export const getSavedView = (
-	{ id }: GetSavedViewPathParameters,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<GetSavedView200>({
-		url: `/api/v2/saved_views/${id}`,
-		method: 'GET',
-		signal,
-	});
-};
-
-export const getGetSavedViewQueryKey = ({ id }: GetSavedViewPathParameters) => {
-	return [`/api/v2/saved_views/${id}`] as const;
-};
-
-export const getGetSavedViewQueryOptions = <
-	TData = Awaited<ReturnType<typeof getSavedView>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	{ id }: GetSavedViewPathParameters,
-	options?: {
-		query?: UseQueryOptions<
-			Awaited<ReturnType<typeof getSavedView>>,
-			TError,
-			TData
-		>;
-	},
-) => {
-	const { query: queryOptions } = options ?? {};
-
-	const queryKey = queryOptions?.queryKey ?? getGetSavedViewQueryKey({ id });
-
-	const queryFn: QueryFunction<Awaited<ReturnType<typeof getSavedView>>> = ({
-		signal,
-	}) => getSavedView({ id }, signal);
-
-	return {
-		queryKey,
-		queryFn,
-		enabled: !!id,
-		...queryOptions,
-	} as UseQueryOptions<
-		Awaited<ReturnType<typeof getSavedView>>,
-		TError,
-		TData
-	> & { queryKey: QueryKey };
-};
-
-export type GetSavedViewQueryResult = NonNullable<
-	Awaited<ReturnType<typeof getSavedView>>
->;
-export type GetSavedViewQueryError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Get saved view
- */
-
-export function useGetSavedView<
-	TData = Awaited<ReturnType<typeof getSavedView>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	{ id }: GetSavedViewPathParameters,
-	options?: {
-		query?: UseQueryOptions<
-			Awaited<ReturnType<typeof getSavedView>>,
-			TError,
-			TData
-		>;
-	},
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
-	const queryOptions = getGetSavedViewQueryOptions({ id }, options);
-
-	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-		queryKey: QueryKey;
-	};
-
-	return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Get saved view
- */
-export const invalidateGetSavedView = async (
-	queryClient: QueryClient,
-	{ id }: GetSavedViewPathParameters,
-	options?: InvalidateOptions,
-): Promise<QueryClient> => {
-	await queryClient.invalidateQueries(
-		{ queryKey: getGetSavedViewQueryKey({ id }) },
-		options,
-	);
-
-	return queryClient;
-};
-
-/**
- * Replaces a saved view's name and query.
- * @summary Update saved view
- */
-export const updateSavedView = (
-	{ id }: UpdateSavedViewPathParameters,
-	savedviewtypesUpdatableSavedViewDTO?: BodyType<SavedviewtypesUpdatableSavedViewDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<void>({
-		url: `/api/v2/saved_views/${id}`,
-		method: 'PUT',
-		headers: { 'Content-Type': 'application/json' },
-		data: savedviewtypesUpdatableSavedViewDTO,
-		signal,
-	});
-};
-
-export const getUpdateSavedViewMutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof updateSavedView>>,
-		TError,
-		{
-			pathParams: UpdateSavedViewPathParameters;
-			data?: BodyType<SavedviewtypesUpdatableSavedViewDTO>;
-		},
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof updateSavedView>>,
-	TError,
-	{
-		pathParams: UpdateSavedViewPathParameters;
-		data?: BodyType<SavedviewtypesUpdatableSavedViewDTO>;
-	},
-	TContext
-> => {
-	const mutationKey = ['updateSavedView'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof updateSavedView>>,
-		{
-			pathParams: UpdateSavedViewPathParameters;
-			data?: BodyType<SavedviewtypesUpdatableSavedViewDTO>;
-		}
-	> = (props) => {
-		const { pathParams, data } = props ?? {};
-
-		return updateSavedView(pathParams, data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type UpdateSavedViewMutationResult = NonNullable<
-	Awaited<ReturnType<typeof updateSavedView>>
->;
-export type UpdateSavedViewMutationBody =
-	| BodyType<SavedviewtypesUpdatableSavedViewDTO>
-	| undefined;
-export type UpdateSavedViewMutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Update saved view
- */
-export const useUpdateSavedView = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof updateSavedView>>,
-		TError,
-		{
-			pathParams: UpdateSavedViewPathParameters;
-			data?: BodyType<SavedviewtypesUpdatableSavedViewDTO>;
-		},
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof updateSavedView>>,
-	TError,
-	{
-		pathParams: UpdateSavedViewPathParameters;
-		data?: BodyType<SavedviewtypesUpdatableSavedViewDTO>;
-	},
-	TContext
-> => {
-	return useMutation(getUpdateSavedViewMutationOptions(options));
-};

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

@@ -8858,112 +8858,6 @@ export interface RuletypesRuleDTO {
 export enum RuletypesThresholdKindDTO {
 	basic = 'basic',
 }
-export interface SavedviewtypesDisplayDTO {
-	/**
-	 * @type string
-	 */
-	color?: string;
-	/**
-	 * @type string
-	 */
-	fontSize?: string;
-	/**
-	 * @type string
-	 */
-	format?: string;
-	/**
-	 * @type integer
-	 */
-	maxLines?: number;
-}
-
-export enum SavedviewtypesPanelTypeDTO {
-	value = 'value',
-	graph = 'graph',
-	table = 'table',
-	list = 'list',
-	trace = 'trace',
-}
-export interface SavedviewtypesSavedViewSpecDTO {
-	display: SavedviewtypesDisplayDTO;
-	/**
-	 * @type string
-	 */
-	displayName: string;
-	panelType: SavedviewtypesPanelTypeDTO;
-	/**
-	 * @type array
-	 */
-	queries: Querybuildertypesv5QueryEnvelopeDTO[];
-	/**
-	 * @type array
-	 */
-	selectedFields: TelemetrytypesTelemetryFieldKeyDTO[];
-}
-
-export interface SavedviewtypesSavedViewDataDTO {
-	/**
-	 * @type string
-	 */
-	schemaVersion: string;
-	spec: SavedviewtypesSavedViewSpecDTO;
-}
-
-export enum SavedviewtypesSourceDTO {
-	traces = 'traces',
-	logs = 'logs',
-	metrics = 'metrics',
-	meter = 'meter',
-}
-export interface SavedviewtypesPostableSavedViewDTO {
-	data: SavedviewtypesSavedViewDataDTO;
-	/**
-	 * @type boolean
-	 */
-	generateName?: boolean;
-	/**
-	 * @type string
-	 */
-	name?: string;
-	source: SavedviewtypesSourceDTO;
-}
-
-export interface SavedviewtypesSavedViewDTO {
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	createdAt?: string;
-	/**
-	 * @type string
-	 */
-	createdBy?: string;
-	data?: SavedviewtypesSavedViewDataDTO;
-	/**
-	 * @type string
-	 */
-	id: string;
-	/**
-	 * @type string
-	 */
-	name?: string;
-	source?: SavedviewtypesSourceDTO;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	updatedAt?: string;
-	/**
-	 * @type string
-	 */
-	updatedBy?: string;
-}
-
-export interface SavedviewtypesUpdatableSavedViewDTO {
-	data: SavedviewtypesSavedViewDataDTO;
-	source: SavedviewtypesSourceDTO;
-}
-
 export interface ServiceaccounttypesDeprecatedPostableServiceAccountRoleDTO {
 	/**
 	 * @type string
@@ -12162,54 +12056,6 @@ export type TestRule200 = {
 	status: string;
 };
 
-export type ListSavedViewsParams = {
-	/**
-	 * @description undefined
-	 */
-	source?: SavedviewtypesSourceDTO;
-	/**
-	 * @type string
-	 * @description undefined
-	 */
-	name?: string;
-};
-
-export type ListSavedViews200 = {
-	/**
-	 * @type array,null
-	 */
-	data: SavedviewtypesSavedViewDTO[] | null;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type CreateSavedView201 = {
-	data: TypesIdentifiableDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type DeleteSavedViewPathParameters = {
-	id: string;
-};
-export type GetSavedViewPathParameters = {
-	id: string;
-};
-export type GetSavedView200 = {
-	data: SavedviewtypesSavedViewDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
-export type UpdateSavedViewPathParameters = {
-	id: string;
-};
 export type GetSessionContext200 = {
 	data: AuthtypesSessionContextDTO;
 	/**

frontend/src/api/utils.ts

@@ -24,3 +24,19 @@ export const Logout = async (): Promise<void> => {
 	window.dispatchEvent(new CustomEvent('LOGOUT'));
 	history.push(ROUTES.LOGIN);
 };
+
+export const UnderscoreToDotMap: Record<string, string> = {
+	k8s_cluster_name: 'k8s.cluster.name',
+	k8s_cluster_uid: 'k8s.cluster.uid',
+	k8s_namespace_name: 'k8s.namespace.name',
+	k8s_node_name: 'k8s.node.name',
+	k8s_node_uid: 'k8s.node.uid',
+	k8s_pod_name: 'k8s.pod.name',
+	k8s_pod_uid: 'k8s.pod.uid',
+	k8s_deployment_name: 'k8s.deployment.name',
+	k8s_daemonset_name: 'k8s.daemonset.name',
+	k8s_statefulset_name: 'k8s.statefulset.name',
+	k8s_cronjob_name: 'k8s.cronjob.name',
+	k8s_job_name: 'k8s.job.name',
+	k8s_persistentvolumeclaim_name: 'k8s.persistentvolumeclaim.name',
+};

frontend/src/assets/Logos/amazon-bedrock.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="#9CA3AF" fill-rule="evenodd" style="flex:none;line-height:1" viewBox="0 0 24 24"><title>AWS</title><path d="M6.763 11.212q.002.446.088.71c.064.176.144.368.256.576.04.063.056.127.056.183q.002.12-.152.24l-.503.335a.4.4 0 0 1-.208.072q-.12-.002-.239-.112a2.5 2.5 0 0 1-.287-.375 6 6 0 0 1-.248-.471q-.934 1.101-2.347 1.101c-.67 0-1.205-.191-1.596-.574-.39-.384-.59-.894-.59-1.533 0-.678.24-1.23.726-1.644.487-.415 1.133-.623 1.955-.623.272 0 .551.024.846.064.296.04.6.104.918.176v-.583q-.001-.908-.375-1.277c-.255-.248-.686-.367-1.3-.367-.28 0-.568.031-.863.103s-.583.16-.862.272a2 2 0 0 1-.28.104.5.5 0 0 1-.127.023q-.168.002-.168-.247v-.391c0-.128.016-.224.056-.28a.6.6 0 0 1 .224-.167 4.6 4.6 0 0 1 1.005-.36 4.8 4.8 0 0 1 1.246-.151c.95 0 1.644.216 2.091.647q.661.646.662 1.963v2.586zm-3.24 1.214c.263 0 .534-.048.822-.144a1.8 1.8 0 0 0 .758-.51 1.3 1.3 0 0 0 .272-.512c.047-.191.08-.423.08-.694v-.335a7 7 0 0 0-.735-.136 6 6 0 0 0-.75-.048c-.535 0-.926.104-1.19.32-.263.215-.39.518-.39.917 0 .375.095.655.295.846.191.2.47.296.838.296m6.41.862c-.144 0-.24-.024-.304-.08-.064-.048-.12-.16-.168-.311L7.586 6.726a1.4 1.4 0 0 1-.072-.32c0-.128.064-.2.191-.2h.783q.227-.001.31.08c.065.048.113.16.16.312l1.342 5.284 1.245-5.284q.058-.24.151-.312a.55.55 0 0 1 .32-.08h.638c.152 0 .256.025.32.08.063.048.12.16.151.312l1.261 5.348 1.381-5.348q.074-.24.16-.312a.52.52 0 0 1 .311-.08h.743c.127 0 .2.065.2.2 0 .04-.009.08-.017.128a1 1 0 0 1-.056.2l-1.923 6.17q-.072.24-.168.311a.5.5 0 0 1-.303.08h-.687c-.15 0-.255-.024-.32-.08-.063-.056-.119-.16-.15-.32L12.32 7.747l-1.23 5.14c-.04.16-.087.264-.15.32-.065.056-.177.08-.32.08zm10.256.215c-.415 0-.83-.048-1.229-.143-.399-.096-.71-.2-.918-.32-.128-.071-.215-.151-.247-.223a.6.6 0 0 1-.048-.224v-.407c0-.167.064-.247.183-.247q.072 0 .144.024c.048.016.12.048.2.08q.408.181.878.279c.32.064.63.096.95.096.502 0 .894-.088 1.165-.264a.86.86 0 0 0 .415-.758.78.78 0 0 0-.215-.559c-.144-.151-.416-.287-.807-.415l-1.157-.36c-.583-.183-1.014-.454-1.277-.813a1.9 1.9 0 0 1-.4-1.158q0-.502.216-.886c.144-.255.335-.479.575-.654.24-.184.51-.32.83-.415.32-.096.655-.136 1.006-.136.175 0 .36.008.535.032.183.024.35.056.518.088q.24.058.455.127.216.072.336.144a.7.7 0 0 1 .24.2.43.43 0 0 1 .071.263v.375q-.002.254-.184.256a.8.8 0 0 1-.303-.096 3.65 3.65 0 0 0-1.532-.311c-.455 0-.815.071-1.062.223s-.375.383-.375.71c0 .224.08.416.24.567.16.152.454.304.877.44l1.134.358c.574.184.99.44 1.237.767s.367.702.367 1.117c0 .343-.072.655-.207.926a2.2 2.2 0 0 1-.583.703c-.248.2-.543.343-.886.447-.36.111-.734.167-1.142.167"/><path fill="#f90" d="M.378 15.475c3.384 1.963 7.56 3.153 11.877 3.153 2.914 0 6.114-.607 9.06-1.852.44-.2.814.287.383.607-2.626 1.94-6.442 2.969-9.722 2.969-4.598 0-8.74-1.7-11.87-4.526-.247-.223-.024-.527.272-.351m23.531-.2c.287.36-.08 2.826-1.485 4.007-.215.184-.423.088-.327-.151l.175-.439c.343-.88.802-2.198.52-2.555-.336-.43-2.22-.207-3.074-.103-.255.032-.295-.192-.063-.36 1.5-1.053 3.967-.75 4.254-.399"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" fill-rule="evenodd" style="flex:none;line-height:1" viewBox="0 0 24 24"><title>AWS</title><path d="M6.763 11.212q.002.446.088.71c.064.176.144.368.256.576.04.063.056.127.056.183q.002.12-.152.24l-.503.335a.4.4 0 0 1-.208.072q-.12-.002-.239-.112a2.5 2.5 0 0 1-.287-.375 6 6 0 0 1-.248-.471q-.934 1.101-2.347 1.101c-.67 0-1.205-.191-1.596-.574-.39-.384-.59-.894-.59-1.533 0-.678.24-1.23.726-1.644.487-.415 1.133-.623 1.955-.623.272 0 .551.024.846.064.296.04.6.104.918.176v-.583q-.001-.908-.375-1.277c-.255-.248-.686-.367-1.3-.367-.28 0-.568.031-.863.103s-.583.16-.862.272a2 2 0 0 1-.28.104.5.5 0 0 1-.127.023q-.168.002-.168-.247v-.391c0-.128.016-.224.056-.28a.6.6 0 0 1 .224-.167 4.6 4.6 0 0 1 1.005-.36 4.8 4.8 0 0 1 1.246-.151c.95 0 1.644.216 2.091.647q.661.646.662 1.963v2.586zm-3.24 1.214c.263 0 .534-.048.822-.144a1.8 1.8 0 0 0 .758-.51 1.3 1.3 0 0 0 .272-.512c.047-.191.08-.423.08-.694v-.335a7 7 0 0 0-.735-.136 6 6 0 0 0-.75-.048c-.535 0-.926.104-1.19.32-.263.215-.39.518-.39.917 0 .375.095.655.295.846.191.2.47.296.838.296m6.41.862c-.144 0-.24-.024-.304-.08-.064-.048-.12-.16-.168-.311L7.586 6.726a1.4 1.4 0 0 1-.072-.32c0-.128.064-.2.191-.2h.783q.227-.001.31.08c.065.048.113.16.16.312l1.342 5.284 1.245-5.284q.058-.24.151-.312a.55.55 0 0 1 .32-.08h.638c.152 0 .256.025.32.08.063.048.12.16.151.312l1.261 5.348 1.381-5.348q.074-.24.16-.312a.52.52 0 0 1 .311-.08h.743c.127 0 .2.065.2.2 0 .04-.009.08-.017.128a1 1 0 0 1-.056.2l-1.923 6.17q-.072.24-.168.311a.5.5 0 0 1-.303.08h-.687c-.15 0-.255-.024-.32-.08-.063-.056-.119-.16-.15-.32L12.32 7.747l-1.23 5.14c-.04.16-.087.264-.15.32-.065.056-.177.08-.32.08zm10.256.215c-.415 0-.83-.048-1.229-.143-.399-.096-.71-.2-.918-.32-.128-.071-.215-.151-.247-.223a.6.6 0 0 1-.048-.224v-.407c0-.167.064-.247.183-.247q.072 0 .144.024c.048.016.12.048.2.08q.408.181.878.279c.32.064.63.096.95.096.502 0 .894-.088 1.165-.264a.86.86 0 0 0 .415-.758.78.78 0 0 0-.215-.559c-.144-.151-.416-.287-.807-.415l-1.157-.36c-.583-.183-1.014-.454-1.277-.813a1.9 1.9 0 0 1-.4-1.158q0-.502.216-.886c.144-.255.335-.479.575-.654.24-.184.51-.32.83-.415.32-.096.655-.136 1.006-.136.175 0 .36.008.535.032.183.024.35.056.518.088q.24.058.455.127.216.072.336.144a.7.7 0 0 1 .24.2.43.43 0 0 1 .071.263v.375q-.002.254-.184.256a.8.8 0 0 1-.303-.096 3.65 3.65 0 0 0-1.532-.311c-.455 0-.815.071-1.062.223s-.375.383-.375.71c0 .224.08.416.24.567.16.152.454.304.877.44l1.134.358c.574.184.99.44 1.237.767s.367.702.367 1.117c0 .343-.072.655-.207.926a2.2 2.2 0 0 1-.583.703c-.248.2-.543.343-.886.447-.36.111-.734.167-1.142.167"/><path fill="#f90" d="M.378 15.475c3.384 1.963 7.56 3.153 11.877 3.153 2.914 0 6.114-.607 9.06-1.852.44-.2.814.287.383.607-2.626 1.94-6.442 2.969-9.722 2.969-4.598 0-8.74-1.7-11.87-4.526-.247-.223-.024-.527.272-.351m23.531-.2c.287.36-.08 2.826-1.485 4.007-.215.184-.423.088-.327-.151l.175-.439c.343-.88.802-2.198.52-2.555-.336-.43-2.22-.207-3.074-.103-.255.032-.295-.192-.063-.36 1.5-1.053 3.967-.75 4.254-.399"/></svg>

frontend/src/assets/Logos/apache-druid.svg

@@ -1,3 +1,3 @@
 <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#29F1FB" d="M8.932 20.806c-.369 0-.738.007-1.109 0-.35-.007-.587-.206-.623-.5a.587.587 0 0 1 .53-.636c.79-.062 1.582-.063 2.372-.003a.548.548 0 0 1 .522.602c-.024.326-.253.526-.616.54zM1.792 8.345c-.392 0-.782.008-1.173.002-.327-.006-.577-.22-.614-.512-.037-.293.146-.544.499-.615.192-.032.388-.045.583-.039a81.515 81.515 0 0 1 1.597 0c.163 0 .325.019.483.056.288.073.445.318.411.617-.034.298-.214.477-.515.487-.424.014-.848.004-1.272.004zm7.588 8.417H4.292a2.464 2.464 0 0 1-.326-.007c-.294-.04-.48-.209-.508-.506-.029-.298.11-.501.391-.606.179-.065.365-.051.549-.051 3.347 0 6.695.005 10.042-.006 1.174-.004 2.187-.439 2.993-1.3.69-.738 1.053-1.63 1.16-2.635.085-.788-.027-1.513-.516-2.156-.544-.718-1.28-1.078-2.163-1.082-3.163-.013-6.328-.005-9.487-.01-.336 0-.673-.027-1.007-.058-.29-.027-.45-.201-.469-.492-.021-.317.141-.545.429-.6a1.55 1.55 0 0 1 .29-.015h10.177c1.71.004 3.187 1.038 3.726 2.654.383 1.147.246 2.304-.182 3.416-.824 2.135-2.762 3.448-5.055 3.454-1.652.005-3.304 0-4.956 0zm2.906-13.568c1.533 0 3.066-.008 4.598 0 2.935.018 5.629 1.892 6.653 4.626.442 1.181.538 2.403.412 3.657-.185 1.842-.735 3.552-1.776 5.084-1.608 2.365-3.873 3.68-6.679 4.118-.95.148-1.905.13-2.86.13-.397 0-.61-.181-.633-.51-.025-.351.196-.621.587-.645.434-.026.87-.004 1.305-.016 2.641-.072 4.928-.982 6.74-2.935 1.269-1.37 1.912-3.039 2.13-4.878.151-1.275.135-2.544-.37-3.752-.773-1.85-2.159-2.983-4.068-3.509-.74-.204-1.5-.243-2.26-.247-2.837-.017-5.675-.007-8.511-.007-.12 0-.24.004-.359-.006a.57.57 0 0 1-.517-.536.557.557 0 0 1 .456-.557c.13-.018.261-.024.392-.019h4.762Z"/>
+  <path fill="currentColor" d="M8.932 20.806c-.369 0-.738.007-1.109 0-.35-.007-.587-.206-.623-.5a.587.587 0 0 1 .53-.636c.79-.062 1.582-.063 2.372-.003a.548.548 0 0 1 .522.602c-.024.326-.253.526-.616.54zM1.792 8.345c-.392 0-.782.008-1.173.002-.327-.006-.577-.22-.614-.512-.037-.293.146-.544.499-.615.192-.032.388-.045.583-.039a81.515 81.515 0 0 1 1.597 0c.163 0 .325.019.483.056.288.073.445.318.411.617-.034.298-.214.477-.515.487-.424.014-.848.004-1.272.004zm7.588 8.417H4.292a2.464 2.464 0 0 1-.326-.007c-.294-.04-.48-.209-.508-.506-.029-.298.11-.501.391-.606.179-.065.365-.051.549-.051 3.347 0 6.695.005 10.042-.006 1.174-.004 2.187-.439 2.993-1.3.69-.738 1.053-1.63 1.16-2.635.085-.788-.027-1.513-.516-2.156-.544-.718-1.28-1.078-2.163-1.082-3.163-.013-6.328-.005-9.487-.01-.336 0-.673-.027-1.007-.058-.29-.027-.45-.201-.469-.492-.021-.317.141-.545.429-.6a1.55 1.55 0 0 1 .29-.015h10.177c1.71.004 3.187 1.038 3.726 2.654.383 1.147.246 2.304-.182 3.416-.824 2.135-2.762 3.448-5.055 3.454-1.652.005-3.304 0-4.956 0zm2.906-13.568c1.533 0 3.066-.008 4.598 0 2.935.018 5.629 1.892 6.653 4.626.442 1.181.538 2.403.412 3.657-.185 1.842-.735 3.552-1.776 5.084-1.608 2.365-3.873 3.68-6.679 4.118-.95.148-1.905.13-2.86.13-.397 0-.61-.181-.633-.51-.025-.351.196-.621.587-.645.434-.026.87-.004 1.305-.016 2.641-.072 4.928-.982 6.74-2.935 1.269-1.37 1.912-3.039 2.13-4.878.151-1.275.135-2.544-.37-3.752-.773-1.85-2.159-2.983-4.068-3.509-.74-.204-1.5-.243-2.26-.247-2.837-.017-5.675-.007-8.511-.007-.12 0-.24.004-.359-.006a.57.57 0 0 1-.517-.536.557.557 0 0 1 .456-.557c.13-.018.261-.024.392-.019h4.762Z"/>
 </svg>

frontend/src/assets/Logos/apache.svg

@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#D22128" d="M17.805 2.197v.066h.156v.44h.072v-.44h.156v-.066zm.9 0l-.175.353-.172-.353h-.087v.506h.067V2.3l.172.35h.045l.172-.35v.404h.066v-.506zm-4.257 1c-.204.31-.424.66-.66 1.06l-.04.062a44.457 44.457 0 00-1.265 2.29c-.187.36-.38.742-.577 1.146l2.267-.25c.66-.302.955-.578 1.242-.976a15.5 15.5 0 00.23-.342c.23-.363.46-.763.663-1.16.197-.386.37-.767.505-1.11.083-.22.15-.422.198-.6.042-.158.074-.307.1-.45-.884.15-1.965.295-2.668.33zM11.894 7.78l-.077.16c-.078.16-.157.32-.236.488-.086.18-.172.364-.26.552l-.132.287a75.265 75.265 0 00-1.427 3.3c-.163.397-.327.807-.493 1.23-.15.38-.297.765-.45 1.164l-.02.06c-.15.396-.3.802-.453 1.22l-.01.027.72-.08a.213.213 0 01-.042-.006c.863-.106 2.01-.75 2.75-1.547.342-.367.652-.8.94-1.306.213-.377.413-.795.604-1.258.168-.405.328-.843.48-1.318-.196.105-.423.18-.673.235a2.184 2.184 0 01-.273.046c.806-.31 1.314-.905 1.683-1.64a2.816 2.816 0 01-.968.428c-.06.012-.116.022-.174.03l-.043.006h.002c.278-.118.514-.248.718-.403a2.571 2.571 0 00.637-.698l.063-.104.077-.154a8.107 8.107 0 00.367-.85l.03-.088a3.04 3.04 0 00.123-.463.733.733 0 01-.094.065c-.243.145-.66.277-.996.34l.663-.074-.664.073h-.017l-.1.017c.006-.003.01-.006.017-.008l-2.265.25-.013.022zM8.27 16.45c-.117.323-.236.654-.355.992l-.005.015c-.016.046-.032.094-.05.142-.08.227-.15.432-.31.9.264.12.475.435.675.793a1.44 1.44 0 00-.466-.99c1.293.06 2.41-.27 2.99-1.217.05-.084.096-.173.14-.268-.26.333-.59.474-1.2.44 0 0-.004 0-.005.002l.004-.002c.9-.404 1.354-.79 1.754-1.433.094-.153.186-.32.28-.503-.788.81-1.702 1.04-2.664.865l-.72.078a6.43 6.43 0 00-.067.183zM15.42.112c-.376.222-1 .85-1.748 1.763l.686 1.294c.48-.687.97-1.307 1.462-1.836l.058-.062c-.02.02-.04.04-.057.062-.16.176-.644.74-1.375 1.863.703-.035 1.784-.18 2.666-.33.262-1.47-.258-2.142-.258-2.142s-.66-1.07-1.436-.61zm-3.084 6.402a40.253 40.253 0 011.306-2.26l.04-.064c.224-.352.45-.693.677-1.02l-.685-1.293-.157.192c-.197.245-.403.51-.613.79a39.853 39.853 0 00-2.016 2.97l-.022.038.893 1.763c.19-.378.38-.752.575-1.118zm-3.73 8.32c.158-.406.319-.81.483-1.225.156-.394.32-.79.484-1.19a91.133 91.133 0 011.6-3.604l.205-.424c.12-.243.237-.485.36-.724a.125.125 0 01.02-.04l-.895-1.763-.044.07c-.207.34-.414.687-.617 1.042a38.056 38.056 0 00-1.092 2.04l-.094.193a24.573 24.573 0 00-1.258 3.087 18.492 18.492 0 00-.52 1.997l.896 1.77c.117-.317.24-.638.364-.963zm-1.376-.476a13.38 13.38 0 00-.234 1.692c0 .02-.004.04-.005.06-.28-.45-1.03-.888-1.026-.884.537.778.944 1.55 1.005 2.31-.29.058-.684-.027-1.14-.195.475.436.83.556.97.588-.434.03-.89.328-1.346.67.668-.27 1.21-.38 1.596-.29-.61 1.74-1.23 3.655-1.843 5.69a.538.538 0 00.364-.354c.11-.368.84-2.786 1.978-5.965l.097-.27.028-.078c.12-.332.246-.672.374-1.02l.09-.237v-.004L7.24 14.3c-.003.02-.01.04-.012.06z"/>
-</svg>

frontend/src/assets/Logos/auth0.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#EB5424" d="M21.98 7.448 19.62 0H4.347L2.02 7.448c-1.352 4.312.03 9.206 3.815 12.015L12.007 24l6.157-4.552c3.755-2.81 5.182-7.688 3.815-12.015l-6.16 4.58 2.343 7.45-6.157-4.597-6.158 4.58 2.358-7.433-6.188-4.55 7.63-.045L12.008 0l2.356 7.404 7.615.044z"/></svg>

frontend/src/assets/Logos/baseten.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#9CA3AF" height="34" viewBox="0 0 131 34">
-  <path fill="#9CA3AF" d="M.36 8.6h16.7v5.6H6.04c-.2 0-.35.16-.35.35v4.9c0 .2.16.35.35.35h11.02v5.6h-5.33c-.2 0-.35.16-.35.35v4.9c0 .2.16.35.35.35h4.98c.2 0 .35-.15.35-.35V25.4h5.34c.2 0 .35-.16.35-.35v-4.9c0-.2-.16-.35-.35-.35h-5.34v-5.6h5.34c.2 0 .35-.16.35-.35v-4.9c0-.2-.16-.35-.35-.35h-5.34V3.35c0-.2-.16-.35-.35-.35H.36c-.2 0-.36.16-.36.35v4.9c0 .2.16.35.36.35ZM44.41 14.7c-.5-.5-1.1-.9-1.76-1.18a5.62 5.62 0 0 0-4.6.17c-.73.37-1.32.91-1.75 1.62h-.17V8.59H34.1v16.83h2.04v-1.81h.17c.21.36.47.67.77.94.31.25.65.48 1.01.67.37.18.77.31 1.18.39a6.2 6.2 0 0 0 3.39-.24 5.36 5.36 0 0 0 3.02-3.1c.29-.75.44-1.62.44-2.6v-.47c0-.96-.16-1.83-.47-2.58-.3-.75-.7-1.4-1.23-1.9v-.01Zm-5.87.66a3.9 3.9 0 0 1 4.34.84c.36.35.64.8.83 1.3.2.5.3 1.07.3 1.7v.47c0 .64-.1 1.23-.3 1.74a3.75 3.75 0 0 1-2.06 2.15 4.27 4.27 0 0 1-3.12-.03 3.86 3.86 0 0 1-2.09-2.2c-.2-.52-.3-1.11-.3-1.75v-.29c0-.62.1-1.2.3-1.7v-.01c.21-.53.5-.99.84-1.36.36-.37.78-.66 1.26-.86ZM97.04 8.59H95v4.86h-2.94v1.86H95v8.17c0 .56.17 1.03.53 1.4.37.35.84.54 1.4.54h4.18v-1.87h-3.5c-.2 0-.33-.05-.43-.15-.1-.1-.14-.27-.14-.49v-7.6h4.65v-1.86h-4.65V8.59ZM114.61 15a5.48 5.48 0 0 0-1.8-1.33 5.6 5.6 0 0 0-2.57-.56 6.17 6.17 0 0 0-4.26 1.7 5.6 5.6 0 0 0-1.72 4.2v.57c0 .9.15 1.75.44 2.5a5.58 5.58 0 0 0 5.5 3.67c1.55 0 2.8-.35 3.72-1.04a5.35 5.35 0 0 0 1.91-2.73l.03-.07-1.94-.52-.02.07c-.11.33-.27.64-.46.94-.17.27-.4.52-.7.74-.28.22-.63.39-1.04.51-.41.13-.9.19-1.46.19a3.8 3.8 0 0 1-2.84-1.05 4.07 4.07 0 0 1-1.1-2.7h9.68v-1.6c0-.54-.11-1.12-.34-1.75a5.04 5.04 0 0 0-1.03-1.74Zm-8.25 3.21a3.8 3.8 0 0 1 1.22-2.25 4.19 4.19 0 0 1 3.99-.7c.44.16.83.38 1.17.66.34.27.62.62.82 1.02.21.38.34.8.38 1.27h-7.58ZM129.09 14.42a4.47 4.47 0 0 0-3.37-1.3c-.93 0-1.73.2-2.4.59-.64.39-1.15.97-1.52 1.74h-.17v-2h-2.04v11.97h2.04v-6.23c0-1.26.32-2.28.95-3.02a3.31 3.31 0 0 1 2.65-1.14c.94 0 1.7.3 2.24.9.56.6.83 1.52.83 2.74v6.75h2.04v-7.13c0-1.71-.42-3.02-1.25-3.87ZM88.1 15a5.48 5.48 0 0 0-1.78-1.33 5.6 5.6 0 0 0-2.58-.56 6.17 6.17 0 0 0-4.27 1.7 5.59 5.59 0 0 0-1.71 4.2v.56c0 .92.14 1.76.44 2.51a5.6 5.6 0 0 0 5.5 3.67c1.55 0 2.8-.35 3.72-1.04a5.36 5.36 0 0 0 1.91-2.73l.03-.07-1.94-.52-.03.07c-.1.32-.26.64-.45.94-.17.27-.4.52-.7.74-.29.21-.64.39-1.05.51-.4.12-.9.19-1.45.19a3.8 3.8 0 0 1-2.85-1.05 4.07 4.07 0 0 1-1.09-2.7h9.68v-1.61c0-.53-.12-1.12-.34-1.74A5.03 5.03 0 0 0 88.1 15Zm-8.24 3.21a3.83 3.83 0 0 1 1.22-2.25 4.2 4.2 0 0 1 3.99-.7c.44.16.83.38 1.16.66.35.27.62.62.83 1.02.2.38.33.8.37 1.27h-7.57ZM73.65 19.42a6.11 6.11 0 0 0-3.23-1.02 6.63 6.63 0 0 1-2.68-.58c-.47-.3-.7-.7-.7-1.25 0-.27.08-.5.21-.7.14-.2.33-.38.56-.52a4.05 4.05 0 0 1 1.78-.42c.85 0 1.54.21 2.06.63.53.41.83 1 .91 1.73l.01.1 1.95-.47-.01-.07c-.07-.45-.22-.91-.45-1.36a3.46 3.46 0 0 0-.94-1.2 4.6 4.6 0 0 0-1.52-.84 6.05 6.05 0 0 0-2.1-.34c-.58 0-1.13.07-1.65.22-.52.14-1 .36-1.43.65-.41.3-.74.66-.99 1.1a2.9 2.9 0 0 0-.37 1.49v.14c0 1.06.38 1.87 1.14 2.42a6.2 6.2 0 0 0 3.24.97c1.18.08 2.04.26 2.56.54.5.28.75.72.75 1.36 0 .6-.25 1.06-.78 1.4-.52.32-1.22.48-2.1.48a3.68 3.68 0 0 1-2.46-.79 3.13 3.13 0 0 1-1.04-2.14v-.09l-1.93.46h-.02v.07a4.4 4.4 0 0 0 3.1 4c.7.24 1.52.36 2.46.36.7 0 1.35-.09 1.93-.27.6-.16 1.12-.4 1.53-.72A3.38 3.38 0 0 0 74.8 22v-.14c0-1.07-.39-1.9-1.14-2.44ZM60.25 23.4c-.1-.1-.14-.27-.14-.49v-9.46h-2.05v1.85h-.16a3.78 3.78 0 0 0-1.61-1.63 4.62 4.62 0 0 0-2.26-.56c-.77 0-1.5.14-2.19.41a5.27 5.27 0 0 0-3.02 3.12c-.29.75-.44 1.63-.44 2.6v.38c0 .99.15 1.87.44 2.63.3.75.7 1.4 1.2 1.93a5.48 5.48 0 0 0 4.05 1.57c.8 0 1.51-.2 2.2-.58.69-.38 1.24-.97 1.63-1.75h.16v.06c0 .56.18 1.03.53 1.4.37.35.85.54 1.41.54h1.36v-1.87h-.68c-.2 0-.34-.05-.43-.15Zm-4.46.13c-.46.2-.97.3-1.52.3a3.68 3.68 0 0 1-2.75-1.09 4.42 4.42 0 0 1-1.05-3.12v-.38c0-.62.1-1.2.29-1.71a3.65 3.65 0 0 1 5-2.17c.47.2.88.49 1.21.86.35.37.62.83.8 1.36.2.5.3 1.08.3 1.7v.3c0 .63-.1 1.23-.3 1.76-.18.5-.45.96-.78 1.33-.33.37-.73.66-1.2.86Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" height="34" viewBox="0 0 131 34">
+  <path fill="currentColor" d="M.36 8.6h16.7v5.6H6.04c-.2 0-.35.16-.35.35v4.9c0 .2.16.35.35.35h11.02v5.6h-5.33c-.2 0-.35.16-.35.35v4.9c0 .2.16.35.35.35h4.98c.2 0 .35-.15.35-.35V25.4h5.34c.2 0 .35-.16.35-.35v-4.9c0-.2-.16-.35-.35-.35h-5.34v-5.6h5.34c.2 0 .35-.16.35-.35v-4.9c0-.2-.16-.35-.35-.35h-5.34V3.35c0-.2-.16-.35-.35-.35H.36c-.2 0-.36.16-.36.35v4.9c0 .2.16.35.36.35ZM44.41 14.7c-.5-.5-1.1-.9-1.76-1.18a5.62 5.62 0 0 0-4.6.17c-.73.37-1.32.91-1.75 1.62h-.17V8.59H34.1v16.83h2.04v-1.81h.17c.21.36.47.67.77.94.31.25.65.48 1.01.67.37.18.77.31 1.18.39a6.2 6.2 0 0 0 3.39-.24 5.36 5.36 0 0 0 3.02-3.1c.29-.75.44-1.62.44-2.6v-.47c0-.96-.16-1.83-.47-2.58-.3-.75-.7-1.4-1.23-1.9v-.01Zm-5.87.66a3.9 3.9 0 0 1 4.34.84c.36.35.64.8.83 1.3.2.5.3 1.07.3 1.7v.47c0 .64-.1 1.23-.3 1.74a3.75 3.75 0 0 1-2.06 2.15 4.27 4.27 0 0 1-3.12-.03 3.86 3.86 0 0 1-2.09-2.2c-.2-.52-.3-1.11-.3-1.75v-.29c0-.62.1-1.2.3-1.7v-.01c.21-.53.5-.99.84-1.36.36-.37.78-.66 1.26-.86ZM97.04 8.59H95v4.86h-2.94v1.86H95v8.17c0 .56.17 1.03.53 1.4.37.35.84.54 1.4.54h4.18v-1.87h-3.5c-.2 0-.33-.05-.43-.15-.1-.1-.14-.27-.14-.49v-7.6h4.65v-1.86h-4.65V8.59ZM114.61 15a5.48 5.48 0 0 0-1.8-1.33 5.6 5.6 0 0 0-2.57-.56 6.17 6.17 0 0 0-4.26 1.7 5.6 5.6 0 0 0-1.72 4.2v.57c0 .9.15 1.75.44 2.5a5.58 5.58 0 0 0 5.5 3.67c1.55 0 2.8-.35 3.72-1.04a5.35 5.35 0 0 0 1.91-2.73l.03-.07-1.94-.52-.02.07c-.11.33-.27.64-.46.94-.17.27-.4.52-.7.74-.28.22-.63.39-1.04.51-.41.13-.9.19-1.46.19a3.8 3.8 0 0 1-2.84-1.05 4.07 4.07 0 0 1-1.1-2.7h9.68v-1.6c0-.54-.11-1.12-.34-1.75a5.04 5.04 0 0 0-1.03-1.74Zm-8.25 3.21a3.8 3.8 0 0 1 1.22-2.25 4.19 4.19 0 0 1 3.99-.7c.44.16.83.38 1.17.66.34.27.62.62.82 1.02.21.38.34.8.38 1.27h-7.58ZM129.09 14.42a4.47 4.47 0 0 0-3.37-1.3c-.93 0-1.73.2-2.4.59-.64.39-1.15.97-1.52 1.74h-.17v-2h-2.04v11.97h2.04v-6.23c0-1.26.32-2.28.95-3.02a3.31 3.31 0 0 1 2.65-1.14c.94 0 1.7.3 2.24.9.56.6.83 1.52.83 2.74v6.75h2.04v-7.13c0-1.71-.42-3.02-1.25-3.87ZM88.1 15a5.48 5.48 0 0 0-1.78-1.33 5.6 5.6 0 0 0-2.58-.56 6.17 6.17 0 0 0-4.27 1.7 5.59 5.59 0 0 0-1.71 4.2v.56c0 .92.14 1.76.44 2.51a5.6 5.6 0 0 0 5.5 3.67c1.55 0 2.8-.35 3.72-1.04a5.36 5.36 0 0 0 1.91-2.73l.03-.07-1.94-.52-.03.07c-.1.32-.26.64-.45.94-.17.27-.4.52-.7.74-.29.21-.64.39-1.05.51-.4.12-.9.19-1.45.19a3.8 3.8 0 0 1-2.85-1.05 4.07 4.07 0 0 1-1.09-2.7h9.68v-1.61c0-.53-.12-1.12-.34-1.74A5.03 5.03 0 0 0 88.1 15Zm-8.24 3.21a3.83 3.83 0 0 1 1.22-2.25 4.2 4.2 0 0 1 3.99-.7c.44.16.83.38 1.16.66.35.27.62.62.83 1.02.2.38.33.8.37 1.27h-7.57ZM73.65 19.42a6.11 6.11 0 0 0-3.23-1.02 6.63 6.63 0 0 1-2.68-.58c-.47-.3-.7-.7-.7-1.25 0-.27.08-.5.21-.7.14-.2.33-.38.56-.52a4.05 4.05 0 0 1 1.78-.42c.85 0 1.54.21 2.06.63.53.41.83 1 .91 1.73l.01.1 1.95-.47-.01-.07c-.07-.45-.22-.91-.45-1.36a3.46 3.46 0 0 0-.94-1.2 4.6 4.6 0 0 0-1.52-.84 6.05 6.05 0 0 0-2.1-.34c-.58 0-1.13.07-1.65.22-.52.14-1 .36-1.43.65-.41.3-.74.66-.99 1.1a2.9 2.9 0 0 0-.37 1.49v.14c0 1.06.38 1.87 1.14 2.42a6.2 6.2 0 0 0 3.24.97c1.18.08 2.04.26 2.56.54.5.28.75.72.75 1.36 0 .6-.25 1.06-.78 1.4-.52.32-1.22.48-2.1.48a3.68 3.68 0 0 1-2.46-.79 3.13 3.13 0 0 1-1.04-2.14v-.09l-1.93.46h-.02v.07a4.4 4.4 0 0 0 3.1 4c.7.24 1.52.36 2.46.36.7 0 1.35-.09 1.93-.27.6-.16 1.12-.4 1.53-.72A3.38 3.38 0 0 0 74.8 22v-.14c0-1.07-.39-1.9-1.14-2.44ZM60.25 23.4c-.1-.1-.14-.27-.14-.49v-9.46h-2.05v1.85h-.16a3.78 3.78 0 0 0-1.61-1.63 4.62 4.62 0 0 0-2.26-.56c-.77 0-1.5.14-2.19.41a5.27 5.27 0 0 0-3.02 3.12c-.29.75-.44 1.63-.44 2.6v.38c0 .99.15 1.87.44 2.63.3.75.7 1.4 1.2 1.93a5.48 5.48 0 0 0 4.05 1.57c.8 0 1.51-.2 2.2-.58.69-.38 1.24-.97 1.63-1.75h.16v.06c0 .56.18 1.03.53 1.4.37.35.85.54 1.41.54h1.36v-1.87h-.68c-.2 0-.34-.05-.43-.15Zm-4.46.13c-.46.2-.97.3-1.52.3a3.68 3.68 0 0 1-2.75-1.09 4.42 4.42 0 0 1-1.05-3.12v-.38c0-.62.1-1.2.29-1.71a3.65 3.65 0 0 1 5-2.17c.47.2.88.49 1.21.86.35.37.62.83.8 1.36.2.5.3 1.08.3 1.7v.3c0 .63-.1 1.23-.3 1.76-.18.5-.45.96-.78 1.33-.33.37-.73.66-1.2.86Z"/>
 </svg>

frontend/src/assets/Logos/cohere.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path fill="#355146" fill-rule="evenodd" d="M6.82 11.908c.525 0 1.57-.03 3.013-.639 1.682-.71 5.029-2 7.443-3.323 1.689-.926 2.429-2.151 2.429-3.8 0-2.29-1.81-4.146-4.043-4.146H6.307C3.1 0 .5 2.666.5 5.954s2.434 5.954 6.32 5.954" clip-rule="evenodd"/><path fill="#d18ee2" fill-rule="evenodd" d="M8.402 16.01c0-1.611.947-3.064 2.399-3.682l2.946-1.254c2.98-1.268 6.26.977 6.26 4.286 0 2.563-2.027 4.64-4.527 4.64l-3.19-.002c-2.147 0-3.888-1.785-3.888-3.987" clip-rule="evenodd"/><path fill="#ff7759" d="M3.848 12.691C1.998 12.691.5 14.228.5 16.124v.444C.5 18.464 1.999 20 3.848 20s3.347-1.536 3.347-3.432v-.444c0-1.896-1.499-3.433-3.347-3.433"/></svg>

frontend/src/assets/Logos/dbos.svg

@@ -1,9 +1,9 @@
 <svg width="109" height="24" viewBox="0 0 109 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_125_22125)">
-<path d="M0 -2.08616e-07V24H17.9352C22.9911 24 26.0999 21.0858 26.0999 17.04V6.96C26.0999 2.91432 22.9911 -2.08616e-07 17.9352 -2.08616e-07H0ZM6.76413 5.82864H19.1992V18.1714H6.76413V5.82864Z" fill="#9CA3AF"/>
-<path d="M46.7659 18.6172H35.0824V14.16H46.7659V18.6172ZM46.595 5.38296V9.5658H35.0824V5.38296H46.595ZM50.2846 12.1373V11.5886C52.5734 10.5258 53.7008 8.8458 53.7008 6.13728C53.7008 2.64012 50.9337 0.000116183 45.5361 0.000116183H28.3184V24H45.7752C51.1728 24 53.9399 21.8401 53.9399 18.0685C53.9399 15.0172 52.6418 13.2001 50.2846 12.1373Z" fill="#9CA3AF"/>
-<path d="M62.397 18.1714H74.8319V5.82864H62.397V18.1714ZM63.6609 24C58.6049 24 55.4961 21.0858 55.4961 17.04V6.96012C55.4961 2.91432 58.6049 0.000116183 63.6609 0.000116183H73.568C78.6238 0.000116183 81.7326 2.91432 81.7326 6.96012V17.04C81.7326 21.0858 78.6238 24 73.568 24H63.6609Z" fill="#9CA3AF"/>
-<path d="M101.66 15.12L90.8995 14.3658C85.5361 13.9886 83.418 11.1772 83.418 7.47432V6.96012C83.418 2.91432 86.5266 0.000116183 91.5827 0.000116183H100.157C105.214 0.000116183 108.323 2.91432 108.323 6.96012V7.98864H101.968V5.14284H90.2504V8.43432L100.601 9.18864C105.999 9.56568 108.493 12.8572 108.493 16.5257V17.04C108.493 20.7428 105.384 24 100.328 24H91.5827C86.5266 24 83.418 20.7428 83.418 17.04V16.0115H89.7722V18.8572H101.66V15.12Z" fill="#9CA3AF"/>
+<path d="M0 -2.08616e-07V24H17.9352C22.9911 24 26.0999 21.0858 26.0999 17.04V6.96C26.0999 2.91432 22.9911 -2.08616e-07 17.9352 -2.08616e-07H0ZM6.76413 5.82864H19.1992V18.1714H6.76413V5.82864Z" fill="currentColor"/>
+<path d="M46.7659 18.6172H35.0824V14.16H46.7659V18.6172ZM46.595 5.38296V9.5658H35.0824V5.38296H46.595ZM50.2846 12.1373V11.5886C52.5734 10.5258 53.7008 8.8458 53.7008 6.13728C53.7008 2.64012 50.9337 0.000116183 45.5361 0.000116183H28.3184V24H45.7752C51.1728 24 53.9399 21.8401 53.9399 18.0685C53.9399 15.0172 52.6418 13.2001 50.2846 12.1373Z" fill="currentColor"/>
+<path d="M62.397 18.1714H74.8319V5.82864H62.397V18.1714ZM63.6609 24C58.6049 24 55.4961 21.0858 55.4961 17.04V6.96012C55.4961 2.91432 58.6049 0.000116183 63.6609 0.000116183H73.568C78.6238 0.000116183 81.7326 2.91432 81.7326 6.96012V17.04C81.7326 21.0858 78.6238 24 73.568 24H63.6609Z" fill="currentColor"/>
+<path d="M101.66 15.12L90.8995 14.3658C85.5361 13.9886 83.418 11.1772 83.418 7.47432V6.96012C83.418 2.91432 86.5266 0.000116183 91.5827 0.000116183H100.157C105.214 0.000116183 108.323 2.91432 108.323 6.96012V7.98864H101.968V5.14284H90.2504V8.43432L100.601 9.18864C105.999 9.56568 108.493 12.8572 108.493 16.5257V17.04C108.493 20.7428 105.384 24 100.328 24H91.5827C86.5266 24 83.418 20.7428 83.418 17.04V16.0115H89.7722V18.8572H101.66V15.12Z" fill="currentColor"/>
 </g>
 <defs>
 <clipPath id="clip0_125_22125">

frontend/src/assets/Logos/dspy.svg

@@ -1,9 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <g fill="none" stroke="#EF4136" stroke-width="1.1" stroke-linecap="round" stroke-linejoin="round">
-    <rect x="2.2" y="2.2" width="19.6" height="19.6" rx="0.6"/>
-    <path d="M12 2.2V4.7a1.75 1.75 0 1 0 0 3.5V12"/>
-    <path d="M12 12v2.5a1.75 1.75 0 1 1 0 3.5v3.8"/>
-    <path d="M2.2 12h2.5a1.75 1.75 0 1 0 3.5 0H12"/>
-    <path d="M12 12h2.8a1.75 1.75 0 1 1 3.5 0h3.5"/>
-  </g>
-</svg>

frontend/src/assets/Logos/elasticsearch.svg

@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#00BFB3" d="M13.394 0C8.683 0 4.609 2.716 2.644 6.667h15.641a4.77 4.77 0 0 0 3.073-1.11c.446-.375.864-.785 1.247-1.243l.001-.002A11.974 11.974 0 0 0 13.394 0zM1.804 8.889a12.009 12.009 0 0 0 0 6.222h14.7a3.111 3.111 0 1 0 0-6.222zm.84 8.444C4.61 21.283 8.684 24 13.395 24c3.701 0 7.011-1.677 9.212-4.312l-.001-.002a9.958 9.958 0 0 0-1.247-1.243 4.77 4.77 0 0 0-3.073-1.11z"/>
-</svg>

frontend/src/assets/Logos/groq.svg

@@ -1 +1 @@
-<svg fill="#F55036" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Groq</title><path d="M12.036 2c-3.853-.035-7 3-7.036 6.781-.035 3.782 3.055 6.872 6.908 6.907h2.42v-2.566h-2.292c-2.407.028-4.38-1.866-4.408-4.23-.029-2.362 1.901-4.298 4.308-4.326h.1c2.407 0 4.358 1.915 4.365 4.278v6.305c0 2.342-1.944 4.25-4.323 4.279a4.375 4.375 0 01-3.033-1.252l-1.851 1.818A7 7 0 0012.029 22h.092c3.803-.056 6.858-3.083 6.879-6.816v-6.5C18.907 4.963 15.817 2 12.036 2z"></path></svg>
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Groq</title><path d="M12.036 2c-3.853-.035-7 3-7.036 6.781-.035 3.782 3.055 6.872 6.908 6.907h2.42v-2.566h-2.292c-2.407.028-4.38-1.866-4.408-4.23-.029-2.362 1.901-4.298 4.308-4.326h.1c2.407 0 4.358 1.915 4.365 4.278v6.305c0 2.342-1.944 4.25-4.323 4.279a4.375 4.375 0 01-3.033-1.252l-1.851 1.818A7 7 0 0012.029 22h.092c3.803-.056 6.858-3.083 6.879-6.816v-6.5C18.907 4.963 15.817 2 12.036 2z"></path></svg>

frontend/src/assets/Logos/haproxy.svg

@@ -1,74 +0,0 @@
-<svg role="img" viewBox="0 0 102.04 102.04" xmlns="http://www.w3.org/2000/svg">
-  <rect x="45.34" y="23.92" width=".41" height="15.95" transform="translate(-9.7 38.24) rotate(-41.55)" fill="#106DA9"/>
-  <rect x="32.04" y="45.06" width="11.92" height="11.92" transform="translate(-13.28 88.67) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="45.04" y="32.06" width="11.92" height="11.92" transform="translate(12.63 88.76) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="45.04" y="58.06" width="11.92" height="11.92" transform="translate(-13.37 114.58) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="58.04" y="45.06" width="11.92" height="11.92" transform="translate(12.54 114.67) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="57.03" y="22.05" width="7.94" height="7.94" transform="translate(34.56 86.84) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="36.03" y="22.05" width="7.94" height="7.94" transform="translate(13.7 65.84) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="22.03" y="37.05" width="7.94" height="7.94" transform="translate(-15.2 66.73) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="22.03" y="58.05" width="7.94" height="7.94" transform="translate(-36.2 87.59) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="72.03" y="58.05" width="7.94" height="7.94" transform="translate(13.45 137.58) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="72.03" y="37.05" width="7.94" height="7.94" transform="translate(34.45 116.73) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="15.02" y="26.04" width="5.96" height="5.96" transform="translate(-11.15 46.82) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="25.02" y="14.04" width="5.96" height="5.96" transform="translate(10.79 44.9) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="40.02" y="9.04" width="5.96" height="5.96" transform="translate(30.68 54.94) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="11.02" y="41.04" width="5.96" height="5.96" transform="translate(-30.12 57.71) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="81.98" y="26" width="5.04" height="5.04" transform="translate(-.2 .59) rotate(-.4)" fill="#106DA9"/>
-  <rect x="70.98" y="15" width="5.04" height="5.04" transform="translate(-.12 .51) rotate(-.4)" fill="#106DA9"/>
-  <rect x="55.98" y="9" width="5.04" height="5.04" transform="translate(-.08 .41) rotate(-.4)" fill="#106DA9"/>
-  <rect x="84.98" y="41" width="5.04" height="5.03" transform="translate(-.3 .6) rotate(-.4)" fill="#106DA9"/>
-  <rect x="36.03" y="72.05" width="7.94" height="7.94" transform="translate(-36.3 115.49) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="57.03" y="72.05" width="7.94" height="7.94" transform="translate(-15.44 136.49) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="81.02" y="70.04" width="5.96" height="5.96" transform="translate(10.39 156.51) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="70.02" y="82.04" width="5.96" height="5.96" transform="translate(-12.52 157.43) rotate(-89.6)" fill="#106DA9"/>
-  <rect x="56.02" y="87.04" width="5.96" height="5.96" transform="translate(-31.44 148.37) rotate(-89.59)" fill="#106DA9"/>
-  <rect x="84.02" y="55.04" width="5.96" height="5.96" transform="translate(28.35 144.6) rotate(-89.59)" fill="#106DA9"/>
-  <rect x="14.98" y="71" width="5.04" height="5.04" transform="translate(-.51 .12) rotate(-.4)" fill="#106DA9"/>
-  <rect x="25.98" y="82" width="5.03" height="5.04" transform="translate(-.61 .21) rotate(-.41)" fill="#106DA9"/>
-  <rect x="40.98" y="87" width="5.04" height="5.04" transform="translate(-.62 .3) rotate(-.4)" fill="#106DA9"/>
-  <rect x="11.98" y="55" width="5.04" height="5.04" transform="translate(-.4 .1) rotate(-.4)" fill="#106DA9"/>
-  <rect x="18.01" y="12.03" width="2.98" height="2.98" transform="translate(5.85 32.93) rotate(-89.61)" fill="#106DA9"/>
-  <rect x=".01" y="45.03" width="2.98" height="2.98" transform="translate(-45.03 47.71) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="2.01" y="35.03" width="2.98" height="2.98" transform="translate(-33.04 39.77) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="35.01" y="2.03" width="2.98" height="2.98" transform="translate(32.73 40) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="6.01" y="26.03" width="2.98" height="2.98" transform="translate(-20.07 34.83) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="11.01" y="18.03" width="2.98" height="2.98" transform="translate(-7.11 31.89) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="25.99" y="6.01" width="3.02" height="3.02" transform="translate(-.05 .19) rotate(-.39)" fill="#106DA9"/>
-  <rect x="44.01" y=".03" width="2.98" height="2.98" transform="translate(0 .31) rotate(-.39)" fill="#106DA9"/>
-  <rect x="93.01" y="26.03" width="2.98" height="2.98" transform="translate(66.34 121.83) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="97.01" y="35.03" width="2.98" height="2.98" transform="translate(61.31 134.77) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="88.01" y="18.03" width="2.98" height="2.98" transform="translate(69.37 108.89) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="98.01" y="45.03" width="2.98" height="2.98" transform="translate(52.3 145.7) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="53.99" y=".01" width="3.02" height="3.02" transform="translate(53.6 57.01) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="64.01" y="2.03" width="2.98" height="2.98" transform="translate(61.53 69) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="18.01" y="12.03" width="2.98" height="2.98" transform="translate(5.85 32.93) rotate(-89.61)" fill="#106DA9"/>
-  <rect x=".01" y="45.03" width="2.98" height="2.98" transform="translate(-45.03 47.71) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="81.01" y="12.03" width="2.98" height="2.98" transform="translate(68.42 95.93) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="2.01" y="35.03" width="2.98" height="2.98" transform="translate(-33.04 39.77) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="35.01" y="2.03" width="2.98" height="2.98" transform="translate(32.73 40) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="6.01" y="26.03" width="2.98" height="2.98" transform="translate(-20.07 34.83) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="11.01" y="18.03" width="2.98" height="2.98" transform="translate(-7.11 31.89) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="25.99" y="6.01" width="3.02" height="3.02" transform="translate(-.05 .19) rotate(-.39)" fill="#106DA9"/>
-  <rect x="44.01" y=".03" width="2.98" height="2.98" transform="translate(0 .31) rotate(-.39)" fill="#106DA9"/>
-  <rect x="73.01" y="6.03" width="2.98" height="2.98" transform="translate(66.47 81.97) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="98.01" y="45.03" width="2.98" height="2.98" transform="translate(52.3 145.7) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="53.99" y=".01" width="3.02" height="3.02" transform="translate(53.6 57.01) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="64.01" y="2.03" width="2.98" height="2.98" transform="translate(61.53 69) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="81.01" y="88.03" width="2.98" height="2.98" transform="translate(-7.58 171.41) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="98.01" y="54.03" width="2.98" height="2.98" transform="translate(43.31 154.64) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="18.01" y="88.03" width="2.98" height="2.98" transform="translate(-70.15 108.42) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="97.01" y="64.03" width="2.98" height="2.98" transform="translate(32.32 163.58) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="64.01" y="97.04" width="2.97" height="2.97" transform="translate(-33.67 163.03) rotate(-89.43)" fill="#106DA9"/>
-  <rect x="93.01" y="73.03" width="2.98" height="2.98" transform="translate(19.31 168.49) rotate(-89.59)" fill="#106DA9"/>
-  <rect x="88.01" y="81.03" width="2.98" height="2.98" transform="translate(6.37 171.45) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="72.99" y="93.01" width="3.02" height="3.02" transform="translate(-.65 .51) rotate(-.39)" fill="#106DA9"/>
-  <rect x="53.99" y="99.01" width="3.02" height="3.02" transform="translate(-.68 .38) rotate(-.39)" fill="#106DA9"/>
-  <rect x="26.01" y="93.03" width="2.98" height="2.98" transform="translate(-67.21 121.37) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="6.01" y="73.03" width="2.98" height="2.98" transform="translate(-67.07 81.51) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="2.01" y="64.03" width="2.98" height="2.98" transform="translate(-62.04 68.57) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="11.01" y="81.03" width="2.98" height="2.98" transform="translate(-70.1 94.46) rotate(-89.61)" fill="#106DA9"/>
-  <rect x=".01" y="54.03" width="2.98" height="2.98" transform="translate(-54.03 56.65) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="45.01" y="99.03" width="2.98" height="2.98" transform="translate(-54.33 146.34) rotate(-89.61)" fill="#106DA9"/>
-  <rect x="35.01" y="97.03" width="2.98" height="2.98" transform="translate(-62.27 134.34) rotate(-89.61)" fill="#106DA9"/>
-</svg>

frontend/src/assets/Logos/hcp-vault.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#FFEC6E" d="m0 0 11.955 24L24 0zm13.366 4.827h1.393v1.38h-1.393zm-2.77 5.569H9.22V8.993h1.389zm0-2.087H9.22V6.906h1.389zm0-2.086H9.22V4.819h1.389zm2.087 6.263h-1.377V11.08h1.388zm0-2.09h-1.377V8.993h1.388zm0-2.087h-1.377V6.906h1.388zm0-2.086h-1.377V4.819h1.388zm.683.683h1.393v1.389h-1.393zm0 3.475V8.993h1.389v1.388Z"/></svg>

frontend/src/assets/Logos/langflow.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#9CA3AF" d="M9.755 1.52h-.001c-.31 0-.608.124-.828.343L4.037 6.752a1.17 1.17 0 0 1-.827.343H1.17A1.17 1.17 0 0 0 0 8.295l.052 1.984a1.17 1.17 0 0 0 1.17 1.14h2.37c.31 0 .607-.124.827-.344l4.93-4.93c.22-.22.517-.343.827-.343h2.874a1.17 1.17 0 0 0 1.17-1.17V2.69a1.17 1.17 0 0 0-1.17-1.17zm9.78 2.503c-.31 0-.608.123-.828.343l-4.889 4.889a1.17 1.17 0 0 1-.827.342h-2.756c-.31 0-.608.124-.827.344L4.15 15.197a1.17 1.17 0 0 1-.827.343H1.32a1.17 1.17 0 0 0-1.17 1.17v1.996c0 .646.524 1.17 1.17 1.17h2.017c.302 0 .592-.116.81-.325l5.535-5.304a1.17 1.17 0 0 1 .81-.326h2.88c.31 0 .607-.123.827-.342l4.93-4.93c.22-.22.517-.344.827-.344h2.873A1.17 1.17 0 0 0 24 7.135V5.193a1.17 1.17 0 0 0-1.17-1.17h-3.294zm0 8.559c-.31 0-.608.123-.828.343l-4.889 4.889a1.17 1.17 0 0 1-.827.343h-2.04a1.17 1.17 0 0 0-1.17 1.2l.052 1.984a1.17 1.17 0 0 0 1.17 1.14h2.37c.31 0 .607-.124.827-.343l4.93-4.93c.22-.22.517-.343.827-.343h2.873a1.17 1.17 0 0 0 1.17-1.17v-1.943a1.17 1.17 0 0 0-1.17-1.17h-3.294Z"/></svg>

frontend/src/assets/Logos/open-webui.svg

@@ -1,5 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <rect x="2.34" y="2.34" width="19.27" height="19.27" rx="4.69" fill="#fff"/>
-  <circle cx="10.41" cy="11.95" r="2.77" fill="none" stroke="#000" stroke-width="1.36"/>
-  <rect x="15" y="8.53" width="1.36" height="6.94" fill="#000"/>
-</svg>

frontend/src/assets/Logos/planetscale.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#9CA3AF" viewBox="0 0 24 24"><title>PlanetScale</title><path d="M0 12C0 5.373 5.373 0 12 0c4.873 0 9.067 2.904 10.947 7.077l-15.87 15.87a12 12 0 0 1-1.935-1.099L14.99 12H12l-8.485 8.485A11.96 11.96 0 0 1 0 12m12.004 12L24 12.004C23.998 18.628 18.628 23.998 12.004 24"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24"><title>PlanetScale</title><path d="M0 12C0 5.373 5.373 0 12 0c4.873 0 9.067 2.904 10.947 7.077l-15.87 15.87a12 12 0 0 1-1.935-1.099L14.99 12H12l-8.485 8.485A11.96 11.96 0 0 1 0 12m12.004 12L24 12.004C23.998 18.628 18.628 23.998 12.004 24"/></svg>

frontend/src/assets/Logos/rabbitmq.svg

@@ -1,3 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#FF6600" d="M23.035 9.601h-7.677a.956.956 0 01-.962-.962V.962a.956.956 0 00-.962-.956H10.56a.956.956 0 00-.962.956V8.64a.956.956 0 01-.962.962H5.762a.956.956 0 01-.961-.962V.962A.956.956 0 003.839 0H.959a.956.956 0 00-.956.962v22.076A.956.956 0 00.965 24h22.07a.956.956 0 00.962-.962V10.58a.956.956 0 00-.962-.98zm-3.86 8.152a1.437 1.437 0 01-1.437 1.443h-1.924a1.437 1.437 0 01-1.436-1.443v-1.917a1.437 1.437 0 011.436-1.443h1.924a1.437 1.437 0 011.437 1.443z"/>
-</svg>

frontend/src/assets/Logos/railway.svg

@@ -1,3 +1,3 @@
 <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#9CA3AF" d="M.113 10.27A13.026 13.026 0 000 11.48h18.23c-.064-.125-.15-.237-.235-.347-3.117-4.027-4.793-3.677-7.19-3.78-.8-.034-1.34-.048-4.524-.048-1.704 0-3.555.005-5.358.01-.234.63-.459 1.24-.567 1.737h9.342v1.216H.113v.002zm18.26 2.426H.009c.02.326.05.645.094.961h16.955c.754 0 1.179-.429 1.315-.96zm-17.318 4.28s2.81 6.902 10.93 7.024c4.855 0 9.027-2.883 10.92-7.024H1.056zM11.988 0C7.5 0 3.593 2.466 1.531 6.108l4.75-.005v-.002c3.71 0 3.849.016 4.573.047l.448.016c1.563.052 3.485.22 4.996 1.364.82.621 2.007 1.99 2.712 2.965.654.902.842 1.94.396 2.934-.408.914-1.289 1.458-2.353 1.458H.391s.099.42.249.886h22.748A12.026 12.026 0 0024 12.005C24 5.377 18.621 0 11.988 0z"/>
+  <path fill="currentColor" d="M.113 10.27A13.026 13.026 0 000 11.48h18.23c-.064-.125-.15-.237-.235-.347-3.117-4.027-4.793-3.677-7.19-3.78-.8-.034-1.34-.048-4.524-.048-1.704 0-3.555.005-5.358.01-.234.63-.459 1.24-.567 1.737h9.342v1.216H.113v.002zm18.26 2.426H.009c.02.326.05.645.094.961h16.955c.754 0 1.179-.429 1.315-.96zm-17.318 4.28s2.81 6.902 10.93 7.024c4.855 0 9.027-2.883 10.92-7.024H1.056zM11.988 0C7.5 0 3.593 2.466 1.531 6.108l4.75-.005v-.002c3.71 0 3.849.016 4.573.047l.448.016c1.563.052 3.485.22 4.996 1.364.82.621 2.007 1.99 2.712 2.965.654.902.842 1.94.396 2.934-.408.914-1.289 1.458-2.353 1.458H.391s.099.42.249.886h22.748A12.026 12.026 0 0024 12.005C24 5.377 18.621 0 11.988 0z"/>
 </svg>

frontend/src/assets/Logos/scala.svg

@@ -1,13 +1,13 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 590 270">
-<path d="M30.36,109.14v.48h0A3.73,3.73,0,0,1,30.36,109.14Z" fill="#de3423" fill-rule="evenodd"/>
+<path d="M30.36,109.14v.48h0A3.73,3.73,0,0,1,30.36,109.14Z" fill="currentColor" fill-rule="evenodd"/>
 <path d="M138.66,28.78C107.2,37.87,57.29,43,30.4,43h0V94.35a.8.8,0,0,0,.19.48c18.35,0,75-6,109.18-15.4a129,129,0,0,0,17.49-5.81c4.18-1.88,6.88-3.86,6.88-5.92V15.91C164.1,20.79,151.39,25.11,138.66,28.78Z" fill="#de3423" fill-rule="evenodd"/>
 <path d="M138.66,95.37c-18.83,5.43-44.24,9.47-67.39,11.83-15.54,1.59-30.06,2.42-40.87,2.42h0v51.31a.8.8,0,0,0,.19.48c18.35,0,75-6,109.18-15.39a130.38,130.38,0,0,0,17.49-5.81c4.18-1.89,6.88-3.86,6.88-5.92V82.5C164.1,87.37,151.39,91.69,138.66,95.37Z" fill="#de3423" fill-rule="evenodd"/>
 <path d="M138.66,162c-18.83,5.43-44.24,9.46-67.39,11.83-15.56,1.59-30.1,2.42-40.91,2.42V228c18.16,0,75.1-5.95,109.37-15.39,12.63-3.48,24.37-7.44,24.37-11.74V149.08C164.1,154,151.39,158.28,138.66,162Z" fill="#de3423" fill-rule="evenodd"/>
-<path d="M30.55,94.83C32.4,97.38,48,102.19,71.27,107.2c23.27,4.46,47.47,22.07,66.29,16.64,12.73-3.68,26.54-36.47,26.54-41.34V82c0-3.4-2.55-6.13-6.88-8.4-17.75-9.07-21.11-12.41-27.69-10.6C95.37,72.43,35.06,67.61,30.55,94.83Z" fill="#de3423" fill-rule="evenodd"/>
-<path d="M30.55,161.41C32.4,164,48,168.77,71.27,173.79c26,4.74,48.61,20.19,67.44,14.75,12.73-3.68,25.39-34.58,25.39-39.46v-.48c0-3.39-2.55-6.13-6.88-8.39-13.54-7.2-31.43-15.13-38-13.32C85,136.3,39.26,138.37,30.55,161.41Z" fill="#de3423" fill-rule="evenodd"/>
-<path d="M200.7,142.39c6,11.79,15.6,17.6,29.05,17.6,14.44,0,19.59-7.64,19.59-15.11,0-5.15-1.83-8.63-6.64-11.79-4.82-3.32-8.3-4.81-16.93-8-10.63-4-16.77-7-23.41-12.29-6.64-5.48-9.79-13-9.79-22.74a28.28,28.28,0,0,1,10.29-22.58c7-5.81,15.44-8.63,25.56-8.63,15.77,0,27.72,6.31,35.69,18.76L249.34,87.78c-4.48-6.81-11.29-10.3-20.59-10.3-9.13,0-15.77,5.15-15.77,12.29,0,4.81,2,7.14,4.82,10,1.82,1.33,6.47,3.32,8.63,4.48l6,2.32,6.8,2.66c11,4.48,18.76,9.3,23.57,14.44s7.31,12.12,7.31,20.75c0,20.42-14.11,34.2-40.51,34.2-21.41,0-37.18-10-44.48-26.4Z" fill="#de3423"/>
-<path d="M354.25,104.71,342,117.49a28.14,28.14,0,0,0-21.24-9.13,25,25,0,0,0-18.43,7.47,27.76,27.76,0,0,0,0,37.52,25,25,0,0,0,18.43,7.47A28.14,28.14,0,0,0,342,151.69l12.29,12.78c-9,9.63-20.09,14.44-33.53,14.44-12.79,0-23.58-4.15-32.37-12.62s-13.12-19.09-13.12-31.7,4.32-23.08,13.12-31.54,19.58-12.78,32.37-12.78C334.16,90.27,345.28,95.08,354.25,104.71Z" fill="#de3423"/>
-<path d="M393.88,125.62C408,124.3,413,122.47,413,116c0-5.15-4.64-9.13-13.94-9.13q-13.44,0-22.41,10.95l-12.28-10.46c8.13-11.45,19.58-17.09,34.36-17.09,20.75,0,33.7,10,33.7,27.05v37c0,5.81,2.15,6.48,7,6.48h.5v15.43c-2,1.17-5.15,1.83-9.3,1.83-4.48,0-8-1.33-10.62-4a14.06,14.06,0,0,1-3-5.48c-5.81,6.8-15.27,10.29-28.39,10.29-18.42,0-30.87-10.13-30.87-25.4C357.7,136.41,369.15,127.78,393.88,125.62ZM391.56,162c13.28,0,21.41-6,21.41-16.6v-9.3a9.75,9.75,0,0,1-4.14,2.49c-3.82,1.33-6.31,1.66-14.28,2.49-11.62,1.33-17.43,5-17.43,10.79C377.12,158.33,382.43,162,391.56,162Z" fill="#de3423"/>
-<path d="M444.84,60.88h19.92V149.2c0,8.13,2.66,11.62,10,11.62a21.15,21.15,0,0,0,6-.67v17.76a35.56,35.56,0,0,1-9.47,1c-17.59,0-26.39-9-26.39-27.06Z" fill="#de3423"/>
-<path d="M521.71,125.62c14.11-1.32,19.09-3.15,19.09-9.62,0-5.15-4.64-9.13-13.94-9.13q-13.44,0-22.41,10.95l-12.28-10.46c8.13-11.45,19.58-17.09,34.36-17.09,20.75,0,33.7,10,33.7,27.05v37c0,5.81,2.15,6.48,7,6.48h.5v15.43c-2,1.17-5.15,1.83-9.3,1.83-4.48,0-8-1.33-10.62-4a13.94,13.94,0,0,1-3-5.48c-5.81,6.8-15.27,10.29-28.39,10.29-18.42,0-30.87-10.13-30.87-25.4C485.53,136.41,497,127.78,521.71,125.62ZM519.39,162c13.28,0,21.41-6,21.41-16.6v-9.3a9.73,9.73,0,0,1-4.15,2.49c-3.81,1.33-6.3,1.66-14.27,2.49-11.62,1.33-17.43,5-17.43,10.79C505,158.33,510.26,162,519.39,162Z" fill="#de3423"/>
+<path d="M30.55,94.83C32.4,97.38,48,102.19,71.27,107.2c23.27,4.46,47.47,22.07,66.29,16.64,12.73-3.68,26.54-36.47,26.54-41.34V82c0-3.4-2.55-6.13-6.88-8.4-17.75-9.07-21.11-12.41-27.69-10.6C95.37,72.43,35.06,67.61,30.55,94.83Z" fill="currentColor" fill-rule="evenodd"/>
+<path d="M30.55,161.41C32.4,164,48,168.77,71.27,173.79c26,4.74,48.61,20.19,67.44,14.75,12.73-3.68,25.39-34.58,25.39-39.46v-.48c0-3.39-2.55-6.13-6.88-8.39-13.54-7.2-31.43-15.13-38-13.32C85,136.3,39.26,138.37,30.55,161.41Z" fill="currentColor" fill-rule="evenodd"/>
+<path d="M200.7,142.39c6,11.79,15.6,17.6,29.05,17.6,14.44,0,19.59-7.64,19.59-15.11,0-5.15-1.83-8.63-6.64-11.79-4.82-3.32-8.3-4.81-16.93-8-10.63-4-16.77-7-23.41-12.29-6.64-5.48-9.79-13-9.79-22.74a28.28,28.28,0,0,1,10.29-22.58c7-5.81,15.44-8.63,25.56-8.63,15.77,0,27.72,6.31,35.69,18.76L249.34,87.78c-4.48-6.81-11.29-10.3-20.59-10.3-9.13,0-15.77,5.15-15.77,12.29,0,4.81,2,7.14,4.82,10,1.82,1.33,6.47,3.32,8.63,4.48l6,2.32,6.8,2.66c11,4.48,18.76,9.3,23.57,14.44s7.31,12.12,7.31,20.75c0,20.42-14.11,34.2-40.51,34.2-21.41,0-37.18-10-44.48-26.4Z" fill="currentColor"/>
+<path d="M354.25,104.71,342,117.49a28.14,28.14,0,0,0-21.24-9.13,25,25,0,0,0-18.43,7.47,27.76,27.76,0,0,0,0,37.52,25,25,0,0,0,18.43,7.47A28.14,28.14,0,0,0,342,151.69l12.29,12.78c-9,9.63-20.09,14.44-33.53,14.44-12.79,0-23.58-4.15-32.37-12.62s-13.12-19.09-13.12-31.7,4.32-23.08,13.12-31.54,19.58-12.78,32.37-12.78C334.16,90.27,345.28,95.08,354.25,104.71Z" fill="currentColor"/>
+<path d="M393.88,125.62C408,124.3,413,122.47,413,116c0-5.15-4.64-9.13-13.94-9.13q-13.44,0-22.41,10.95l-12.28-10.46c8.13-11.45,19.58-17.09,34.36-17.09,20.75,0,33.7,10,33.7,27.05v37c0,5.81,2.15,6.48,7,6.48h.5v15.43c-2,1.17-5.15,1.83-9.3,1.83-4.48,0-8-1.33-10.62-4a14.06,14.06,0,0,1-3-5.48c-5.81,6.8-15.27,10.29-28.39,10.29-18.42,0-30.87-10.13-30.87-25.4C357.7,136.41,369.15,127.78,393.88,125.62ZM391.56,162c13.28,0,21.41-6,21.41-16.6v-9.3a9.75,9.75,0,0,1-4.14,2.49c-3.82,1.33-6.31,1.66-14.28,2.49-11.62,1.33-17.43,5-17.43,10.79C377.12,158.33,382.43,162,391.56,162Z" fill="currentColor"/>
+<path d="M444.84,60.88h19.92V149.2c0,8.13,2.66,11.62,10,11.62a21.15,21.15,0,0,0,6-.67v17.76a35.56,35.56,0,0,1-9.47,1c-17.59,0-26.39-9-26.39-27.06Z" fill="currentColor"/>
+<path d="M521.71,125.62c14.11-1.32,19.09-3.15,19.09-9.62,0-5.15-4.64-9.13-13.94-9.13q-13.44,0-22.41,10.95l-12.28-10.46c8.13-11.45,19.58-17.09,34.36-17.09,20.75,0,33.7,10,33.7,27.05v37c0,5.81,2.15,6.48,7,6.48h.5v15.43c-2,1.17-5.15,1.83-9.3,1.83-4.48,0-8-1.33-10.62-4a13.94,13.94,0,0,1-3-5.48c-5.81,6.8-15.27,10.29-28.39,10.29-18.42,0-30.87-10.13-30.87-25.4C485.53,136.41,497,127.78,521.71,125.62ZM519.39,162c13.28,0,21.41-6,21.41-16.6v-9.3a9.73,9.73,0,0,1-4.15,2.49c-3.81,1.33-6.3,1.66-14.27,2.49-11.62,1.33-17.43,5-17.43,10.79C505,158.33,510.26,162,519.39,162Z" fill="currentColor"/>
 </svg>

frontend/src/constants/features.ts

@@ -7,6 +7,7 @@ export enum FeatureKeys {
 	GATEWAY = 'gateway',
 	PREMIUM_SUPPORT = 'premium_support',
 	ANOMALY_DETECTION = 'anomaly_detection',
+	DOT_METRICS_ENABLED = 'dot_metrics_enabled',
 	USE_JSON_BODY = 'use_json_body',
 	ENABLE_AI_OBSERVABILITY = 'enable_ai_observability',
 	ENABLE_METRICS_REDUCTION = 'enable_metrics_reduction',

frontend/src/constants/generated/semconvFamilies.gen.ts

@@ -1,32 +0,0 @@
-// Code generated by scripts/semconv. DO NOT EDIT.
-
-export type SemconvFamily = {
-	readonly current: string;
-	readonly old: readonly string[];
-	readonly kind: 'attribute' | 'metric';
-	readonly contexts: readonly string[];
-	readonly signals: readonly string[];
-	readonly applyToMetrics: readonly string[];
-	readonly valueMap: Readonly<Record<string, string>>;
-};
-
-export const SEMCONV_FAMILIES: readonly SemconvFamily[] = [
-	{
-		current: 'db.system.name',
-		old: ['db.system'],
-		kind: 'attribute',
-		contexts: [],
-		signals: [],
-		applyToMetrics: [],
-		valueMap: {},
-	},
-	{
-		current: 'deployment.environment.name',
-		old: ['deployment.environment'],
-		kind: 'attribute',
-		contexts: [],
-		signals: [],
-		applyToMetrics: [],
-		valueMap: {},
-	},
-] as const;

frontend/src/container/AllError/index.tsx

@@ -37,6 +37,8 @@ import { ErrorResponse, SuccessResponse } from 'types/api';
 import { Exception, PayloadProps } from 'types/api/errors/getAll';
 import { GlobalReducer } from 'types/reducer/globalTime';
 
+import { FeatureKeys } from '../../constants/features';
+import { useAppContext } from '../../providers/App/App';
 import { FilterDropdownExtendsProps } from './types';
 import {
 	extractFilterValues,
@@ -416,6 +418,11 @@ function AllErrors(): JSX.Element {
 		},
 	];
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const onChangeHandler: TableProps<Exception>['onChange'] = useCallback(
 		(
 			paginations: TablePaginationConfig,
@@ -451,7 +458,7 @@ function AllErrors(): JSX.Element {
 	useEffect(() => {
 		if (!isUndefined(errorCountResponse.data?.payload)) {
 			const selectedEnvironments = queries.find(
-				(val) => val.tagKey === getResourceDeploymentKeys(),
+				(val) => val.tagKey === getResourceDeploymentKeys(dotMetricsEnabled),
 			)?.tagValue;
 
 			logEvent('Exception: List page visited', {

frontend/src/container/Home/Services/ServiceMetrics.tsx

@@ -35,6 +35,7 @@ import { openInNewTab } from 'utils/navigation';
 
 import triangleRulerUrl from '@/assets/Icons/triangle-ruler.svg';
 
+import { FeatureKeys } from '../../../constants/features';
 import { DOCS_LINKS } from '../constants';
 import { columns, TIME_PICKER_OPTIONS } from './constants';
 
@@ -211,13 +212,19 @@ function ServiceMetrics({
 
 	const topLevelOperations = useMemo(() => Object.entries(data || {}), [data]);
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const queryRangeRequestData = useMemo(
 		() =>
 			getQueryRangeRequestData({
 				topLevelOperations,
 				globalSelectedInterval,
+				dotMetricsEnabled,
 			}),
-		[globalSelectedInterval, topLevelOperations],
+		[globalSelectedInterval, topLevelOperations, dotMetricsEnabled],
 	);
 
 	const dataQueries = useGetQueriesRange(

frontend/src/container/InfraMonitoringHostsV2/constants.tsx

@@ -82,7 +82,7 @@ export function getHostMetricsQueryPayload(
 	start: number,
 	end: number,
 ): ReturnType<typeof getHostQueryPayload> {
-	return getHostQueryPayload(host.hostName, start, end);
+	return getHostQueryPayload(host.hostName, start, end, true);
 }
 
 export { hostWidgetInfo };

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/__tests__/EntityMetrics.test.tsx

@@ -121,6 +121,12 @@ jest.spyOn(appContextHooks, 'useAppContext').mockReturnValue({
 			plan_version: 'test-plan-version',
 		},
 	},
+	featureFlags: [
+		{
+			name: 'DOT_METRICS_ENABLED',
+			active: false,
+		},
+	],
 } as any);
 
 const mockEntity = {

frontend/src/container/LogDetailedView/InfraMetrics/NodeMetrics.tsx

@@ -17,6 +17,8 @@ import { SuccessResponse } from 'types/api';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import uPlot from 'uplot';
 
+import { FeatureKeys } from '../../../constants/features';
+import { useAppContext } from '../../../providers/App/App';
 import {
 	getHostQueryPayload,
 	getNodeQueryPayload,
@@ -51,12 +53,23 @@ function NodeMetrics({
 		};
 	}, [timestamp]);
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const queryPayloads = useMemo(() => {
 		if (nodeName) {
-			return getNodeQueryPayload(clusterName, nodeName, start, end);
+			return getNodeQueryPayload(
+				clusterName,
+				nodeName,
+				start,
+				end,
+				dotMetricsEnabled,
+			);
 		}
-		return getHostQueryPayload(hostName, start, end);
-	}, [nodeName, hostName, clusterName, start, end]);
+		return getHostQueryPayload(hostName, start, end, dotMetricsEnabled);
+	}, [nodeName, hostName, clusterName, start, end, dotMetricsEnabled]);
 
 	const widgetInfo = nodeName ? nodeWidgetInfo : hostWidgetInfo;
 	const queries = useQueries(

frontend/src/container/LogDetailedView/InfraMetrics/PodMetrics.tsx

@@ -12,11 +12,13 @@ import { useResizeObserver } from 'hooks/useDimensions';
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
 import { getUPlotChartOptions } from 'lib/uPlotLib/getUplotChartOptions';
 import { getUPlotChartData } from 'lib/uPlotLib/utils/getUplotChartData';
+import { useAppContext } from 'providers/App/App';
 import { useTimezone } from 'providers/Timezone';
 import { SuccessResponse } from 'types/api';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import uPlot from 'uplot';
 
+import { FeatureKeys } from '../../../constants/features';
 import { getPodQueryPayload, podWidgetInfo } from './constants';
 
 function PodMetrics({
@@ -52,9 +54,14 @@ function PodMetrics({
 		scrollLeft: 0,
 	});
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const queryPayloads = useMemo(
-		() => getPodQueryPayload(clusterName, podName, start, end),
-		[clusterName, end, podName, start],
+		() => getPodQueryPayload(clusterName, podName, start, end, dotMetricsEnabled),
+		[clusterName, end, podName, start, dotMetricsEnabled],
 	);
 	const queries = useQueries(
 		queryPayloads.map((payload) => ({

frontend/src/container/LogDetailedView/InfraMetrics/constants.ts

@@ -9,21 +9,48 @@ export const getPodQueryPayload = (
 	podName: string,
 	start: number,
 	end: number,
+	dotMetricsEnabled: boolean,
 ): GetQueryResultsProps[] => {
-	const k8sClusterNameKey = 'k8s.cluster.name';
-	const k8sPodNameKey = 'k8s.pod.name';
-	const containerCpuUtilKey = 'container.cpu.usage';
-	const containerMemUsageKey = 'container.memory.usage';
-	const k8sContainerCpuReqKey = 'k8s.container.cpu_request';
-	const k8sContainerCpuLimitKey = 'k8s.container.cpu_limit';
-	const k8sContainerMemReqKey = 'k8s.container.memory_request';
-	const k8sContainerMemLimitKey = 'k8s.container.memory_limit';
-	const k8sPodFsAvailKey = 'k8s.pod.filesystem.available';
-	const k8sPodFsCapKey = 'k8s.pod.filesystem.capacity';
-	const k8sPodNetIoKey = 'k8s.pod.network.io';
-	const podLegendTemplate = '{{k8s.pod.name}}';
-	const podLegendUsage = 'usage - {{k8s.pod.name}}';
-	const podLegendLimit = 'limit - {{k8s.pod.name}}';
+	const k8sClusterNameKey = dotMetricsEnabled
+		? 'k8s.cluster.name'
+		: 'k8s_cluster_name';
+	const k8sPodNameKey = dotMetricsEnabled ? 'k8s.pod.name' : 'k8s_pod_name';
+	const containerCpuUtilKey = dotMetricsEnabled
+		? 'container.cpu.usage'
+		: 'container_cpu_usage';
+	const containerMemUsageKey = dotMetricsEnabled
+		? 'container.memory.usage'
+		: 'container_memory_usage';
+	const k8sContainerCpuReqKey = dotMetricsEnabled
+		? 'k8s.container.cpu_request'
+		: 'k8s_container_cpu_request';
+	const k8sContainerCpuLimitKey = dotMetricsEnabled
+		? 'k8s.container.cpu_limit'
+		: 'k8s_container_cpu_limit';
+	const k8sContainerMemReqKey = dotMetricsEnabled
+		? 'k8s.container.memory_request'
+		: 'k8s_container_memory_request';
+	const k8sContainerMemLimitKey = dotMetricsEnabled
+		? 'k8s.container.memory_limit'
+		: 'k8s_container_memory_limit';
+	const k8sPodFsAvailKey = dotMetricsEnabled
+		? 'k8s.pod.filesystem.available'
+		: 'k8s_pod_filesystem_available';
+	const k8sPodFsCapKey = dotMetricsEnabled
+		? 'k8s.pod.filesystem.capacity'
+		: 'k8s_pod_filesystem_capacity';
+	const k8sPodNetIoKey = dotMetricsEnabled
+		? 'k8s.pod.network.io'
+		: 'k8s_pod_network_io';
+	const podLegendTemplate = dotMetricsEnabled
+		? '{{k8s.pod.name}}'
+		: '{{k8s_pod_name}}';
+	const podLegendUsage = dotMetricsEnabled
+		? 'usage - {{k8s.pod.name}}'
+		: 'usage - {{k8s_pod_name}}';
+	const podLegendLimit = dotMetricsEnabled
+		? 'limit - {{k8s.pod.name}}'
+		: 'limit - {{k8s_pod_name}}';
 
 	return [
 		{
@@ -1000,17 +1027,36 @@ export const getNodeQueryPayload = (
 	nodeName: string,
 	start: number,
 	end: number,
+	dotMetricsEnabled: boolean,
 ): GetQueryResultsProps[] => {
-	const k8sClusterNameKey = 'k8s.cluster.name';
-	const k8sNodeNameKey = 'k8s.node.name';
-	const k8sNodeCpuTimeKey = 'k8s.node.cpu.time';
-	const k8sNodeAllocCpuKey = 'k8s.node.allocatable_cpu';
-	const k8sNodeMemWsKey = 'k8s.node.memory.working_set';
-	const k8sNodeAllocMemKey = 'k8s.node.allocatable_memory';
-	const k8sNodeNetIoKey = 'k8s.node.network.io';
-	const k8sNodeFsAvailKey = 'k8s.node.filesystem.available';
-	const k8sNodeFsCapKey = 'k8s.node.filesystem.capacity';
-	const podLegend = '{{k8s.node.name}}';
+	const k8sClusterNameKey = dotMetricsEnabled
+		? 'k8s.cluster.name'
+		: 'k8s_cluster_name';
+	const k8sNodeNameKey = dotMetricsEnabled ? 'k8s.node.name' : 'k8s_node_name';
+	const k8sNodeCpuTimeKey = dotMetricsEnabled
+		? 'k8s.node.cpu.time'
+		: 'k8s_node_cpu_time';
+	const k8sNodeAllocCpuKey = dotMetricsEnabled
+		? 'k8s.node.allocatable_cpu'
+		: 'k8s_node_allocatable_cpu';
+	const k8sNodeMemWsKey = dotMetricsEnabled
+		? 'k8s.node.memory.working_set'
+		: 'k8s_node_memory_working_set';
+	const k8sNodeAllocMemKey = dotMetricsEnabled
+		? 'k8s.node.allocatable_memory'
+		: 'k8s_node_allocatable_memory';
+	const k8sNodeNetIoKey = dotMetricsEnabled
+		? 'k8s.node.network.io'
+		: 'k8s_node_network_io';
+	const k8sNodeFsAvailKey = dotMetricsEnabled
+		? 'k8s.node.filesystem.available'
+		: 'k8s_node_filesystem_available';
+	const k8sNodeFsCapKey = dotMetricsEnabled
+		? 'k8s.node.filesystem.capacity'
+		: 'k8s_node_filesystem_capacity';
+	const podLegend = dotMetricsEnabled
+		? '{{k8s.node.name}}'
+		: '{{k8s_node_name}}';
 
 	return [
 		{
@@ -1540,23 +1586,48 @@ export const getHostQueryPayload = (
 	hostName: string,
 	start: number,
 	end: number,
+	dotMetricsEnabled: boolean,
 ): GetQueryResultsProps[] => {
-	const hostNameKey = 'host.name';
-	const cpuTimeKey = 'system.cpu.time';
-	const memUsageKey = 'system.memory.usage';
-	const load1mKey = 'system.cpu.load_average.1m';
-	const load5mKey = 'system.cpu.load_average.5m';
-	const load15mKey = 'system.cpu.load_average.15m';
-	const netIoKey = 'system.network.io';
-	const netPktsKey = 'system.network.packets';
-	const netErrKey = 'system.network.errors';
-	const netDropKey = 'system.network.dropped';
-	const netConnKey = 'system.network.connections';
-	const diskIoKey = 'system.disk.io';
-	const diskOpTimeKey = 'system.disk.operation_time';
-	const diskOpsKey = 'system.disk.operations';
-	const diskPendingKey = 'system.disk.pending_operations';
-	const fsUsageKey = 'system.filesystem.usage';
+	const hostNameKey = dotMetricsEnabled ? 'host.name' : 'host_name';
+	const cpuTimeKey = dotMetricsEnabled ? 'system.cpu.time' : 'system_cpu_time';
+	const memUsageKey = dotMetricsEnabled
+		? 'system.memory.usage'
+		: 'system_memory_usage';
+	const load1mKey = dotMetricsEnabled
+		? 'system.cpu.load_average.1m'
+		: 'system_cpu_load_average_1m';
+	const load5mKey = dotMetricsEnabled
+		? 'system.cpu.load_average.5m'
+		: 'system_cpu_load_average_5m';
+	const load15mKey = dotMetricsEnabled
+		? 'system.cpu.load_average.15m'
+		: 'system_cpu_load_average_15m';
+	const netIoKey = dotMetricsEnabled ? 'system.network.io' : 'system_network_io';
+	const netPktsKey = dotMetricsEnabled
+		? 'system.network.packets'
+		: 'system_network_packets';
+	const netErrKey = dotMetricsEnabled
+		? 'system.network.errors'
+		: 'system_network_errors';
+	const netDropKey = dotMetricsEnabled
+		? 'system.network.dropped'
+		: 'system_network_dropped';
+	const netConnKey = dotMetricsEnabled
+		? 'system.network.connections'
+		: 'system_network_connections';
+	const diskIoKey = dotMetricsEnabled ? 'system.disk.io' : 'system_disk_io';
+	const diskOpTimeKey = dotMetricsEnabled
+		? 'system.disk.operation_time'
+		: 'system_disk_operation_time';
+	const diskOpsKey = dotMetricsEnabled
+		? 'system.disk.operations'
+		: 'system_disk_operations';
+	const diskPendingKey = dotMetricsEnabled
+		? 'system.disk.pending_operations'
+		: 'system_disk_pending_operations';
+	const fsUsageKey = dotMetricsEnabled
+		? 'system.filesystem.usage'
+		: 'system_filesystem_usage';
 
 	return [
 		{

frontend/src/container/MetricsApplication/MetricsPageQueries/DBCallQueries.ts

@@ -21,6 +21,7 @@ export const databaseCallsRPS = ({
 	servicename,
 	legend,
 	tagFilterItems,
+	dotMetricsEnabled,
 }: DatabaseCallsRPSProps): QueryBuilderData => {
 	const autocompleteData: BaseAutocompleteData[] = [
 		{
@@ -32,7 +33,7 @@ export const databaseCallsRPS = ({
 	const groupBy: BaseAutocompleteData[] = [
 		{
 			dataType: DataTypes.String,
-			key: WidgetKeys.DbSystem,
+			key: dotMetricsEnabled ? WidgetKeys.Db_system : WidgetKeys.Db_system_norm,
 			type: 'tag',
 		},
 	];
@@ -41,7 +42,9 @@ export const databaseCallsRPS = ({
 			{
 				id: '',
 				key: {
-					key: WidgetKeys.OTelServiceName,
+					key: dotMetricsEnabled
+						? WidgetKeys.Service_name
+						: WidgetKeys.Service_name_norm,
 					dataType: DataTypes.String,
 					type: MetricsType.Resource,
 				},
@@ -72,6 +75,7 @@ export const databaseCallsRPS = ({
 export const databaseCallsAvgDuration = ({
 	servicename,
 	tagFilterItems,
+	dotMetricsEnabled,
 }: DatabaseCallProps): QueryBuilderData => {
 	const autocompleteDataA: BaseAutocompleteData = {
 		key: WidgetKeys.SignozDbLatencySum,
@@ -88,7 +92,9 @@ export const databaseCallsAvgDuration = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Resource,
 			},

frontend/src/container/MetricsApplication/MetricsPageQueries/ExternalQueries.ts

@@ -32,6 +32,7 @@ export const externalCallErrorPercent = ({
 	servicename,
 	legend,
 	tagFilterItems,
+	dotMetricsEnabled,
 }: ExternalCallDurationByAddressProps): QueryBuilderData => {
 	const autocompleteDataA: BaseAutocompleteData = {
 		key: WidgetKeys.SignozExternalCallLatencyCount,
@@ -48,7 +49,9 @@ export const externalCallErrorPercent = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Resource,
 			},
@@ -58,7 +61,7 @@ export const externalCallErrorPercent = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.StatusCode,
+				key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm,
 				dataType: DataTypes.Int64,
 				type: MetricsType.Tag,
 			},
@@ -71,7 +74,9 @@ export const externalCallErrorPercent = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Resource,
 			},
@@ -115,6 +120,7 @@ export const externalCallErrorPercent = ({
 export const externalCallDuration = ({
 	servicename,
 	tagFilterItems,
+	dotMetricsEnabled,
 }: ExternalCallProps): QueryBuilderData => {
 	const autocompleteDataA: BaseAutocompleteData = {
 		dataType: DataTypes.Float64,
@@ -135,7 +141,9 @@ export const externalCallDuration = ({
 			id: '',
 			key: {
 				dataType: DataTypes.String,
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				type: MetricsType.Resource,
 			},
 			op: OPERATORS.IN,
@@ -175,6 +183,7 @@ export const externalCallRpsByAddress = ({
 	servicename,
 	legend,
 	tagFilterItems,
+	dotMetricsEnabled,
 }: ExternalCallDurationByAddressProps): QueryBuilderData => {
 	const autocompleteData: BaseAutocompleteData[] = [
 		{
@@ -189,7 +198,9 @@ export const externalCallRpsByAddress = ({
 				id: '',
 				key: {
 					dataType: DataTypes.String,
-					key: WidgetKeys.OTelServiceName,
+					key: dotMetricsEnabled
+						? WidgetKeys.Service_name
+						: WidgetKeys.Service_name_norm,
 					type: MetricsType.Resource,
 				},
 				op: OPERATORS.IN,
@@ -220,6 +231,7 @@ export const externalCallDurationByAddress = ({
 	servicename,
 	legend,
 	tagFilterItems,
+	dotMetricsEnabled,
 }: ExternalCallDurationByAddressProps): QueryBuilderData => {
 	const autocompleteDataA: BaseAutocompleteData = {
 		dataType: DataTypes.Float64,
@@ -239,7 +251,9 @@ export const externalCallDurationByAddress = ({
 			id: '',
 			key: {
 				dataType: DataTypes.String,
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				type: MetricsType.Resource,
 			},
 			op: OPERATORS.IN,

frontend/src/container/MetricsApplication/MetricsPageQueries/OverviewQueries.ts

@@ -37,10 +37,15 @@ export const latency = ({
 	tagFilterItems,
 	isSpanMetricEnable = false,
 	topLevelOperationsRoute,
+	dotMetricsEnabled,
 }: LatencyProps): QueryBuilderData => {
-	const signozLatencyBucketMetrics = WidgetKeys.SignozLatencyBucket;
+	const signozLatencyBucketMetrics = dotMetricsEnabled
+		? WidgetKeys.Signoz_latency_bucket
+		: WidgetKeys.Signoz_latency_bucket_norm;
 
-	const signozMetricsServiceName = WidgetKeys.OTelServiceName;
+	const signozMetricsServiceName = dotMetricsEnabled
+		? WidgetKeys.Service_name
+		: WidgetKeys.Service_name_norm;
 	const newAutoCompleteData: BaseAutocompleteData = {
 		key: isSpanMetricEnable
 			? signozLatencyBucketMetrics
@@ -282,21 +287,28 @@ export const apDexMetricsQueryBuilderQueries = ({
 	threashold,
 	delta,
 	metricsBuckets,
+	dotMetricsEnabled,
 }: ApDexMetricsQueryBuilderQueriesProps): QueryBuilderData => {
 	const autoCompleteDataA: BaseAutocompleteData = {
-		key: WidgetKeys.SignozLatencyCount,
+		key: dotMetricsEnabled
+			? WidgetKeys.SignozLatencyCount
+			: WidgetKeys.SignozLatencyCountNorm,
 		dataType: DataTypes.Float64,
 		type: '',
 	};
 
 	const autoCompleteDataB: BaseAutocompleteData = {
-		key: WidgetKeys.SignozLatencyBucket,
+		key: dotMetricsEnabled
+			? WidgetKeys.Signoz_latency_bucket
+			: WidgetKeys.Signoz_latency_bucket_norm,
 		dataType: DataTypes.Float64,
 		type: '',
 	};
 
 	const autoCompleteDataC: BaseAutocompleteData = {
-		key: WidgetKeys.SignozLatencyBucket,
+		key: dotMetricsEnabled
+			? WidgetKeys.Signoz_latency_bucket
+			: WidgetKeys.Signoz_latency_bucket_norm,
 		dataType: DataTypes.Float64,
 		type: '',
 	};
@@ -305,7 +317,9 @@ export const apDexMetricsQueryBuilderQueries = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Tag,
 			},
@@ -329,7 +343,7 @@ export const apDexMetricsQueryBuilderQueries = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.StatusCode,
+				key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm,
 				dataType: DataTypes.String,
 				type: MetricsType.Tag,
 			},
@@ -349,7 +363,9 @@ export const apDexMetricsQueryBuilderQueries = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Tag,
 			},
@@ -383,7 +399,7 @@ export const apDexMetricsQueryBuilderQueries = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.StatusCode,
+				key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm,
 				dataType: DataTypes.String,
 				type: MetricsType.Tag,
 			},
@@ -393,7 +409,9 @@ export const apDexMetricsQueryBuilderQueries = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Tag,
 			},
@@ -456,10 +474,13 @@ export const operationPerSec = ({
 	servicename,
 	tagFilterItems,
 	topLevelOperations,
+	dotMetricsEnabled,
 }: OperationPerSecProps): QueryBuilderData => {
 	const autocompleteData: BaseAutocompleteData[] = [
 		{
-			key: WidgetKeys.SignozLatencyCount,
+			key: dotMetricsEnabled
+				? WidgetKeys.SignozLatencyCount
+				: WidgetKeys.SignozLatencyCountNorm,
 			dataType: DataTypes.Float64,
 			type: '',
 		},
@@ -470,7 +491,9 @@ export const operationPerSec = ({
 			{
 				id: '',
 				key: {
-					key: WidgetKeys.OTelServiceName,
+					key: dotMetricsEnabled
+						? WidgetKeys.Service_name
+						: WidgetKeys.Service_name_norm,
 					dataType: DataTypes.String,
 					type: MetricsType.Resource,
 				},
@@ -511,6 +534,7 @@ export const errorPercentage = ({
 	servicename,
 	tagFilterItems,
 	topLevelOperations,
+	dotMetricsEnabled,
 }: OperationPerSecProps): QueryBuilderData => {
 	const autocompleteDataA: BaseAutocompleteData = {
 		key: WidgetKeys.SignozCallsTotal,
@@ -529,7 +553,9 @@ export const errorPercentage = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Resource,
 			},
@@ -549,7 +575,7 @@ export const errorPercentage = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.StatusCode,
+				key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm,
 				dataType: DataTypes.Int64,
 				type: MetricsType.Tag,
 			},
@@ -563,7 +589,9 @@ export const errorPercentage = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Resource,
 			},

frontend/src/container/MetricsApplication/MetricsPageQueries/TopOperationQueries.ts

@@ -21,9 +21,12 @@ import { getQueryBuilderQuerieswithFormula } from './MetricsPageQueriesFactory';
 
 export const topOperationQueries = ({
 	servicename,
+	dotMetricsEnabled,
 }: TopOperationQueryFactoryProps): QueryBuilderData => {
 	const latencyAutoCompleteData: BaseAutocompleteData = {
-		key: WidgetKeys.SignozLatencyBucket,
+		key: dotMetricsEnabled
+			? WidgetKeys.Signoz_latency_bucket
+			: WidgetKeys.Signoz_latency_bucket_norm,
 		dataType: DataTypes.Float64,
 		type: '',
 	};
@@ -35,7 +38,9 @@ export const topOperationQueries = ({
 	};
 
 	const numOfCallAutoCompleteData: BaseAutocompleteData = {
-		key: WidgetKeys.SignozLatencyCount,
+		key: dotMetricsEnabled
+			? WidgetKeys.SignozLatencyCount
+			: WidgetKeys.SignozLatencyCountNorm,
 		dataType: DataTypes.Float64,
 		type: '',
 	};
@@ -44,7 +49,9 @@ export const topOperationQueries = ({
 		{
 			id: '',
 			key: {
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				dataType: DataTypes.String,
 				type: MetricsType.Resource,
 			},
@@ -58,7 +65,9 @@ export const topOperationQueries = ({
 			id: '',
 			key: {
 				dataType: DataTypes.String,
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				type: MetricsType.Resource,
 			},
 			op: OPERATORS.IN,
@@ -68,7 +77,7 @@ export const topOperationQueries = ({
 			id: '',
 			key: {
 				dataType: DataTypes.Int64,
-				key: WidgetKeys.StatusCode,
+				key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm,
 				type: MetricsType.Tag,
 			},
 			op: OPERATORS.IN,

frontend/src/container/MetricsApplication/Tabs/DBCall.tsx

@@ -28,6 +28,8 @@ import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
 import { EQueryType } from 'types/common/dashboard';
 import { v4 as uuid } from 'uuid';
 
+import { FeatureKeys } from '../../../constants/features';
+import { useAppContext } from '../../../providers/App/App';
 import {
 	GraphTitle,
 	MENU_ITEMS,
@@ -87,7 +89,12 @@ function DBCall(): JSX.Element {
 		[queries],
 	);
 
-	const legend = '{{db.system}}';
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
+	const legend = dotMetricsEnabled ? '{{db.system}}' : '{{db_system}}';
 
 	const databaseCallsRPSWidget = useMemo(
 		() =>
@@ -99,6 +106,7 @@ function DBCall(): JSX.Element {
 						servicename,
 						legend,
 						tagFilterItems,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -109,7 +117,7 @@ function DBCall(): JSX.Element {
 				id: SERVICE_CHART_ID.dbCallsRPS,
 				fillSpans: false,
 			}),
-		[servicename, tagFilterItems, legend],
+		[servicename, tagFilterItems, dotMetricsEnabled, legend],
 	);
 	const databaseCallsAverageDurationWidget = useMemo(
 		() =>
@@ -120,6 +128,7 @@ function DBCall(): JSX.Element {
 					builder: databaseCallsAvgDuration({
 						servicename,
 						tagFilterItems,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -130,7 +139,7 @@ function DBCall(): JSX.Element {
 				id: GraphTitle.DATABASE_CALLS_AVG_DURATION,
 				fillSpans: true,
 			}),
-		[servicename, tagFilterItems],
+		[servicename, tagFilterItems, dotMetricsEnabled],
 	);
 
 	const stepInterval = useMemo(
@@ -148,7 +157,7 @@ function DBCall(): JSX.Element {
 	useEffect(() => {
 		if (!logEventCalledRef.current) {
 			const selectedEnvironments = queries.find(
-				(val) => val.tagKey === getResourceDeploymentKeys(),
+				(val) => val.tagKey === getResourceDeploymentKeys(dotMetricsEnabled),
 			)?.tagValue;
 
 			logEvent('APM: Service detail page visited', {

frontend/src/container/MetricsApplication/Tabs/External.tsx

@@ -30,6 +30,8 @@ import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { EQueryType } from 'types/common/dashboard';
 import { v4 as uuid } from 'uuid';
 
+import { FeatureKeys } from '../../../constants/features';
+import { useAppContext } from '../../../providers/App/App';
 import {
 	GraphTitle,
 	legend,
@@ -82,6 +84,10 @@ function External(): JSX.Element {
 			handleNonInQueryRange(resourceAttributesToTagFilterItems(queries)) || [],
 		[queries],
 	);
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
 
 	const externalCallErrorWidget = useMemo(
 		() =>
@@ -93,6 +99,7 @@ function External(): JSX.Element {
 						servicename,
 						legend: legend.address,
 						tagFilterItems,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -102,7 +109,7 @@ function External(): JSX.Element {
 				yAxisUnit: '%',
 				id: GraphTitle.EXTERNAL_CALL_ERROR_PERCENTAGE,
 			}),
-		[servicename, tagFilterItems],
+		[servicename, tagFilterItems, dotMetricsEnabled],
 	);
 
 	const selectedTraceTags = useMemo(
@@ -119,6 +126,7 @@ function External(): JSX.Element {
 					builder: externalCallDuration({
 						servicename,
 						tagFilterItems,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -129,7 +137,7 @@ function External(): JSX.Element {
 				id: GraphTitle.EXTERNAL_CALL_DURATION,
 				fillSpans: true,
 			}),
-		[servicename, tagFilterItems],
+		[servicename, tagFilterItems, dotMetricsEnabled],
 	);
 
 	const errorApmToTraceQuery = useGetAPMToTracesQueries({
@@ -163,7 +171,7 @@ function External(): JSX.Element {
 	useEffect(() => {
 		if (!logEventCalledRef.current) {
 			const selectedEnvironments = queries.find(
-				(val) => val.tagKey === getResourceDeploymentKeys(),
+				(val) => val.tagKey === getResourceDeploymentKeys(dotMetricsEnabled),
 			)?.tagValue;
 
 			logEvent('APM: Service detail page visited', {
@@ -186,6 +194,7 @@ function External(): JSX.Element {
 						servicename,
 						legend: legend.address,
 						tagFilterItems,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -196,7 +205,7 @@ function External(): JSX.Element {
 				id: GraphTitle.EXTERNAL_CALL_RPS_BY_ADDRESS,
 				fillSpans: true,
 			}),
-		[servicename, tagFilterItems],
+		[servicename, tagFilterItems, dotMetricsEnabled],
 	);
 
 	const externalCallDurationAddressWidget = useMemo(
@@ -209,6 +218,7 @@ function External(): JSX.Element {
 						servicename,
 						legend: legend.address,
 						tagFilterItems,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -219,7 +229,7 @@ function External(): JSX.Element {
 				id: GraphTitle.EXTERNAL_CALL_DURATION_BY_ADDRESS,
 				fillSpans: true,
 			}),
-		[servicename, tagFilterItems],
+		[servicename, tagFilterItems, dotMetricsEnabled],
 	);
 
 	const apmToTraceQuery = useGetAPMToTracesQueries({

frontend/src/container/MetricsApplication/Tabs/Overview.tsx

@@ -93,12 +93,15 @@ function Application(): JSX.Element {
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[handleSetTimeStamp],
 	);
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
 
 	const logEventCalledRef = useRef(false);
 	useEffect(() => {
 		if (!logEventCalledRef.current) {
 			const selectedEnvironments = queries.find(
-				(val) => val.tagKey === getResourceDeploymentKeys(),
+				(val) => val.tagKey === getResourceDeploymentKeys(dotMetricsEnabled),
 			)?.tagValue;
 
 			logEvent('APM: Service detail page visited', {
@@ -156,6 +159,7 @@ function Application(): JSX.Element {
 						servicename,
 						tagFilterItems,
 						topLevelOperations: topLevelOperationsRoute,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -165,7 +169,7 @@ function Application(): JSX.Element {
 				yAxisUnit: 'ops',
 				id: SERVICE_CHART_ID.rps,
 			}),
-		[servicename, tagFilterItems, topLevelOperationsRoute],
+		[servicename, tagFilterItems, topLevelOperationsRoute, dotMetricsEnabled],
 	);
 
 	const errorPercentageWidget = useMemo(
@@ -178,6 +182,7 @@ function Application(): JSX.Element {
 						servicename,
 						tagFilterItems,
 						topLevelOperations: topLevelOperationsRoute,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -188,7 +193,7 @@ function Application(): JSX.Element {
 				id: SERVICE_CHART_ID.errorPercentage,
 				fillSpans: true,
 			}),
-		[servicename, tagFilterItems, topLevelOperationsRoute],
+		[servicename, tagFilterItems, topLevelOperationsRoute, dotMetricsEnabled],
 	);
 
 	const stepInterval = useMemo(

frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/ApDexMetrics.tsx

@@ -22,6 +22,8 @@ import { apDexMetricsQueryBuilderQueries } from 'container/MetricsApplication/Me
 import { EQueryType } from 'types/common/dashboard';
 import { v4 as uuid } from 'uuid';
 
+import { FeatureKeys } from '../../../../../constants/features';
+import { useAppContext } from '../../../../../providers/App/App';
 import { IServiceName } from '../../types';
 import { ApDexMetricsProps } from './types';
 
@@ -36,6 +38,10 @@ function ApDexMetrics({
 }: ApDexMetricsProps): JSX.Element {
 	const { servicename: encodedServiceName } = useParams<IServiceName>();
 	const servicename = decodeURIComponent(encodedServiceName);
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
 	const apDexMetricsWidget = useMemo(
 		() =>
 			getWidgetQueryBuilder({
@@ -49,6 +55,7 @@ function ApDexMetrics({
 						threashold: thresholdValue || 0,
 						delta: delta || false,
 						metricsBuckets: metricsBuckets || [],
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -74,6 +81,7 @@ function ApDexMetrics({
 			tagFilterItems,
 			thresholdValue,
 			topLevelOperationsRoute,
+			dotMetricsEnabled,
 		],
 	);
 

frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/ApDexMetricsApplication.tsx

@@ -3,6 +3,8 @@ import Spinner from 'components/Spinner';
 import { useGetMetricMeta } from 'hooks/apDex/useGetMetricMeta';
 import useErrorNotification from 'hooks/useErrorNotification';
 
+import { FeatureKeys } from '../../../../../constants/features';
+import { useAppContext } from '../../../../../providers/App/App';
 import { WidgetKeys } from '../../../constant';
 import { IServiceName } from '../../types';
 import ApDexMetrics from './ApDexMetrics';
@@ -18,8 +20,17 @@ function ApDexMetricsApplication({
 	const { servicename: encodedServiceName } = useParams<IServiceName>();
 	const servicename = decodeURIComponent(encodedServiceName);
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
+	const signozLatencyBucketMetrics = dotMetricsEnabled
+		? WidgetKeys.Signoz_latency_bucket
+		: WidgetKeys.Signoz_latency_bucket_norm;
+
 	const { data, isLoading, error } = useGetMetricMeta(
-		WidgetKeys.SignozLatencyBucket,
+		signozLatencyBucketMetrics,
 		servicename,
 	);
 	useErrorNotification(error);

frontend/src/container/MetricsApplication/Tabs/Overview/ServiceOverview.tsx

@@ -56,6 +56,10 @@ function ServiceOverview({
 		[isSpanMetricEnable, queries],
 	);
 
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const latencyWidget = useMemo(
 		() =>
 			getWidgetQueryBuilder({
@@ -67,6 +71,7 @@ function ServiceOverview({
 						tagFilterItems,
 						isSpanMetricEnable,
 						topLevelOperationsRoute,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
@@ -76,7 +81,13 @@ function ServiceOverview({
 				yAxisUnit: 'ns',
 				id: SERVICE_CHART_ID.latency,
 			}),
-		[isSpanMetricEnable, servicename, tagFilterItems, topLevelOperationsRoute],
+		[
+			isSpanMetricEnable,
+			servicename,
+			tagFilterItems,
+			topLevelOperationsRoute,
+			dotMetricsEnabled,
+		],
 	);
 
 	const isQueryEnabled =

frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx

@@ -19,6 +19,8 @@ import { EQueryType } from 'types/common/dashboard';
 import { GlobalReducer } from 'types/reducer/globalTime';
 import { v4 as uuid } from 'uuid';
 
+import { FeatureKeys } from '../../../../constants/features';
+import { useAppContext } from '../../../../providers/App/App';
 import { IServiceName } from '../types';
 import { title } from './config';
 import ColumnWithLink from './TableRenderer/ColumnWithLink';
@@ -42,6 +44,11 @@ function TopOperationMetrics(): JSX.Element {
 		convertRawQueriesToTraceSelectedTags(queries) || [],
 	);
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const keyOperationWidget = useMemo(
 		() =>
 			getWidgetQueryBuilder({
@@ -50,13 +57,14 @@ function TopOperationMetrics(): JSX.Element {
 					promql: [],
 					builder: topOperationQueries({
 						servicename,
+						dotMetricsEnabled,
 					}),
 					clickhouse_sql: [],
 					id: uuid(),
 				},
 				panelTypes: PANEL_TYPES.TABLE,
 			}),
-		[servicename],
+		[servicename, dotMetricsEnabled],
 	);
 
 	const updatedQuery = updateStepInterval(keyOperationWidget.query);

frontend/src/container/MetricsApplication/Tabs/types.ts

@@ -10,6 +10,7 @@ export interface IServiceName {
 
 export interface TopOperationQueryFactoryProps {
 	servicename: IServiceName['servicename'];
+	dotMetricsEnabled: boolean;
 }
 
 export interface ExternalCallDurationByAddressProps extends ExternalCallProps {
@@ -19,6 +20,7 @@ export interface ExternalCallDurationByAddressProps extends ExternalCallProps {
 export interface ExternalCallProps {
 	servicename: IServiceName['servicename'];
 	tagFilterItems: TagFilterItem[];
+	dotMetricsEnabled: boolean;
 }
 
 export interface BuilderQueriesProps {
@@ -50,6 +52,7 @@ export interface OperationPerSecProps {
 	servicename: IServiceName['servicename'];
 	tagFilterItems: TagFilterItem[];
 	topLevelOperations: string[];
+	dotMetricsEnabled: boolean;
 }
 
 export interface LatencyProps {
@@ -57,6 +60,7 @@ export interface LatencyProps {
 	tagFilterItems: TagFilterItem[];
 	isSpanMetricEnable?: boolean;
 	topLevelOperationsRoute: string[];
+	dotMetricsEnabled: boolean;
 }
 
 export interface ApDexProps {
@@ -74,4 +78,5 @@ export interface TableRendererProps {
 export interface ApDexMetricsQueryBuilderQueriesProps extends ApDexProps {
 	delta: boolean;
 	metricsBuckets: number[];
+	dotMetricsEnabled: boolean;
 }

frontend/src/container/MetricsApplication/constant.ts

@@ -85,11 +85,14 @@ export enum WidgetKeys {
 	HasError = 'hasError',
 	Address = 'address',
 	DurationNano = 'durationNano',
+	StatusCodeNorm = 'status_code',
 	StatusCode = 'status.code',
 	Operation = 'operation',
 	OperationName = 'operationName',
-	OTelServiceName = 'service.name',
+	Service_name_norm = 'service_name',
+	Service_name = 'service.name',
 	ServiceName = 'serviceName',
+	SignozLatencyCountNorm = 'signoz_latency_count',
 	SignozLatencyCount = 'signoz_latency.count',
 	SignozDBLatencyCount = 'signoz_db_latency_count',
 	DatabaseCallCount = 'signoz_database_call_count',
@@ -98,8 +101,10 @@ export enum WidgetKeys {
 	SignozCallsTotal = 'signoz_calls_total',
 	SignozExternalCallLatencyCount = 'signoz_external_call_latency_count',
 	SignozExternalCallLatencySum = 'signoz_external_call_latency_sum',
-	SignozLatencyBucket = 'signoz_latency.bucket',
-	DbSystem = 'db.system',
+	Signoz_latency_bucket_norm = 'signoz_latency_bucket',
+	Signoz_latency_bucket = 'signoz_latency.bucket',
+	Db_system = 'db.system',
+	Db_system_norm = 'db_system',
 }
 
 export const topOperationMetricsDownloadOptions: DownloadOptions = {

frontend/src/container/MetricsApplication/types.ts

@@ -32,4 +32,5 @@ export interface DatabaseCallsRPSProps extends DatabaseCallProps {
 export interface DatabaseCallProps {
 	servicename: IServiceName['servicename'];
 	tagFilterItems: TagFilterItem[];
+	dotMetricsEnabled: boolean;
 }

frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.ts

@@ -5,11 +5,9 @@ import androidJavaMonitoringUrl from '@/assets/Logos/android-java-monitoring.svg
 import androidKotlinMonitoringUrl from '@/assets/Logos/android-kotlin-monitoring.svg';
 import anthropicApiMonitoringUrl from '@/assets/Logos/anthropic-api-monitoring.svg';
 import apacheDruidUrl from '@/assets/Logos/apache-druid.svg';
-import apacheUrl from '@/assets/Logos/apache.svg';
 import apiGatewayUrl from '@/assets/Logos/api-gateway.svg';
 import argocdUrl from '@/assets/Logos/argocd.svg';
 import aspnetUrl from '@/assets/Logos/aspnet.svg';
-import auth0Url from '@/assets/Logos/auth0.svg';
 import autogenUrl from '@/assets/Logos/autogen.svg';
 import awsAlbUrl from '@/assets/Logos/aws-alb.svg';
 import azureAppServiceUrl from '@/assets/Logos/azure-app-service.svg';
@@ -29,7 +27,6 @@ import claudeCodeUrl from '@/assets/Logos/claude-code.svg';
 import clickhouseUrl from '@/assets/Logos/clickhouse.svg';
 import cloudflareUrl from '@/assets/Logos/cloudflare.svg';
 import cloudwatchLogsUrl from '@/assets/Logos/cloudwatch-logs.svg';
-import cohereUrl from '@/assets/Logos/cohere.svg';
 import confluentKafkaUrl from '@/assets/Logos/confluent-kafka.svg';
 import convexLogoUrl from '@/assets/Logos/convex-logo.svg';
 import cppUrl from '@/assets/Logos/cpp.svg';
@@ -42,13 +39,11 @@ import denoUrl from '@/assets/Logos/deno.svg';
 import dockerUrl from '@/assets/Logos/docker.svg';
 import documentLoadUrl from '@/assets/Logos/document-load.svg';
 import dotnetUrl from '@/assets/Logos/dotnet.svg';
-import dspyUrl from '@/assets/Logos/dspy.svg';
 import dynamodbUrl from '@/assets/Logos/dynamodb.svg';
 import ec2Url from '@/assets/Logos/ec2.svg';
 import ecsUrl from '@/assets/Logos/ecs.svg';
 import eksUrl from '@/assets/Logos/eks.svg';
 import elasticacheUrl from '@/assets/Logos/elasticache.svg';
-import elasticsearchUrl from '@/assets/Logos/elasticsearch.svg';
 import elbUrl from '@/assets/Logos/elb.svg';
 import elixirUrl from '@/assets/Logos/elixir.svg';
 import elkUrl from '@/assets/Logos/elk.svg';
@@ -78,10 +73,8 @@ import grafanaUrl from '@/assets/Logos/grafana.svg';
 import graphqlUrl from '@/assets/Logos/graphql.svg';
 import grokUrl from '@/assets/Logos/grok.svg';
 import groqUrl from '@/assets/Logos/groq.svg';
-import haproxyUrl from '@/assets/Logos/haproxy.svg';
 import hasuraUrl from '@/assets/Logos/hasura.svg';
 import haystackUrl from '@/assets/Logos/haystack.svg';
-import hcpVaultUrl from '@/assets/Logos/hcp-vault.svg';
 import herokuUrl from '@/assets/Logos/heroku.svg';
 import honeycombUrl from '@/assets/Logos/honeycomb.svg';
 import hostmetricsUrl from '@/assets/Logos/hostmetrics.svg';
@@ -99,7 +92,6 @@ import kafkaUrl from '@/assets/Logos/kafka.svg';
 import kubernetesUrl from '@/assets/Logos/kubernetes.svg';
 import lambdaUrl from '@/assets/Logos/lambda.svg';
 import langchainUrl from '@/assets/Logos/langchain.svg';
-import langflowUrl from '@/assets/Logos/langflow.svg';
 import langtraceUrl from '@/assets/Logos/langtrace.svg';
 import litellmUrl from '@/assets/Logos/litellm.svg';
 import livekitUrl from '@/assets/Logos/livekit.svg';
@@ -125,7 +117,6 @@ import ollamaUrl from '@/assets/Logos/ollama.svg';
 import openaiUrl from '@/assets/Logos/openai.svg';
 import openclawUrl from '@/assets/Logos/openclaw.svg';
 import opencodeUrl from '@/assets/Logos/opencode.svg';
-import openWebuiUrl from '@/assets/Logos/open-webui.svg';
 import openlitUrl from '@/assets/Logos/openlit.svg';
 import openrouterUrl from '@/assets/Logos/openrouter.svg';
 import opentelemetryUrl from '@/assets/Logos/opentelemetry.svg';
@@ -140,7 +131,6 @@ import pythonUrl from '@/assets/Logos/python.svg';
 import quarkusUrl from '@/assets/Logos/quarkus.svg';
 import quickstartUrl from '@/assets/Logos/quickstart.svg';
 import qwenUrl from '@/assets/Logos/qwen.svg';
-import rabbitmqUrl from '@/assets/Logos/rabbitmq.svg';
 import railwayUrl from '@/assets/Logos/railway.svg';
 import rdsUrl from '@/assets/Logos/rds.svg';
 import reactjsUrl from '@/assets/Logos/reactjs.svg';
@@ -3947,58 +3937,6 @@ const onboardingConfigWithLinks = [
 		],
 		link: '/docs/claude-code-monitoring/',
 	},
-	{
-		dataSource: 'cohere',
-		label: 'Cohere',
-		imgUrl: cohereUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'cohere',
-			'cohere api',
-			'cohere logs',
-			'cohere metrics',
-			'cohere monitoring',
-			'cohere observability',
-			'cohere traces',
-			'llm',
-			'llm monitoring',
-			'logging',
-			'logs',
-			'metrics',
-			'monitoring',
-			'observability',
-			'otel cohere integration',
-			'telemetry',
-		],
-		link: '/docs/cohere-monitoring/',
-	},
-	{
-		dataSource: 'langflow',
-		label: 'Langflow',
-		imgUrl: langflowUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'langflow',
-			'langflow logs',
-			'langflow metrics',
-			'langflow monitoring',
-			'langflow observability',
-			'langflow traces',
-			'llm',
-			'llm monitoring',
-			'logging',
-			'logs',
-			'low code ai',
-			'metrics',
-			'monitoring',
-			'observability',
-			'otel langflow integration',
-			'telemetry',
-		],
-		link: '/docs/langflow-observability/',
-	},
 	{
 		dataSource: 'deepseek-api',
 		label: 'DeepSeek API',
@@ -5545,32 +5483,12 @@ const onboardingConfigWithLinks = [
 		relatedSearchKeywords: [
 			'infrastructure',
 			'traefik',
-			'traefik access logs',
-			'traefik logs',
 			'traefik metrics',
 			'traefik monitoring',
 			'traefik observability',
 			'traefik tracing',
 		],
 		link: '/docs/tutorial/traefik-observability/',
-		question: {
-			desc: 'Which Traefik signals do you want to send to SigNoz?',
-			type: 'select',
-			options: [
-				{
-					key: 'traefik-metrics-traces',
-					label: 'Metrics & Traces',
-					imgUrl: opentelemetryUrl,
-					link: '/docs/tutorial/traefik-observability/',
-				},
-				{
-					key: 'traefik-logs',
-					label: 'Access Logs',
-					imgUrl: opentelemetryUrl,
-					link: '/docs/integrations/opentelemetry-traefik/',
-				},
-			],
-		},
 	},
 	{
 		dataSource: 'mongodb-atlas',
@@ -5600,32 +5518,11 @@ const onboardingConfigWithLinks = [
 		relatedSearchKeywords: [
 			'database',
 			'mysql',
-			'mysql error log',
-			'mysql logs',
 			'mysql metrics',
 			'mysql monitoring',
 			'mysql observability',
-			'mysql slow query log',
 		],
 		link: '/docs/metrics-management/mysql-metrics/',
-		question: {
-			desc: 'Which MySQL signals do you want to send to SigNoz?',
-			type: 'select',
-			options: [
-				{
-					key: 'mysql-metrics',
-					label: 'Metrics',
-					imgUrl: opentelemetryUrl,
-					link: '/docs/metrics-management/mysql-metrics/',
-				},
-				{
-					key: 'mysql-logs',
-					label: 'Logs',
-					imgUrl: opentelemetryUrl,
-					link: '/docs/integrations/opentelemetry-mysql/',
-				},
-			],
-		},
 	},
 	{
 		dataSource: 'jmx',
@@ -6570,30 +6467,6 @@ const onboardingConfigWithLinks = [
 		id: 'cert-manager',
 		link: '/docs/infrastructure-monitoring/cert-manager/',
 	},
-	{
-		dataSource: 'pgbouncer',
-		label: 'PgBouncer',
-		imgUrl: postgresqlUrl,
-		tags: ['infrastructure monitoring', 'metrics'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'connection pooler',
-			'connection pooling',
-			'database',
-			'metrics',
-			'monitoring',
-			'observability',
-			'opentelemetry pgbouncer',
-			'pgbouncer',
-			'pgbouncer metrics',
-			'pgbouncer monitoring',
-			'pgbouncer observability',
-			'postgres',
-			'postgresql',
-		],
-		id: 'pgbouncer',
-		link: '/docs/metrics-management/opentelemetry-pgbouncer/',
-	},
 	{
 		dataSource: 'graphql',
 		label: 'GraphQL',
@@ -6618,28 +6491,6 @@ const onboardingConfigWithLinks = [
 		id: 'graphql',
 		link: '/docs/instrumentation/javascript/opentelemetry-graphql/',
 	},
-	{
-		dataSource: 'opentelemetry-ebpf',
-		label: 'OpenTelemetry eBPF (OBI)',
-		imgUrl: opentelemetryUrl,
-		tags: ['apm/traces'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'auto instrumentation',
-			'ebpf',
-			'obi',
-			'opentelemetry ebpf',
-			'opentelemetry obi',
-			'otel ebpf',
-			'zero code instrumentation',
-			'monitoring',
-			'observability',
-			'traces',
-			'tracing',
-		],
-		id: 'opentelemetry-ebpf',
-		link: '/docs/instrumentation/opentelemetry-ebpf/',
-	},
 	{
 		dataSource: 'railway',
 		label: 'Railway',
@@ -6662,54 +6513,6 @@ const onboardingConfigWithLinks = [
 		id: 'railway',
 		link: '/docs/integrations/outposts/railway/',
 	},
-	{
-		dataSource: 'hcp-vault',
-		label: 'HCP Vault',
-		imgUrl: hcpVaultUrl,
-		tags: ['logs'],
-		module: 'logs',
-		relatedSearchKeywords: [
-			'hashicorp',
-			'hashicorp vault',
-			'hcp',
-			'hcp vault',
-			'hcp vault logs',
-			'hcp vault monitoring',
-			'hcp vault observability',
-			'log forwarding',
-			'logging',
-			'logs',
-			'monitoring',
-			'observability',
-			'secrets management',
-			'vault',
-		],
-		id: 'hcp-vault',
-		link: '/docs/integrations/outposts/hcp-vault/',
-	},
-	{
-		dataSource: 'auth0',
-		label: 'Auth0',
-		imgUrl: auth0Url,
-		tags: ['logs'],
-		module: 'logs',
-		relatedSearchKeywords: [
-			'auth0',
-			'auth0 logs',
-			'auth0 monitoring',
-			'auth0 observability',
-			'authentication',
-			'authorization',
-			'identity',
-			'log forwarding',
-			'logging',
-			'logs',
-			'monitoring',
-			'observability',
-		],
-		id: 'auth0',
-		link: '/docs/integrations/outposts/auth0/',
-	},
 	{
 		dataSource: 'aspnet-core-metrics',
 		label: 'ASP.NET Core Metrics',
@@ -6829,164 +6632,5 @@ const onboardingConfigWithLinks = [
 		id: 'apache-druid',
 		link: '/docs/integrations/opentelemetry-apache-druid/',
 	},
-	{
-		dataSource: 'apache',
-		label: 'Apache HTTP Server',
-		imgUrl: apacheUrl,
-		tags: ['infrastructure monitoring', 'metrics', 'logs'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'apache',
-			'apache access logs',
-			'apache error logs',
-			'apache http server',
-			'apache httpd',
-			'apache logs',
-			'apache metrics',
-			'apache monitoring',
-			'apache observability',
-			'httpd',
-			'infrastructure monitoring',
-			'logs',
-			'metrics',
-			'mod_status',
-			'monitoring',
-			'observability',
-			'opentelemetry apache',
-			'web server',
-		],
-		id: 'apache',
-		link: '/docs/integrations/opentelemetry-apache/',
-	},
-	{
-		dataSource: 'haproxy',
-		label: 'HAProxy',
-		imgUrl: haproxyUrl,
-		tags: ['infrastructure monitoring', 'metrics', 'logs'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'haproxy',
-			'haproxy logs',
-			'haproxy metrics',
-			'haproxy monitoring',
-			'haproxy observability',
-			'infrastructure monitoring',
-			'load balancer',
-			'logs',
-			'metrics',
-			'monitoring',
-			'observability',
-			'opentelemetry haproxy',
-			'proxy',
-			'reverse proxy',
-			'syslog',
-		],
-		id: 'haproxy',
-		link: '/docs/integrations/opentelemetry-haproxy/',
-	},
-	{
-		dataSource: 'elasticsearch',
-		label: 'Elasticsearch',
-		imgUrl: elasticsearchUrl,
-		tags: ['database'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'cluster health',
-			'database',
-			'elastic',
-			'elasticsearch',
-			'elasticsearch logs',
-			'elasticsearch metrics',
-			'elasticsearch monitoring',
-			'elasticsearch observability',
-			'logs',
-			'metrics',
-			'monitoring',
-			'observability',
-			'opentelemetry elasticsearch',
-			'search engine',
-		],
-		id: 'elasticsearch',
-		link: '/docs/integrations/opentelemetry-elasticsearch/',
-	},
-	{
-		dataSource: 'rabbitmq',
-		label: 'RabbitMQ',
-		imgUrl: rabbitmqUrl,
-		tags: ['Messaging Queues'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'amqp',
-			'broker',
-			'logs',
-			'messaging',
-			'messaging queues',
-			'metrics',
-			'monitoring',
-			'observability',
-			'opentelemetry rabbitmq',
-			'queues',
-			'rabbitmq',
-			'rabbitmq logs',
-			'rabbitmq metrics',
-			'rabbitmq monitoring',
-			'rabbitmq observability',
-		],
-		id: 'rabbitmq',
-		link: '/docs/integrations/opentelemetry-rabbitmq/',
-	},
-	{
-		dataSource: 'open-webui',
-		label: 'Open WebUI',
-		imgUrl: openWebuiUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'llm',
-			'llm monitoring',
-			'logs',
-			'metrics',
-			'monitoring',
-			'observability',
-			'open webui',
-			'open webui logs',
-			'open webui metrics',
-			'open webui monitoring',
-			'open webui observability',
-			'open webui traces',
-			'openlit',
-			'openwebui',
-			'otel open webui integration',
-			'self hosted chat ui',
-			'traces',
-			'tracing',
-		],
-		id: 'open-webui',
-		link: '/docs/open-webui-monitoring/',
-	},
-	{
-		dataSource: 'dspy',
-		label: 'DSPy',
-		imgUrl: dspyUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'dspy',
-			'dspy monitoring',
-			'dspy observability',
-			'dspy traces',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'openinference',
-			'otel dspy integration',
-			'prompt optimization',
-			'traces',
-			'tracing',
-		],
-		id: 'dspy',
-		link: '/docs/dspy-observability/',
-	},
 ];
 export default onboardingConfigWithLinks;

frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx

@@ -53,6 +53,8 @@ import { getUserOperatingSystem, UserOperatingSystem } from 'utils/getUserOS';
 import { useSelectPopupContainer } from 'utils/selectPopupContainer';
 import { v4 as uuid } from 'uuid';
 
+import { FeatureKeys } from '../../../../constants/features';
+import { useAppContext } from '../../../../providers/App/App';
 import { selectStyle } from './config';
 import { PLACEHOLDER } from './constant';
 import ExampleQueriesRendererForLogs from './ExampleQueriesRendererForLogs';
@@ -102,6 +104,11 @@ function QueryBuilderSearch({
 
 	const [isEditingTag, setIsEditingTag] = useState(false);
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const {
 		updateTag,
 		handleClearTag,
@@ -121,6 +128,7 @@ function QueryBuilderSearch({
 		exampleQueries,
 	} = useAutoComplete(
 		query,
+		dotMetricsEnabled,
 		whereClauseConfig,
 		isLogsExplorerPage,
 		isInfraMonitoring,
@@ -138,6 +146,7 @@ function QueryBuilderSearch({
 	const { sourceKeys, handleRemoveSourceKey } = useFetchKeysAndValues(
 		searchValue,
 		query,
+		dotMetricsEnabled,
 		searchKey,
 		isLogsExplorerPage,
 		isInfraMonitoring,

frontend/src/container/ResourceAttributesFilter/ResourceAttributesFilter.tsx

@@ -14,6 +14,8 @@ import { SelectOption } from 'types/common/select';
 import { popupContainer } from 'utils/selectPopupContainer';
 import { v4 as uuid } from 'uuid';
 
+import { FeatureKeys } from '../../constants/features';
+import { useAppContext } from '../../providers/App/App';
 import QueryChip from './components/QueryChip';
 import { QueryChipItem, SearchContainer } from './styles';
 
@@ -40,7 +42,12 @@ function ResourceAttributesFilter({
 		SelectOption<string, string>[]
 	>([]);
 
-	const resourceDeploymentKey = getResourceDeploymentKeys();
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
+	const resourceDeploymentKey = getResourceDeploymentKeys(dotMetricsEnabled);
 
 	const [selectedEnvironments, setSelectedEnvironments] = useState<string[]>([]);
 
@@ -66,14 +73,14 @@ function ResourceAttributesFilter({
 	}, [queries, resourceDeploymentKey]);
 
 	useEffect(() => {
-		getEnvironmentTagKeys().then((tagKeys) => {
+		getEnvironmentTagKeys(dotMetricsEnabled).then((tagKeys) => {
 			if (tagKeys && Array.isArray(tagKeys) && tagKeys.length > 0) {
-				getEnvironmentTagValues().then((tagValues) => {
+				getEnvironmentTagValues(dotMetricsEnabled).then((tagValues) => {
 					setEnvironments(tagValues);
 				});
 			}
 		});
-	}, []);
+	}, [dotMetricsEnabled]);
 
 	return (
 		<div className="resourceAttributesFilter-container">

frontend/src/container/ResourceAttributesFilter/components/QueryChip/QueryChip.tsx

@@ -3,6 +3,8 @@ import {
 	getResourceDeploymentKeys,
 } from 'hooks/useResourceAttribute/utils';
 
+import { FeatureKeys } from '../../../../constants/features';
+import { useAppContext } from '../../../../providers/App/App';
 import { QueryChipContainer, QueryChipItem } from '../../styles';
 import { IQueryChipProps } from './types';
 
@@ -11,7 +13,13 @@ function QueryChip({ queryData, onClose }: IQueryChipProps): JSX.Element {
 		onClose(queryData.id);
 	};
 
-	const isClosable = queryData.tagKey !== getResourceDeploymentKeys();
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
+	const isClosable =
+		queryData.tagKey !== getResourceDeploymentKeys(dotMetricsEnabled);
 
 	return (
 		<QueryChipContainer>

frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsApplication.tsx

@@ -4,6 +4,8 @@ import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
 import { GlobalReducer } from 'types/reducer/globalTime';
 
+import { FeatureKeys } from '../../../constants/features';
+import { useAppContext } from '../../../providers/App/App';
 import { ServiceMetricsProps } from '../types';
 import { getQueryRangeRequestData } from '../utils';
 import ServiceMetricTable from './ServiceMetricTable';
@@ -16,13 +18,19 @@ function ServiceMetricsApplication({
 		GlobalReducer
 	>((state) => state.globalTime);
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const queryRangeRequestData = useMemo(
 		() =>
 			getQueryRangeRequestData({
 				topLevelOperations,
 				globalSelectedInterval,
+				dotMetricsEnabled,
 			}),
-		[globalSelectedInterval, topLevelOperations],
+		[globalSelectedInterval, topLevelOperations, dotMetricsEnabled],
 	);
 	return (
 		<ServiceMetricTable

frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricsQuery.ts

@@ -19,10 +19,13 @@ import {
 
 export const serviceMetricsQuery = (
 	topLevelOperation: [keyof ServiceDataProps, string[]],
+	dotMetricsEnabled: boolean,
 ): QueryBuilderData => {
 	const p99AutoCompleteData: BaseAutocompleteData = {
 		dataType: DataTypes.Float64,
-		key: WidgetKeys.SignozLatencyBucket,
+		key: dotMetricsEnabled
+			? WidgetKeys.Signoz_latency_bucket
+			: WidgetKeys.Signoz_latency_bucket_norm,
 		type: '',
 	};
 
@@ -50,7 +53,9 @@ export const serviceMetricsQuery = (
 			id: '',
 			key: {
 				dataType: DataTypes.String,
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				type: MetricsType.Resource,
 			},
 			op: OPERATORS.IN,
@@ -73,7 +78,9 @@ export const serviceMetricsQuery = (
 			id: '',
 			key: {
 				dataType: DataTypes.String,
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				type: MetricsType.Resource,
 			},
 			op: OPERATORS.IN,
@@ -83,7 +90,7 @@ export const serviceMetricsQuery = (
 			id: '',
 			key: {
 				dataType: DataTypes.Int64,
-				key: WidgetKeys.StatusCode,
+				key: dotMetricsEnabled ? WidgetKeys.StatusCode : WidgetKeys.StatusCodeNorm,
 				type: MetricsType.Tag,
 			},
 			op: OPERATORS.IN,
@@ -106,7 +113,9 @@ export const serviceMetricsQuery = (
 			id: '',
 			key: {
 				dataType: DataTypes.String,
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				type: MetricsType.Resource,
 			},
 			op: OPERATORS.IN,
@@ -129,7 +138,9 @@ export const serviceMetricsQuery = (
 			id: '',
 			key: {
 				dataType: DataTypes.String,
-				key: WidgetKeys.OTelServiceName,
+				key: dotMetricsEnabled
+					? WidgetKeys.Service_name
+					: WidgetKeys.Service_name_norm,
 				type: MetricsType.Resource,
 			},
 			op: OPERATORS.IN,
@@ -182,7 +193,9 @@ export const serviceMetricsQuery = (
 	const groupBy: BaseAutocompleteData[] = [
 		{
 			dataType: DataTypes.String,
-			key: WidgetKeys.OTelServiceName,
+			key: dotMetricsEnabled
+				? WidgetKeys.Service_name
+				: WidgetKeys.Service_name_norm,
 			type: MetricsType.Tag,
 		},
 	];

frontend/src/container/ServiceApplication/ServiceTraces/index.tsx

@@ -17,6 +17,8 @@ import { AppState } from 'store/reducers';
 import { GlobalReducer } from 'types/reducer/globalTime';
 import { Tags } from 'types/reducer/trace';
 
+import { FeatureKeys } from '../../../constants/features';
+import { useAppContext } from '../../../providers/App/App';
 import SkipOnBoardingModal from '../SkipOnBoardModal';
 import ServiceTraceTable from './ServiceTracesTable';
 
@@ -38,6 +40,11 @@ function ServiceTraces(): JSX.Element {
 		selectedTags,
 	});
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	useErrorNotification(error);
 
 	const services = data || [];
@@ -55,7 +62,7 @@ function ServiceTraces(): JSX.Element {
 	useEffect(() => {
 		if (!logEventCalledRef.current && !isUndefined(data)) {
 			const selectedEnvironments = queries.find(
-				(val) => val.tagKey === getResourceDeploymentKeys(),
+				(val) => val.tagKey === getResourceDeploymentKeys(dotMetricsEnabled),
 			)?.tagValue;
 
 			const rps = data.reduce((total, service) => total + service.callRate, 0);

frontend/src/container/ServiceApplication/types.ts

@@ -26,6 +26,7 @@ export interface ServiceMetricsTableProps {
 export interface GetQueryRangeRequestDataProps {
 	topLevelOperations: [keyof ServiceDataProps, string[]][];
 	globalSelectedInterval: Time | CustomTimeType;
+	dotMetricsEnabled: boolean;
 }
 
 export interface GetServiceListFromQueryProps {

frontend/src/container/ServiceApplication/utils.ts

@@ -26,6 +26,7 @@ export function getSeriesValue(
 export const getQueryRangeRequestData = ({
 	topLevelOperations,
 	globalSelectedInterval,
+	dotMetricsEnabled,
 }: GetQueryRangeRequestDataProps): GetQueryResultsProps[] => {
 	const requestData: GetQueryResultsProps[] = [];
 	topLevelOperations.forEach((operation) => {
@@ -33,7 +34,7 @@ export const getQueryRangeRequestData = ({
 			query: {
 				queryType: EQueryType.QUERY_BUILDER,
 				promql: [],
-				builder: serviceMetricsQuery(operation),
+				builder: serviceMetricsQuery(operation, dotMetricsEnabled),
 				clickhouse_sql: [],
 				id: uuid(),
 			},

frontend/src/hooks/queryBuilder/useAutoComplete.ts

@@ -27,6 +27,7 @@ export type WhereClauseConfig = {
 
 export const useAutoComplete = (
 	query: IBuilderQuery,
+	dotMetricsEnabled: boolean,
 	whereClauseConfig?: WhereClauseConfig,
 	shouldUseSuggestions?: boolean,
 	isInfraMonitoring?: boolean,
@@ -39,6 +40,7 @@ export const useAutoComplete = (
 	const { keys, results, isFetching, exampleQueries } = useFetchKeysAndValues(
 		searchValue,
 		query,
+		dotMetricsEnabled,
 		searchKey,
 		shouldUseSuggestions,
 		isInfraMonitoring,

frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts

@@ -48,6 +48,7 @@ type IuseFetchKeysAndValues = {
 export const useFetchKeysAndValues = (
 	searchValue: string,
 	query: IBuilderQuery,
+	dotMetricsEnabled: boolean,
 	searchKey: string,
 	shouldUseSuggestions?: boolean,
 	isInfraMonitoring?: boolean,

frontend/src/hooks/useResourceAttribute/ResourceProvider.tsx

@@ -6,6 +6,8 @@ import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { encode } from 'js-base64';
 
+import { FeatureKeys } from '../../constants/features';
+import { useAppContext } from '../../providers/App/App';
 import { whilelistedKeys } from './config';
 import { ResourceContext } from './context';
 import {
@@ -56,6 +58,11 @@ function ResourceProvider({ children }: Props): JSX.Element {
 		}
 	};
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const dispatchQueries = useCallback(
 		(queries: IResourceAttribute[]): void => {
 			urlQuery.set(
@@ -71,7 +78,7 @@ function ResourceProvider({ children }: Props): JSX.Element {
 
 	const loadTagKeys = (): void => {
 		handleLoading(true);
-		GetTagKeys()
+		GetTagKeys(dotMetricsEnabled)
 			.then((tagKeys) => {
 				const options = mappingWithRoutesAndKeys(pathname, tagKeys);
 				setOptionsData({ options, mode: undefined });
@@ -154,15 +161,15 @@ function ResourceProvider({ children }: Props): JSX.Element {
 
 			setSelectedQueries([...value]);
 		},
-		[optionsData.mode, step, staging, pathname],
+		[optionsData.mode, step, staging, dotMetricsEnabled, pathname],
 	);
 
 	const handleEnvironmentChange = useCallback(
 		(environments: string[]): void => {
-			const staging = [getResourceDeploymentKeys(), 'IN'];
+			const staging = [getResourceDeploymentKeys(dotMetricsEnabled), 'IN'];
 
 			const queriesCopy = queries.filter(
-				(query) => query.tagKey !== getResourceDeploymentKeys(),
+				(query) => query.tagKey !== getResourceDeploymentKeys(dotMetricsEnabled),
 			);
 
 			if (environments && Array.isArray(environments) && environments.length > 0) {
@@ -177,7 +184,7 @@ function ResourceProvider({ children }: Props): JSX.Element {
 
 			setStep('Idle');
 		},
-		[dispatchQueries, queries],
+		[dispatchQueries, dotMetricsEnabled, queries],
 	);
 
 	const handleClose = useCallback(

frontend/src/hooks/useResourceAttribute/__tests__/ResourceProvider.test.tsx

@@ -2,9 +2,13 @@ import { ReactNode } from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { Router } from 'react-router-dom';
 import { act, renderHook, waitFor } from '@testing-library/react';
+import { FeatureKeys } from 'constants/features';
 import ROUTES from 'constants/routes';
 import { createMemoryHistory, MemoryHistory } from 'history';
 import { encode } from 'js-base64';
+import { AppContext } from 'providers/App/App';
+import { IAppContext } from 'providers/App/types';
+import { getAppContextMock } from 'tests/test-utils';
 
 import ResourceProvider from '../ResourceProvider';
 import useResourceAttribute from '../useResourceAttribute';
@@ -51,8 +55,10 @@ const mockTagValues = getResourceAttributesTagValues as jest.MockedFunction<
 
 function createWrapper({
 	routerHistory,
+	appContextOverrides,
 }: {
 	routerHistory: MemoryHistory;
+	appContextOverrides?: Partial<IAppContext>;
 }): ({ children }: { children: ReactNode }) => JSX.Element {
 	const queryClient = new QueryClient({
 		defaultOptions: { queries: { retry: false } },
@@ -60,9 +66,13 @@ function createWrapper({
 	return function Wrapper({ children }: { children: ReactNode }): JSX.Element {
 		return (
 			<QueryClientProvider client={queryClient}>
-				<Router history={routerHistory}>
-					<ResourceProvider>{children}</ResourceProvider>
-				</Router>
+				<AppContext.Provider
+					value={getAppContextMock('ADMIN', appContextOverrides)}
+				>
+					<Router history={routerHistory}>
+						<ResourceProvider>{children}</ResourceProvider>
+					</Router>
+				</AppContext.Provider>
 			</QueryClientProvider>
 		);
 	};
@@ -401,7 +411,7 @@ describe('ResourceProvider', () => {
 	});
 
 	describe('handleEnvironmentChange', () => {
-		it('adds a dotted environment query when envs are provided', async () => {
+		it('adds an environment query when envs are provided', async () => {
 			const routerHistory = createMemoryHistory({ initialEntries: ['/'] });
 			const { result } = renderHook(() => useResourceAttribute(), {
 				wrapper: createWrapper({ routerHistory }),
@@ -414,7 +424,7 @@ describe('ResourceProvider', () => {
 			await waitFor(() => {
 				expect(result.current.queries).toHaveLength(1);
 				expect(result.current.queries[0]).toMatchObject({
-					tagKey: 'resource_deployment.environment',
+					tagKey: 'resource_deployment_environment',
 					operator: 'IN',
 					tagValue: ['production'],
 				});
@@ -425,7 +435,7 @@ describe('ResourceProvider', () => {
 			const seeded = [
 				{
 					id: 'env',
-					tagKey: 'resource_deployment.environment',
+					tagKey: 'resource_deployment_environment',
 					operator: 'IN',
 					tagValue: ['production'],
 				},
@@ -449,7 +459,7 @@ describe('ResourceProvider', () => {
 
 			await waitFor(() => {
 				const tagKeys = result.current.queries.map((q) => q.tagKey);
-				expect(tagKeys).not.toContain('resource_deployment.environment');
+				expect(tagKeys).not.toContain('resource_deployment_environment');
 				expect(tagKeys).toContain('resource_service_name');
 			});
 		});
@@ -458,7 +468,7 @@ describe('ResourceProvider', () => {
 			const seeded = [
 				{
 					id: 'env',
-					tagKey: 'resource_deployment.environment',
+					tagKey: 'resource_deployment_environment',
 					operator: 'IN',
 					tagValue: ['production'],
 				},
@@ -476,13 +486,43 @@ describe('ResourceProvider', () => {
 
 			await waitFor(() => {
 				const envQueries = result.current.queries.filter(
-					(q) => q.tagKey === 'resource_deployment.environment',
+					(q) => q.tagKey === 'resource_deployment_environment',
 				);
 				expect(envQueries).toHaveLength(1);
 				expect(envQueries[0].tagValue).toStrictEqual(['staging']);
 			});
 		});
 
+		it('uses the dotted deployment env key when DOT_METRICS_ENABLED is active', async () => {
+			const routerHistory = createMemoryHistory({ initialEntries: ['/'] });
+			const { result } = renderHook(() => useResourceAttribute(), {
+				wrapper: createWrapper({
+					routerHistory,
+					appContextOverrides: {
+						featureFlags: [
+							{
+								name: FeatureKeys.DOT_METRICS_ENABLED,
+								active: true,
+								usage: 0,
+								usage_limit: -1,
+								route: '',
+							},
+						],
+					},
+				}),
+			});
+
+			act(() => {
+				result.current.handleEnvironmentChange(['production']);
+			});
+
+			await waitFor(() => {
+				expect(result.current.queries[0].tagKey).toBe(
+					'resource_deployment.environment',
+				);
+			});
+		});
+
 		it('preserves unrelated query params when dispatching', async () => {
 			const routerHistory = createMemoryHistory({
 				initialEntries: ['/?tab=overview'],

frontend/src/hooks/useResourceAttribute/__tests__/whitelistedKeys.test.ts

@@ -5,13 +5,13 @@ import { mappingWithRoutesAndKeys } from '../utils';
 
 describe('useResourceAttribute config', () => {
 	describe('whilelistedKeys', () => {
-		it('should include underscore-notation keys', () => {
+		it('should include underscore-notation keys (DOT_METRICS_ENABLED=false)', () => {
 			expect(whilelistedKeys).toContain('resource_deployment_environment');
 			expect(whilelistedKeys).toContain('resource_k8s_cluster_name');
 			expect(whilelistedKeys).toContain('resource_k8s_cluster_namespace');
 		});
 
-		it('should include dot-notation keys', () => {
+		it('should include dot-notation keys (DOT_METRICS_ENABLED=true)', () => {
 			expect(whilelistedKeys).toContain('resource_deployment.environment');
 			expect(whilelistedKeys).toContain('resource_k8s.cluster.name');
 			expect(whilelistedKeys).toContain('resource_k8s.cluster.namespace');

frontend/src/hooks/useResourceAttribute/utils.ts

@@ -144,11 +144,19 @@ export const OperatorSchema: IOption[] = OperatorConversions.map(
 	}),
 );
 
-export const getResourceDeploymentKeys = (): string =>
-	'resource_deployment.environment';
+export const getResourceDeploymentKeys = (
+	dotMetricsEnabled: boolean,
+): string => {
+	if (dotMetricsEnabled) {
+		return 'resource_deployment.environment';
+	}
+	return 'resource_deployment_environment';
+};
 
-export const GetTagKeys = async (): Promise<IOption[]> => {
-	const resourceDeploymentKey = getResourceDeploymentKeys();
+export const GetTagKeys = async (
+	dotMetricsEnabled: boolean,
+): Promise<IOption[]> => {
+	const resourceDeploymentKey = getResourceDeploymentKeys(dotMetricsEnabled);
 	const { payload } = await getResourceAttributesTagKeys({
 		metricName: 'signoz_calls_total',
 		match: 'resource_',
@@ -168,10 +176,12 @@ export const GetTagKeys = async (): Promise<IOption[]> => {
 		}));
 };
 
-export const getEnvironmentTagKeys = async (): Promise<IOption[]> => {
+export const getEnvironmentTagKeys = async (
+	dotMetricsEnabled: boolean,
+): Promise<IOption[]> => {
 	const { payload } = await getResourceAttributesTagKeys({
 		metricName: 'signoz_calls_total',
-		match: getResourceDeploymentKeys(),
+		match: getResourceDeploymentKeys(dotMetricsEnabled),
 	});
 	if (!payload || !payload?.data) {
 		return [];
@@ -184,9 +194,11 @@ export const getEnvironmentTagKeys = async (): Promise<IOption[]> => {
 	}));
 };
 
-export const getEnvironmentTagValues = async (): Promise<IOption[]> => {
+export const getEnvironmentTagValues = async (
+	dotMetricsEnabled: boolean,
+): Promise<IOption[]> => {
 	const { payload } = await getResourceAttributesTagValues({
-		tagKey: getResourceDeploymentKeys(),
+		tagKey: getResourceDeploymentKeys(dotMetricsEnabled),
 		metricName: 'signoz_calls_total',
 	});
 

frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricColumnGraphs.tsx

@@ -4,6 +4,8 @@ import { CardContainer } from 'container/GridCardLayout/styles';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { Widgets } from 'types/api/dashboard/getAll';
 
+import { FeatureKeys } from '../../../../constants/features';
+import { useAppContext } from '../../../../providers/App/App';
 import MetricPageGridGraph from './MetricPageGraph';
 import {
 	getAverageRequestLatencyWidgetData,
@@ -71,15 +73,20 @@ function MetricColumnGraphs({
 }): JSX.Element {
 	const { t } = useTranslation('messagingQueues');
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const metricsData = [
 		{
 			title: t('metricGraphCategory.brokerMetrics.title'),
 			description: t('metricGraphCategory.brokerMetrics.description'),
 			graphCount: [
-				getBrokerCountWidgetData(),
-				getRequestTimesWidgetData(),
-				getProducerFetchRequestPurgatoryWidgetData(),
-				getBrokerNetworkThroughputWidgetData(),
+				getBrokerCountWidgetData(dotMetricsEnabled),
+				getRequestTimesWidgetData(dotMetricsEnabled),
+				getProducerFetchRequestPurgatoryWidgetData(dotMetricsEnabled),
+				getBrokerNetworkThroughputWidgetData(dotMetricsEnabled),
 			],
 			id: 'broker-metrics',
 		},
@@ -87,11 +94,11 @@ function MetricColumnGraphs({
 			title: t('metricGraphCategory.producerMetrics.title'),
 			description: t('metricGraphCategory.producerMetrics.description'),
 			graphCount: [
-				getIoWaitTimeWidgetData(),
-				getRequestResponseWidgetData(),
-				getAverageRequestLatencyWidgetData(),
-				getKafkaProducerByteRateWidgetData(),
-				getBytesConsumedWidgetData(),
+				getIoWaitTimeWidgetData(dotMetricsEnabled),
+				getRequestResponseWidgetData(dotMetricsEnabled),
+				getAverageRequestLatencyWidgetData(dotMetricsEnabled),
+				getKafkaProducerByteRateWidgetData(dotMetricsEnabled),
+				getBytesConsumedWidgetData(dotMetricsEnabled),
 			],
 			id: 'producer-metrics',
 		},
@@ -99,11 +106,11 @@ function MetricColumnGraphs({
 			title: t('metricGraphCategory.consumerMetrics.title'),
 			description: t('metricGraphCategory.consumerMetrics.description'),
 			graphCount: [
-				getConsumerOffsetWidgetData(),
-				getConsumerGroupMemberWidgetData(),
-				getConsumerLagByGroupWidgetData(),
-				getConsumerFetchRateWidgetData(),
-				getMessagesConsumedWidgetData(),
+				getConsumerOffsetWidgetData(dotMetricsEnabled),
+				getConsumerGroupMemberWidgetData(dotMetricsEnabled),
+				getConsumerLagByGroupWidgetData(dotMetricsEnabled),
+				getConsumerFetchRateWidgetData(dotMetricsEnabled),
+				getMessagesConsumedWidgetData(dotMetricsEnabled),
 			],
 			id: 'consumer-metrics',
 		},

frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricPage.tsx

@@ -8,6 +8,8 @@ import { useIsDarkMode } from 'hooks/useDarkMode';
 import { ChevronDown, ChevronUp } from '@signozhq/icons';
 import { Widgets } from 'types/api/dashboard/getAll';
 
+import { FeatureKeys } from '../../../../constants/features';
+import { useAppContext } from '../../../../providers/App/App';
 import MetricColumnGraphs from './MetricColumnGraphs';
 import MetricPageGridGraph from './MetricPageGraph';
 import {
@@ -95,6 +97,11 @@ function MetricPage(): JSX.Element {
 		}));
 	};
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const { t } = useTranslation('messagingQueues');
 
 	const metricSections = [
@@ -103,10 +110,10 @@ function MetricPage(): JSX.Element {
 			title: t('metricGraphCategory.brokerJVMMetrics.title'),
 			description: t('metricGraphCategory.brokerJVMMetrics.description'),
 			graphCount: [
-				getJvmGCCountWidgetData(),
-				getJvmGcCollectionsElapsedWidgetData(),
-				getCpuRecentUtilizationWidgetData(),
-				getJvmMemoryHeapWidgetData(),
+				getJvmGCCountWidgetData(dotMetricsEnabled),
+				getJvmGcCollectionsElapsedWidgetData(dotMetricsEnabled),
+				getCpuRecentUtilizationWidgetData(dotMetricsEnabled),
+				getJvmMemoryHeapWidgetData(dotMetricsEnabled),
 			],
 		},
 		{
@@ -114,10 +121,10 @@ function MetricPage(): JSX.Element {
 			title: t('metricGraphCategory.partitionMetrics.title'),
 			description: t('metricGraphCategory.partitionMetrics.description'),
 			graphCount: [
-				getPartitionCountPerTopicWidgetData(),
-				getCurrentOffsetPartitionWidgetData(),
-				getOldestOffsetWidgetData(),
-				getInsyncReplicasWidgetData(),
+				getPartitionCountPerTopicWidgetData(dotMetricsEnabled),
+				getCurrentOffsetPartitionWidgetData(dotMetricsEnabled),
+				getOldestOffsetWidgetData(dotMetricsEnabled),
+				getInsyncReplicasWidgetData(dotMetricsEnabled),
 			],
 		},
 	];
@@ -131,7 +138,7 @@ function MetricPage(): JSX.Element {
 
 			// Only log when first graph has rendered and we haven't logged yet
 			if (renderedGraphCountRef.current === 1 && !hasLoggedRef.current) {
-				void logEvent('MQ Kafka: Metric view', {
+				logEvent('MQ Kafka: Metric view', {
 					graphRendered: true,
 				});
 				hasLoggedRef.current = true;

frontend/src/pages/MessagingQueues/MQDetails/MetricPage/MetricPageUtil.ts

@@ -78,15 +78,21 @@ export function getWidgetQuery(
 	};
 }
 
-export const getRequestTimesWidgetData = (): Widgets =>
+export const getRequestTimesWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.request.time.avg',
-						id: 'kafka.request.time.avg--float64--Gauge--true',
+						// choose key based on flag
+						key: dotMetricsEnabled
+							? 'kafka.request.time.avg'
+							: 'kafka_request_time_avg',
+						// mirror into the id as well
+						id: 'kafka_request_time_avg--float64--Gauge--true',
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -116,15 +122,15 @@ export const getRequestTimesWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getBrokerCountWidgetData = (): Widgets =>
+export const getBrokerCountWidgetData = (dotMetricsEnabled: boolean): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.brokers',
-						id: 'kafka.brokers--float64--Gauge--true',
+						key: dotMetricsEnabled ? 'kafka.brokers' : 'kafka_brokers',
+						id: 'kafka_brokers--float64--Gauge--true',
 						type: 'Gauge',
 					},
 					aggregateOperator: 'sum',
@@ -150,15 +156,20 @@ export const getBrokerCountWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getProducerFetchRequestPurgatoryWidgetData = (): Widgets =>
+export const getProducerFetchRequestPurgatoryWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.purgatory.size',
-						id: 'kafka.purgatory.size--float64--Gauge--true',
+						// inline ternary based on dotMetricsEnabled
+						key: dotMetricsEnabled ? 'kafka.purgatory.size' : 'kafka_purgatory_size',
+						id: `${
+							dotMetricsEnabled ? 'kafka.purgatory.size' : 'kafka_purgatory_size'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -185,15 +196,24 @@ export const getProducerFetchRequestPurgatoryWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getBrokerNetworkThroughputWidgetData = (): Widgets =>
+export const getBrokerNetworkThroughputWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka_server_brokertopicmetrics_total_replicationbytesinpersec_oneminuterate',
-						id: 'kafka_server_brokertopicmetrics_total_replicationbytesinpersec_oneminuterate--float64--Gauge--true',
+						// inline ternary based on dotMetricsEnabled
+						key: dotMetricsEnabled
+							? 'kafka_server_brokertopicmetrics_total_replicationbytesinpersec_oneminuterate'
+							: 'kafka_server_brokertopicmetrics_bytesoutpersec_oneminuterate',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka_server_brokertopicmetrics_total_replicationbytesinpersec_oneminuterate'
+								: 'kafka_server_brokertopicmetrics_bytesoutpersec_oneminuterate'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -220,15 +240,22 @@ export const getBrokerNetworkThroughputWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getIoWaitTimeWidgetData = (): Widgets =>
+export const getIoWaitTimeWidgetData = (dotMetricsEnabled: boolean): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.producer.io_waittime_total',
-						id: 'kafka.producer.io_waittime_total--float64--Sum--true',
+						// inline ternary based on dotMetricsEnabled
+						key: dotMetricsEnabled
+							? 'kafka.producer.io_waittime_total'
+							: 'kafka_producer_io_waittime_total',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.producer.io_waittime_total'
+								: 'kafka_producer_io_waittime_total'
+						}--float64--Sum--true`,
 						type: 'Sum',
 					},
 					aggregateOperator: 'rate',
@@ -255,15 +282,23 @@ export const getIoWaitTimeWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getRequestResponseWidgetData = (): Widgets =>
+export const getRequestResponseWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.producer.request_rate',
-						id: 'kafka.producer.request_rate--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.producer.request_rate'
+							: 'kafka_producer_request_rate',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.producer.request_rate'
+								: 'kafka_producer_request_rate'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -286,8 +321,14 @@ export const getRequestResponseWidgetData = (): Widgets =>
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.producer.response_rate',
-						id: 'kafka.producer.response_rate--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.producer.response_rate'
+							: 'kafka_producer_response_rate',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.producer.response_rate'
+								: 'kafka_producer_response_rate'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -314,15 +355,23 @@ export const getRequestResponseWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getAverageRequestLatencyWidgetData = (): Widgets =>
+export const getAverageRequestLatencyWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.producer.request_latency_avg',
-						id: 'kafka.producer.request_latency_avg--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.producer.request_latency_avg'
+							: 'kafka_producer_request_latency_avg',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.producer.request_latency_avg'
+								: 'kafka_producer_request_latency_avg'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -349,15 +398,23 @@ export const getAverageRequestLatencyWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getKafkaProducerByteRateWidgetData = (): Widgets =>
+export const getKafkaProducerByteRateWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.producer.byte_rate',
-						id: 'kafka.producer.byte_rate--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.producer.byte_rate'
+							: 'kafka_producer_byte_rate',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.producer.byte_rate'
+								: 'kafka_producer_byte_rate'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -385,21 +442,31 @@ export const getKafkaProducerByteRateWidgetData = (): Widgets =>
 					timeAggregation: 'avg',
 				},
 			],
-			title: 'kafka.producer.byte_rate',
+			title: dotMetricsEnabled
+				? 'kafka.producer.byte_rate'
+				: 'kafka_producer_byte_rate',
 			description:
 				'Helps measure the data output rate from the producer, indicating the load a producer is placing on Kafka brokers.',
 		}),
 	);
 
-export const getBytesConsumedWidgetData = (): Widgets =>
+export const getBytesConsumedWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.consumer.bytes_consumed_rate',
-						id: 'kafka.consumer.bytes_consumed_rate--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.consumer.bytes_consumed_rate'
+							: 'kafka_consumer_bytes_consumed_rate',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.consumer.bytes_consumed_rate'
+								: 'kafka_consumer_bytes_consumed_rate'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -427,15 +494,23 @@ export const getBytesConsumedWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getConsumerOffsetWidgetData = (): Widgets =>
+export const getConsumerOffsetWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.consumer_group.offset',
-						id: 'kafka.consumer_group.offset--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.consumer_group.offset'
+							: 'kafka_consumer_group_offset',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.consumer_group.offset'
+								: 'kafka_consumer_group_offset'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -481,15 +556,23 @@ export const getConsumerOffsetWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getConsumerGroupMemberWidgetData = (): Widgets =>
+export const getConsumerGroupMemberWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.consumer_group.members',
-						id: 'kafka.consumer_group.members--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.consumer_group.members'
+							: 'kafka_consumer_group_members',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.consumer_group.members'
+								: 'kafka_consumer_group_members'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'sum',
@@ -522,15 +605,23 @@ export const getConsumerGroupMemberWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getConsumerLagByGroupWidgetData = (): Widgets =>
+export const getConsumerLagByGroupWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.consumer_group.lag',
-						id: 'kafka.consumer_group.lag--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.consumer_group.lag'
+							: 'kafka_consumer_group_lag',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.consumer_group.lag'
+								: 'kafka_consumer_group_lag'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -576,15 +667,23 @@ export const getConsumerLagByGroupWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getConsumerFetchRateWidgetData = (): Widgets =>
+export const getConsumerFetchRateWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.consumer.fetch_rate',
-						id: 'kafka.consumer.fetch_rate--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.consumer.fetch_rate'
+							: 'kafka_consumer_fetch_rate',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.consumer.fetch_rate'
+								: 'kafka_consumer_fetch_rate'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -597,7 +696,7 @@ export const getConsumerFetchRateWidgetData = (): Widgets =>
 						{
 							dataType: DataTypes.String,
 							id: 'service_name--string--tag--false',
-							key: 'service.name',
+							key: dotMetricsEnabled ? 'service.name' : 'service_name',
 							type: 'tag',
 						},
 					],
@@ -618,15 +717,23 @@ export const getConsumerFetchRateWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getMessagesConsumedWidgetData = (): Widgets =>
+export const getMessagesConsumedWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.consumer.records_consumed_rate',
-						id: 'kafka.consumer.records_consumed_rate--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.consumer.records_consumed_rate'
+							: 'kafka_consumer_records_consumed_rate',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.consumer.records_consumed_rate'
+								: 'kafka_consumer_records_consumed_rate'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -653,15 +760,21 @@ export const getMessagesConsumedWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getJvmGCCountWidgetData = (): Widgets =>
+export const getJvmGCCountWidgetData = (dotMetricsEnabled: boolean): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'jvm.gc.collections.count',
-						id: 'jvm.gc.collections.count--float64--Sum--true',
+						key: dotMetricsEnabled
+							? 'jvm.gc.collections.count'
+							: 'jvm_gc_collections_count',
+						id: `${
+							dotMetricsEnabled
+								? 'jvm.gc.collections.count'
+								: 'jvm_gc_collections_count'
+						}--float64--Sum--true`,
 						type: 'Sum',
 					},
 					aggregateOperator: 'rate',
@@ -688,15 +801,23 @@ export const getJvmGCCountWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getJvmGcCollectionsElapsedWidgetData = (): Widgets =>
+export const getJvmGcCollectionsElapsedWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'jvm.gc.collections.elapsed',
-						id: 'jvm.gc.collections.elapsed--float64--Sum--true',
+						key: dotMetricsEnabled
+							? 'jvm.gc.collections.elapsed'
+							: 'jvm_gc_collections_elapsed',
+						id: `${
+							dotMetricsEnabled
+								? 'jvm.gc.collections.elapsed'
+								: 'jvm_gc_collections_elapsed'
+						}--float64--Sum--true`,
 						type: 'Sum',
 					},
 					aggregateOperator: 'rate',
@@ -717,21 +838,31 @@ export const getJvmGcCollectionsElapsedWidgetData = (): Widgets =>
 					timeAggregation: 'rate',
 				},
 			],
-			title: 'jvm.gc.collections.elapsed',
+			title: dotMetricsEnabled
+				? 'jvm.gc.collections.elapsed'
+				: 'jvm_gc_collections_elapsed',
 			description:
 				'Measures the total time (usually in milliseconds) spent on garbage collection (GC) events in the Java Virtual Machine (JVM).',
 		}),
 	);
 
-export const getCpuRecentUtilizationWidgetData = (): Widgets =>
+export const getCpuRecentUtilizationWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'jvm.cpu.recent_utilization',
-						id: 'jvm.cpu.recent_utilization--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'jvm.cpu.recent_utilization'
+							: 'jvm_cpu_recent_utilization',
+						id: `${
+							dotMetricsEnabled
+								? 'jvm.cpu.recent_utilization'
+								: 'jvm_cpu_recent_utilization'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -758,15 +889,19 @@ export const getCpuRecentUtilizationWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getJvmMemoryHeapWidgetData = (): Widgets =>
+export const getJvmMemoryHeapWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'jvm.memory.heap.max',
-						id: 'jvm.memory.heap.max--float64--Gauge--true',
+						key: dotMetricsEnabled ? 'jvm.memory.heap.max' : 'jvm_memory_heap_max',
+						id: `${
+							dotMetricsEnabled ? 'jvm.memory.heap.max' : 'jvm_memory_heap_max'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -793,15 +928,21 @@ export const getJvmMemoryHeapWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getPartitionCountPerTopicWidgetData = (): Widgets =>
+export const getPartitionCountPerTopicWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.topic.partitions',
-						id: 'kafka.topic.partitions--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.topic.partitions'
+							: 'kafka_topic_partitions',
+						id: `${
+							dotMetricsEnabled ? 'kafka.topic.partitions' : 'kafka_topic_partitions'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'sum',
@@ -834,15 +975,23 @@ export const getPartitionCountPerTopicWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getCurrentOffsetPartitionWidgetData = (): Widgets =>
+export const getCurrentOffsetPartitionWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.partition.current_offset',
-						id: 'kafka.partition.current_offset--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.partition.current_offset'
+							: 'kafka_partition_current_offset',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.partition.current_offset'
+								: 'kafka_partition_current_offset'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -882,15 +1031,23 @@ export const getCurrentOffsetPartitionWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getOldestOffsetWidgetData = (): Widgets =>
+export const getOldestOffsetWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.partition.oldest_offset',
-						id: 'kafka.partition.oldest_offset--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.partition.oldest_offset'
+							: 'kafka_partition_oldest_offset',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.partition.oldest_offset'
+								: 'kafka_partition_oldest_offset'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',
@@ -930,15 +1087,23 @@ export const getOldestOffsetWidgetData = (): Widgets =>
 		}),
 	);
 
-export const getInsyncReplicasWidgetData = (): Widgets =>
+export const getInsyncReplicasWidgetData = (
+	dotMetricsEnabled: boolean,
+): Widgets =>
 	getWidgetQueryBuilder(
 		getWidgetQuery({
 			queryData: [
 				{
 					aggregateAttribute: {
 						dataType: DataTypes.Float64,
-						key: 'kafka.partition.replicas_in_sync',
-						id: 'kafka.partition.replicas_in_sync--float64--Gauge--true',
+						key: dotMetricsEnabled
+							? 'kafka.partition.replicas_in_sync'
+							: 'kafka_partition_replicas_in_sync',
+						id: `${
+							dotMetricsEnabled
+								? 'kafka.partition.replicas_in_sync'
+								: 'kafka_partition_replicas_in_sync'
+						}--float64--Gauge--true`,
 						type: 'Gauge',
 					},
 					aggregateOperator: 'avg',

frontend/src/pages/MessagingQueues/MQGraph/MQConfigOptions.tsx

@@ -11,6 +11,8 @@ import useDebouncedFn from 'hooks/useDebouncedFunction';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { Check, Share2 } from '@signozhq/icons';
 
+import { FeatureKeys } from '../../../constants/features';
+import { useAppContext } from '../../../providers/App/App';
 import { useGetAllConfigOptions } from './useGetAllConfigOptions';
 
 import './MQConfigOptions.styles.scss';
@@ -38,11 +40,19 @@ const useConfigOptions = (
 	isFetching: boolean;
 	options: DefaultOptionType[];
 } => {
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const [searchText, setSearchText] = useState<string>('');
-	const { isFetching, options } = useGetAllConfigOptions({
-		attributeKey: type,
-		searchText,
-	});
+	const { isFetching, options } = useGetAllConfigOptions(
+		{
+			attributeKey: type,
+			searchText,
+		},
+		dotMetricsEnabled,
+	);
 	const handleDebouncedSearch = useDebouncedFn((searchText): void => {
 		setSearchText(searchText as string);
 	}, 500);

frontend/src/pages/MessagingQueues/MQGraph/MQGraph.tsx

@@ -3,6 +3,7 @@ import { useCallback, useMemo, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 import { useHistory, useLocation } from 'react-router-dom';
 import logEvent from 'api/common/logEvent';
+import { FeatureKeys } from 'constants/features';
 import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { ViewMenuAction } from 'container/GridCardLayout/config';
@@ -11,6 +12,7 @@ import { Card } from 'container/GridCardLayout/styles';
 import { getWidgetQueryBuilder } from 'container/MetricsApplication/MetricsApplication.factory';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import useUrlQuery from 'hooks/useUrlQuery';
+import { useAppContext } from 'providers/App/App';
 import { UpdateTimeInterval } from 'store/actions';
 
 import {
@@ -32,9 +34,15 @@ function MessagingQueuesGraph(): JSX.Element {
 		[consumerGrp, topic, partition],
 	);
 
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const widgetData = useMemo(
-		() => getWidgetQueryBuilder(getWidgetQuery({ filterItems })),
-		[filterItems],
+		() =>
+			getWidgetQueryBuilder(getWidgetQuery({ filterItems, dotMetricsEnabled })),
+		[filterItems, dotMetricsEnabled],
 	);
 
 	const history = useHistory();
@@ -73,7 +81,7 @@ function MessagingQueuesGraph(): JSX.Element {
 	const checkIfDataExists = (isDataAvailable: boolean): void => {
 		if (!isLogEventCalled.current) {
 			isLogEventCalled.current = true;
-			void logEvent('Messaging Queues: Graph data fetched', {
+			logEvent('Messaging Queues: Graph data fetched', {
 				isDataAvailable,
 			});
 		}

frontend/src/pages/MessagingQueues/MQGraph/useGetAllConfigOptions.ts

@@ -16,6 +16,7 @@ export interface GetAllConfigOptionsResponse {
 
 export function useGetAllConfigOptions(
 	props: ConfigOptions,
+	dotMetricsEnabled: boolean,
 ): GetAllConfigOptionsResponse {
 	const { attributeKey, searchText } = props;
 
@@ -25,7 +26,9 @@ export function useGetAllConfigOptions(
 			const { payload } = await getAttributesValues({
 				aggregateOperator: 'avg',
 				dataSource: DataSource.METRICS,
-				aggregateAttribute: 'kafka.consumer_group.lag',
+				aggregateAttribute: dotMetricsEnabled
+					? 'kafka.consumer_group.lag'
+					: 'kafka_consumer_group_lag',
 				attributeKey,
 				searchText: searchText ?? '',
 				filterAttributeKeyDataType: DataTypes.String,

frontend/src/pages/MessagingQueues/MessagingQueuesUtils.ts

@@ -94,8 +94,10 @@ export function getFiltersFromConfigOptions(
 
 export function getWidgetQuery({
 	filterItems,
+	dotMetricsEnabled,
 }: {
 	filterItems: TagFilterItem[];
+	dotMetricsEnabled: boolean;
 }): GetWidgetQueryBuilderProps {
 	return {
 		title: 'Consumer Lag',
@@ -110,8 +112,14 @@ export function getWidgetQuery({
 					{
 						aggregateAttribute: {
 							dataType: DataTypes.Float64,
-							id: 'kafka.consumer_group.lag--float64--Gauge--true',
-							key: 'kafka.consumer_group.lag',
+							id: `${
+								dotMetricsEnabled
+									? 'kafka.consumer_group.lag'
+									: 'kafka_consumer_group_lag'
+							}--float64--Gauge--true`,
+							key: dotMetricsEnabled
+								? 'kafka.consumer_group.lag'
+								: 'kafka_consumer_group_lag',
 							type: 'Gauge',
 						},
 						aggregateOperator: 'max',

frontend/src/utils/__tests__/queryContextUtils.test.ts

@@ -648,176 +648,3 @@ describe('getQueryContextAtCursor - trailing dot in key/value', () => {
 		expect(ctx.keyToken).toBe('k8s.namespace');
 	});
 });
-
-describe('getQueryContextAtCursor - partial operator', () => {
-	it('treats text after an incomplete key as an operator prefix', () => {
-		const q = 'service.name c';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.isInKey).toBe(false);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('c');
-		expect(ctx.currentPair).toStrictEqual(
-			expect.objectContaining({
-				key: 'service.name',
-				operator: 'c',
-				position: expect.objectContaining({
-					operatorStart: 13,
-					operatorEnd: 13,
-				}),
-			}),
-		);
-	});
-
-	it('keeps the operator context while completing contains', () => {
-		const q = 'service.name cont';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('cont');
-	});
-
-	it('treats cursor mid-token as operator context', () => {
-		const q = 'service.name cont';
-		// cursor sits between "con" and "t" — user still typing the operator
-		const ctx = getQueryContextAtCursor(q, 15);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.isInKey).toBe(false);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('cont');
-	});
-
-	it('keeps operator context when an AND conjunction precedes the pair', () => {
-		const q = 'a = 1 AND service.name c';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.isInKey).toBe(false);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('c');
-		expect(ctx.currentPair).toStrictEqual(
-			expect.objectContaining({
-				key: 'service.name',
-				operator: 'c',
-				position: expect.objectContaining({
-					operatorStart: 23,
-					operatorEnd: 23,
-				}),
-			}),
-		);
-	});
-
-	it('keeps operator context when an open parenthesis precedes the pair', () => {
-		const q = '(service.name c';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.isInKey).toBe(false);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('c');
-	});
-
-	it('re-glues a partial operator that follows a NOT negation', () => {
-		const q = 'service.name NOT c';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.isInKey).toBe(false);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('NOT c');
-		// operatorStart points at the partial operator (post-NOT), not at the
-		// negation — so suggestion selection only replaces the partial, never
-		// the user's typed NOT.
-		expect(ctx.currentPair).toStrictEqual(
-			expect.objectContaining({
-				key: 'service.name',
-				operator: 'NOT c',
-				hasNegation: true,
-				position: expect.objectContaining({
-					negationStart: 13,
-					negationEnd: 15,
-					operatorStart: 17,
-					operatorEnd: 17,
-				}),
-			}),
-		);
-	});
-
-	it('re-glues a multi-character partial operator after NOT', () => {
-		const q = 'service.name NOT lik';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('NOT lik');
-		expect(ctx.currentPair?.hasNegation).toBe(true);
-	});
-
-	it('re-glues an uppercase partial operator after NOT', () => {
-		const q = 'service.name NOT EXI';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('NOT EXI');
-		expect(ctx.currentPair?.hasNegation).toBe(true);
-	});
-
-	it('preserves original NOT casing in the operator text', () => {
-		const q = 'service.name not c';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('not c');
-		expect(ctx.currentPair?.hasNegation).toBe(true);
-	});
-
-	it('tolerates extra whitespace between NOT and the partial operator', () => {
-		const q = 'service.name NOT  c';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.keyToken).toBe('service.name');
-		// Display text uses a canonical single space between NOT and the
-		// partial, regardless of how many spaces the user typed.
-		expect(ctx.operatorToken).toBe('NOT c');
-		expect(ctx.currentPair?.hasNegation).toBe(true);
-	});
-
-	it('keeps operator context for NOT-prefixed partial inside parentheses', () => {
-		const q = '(service.name NOT c';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('NOT c');
-		expect(ctx.currentPair?.hasNegation).toBe(true);
-	});
-
-	it('keeps operator context for NOT-prefixed partial after an AND conjunction', () => {
-		const q = 'a = 1 AND service.name NOT c';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.keyToken).toBe('service.name');
-		expect(ctx.operatorToken).toBe('NOT c');
-		expect(ctx.currentPair?.hasNegation).toBe(true);
-	});
-
-	it('re-glues the most recent incomplete pair when three partial tokens are typed', () => {
-		// Pins documented behavior: with two trailing partial pairs (`c` and
-		// `k`), the heuristic pairs the most recent two — `c` becomes the
-		// key, `k` becomes the partial operator. The earlier `service.name`
-		// is dropped from the current pair view.
-		const q = 'service.name c k';
-		const ctx = getQueryContextAtCursor(q, q.length);
-
-		expect(ctx.isInOperator).toBe(true);
-		expect(ctx.keyToken).toBe('c');
-		expect(ctx.operatorToken).toBe('k');
-	});
-});

frontend/src/utils/lazyWithRetries.ts

@@ -16,14 +16,9 @@ export const lazyRetry = (componentImport: ComponentImport): Promise<any> =>
 				resolve(component);
 			})
 			.catch((error: Error) => {
-				// A stale chunk reference right after a deploy self-heals: one reload pulls a
-				// fresh index.html with the new hashed asset names. That reload is only
-				// once-only if the flag persists, so a failed write (sessionStorage blocked in
-				// an iframe, storage disabled) must not reload at all — it would loop forever.
-				if (
-					!hasRefreshed &&
-					setSessionStorageApi(SESSIONSTORAGE.RETRY_LAZY_REFRESHED, 'true')
-				) {
+				if (!hasRefreshed) {
+					setSessionStorageApi(SESSIONSTORAGE.RETRY_LAZY_REFRESHED, 'true');
+
 					window.location.reload();
 				}
 

frontend/src/utils/queryContextUtils.ts

@@ -605,98 +605,6 @@ export function getQueryContextAtCursor(
 			queryPairs,
 		);
 
-		// Re-glue a partial operator that ANTLR has lexed as a second key.
-		//
-		// When the user types `service.name c` (or `service.name NOT c`), the
-		// lexer sees two KEY tokens (`service.name`, `c`) instead of a key +
-		// partial operator, so `extractQueryPairs` emits two consecutive
-		// key-only incomplete pairs. Downstream, that makes the dropdown
-		// suggest keys when it should be suggesting operators.
-		//
-		// Detect that pattern — a previous incomplete key-only pair followed
-		// by another incomplete key-only `currentPair`, separated only by
-		// whitespace (or by a negation token attached to the previous pair) —
-		// and rebuild a single synthetic pair where the previous pair's key
-		// is the key and the current pair's key is treated as the partial
-		// operator. The synthetic pair inherits the previous pair's negation
-		// flag and positions via the spread, so `NOT <partial>` propagates
-		// correctly to consumers.
-		const previousIncompletePair = queryPairs
-			.filter(
-				(pair) =>
-					!pair.isComplete &&
-					!!pair.key &&
-					!pair.operator &&
-					pair.position.keyEnd < (currentPair?.position.keyStart ?? cursorIndex),
-			)
-			.sort((a, b) => b.position.keyEnd - a.position.keyEnd)[0];
-
-		if (
-			previousIncompletePair &&
-			currentPair &&
-			currentPair !== previousIncompletePair &&
-			!currentPair.operator &&
-			currentPair.position.keyStart > previousIncompletePair.position.keyEnd
-		) {
-			const negationStart = previousIncompletePair.position.negationStart ?? 0;
-			const negationEnd = previousIncompletePair.position.negationEnd ?? 0;
-			const negationAfterKey =
-				previousIncompletePair.hasNegation &&
-				negationStart > previousIncompletePair.position.keyEnd;
-			const gapStart = negationAfterKey
-				? negationEnd + 1
-				: previousIncompletePair.position.keyEnd + 1;
-			const textBetweenPairs = query.slice(
-				gapStart,
-				currentPair.position.keyStart,
-			);
-
-			if (textBetweenPairs.trim() === '') {
-				// The replacement range (operatorStart/operatorEnd) must point
-				// at the partial operator only, NOT the leading negation.
-				// Consumers like QuerySearch use it to splice the chosen
-				// suggestion in-place, so including the negation would let a
-				// `NOT lik` -> `LIKE` selection erase the user's typed `NOT`.
-				// Matches the convention used for complete pairs in
-				// extractQueryPairs, where operatorStart starts after the
-				// negation token.
-				const operatorStart = currentPair.position.keyStart;
-				const operatorEnd = currentPair.position.keyEnd;
-				const partialOperator = query.slice(operatorStart, operatorEnd + 1);
-				const operatorText = negationAfterKey
-					? `${query.slice(negationStart, negationEnd + 1)} ${partialOperator}`
-					: partialOperator;
-
-				return {
-					tokenType: -1,
-					text: '',
-					start: cursorIndex,
-					stop: cursorIndex,
-					currentToken: operatorText,
-					isInKey: false,
-					isInNegation: false,
-					isInOperator: true,
-					isInValue: false,
-					isInConjunction: false,
-					isInFunction: false,
-					isInParenthesis: false,
-					isInBracketList: false,
-					keyToken: previousIncompletePair.key,
-					operatorToken: operatorText,
-					queryPairs,
-					currentPair: {
-						...previousIncompletePair,
-						operator: operatorText,
-						position: {
-							...previousIncompletePair.position,
-							operatorStart,
-							operatorEnd,
-						},
-					},
-				};
-			}
-		}
-
 		// Check if cursor is within any of the specific context boundaries
 		// FIXED: Include the case where the cursor is exactly at the end of a boundary
 		const isInKeyBoundary =

go.mod

@@ -4,7 +4,7 @@ go 1.25.7
 
 require (
 	dario.cat/mergo v1.0.2
-	github.com/AfterShip/clickhouse-sql-parser v0.5.5
+	github.com/AfterShip/clickhouse-sql-parser v0.5.4
 	github.com/ClickHouse/clickhouse-go/v2 v2.44.0
 	github.com/DATA-DOG/go-sqlmock v1.5.2
 	github.com/SigNoz/clickhouse-go-mock v0.14.0

go.sum

@@ -66,8 +66,8 @@ dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
 filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
-github.com/AfterShip/clickhouse-sql-parser v0.5.5 h1:LCA23yAA4GgF73PoYXb67yzCdC4sXsj4geQz1Oij3U8=
-github.com/AfterShip/clickhouse-sql-parser v0.5.5/go.mod h1:Qi3qvPTfZb/aFwI5V4WFOahgjsLJa4MzVijIAfwOhDw=
+github.com/AfterShip/clickhouse-sql-parser v0.5.4 h1:yiCQaMq8EO+dpKdnpP9YYd/ne6MSuOXgsMsNL33NiTI=
+github.com/AfterShip/clickhouse-sql-parser v0.5.4/go.mod h1:Qi3qvPTfZb/aFwI5V4WFOahgjsLJa4MzVijIAfwOhDw=
 github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA=

pkg/apiserver/signozapiserver/provider.go

@@ -25,7 +25,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/promote"
 	"github.com/SigNoz/signoz/pkg/modules/rawdataexport"
 	"github.com/SigNoz/signoz/pkg/modules/rulestatehistory"
-	"github.com/SigNoz/signoz/pkg/modules/savedview"
 	"github.com/SigNoz/signoz/pkg/modules/serviceaccount"
 	"github.com/SigNoz/signoz/pkg/modules/session"
 	"github.com/SigNoz/signoz/pkg/modules/spanmapper"
@@ -76,7 +75,6 @@ type provider struct {
 	rulerHandler               ruler.Handler
 	llmPricingRuleHandler      llmpricingrule.Handler
 	statsHandler               statsreporter.Handler
-	savedViewHandler           savedview.Handler
 }
 
 func NewFactory(
@@ -112,7 +110,6 @@ func NewFactory(
 	traceDetailHandler tracedetail.Handler,
 	rulerHandler ruler.Handler,
 	statsHandler statsreporter.Handler,
-	savedViewHandler savedview.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(
@@ -151,7 +148,6 @@ func NewFactory(
 			traceDetailHandler,
 			rulerHandler,
 			statsHandler,
-			savedViewHandler,
 		)
 	})
 }
@@ -192,7 +188,6 @@ func newProvider(
 	traceDetailHandler tracedetail.Handler,
 	rulerHandler ruler.Handler,
 	statsHandler statsreporter.Handler,
-	savedViewHandler savedview.Handler,
 ) (apiserver.APIServer, error) {
 	settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/apiserver/signozapiserver")
 	router := mux.NewRouter().UseEncodedPath()
@@ -232,7 +227,6 @@ func newProvider(
 		rulerHandler:               rulerHandler,
 		llmPricingRuleHandler:      llmPricingRuleHandler,
 		statsHandler:               statsHandler,
-		savedViewHandler:           savedViewHandler,
 	}
 
 	provider.authzMiddleware = middleware.NewAuthZ(settings.Logger(), orgGetter, authzService)
@@ -365,10 +359,6 @@ func (provider *provider) AddToRouter(router *mux.Router) error {
 		return err
 	}
 
-	if err := provider.addSavedViewRoutes(router); err != nil {
-		return err
-	}
-
 	return nil
 }
 

pkg/apiserver/signozapiserver/savedview.go

@@ -1,151 +0,0 @@
-package signozapiserver
-
-import (
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/http/handler"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/coretypes"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
-	"github.com/gorilla/mux"
-)
-
-func (provider *provider) addSavedViewRoutes(router *mux.Router) error {
-	if err := router.Handle("/api/v2/saved_views", handler.New(
-		provider.authzMiddleware.CheckResources(provider.savedViewHandler.ListV2, authtypes.SigNozAdminRoleName, authtypes.SigNozEditorRoleName, authtypes.SigNozViewerRoleName),
-		handler.OpenAPIDef{
-			ID:                  "ListSavedViews",
-			Tags:                []string{"saved_view"},
-			Summary:             "List saved views",
-			Description:         "Returns saved views, optionally filtered by source and name.",
-			Request:             nil,
-			RequestQuery:        new(savedviewtypes.ListSavedViewsParams),
-			RequestContentType:  "",
-			Response:            new([]*savedviewtypes.SavedView),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{http.StatusBadRequest},
-			Deprecated:          false,
-			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceSavedView.Scope(coretypes.VerbList)}),
-		},
-		handler.WithResourceDefs(handler.BasicResourceDef{
-			Resource: coretypes.ResourceMetaResourceSavedView,
-			Verb:     coretypes.VerbList,
-			Category: coretypes.ActionCategoryDataAccess,
-			Selector: coretypes.WildcardSelector,
-		}),
-	)).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v2/saved_views", handler.New(
-		provider.authzMiddleware.CheckResources(provider.savedViewHandler.CreateV2, authtypes.SigNozAdminRoleName, authtypes.SigNozEditorRoleName),
-		handler.OpenAPIDef{
-			ID:                  "CreateSavedView",
-			Tags:                []string{"saved_view"},
-			Summary:             "Create saved view",
-			Description:         "Persists a saved view for the explore page. Returns the id of the created view.",
-			Request:             new(savedviewtypes.PostableSavedView),
-			RequestContentType:  "application/json",
-			Response:            new(types.Identifiable),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusCreated,
-			ErrorStatusCodes:    []int{http.StatusBadRequest},
-			Deprecated:          false,
-			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceSavedView.Scope(coretypes.VerbCreate)}),
-		},
-		handler.WithResourceDefs(handler.BasicResourceDef{
-			Resource: coretypes.ResourceMetaResourceSavedView,
-			Verb:     coretypes.VerbCreate,
-			Category: coretypes.ActionCategoryDataAccess,
-			ID:       coretypes.ResponseJSONPath("data.id"),
-			Selector: coretypes.WildcardSelector,
-		}),
-	)).Methods(http.MethodPost).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v2/saved_views/{id}", handler.New(
-		provider.authzMiddleware.CheckResources(provider.savedViewHandler.GetV2, authtypes.SigNozAdminRoleName, authtypes.SigNozEditorRoleName, authtypes.SigNozViewerRoleName),
-		handler.OpenAPIDef{
-			ID:                  "GetSavedView",
-			Tags:                []string{"saved_view"},
-			Summary:             "Get saved view",
-			Description:         "Returns a saved view by id.",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            new(savedviewtypes.SavedView),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
-			Deprecated:          false,
-			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceSavedView.Scope(coretypes.VerbRead)}),
-		},
-		handler.WithResourceDefs(handler.BasicResourceDef{
-			Resource: coretypes.ResourceMetaResourceSavedView,
-			Verb:     coretypes.VerbRead,
-			Category: coretypes.ActionCategoryDataAccess,
-			ID:       coretypes.PathParam("id"),
-			Selector: coretypes.IDSelector,
-		}),
-	)).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v2/saved_views/{id}", handler.New(
-		provider.authzMiddleware.CheckResources(provider.savedViewHandler.UpdateV2, authtypes.SigNozAdminRoleName, authtypes.SigNozEditorRoleName),
-		handler.OpenAPIDef{
-			ID:                  "UpdateSavedView",
-			Tags:                []string{"saved_view"},
-			Summary:             "Update saved view",
-			Description:         "Replaces a saved view's name and query.",
-			Request:             new(savedviewtypes.UpdatableSavedView),
-			RequestContentType:  "application/json",
-			Response:            nil,
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusNoContent,
-			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
-			Deprecated:          false,
-			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceSavedView.Scope(coretypes.VerbUpdate)}),
-		},
-		handler.WithResourceDefs(handler.BasicResourceDef{
-			Resource: coretypes.ResourceMetaResourceSavedView,
-			Verb:     coretypes.VerbUpdate,
-			Category: coretypes.ActionCategoryDataAccess,
-			ID:       coretypes.PathParam("id"),
-			Selector: coretypes.IDSelector,
-		}),
-	)).Methods(http.MethodPut).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v2/saved_views/{id}", handler.New(
-		provider.authzMiddleware.CheckResources(provider.savedViewHandler.Delete, authtypes.SigNozAdminRoleName, authtypes.SigNozEditorRoleName),
-		handler.OpenAPIDef{
-			ID:                  "DeleteSavedView",
-			Tags:                []string{"saved_view"},
-			Summary:             "Delete saved view",
-			Description:         "Deletes a saved view by id.",
-			Request:             nil,
-			RequestContentType:  "",
-			Response:            nil,
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusNoContent,
-			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
-			Deprecated:          false,
-			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceMetaResourceSavedView.Scope(coretypes.VerbDelete)}),
-		},
-		handler.WithResourceDefs(handler.BasicResourceDef{
-			Resource: coretypes.ResourceMetaResourceSavedView,
-			Verb:     coretypes.VerbDelete,
-			Category: coretypes.ActionCategoryDataAccess,
-			ID:       coretypes.PathParam("id"),
-			Selector: coretypes.IDSelector,
-		}),
-	)).Methods(http.MethodDelete).GetError(); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/modules/savedview/implsavedview/handler.go

@@ -11,8 +11,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/savedview"
 	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/gorilla/mux"
 )
@@ -25,116 +23,6 @@ func NewHandler(module savedview.Module) savedview.Handler {
 	return &handler{module: module}
 }
 
-// legacyExtraData mirrors the frontend's extraData JSON shape so /api/v1
-// responses can synthesize the same shape back for the legacy frontend.
-type legacyExtraData struct {
-	Color         string                             `json:"color,omitempty"`
-	SelectColumns []telemetrytypes.TelemetryFieldKey `json:"selectColumns,omitempty"`
-	Format        string                             `json:"format,omitempty"`
-	MaxLines      int                                `json:"maxLines,omitempty"`
-	FontSize      string                             `json:"fontSize,omitempty"`
-}
-
-// newPostableSavedViewFromLegacyView builds a create payload for a v1 request.
-func newPostableSavedViewFromLegacyView(v *v3.SavedView) savedviewtypes.PostableSavedView {
-	var legacy legacyExtraData
-	if v.ExtraData != "" {
-		// Best-effort: malformed/older extraData shapes never fail the request
-		_ = json.Unmarshal([]byte(v.ExtraData), &legacy)
-	}
-
-	return savedviewtypes.PostableSavedView{
-		GenerateName: true,
-		Source:       savedviewtypes.Source{String: valuer.NewString(v.SourcePage)},
-		Data: savedviewtypes.SavedViewData{
-			SchemaVersion: savedviewtypes.SavedViewSchemaVersion,
-			Spec: savedviewtypes.SavedViewSpec{
-				DisplayName:    v.Name,
-				PanelType:      savedviewtypes.PanelType{String: valuer.NewString(string(v.CompositeQuery.PanelType))},
-				Queries:        v.CompositeQuery.Queries,
-				SelectedFields: legacy.SelectColumns,
-				Display: savedviewtypes.Display{
-					MaxLines: legacy.MaxLines,
-					FontSize: legacy.FontSize,
-					Format:   legacy.Format,
-					Color:    legacy.Color,
-				},
-			},
-		},
-	}
-}
-
-// newUpdatableSavedViewFromLegacyView builds an update payload for a v1 request.
-func newUpdatableSavedViewFromLegacyView(v *v3.SavedView) savedviewtypes.UpdatableSavedView {
-	var legacy legacyExtraData
-	if v.ExtraData != "" {
-		// Best-effort: malformed/older extraData shapes never fail the request
-		_ = json.Unmarshal([]byte(v.ExtraData), &legacy)
-	}
-
-	return savedviewtypes.UpdatableSavedView{
-		Source: savedviewtypes.Source{String: valuer.NewString(v.SourcePage)},
-		Data: savedviewtypes.SavedViewData{
-			SchemaVersion: savedviewtypes.SavedViewSchemaVersion,
-			Spec: savedviewtypes.SavedViewSpec{
-				DisplayName:    v.Name,
-				PanelType:      savedviewtypes.PanelType{String: valuer.NewString(string(v.CompositeQuery.PanelType))},
-				Queries:        v.CompositeQuery.Queries,
-				SelectedFields: legacy.SelectColumns,
-				Display: savedviewtypes.Display{
-					MaxLines: legacy.MaxLines,
-					FontSize: legacy.FontSize,
-					Format:   legacy.Format,
-					Color:    legacy.Color,
-				},
-			},
-		},
-	}
-}
-
-// newLegacyViewFromSavedView renders a v2 SavedView back into the v1 shape.
-func newLegacyViewFromSavedView(v *savedviewtypes.SavedView) (*v3.SavedView, error) {
-	extraData, err := json.Marshal(legacyExtraData{
-		Color:         v.Data.Spec.Display.Color,
-		SelectColumns: v.Data.Spec.SelectedFields,
-		Format:        v.Data.Spec.Display.Format,
-		MaxLines:      v.Data.Spec.Display.MaxLines,
-		FontSize:      v.Data.Spec.Display.FontSize,
-	})
-	if err != nil {
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "error in marshalling extra data")
-	}
-
-	return &v3.SavedView{
-		ID:         v.ID,
-		Name:       v.Data.Spec.DisplayName,
-		CreatedAt:  v.CreatedAt,
-		CreatedBy:  v.CreatedBy,
-		UpdatedAt:  v.UpdatedAt,
-		UpdatedBy:  v.UpdatedBy,
-		SourcePage: v.Source.StringValue(),
-		CompositeQuery: &v3.CompositeQuery{
-			PanelType: v3.PanelType(v.Data.Spec.PanelType.StringValue()),
-			// Saved views are only ever created from the explorer's builder mode.
-			QueryType: v3.QueryTypeBuilder,
-			Queries:   v.Data.Spec.Queries,
-		},
-		ExtraData: string(extraData),
-	}, nil
-}
-
-func newLegacyViewsFromSavedViews(views []*savedviewtypes.SavedView) ([]*v3.SavedView, error) {
-	out := make([]*v3.SavedView, 0, len(views))
-	for _, view := range views {
-		legacyView, err := newLegacyViewFromSavedView(view)
-		if err != nil {
-			return nil, err
-		}
-		out = append(out, legacyView)
-	}
-	return out, nil
-}
-
 func (handler *handler) Create(w http.ResponseWriter, r *http.Request) {
 	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
 	defer cancel()
@@ -156,7 +44,7 @@ func (handler *handler) Create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	uuid, err := handler.module.CreateView(ctx, claims.OrgID, newPostableSavedViewFromLegacyView(&view))
+	uuid, err := handler.module.CreateView(ctx, claims.OrgID, view)
 	if err != nil {
 		render.Error(w, err)
 		return
@@ -175,7 +63,7 @@ func (handler *handler) Get(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	viewID := mux.Vars(r)["id"]
+	viewID := mux.Vars(r)["viewId"]
 	viewUUID, err := valuer.NewUUID(viewID)
 	if err != nil {
 		render.Error(w, errors.Wrapf(err, errors.TypeInvalidInput, errors.CodeInvalidInput, "failed to parse view id"))
@@ -188,13 +76,7 @@ func (handler *handler) Get(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	legacyView, err := newLegacyViewFromSavedView(view)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	render.Success(w, http.StatusOK, legacyView)
+	render.Success(w, http.StatusOK, view)
 }
 
 func (handler *handler) Update(w http.ResponseWriter, r *http.Request) {
@@ -207,7 +89,7 @@ func (handler *handler) Update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	viewID := mux.Vars(r)["id"]
+	viewID := mux.Vars(r)["viewId"]
 	viewUUID, err := valuer.NewUUID(viewID)
 	if err != nil {
 		render.Error(w, errors.Wrapf(err, errors.TypeInvalidInput, errors.CodeInvalidInput, "failed to parse view id"))
@@ -224,7 +106,7 @@ func (handler *handler) Update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = handler.module.UpdateView(ctx, claims.OrgID, viewUUID, newUpdatableSavedViewFromLegacyView(&view))
+	err = handler.module.UpdateView(ctx, claims.OrgID, viewUUID, view)
 	if err != nil {
 		render.Error(w, err)
 		return
@@ -243,7 +125,7 @@ func (handler *handler) Delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	viewID := mux.Vars(r)["id"]
+	viewID := mux.Vars(r)["viewId"]
 	viewUUID, err := valuer.NewUUID(viewID)
 	if err != nil {
 		render.Error(w, errors.Wrapf(err, errors.TypeInvalidInput, errors.CodeInvalidInput, "failed to parse view id"))
@@ -256,7 +138,7 @@ func (handler *handler) Delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	render.Success(w, http.StatusNoContent, nil)
+	render.Success(w, http.StatusOK, nil)
 }
 
 func (handler *handler) List(w http.ResponseWriter, r *http.Request) {
@@ -271,18 +153,13 @@ func (handler *handler) List(w http.ResponseWriter, r *http.Request) {
 
 	sourcePage := r.URL.Query().Get("sourcePage")
 	name := r.URL.Query().Get("name")
+	category := r.URL.Query().Get("category")
 
-	views, err := handler.module.GetViewsForFilters(r.Context(), claims.OrgID, savedviewtypes.Source{String: valuer.NewString(sourcePage)}, name)
+	queries, err := handler.module.GetViewsForFilters(r.Context(), claims.OrgID, sourcePage, name, category)
 	if err != nil {
 		render.Error(w, err)
 		return
 	}
 
-	legacyViews, err := newLegacyViewsFromSavedViews(views)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	render.Success(w, http.StatusOK, legacyViews)
+	render.Success(w, http.StatusOK, queries)
 }

pkg/modules/savedview/implsavedview/handler_test.go

@@ -1,197 +0,0 @@
-package implsavedview
-
-import (
-	"encoding/json"
-	"testing"
-	"time"
-
-	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func testQueries() []qbtypes.QueryEnvelope {
-	return []qbtypes.QueryEnvelope{
-		{
-			Type: qbtypes.QueryTypeBuilder,
-			Spec: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-				Signal:       telemetrytypes.SignalLogs,
-				Aggregations: []qbtypes.LogAggregation{{Expression: "count()"}},
-			},
-		},
-	}
-}
-
-func TestNewPostableSavedViewFromLegacyView(t *testing.T) {
-	t.Run("all fields carried over", func(t *testing.T) {
-		legacy := &v3.SavedView{
-			Name:       "my view",
-			SourcePage: "logs",
-			CompositeQuery: &v3.CompositeQuery{
-				PanelType: v3.PanelTypeGraph,
-				Queries:   testQueries(),
-			},
-			ExtraData: `{"color":"blue","selectColumns":[{"name":"service.name"}],"format":"table","maxLines":10,"fontSize":"large"}`,
-		}
-
-		postable := newPostableSavedViewFromLegacyView(legacy)
-
-		assert.Empty(t, postable.Name, "v1 has no slug concept -- name must always be generated")
-		assert.True(t, postable.GenerateName, "v1 has no slug concept -- name must always be generated")
-		assert.Equal(t, "my view", postable.Data.Spec.DisplayName)
-		assert.Equal(t, savedviewtypes.SourceLogs, postable.Source)
-		assert.Equal(t, savedviewtypes.SavedViewSchemaVersion, postable.Data.SchemaVersion)
-		assert.Equal(t, savedviewtypes.PanelTypeGraph, postable.Data.Spec.PanelType)
-		assert.Equal(t, legacy.CompositeQuery.Queries, postable.Data.Spec.Queries)
-		assert.Equal(t, []telemetrytypes.TelemetryFieldKey{{Name: "service.name"}}, postable.Data.Spec.SelectedFields)
-		assert.Equal(t, savedviewtypes.Display{MaxLines: 10, FontSize: "large", Format: "table", Color: "blue"}, postable.Data.Spec.Display)
-	})
-
-	t.Run("empty extra data leaves display and selected fields zero-valued", func(t *testing.T) {
-		legacy := &v3.SavedView{
-			Name:       "no extra data",
-			SourcePage: "traces",
-			CompositeQuery: &v3.CompositeQuery{
-				PanelType: v3.PanelTypeTable,
-				Queries:   testQueries(),
-			},
-			ExtraData: "",
-		}
-
-		postable := newPostableSavedViewFromLegacyView(legacy)
-
-		assert.Equal(t, savedviewtypes.Display{}, postable.Data.Spec.Display)
-		assert.Nil(t, postable.Data.Spec.SelectedFields)
-	})
-
-	t.Run("malformed extra data is ignored, not an error", func(t *testing.T) {
-		legacy := &v3.SavedView{
-			Name:       "malformed extra data",
-			SourcePage: "metrics",
-			CompositeQuery: &v3.CompositeQuery{
-				PanelType: v3.PanelTypeList,
-				Queries:   testQueries(),
-			},
-			ExtraData: `{not valid json`,
-		}
-
-		postable := newPostableSavedViewFromLegacyView(legacy)
-
-		assert.Equal(t, "malformed extra data", postable.Data.Spec.DisplayName)
-		assert.Equal(t, savedviewtypes.Display{}, postable.Data.Spec.Display)
-	})
-}
-
-func TestNewUpdatableSavedViewFromLegacyView(t *testing.T) {
-	legacy := &v3.SavedView{
-		Name:       "renamed view",
-		SourcePage: "traces",
-		CompositeQuery: &v3.CompositeQuery{
-			PanelType: v3.PanelTypeTable,
-			Queries:   testQueries(),
-		},
-		ExtraData: `{"color":"red"}`,
-	}
-
-	updatable := newUpdatableSavedViewFromLegacyView(legacy)
-
-	assert.Equal(t, "renamed view", updatable.Data.Spec.DisplayName)
-	assert.Equal(t, savedviewtypes.SourceTraces, updatable.Source)
-}
-
-func TestNewLegacyViewFromSavedView(t *testing.T) {
-	now := time.Now()
-	savedView := &savedviewtypes.SavedView{
-		Name:   "my-view-abc123ef",
-		Source: savedviewtypes.SourceLogs,
-		Data: savedviewtypes.SavedViewData{
-			SchemaVersion: savedviewtypes.SavedViewSchemaVersion,
-			Spec: savedviewtypes.SavedViewSpec{
-				DisplayName:    "my view",
-				PanelType:      savedviewtypes.PanelTypeGraph,
-				Queries:        testQueries(),
-				SelectedFields: []telemetrytypes.TelemetryFieldKey{{Name: "service.name"}},
-				Display:        savedviewtypes.Display{MaxLines: 10, FontSize: "large", Format: "table", Color: "blue"},
-			},
-		},
-	}
-	savedView.ID = valuer.GenerateUUID()
-	savedView.CreatedAt = now
-	savedView.UpdatedAt = now
-	savedView.CreatedBy = "creator@signoz.io"
-	savedView.UpdatedBy = "updater@signoz.io"
-
-	legacy, err := newLegacyViewFromSavedView(savedView)
-	require.NoError(t, err)
-
-	assert.Equal(t, savedView.ID, legacy.ID)
-	assert.Equal(t, savedView.Data.Spec.DisplayName, legacy.Name)
-	assert.Equal(t, savedView.CreatedAt, legacy.CreatedAt)
-	assert.Equal(t, savedView.CreatedBy, legacy.CreatedBy)
-	assert.Equal(t, savedView.UpdatedAt, legacy.UpdatedAt)
-	assert.Equal(t, savedView.UpdatedBy, legacy.UpdatedBy)
-	assert.Equal(t, "logs", legacy.SourcePage)
-	assert.Equal(t, v3.PanelTypeGraph, legacy.CompositeQuery.PanelType)
-	assert.Equal(t, v3.QueryTypeBuilder, legacy.CompositeQuery.QueryType)
-	assert.Equal(t, savedView.Data.Spec.Queries, legacy.CompositeQuery.Queries)
-
-	var extra legacyExtraData
-	require.NoError(t, json.Unmarshal([]byte(legacy.ExtraData), &extra))
-	assert.Equal(t, "blue", extra.Color)
-	assert.Equal(t, savedView.Data.Spec.SelectedFields, extra.SelectColumns)
-	assert.Equal(t, "table", extra.Format)
-	assert.Equal(t, 10, extra.MaxLines)
-	assert.Equal(t, "large", extra.FontSize)
-}
-
-func TestNewLegacyViewsFromSavedViews(t *testing.T) {
-	a := &savedviewtypes.SavedView{Name: "a-slug", Source: savedviewtypes.SourceLogs, Data: savedviewtypes.SavedViewData{Spec: savedviewtypes.SavedViewSpec{DisplayName: "a", PanelType: savedviewtypes.PanelTypeGraph, Queries: testQueries()}}}
-	b := &savedviewtypes.SavedView{Name: "b-slug", Source: savedviewtypes.SourceTraces, Data: savedviewtypes.SavedViewData{Spec: savedviewtypes.SavedViewSpec{DisplayName: "b", PanelType: savedviewtypes.PanelTypeTable, Queries: testQueries()}}}
-
-	legacyViews, err := newLegacyViewsFromSavedViews([]*savedviewtypes.SavedView{a, b})
-	require.NoError(t, err)
-	require.Len(t, legacyViews, 2)
-	assert.Equal(t, "a", legacyViews[0].Name)
-	assert.Equal(t, "b", legacyViews[1].Name)
-}
-
-// TestLegacyViewRoundTrip guards the whole v1<->v2 bridge: converting a
-// SavedView to its legacy shape and back must recover the fields the legacy
-// frontend round-trips through (displayName, source, panelType, queries,
-// selectedFields, display) -- these two functions are each other's inverse
-// on the API surface, so a regression in either should fail this. The internal
-// slug (Name) is deliberately NOT part of this contract -- v1 never sees it.
-func TestLegacyViewRoundTrip(t *testing.T) {
-	original := &savedviewtypes.SavedView{
-		Name:   "round-trip-abc123ef",
-		Source: savedviewtypes.SourceMetrics,
-		Data: savedviewtypes.SavedViewData{
-			SchemaVersion: savedviewtypes.SavedViewSchemaVersion,
-			Spec: savedviewtypes.SavedViewSpec{
-				DisplayName:    "round trip",
-				PanelType:      savedviewtypes.PanelTypeTable,
-				Queries:        testQueries(),
-				SelectedFields: []telemetrytypes.TelemetryFieldKey{{Name: "service.name"}},
-				Display:        savedviewtypes.Display{MaxLines: 5, FontSize: "small", Format: "list", Color: "red"},
-			},
-		},
-	}
-
-	legacy, err := newLegacyViewFromSavedView(original)
-	require.NoError(t, err)
-
-	roundTripped := newPostableSavedViewFromLegacyView(legacy)
-
-	assert.Empty(t, roundTripped.Name)
-	assert.True(t, roundTripped.GenerateName)
-	assert.Equal(t, original.Data.Spec.DisplayName, roundTripped.Data.Spec.DisplayName)
-	assert.Equal(t, original.Source, roundTripped.Source)
-	assert.Equal(t, original.Data.Spec.PanelType, roundTripped.Data.Spec.PanelType)
-	assert.Equal(t, original.Data.Spec.Queries, roundTripped.Data.Spec.Queries)
-	assert.Equal(t, original.Data.Spec.SelectedFields, roundTripped.Data.Spec.SelectedFields)
-	assert.Equal(t, original.Data.Spec.Display, roundTripped.Data.Spec.Display)
-}

pkg/modules/savedview/implsavedview/handler_v2.go

@@ -1,135 +0,0 @@
-package implsavedview
-
-import (
-	"context"
-	"net/http"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/http/binding"
-	"github.com/SigNoz/signoz/pkg/http/render"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/gorilla/mux"
-)
-
-func (handler *handler) CreateV2(w http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
-	defer cancel()
-
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	var view savedviewtypes.PostableSavedView
-	if err := binding.JSON.BindBody(r.Body, &view, binding.WithDisallowUnknownFields(true)); err != nil {
-		render.Error(w, err)
-		return
-	}
-	if err := view.Validate(); err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	uuid, err := handler.module.CreateView(ctx, claims.OrgID, view)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	render.Success(w, http.StatusCreated, types.Identifiable{ID: uuid})
-}
-
-func (handler *handler) GetV2(w http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
-	defer cancel()
-
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	viewID := mux.Vars(r)["id"]
-	viewUUID, err := valuer.NewUUID(viewID)
-	if err != nil {
-		render.Error(w, errors.Wrapf(err, errors.TypeInvalidInput, errors.CodeInvalidInput, "failed to parse view id"))
-		return
-	}
-
-	view, err := handler.module.GetView(ctx, claims.OrgID, viewUUID)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	render.Success(w, http.StatusOK, view)
-}
-
-func (handler *handler) UpdateV2(w http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
-	defer cancel()
-
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	viewID := mux.Vars(r)["id"]
-	viewUUID, err := valuer.NewUUID(viewID)
-	if err != nil {
-		render.Error(w, errors.Wrapf(err, errors.TypeInvalidInput, errors.CodeInvalidInput, "failed to parse view id"))
-		return
-	}
-	var view savedviewtypes.UpdatableSavedView
-	if err := binding.JSON.BindBody(r.Body, &view, binding.WithDisallowUnknownFields(true)); err != nil {
-		render.Error(w, err)
-		return
-	}
-	if err := view.Validate(); err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	err = handler.module.UpdateView(ctx, claims.OrgID, viewUUID, view)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	render.Success(w, http.StatusNoContent, nil)
-}
-
-func (handler *handler) ListV2(w http.ResponseWriter, r *http.Request) {
-	ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
-	defer cancel()
-
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	params := new(savedviewtypes.ListSavedViewsParams)
-	if err := binding.Query.BindQuery(r.URL.Query(), params); err != nil {
-		render.Error(w, err)
-		return
-	}
-	if err := params.Validate(); err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	queries, err := handler.module.GetViewsForFilters(r.Context(), claims.OrgID, params.Source, params.Name)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	render.Success(w, http.StatusOK, queries)
-}

pkg/modules/savedview/implsavedview/module.go

@@ -2,59 +2,185 @@ package implsavedview
 
 import (
 	"context"
+	"encoding/json"
+	"strings"
+	"time"
 
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/modules/savedview"
+	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
 type module struct {
-	store savedviewtypes.Store
+	sqlstore sqlstore.SQLStore
 }
 
-func NewModule(store savedviewtypes.Store) savedview.Module {
-	return &module{store: store}
+func NewModule(sqlstore sqlstore.SQLStore) savedview.Module {
+	return &module{sqlstore: sqlstore}
 }
 
-func (module *module) GetViewsForFilters(ctx context.Context, orgID string, source savedviewtypes.Source, name string) ([]*savedviewtypes.SavedView, error) {
-	return module.store.List(ctx, orgID, source, name)
-}
-
-func (module *module) CreateView(ctx context.Context, orgID string, view savedviewtypes.PostableSavedView) (valuer.UUID, error) {
-	claims, err := authtypes.ClaimsFromContext(ctx)
+func (module *module) GetViewsForFilters(ctx context.Context, orgID string, sourcePage string, name string, category string) ([]*v3.SavedView, error) {
+	var views []savedviewtypes.SavedView
+	var err error
+	if len(category) == 0 {
+		err = module.sqlstore.BunDB().NewSelect().Model(&views).Where("org_id = ? AND source_page = ? AND name LIKE ?", orgID, sourcePage, "%"+name+"%").Scan(ctx)
+	} else {
+		err = module.sqlstore.BunDB().NewSelect().Model(&views).Where("org_id = ? AND source_page = ? AND category LIKE ? AND name LIKE ?", orgID, sourcePage, "%"+category+"%", "%"+name+"%").Scan(ctx)
+	}
 	if err != nil {
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "error in getting saved views")
+	}
+
+	var savedViews []*v3.SavedView
+	for _, view := range views {
+		var compositeQuery v3.CompositeQuery
+		err = json.Unmarshal([]byte(view.Data), &compositeQuery)
+		if err != nil {
+			return nil, errors.WrapInternalf(err, errors.CodeInternal, "error in unmarshalling explorer query data: %s", err.Error())
+		}
+		savedViews = append(savedViews, &v3.SavedView{
+			ID:             view.ID,
+			Name:           view.Name,
+			CreatedAt:      view.CreatedAt,
+			CreatedBy:      view.CreatedBy,
+			UpdatedAt:      view.UpdatedAt,
+			UpdatedBy:      view.UpdatedBy,
+			Tags:           strings.Split(view.Tags, ","),
+			SourcePage:     view.SourcePage,
+			CompositeQuery: &compositeQuery,
+			ExtraData:      view.ExtraData,
+		})
+	}
+	return savedViews, nil
+}
+
+func (module *module) CreateView(ctx context.Context, orgID string, view v3.SavedView) (valuer.UUID, error) {
+	data, err := json.Marshal(view.CompositeQuery)
+	if err != nil {
+		return valuer.UUID{}, errors.WrapInternalf(err, errors.CodeInternal, "error in marshalling explorer query data")
+	}
+
+	uuid := valuer.GenerateUUID()
+	createdAt := time.Now()
+	updatedAt := time.Now()
+
+	claims, errv2 := authtypes.ClaimsFromContext(ctx)
+	if errv2 != nil {
 		return valuer.UUID{}, errors.NewInternalf(errors.CodeInternal, "error in getting email from context")
 	}
 
-	dbView := view.ToSavedView(orgID, claims.Email)
+	createBy := claims.Email
+	updatedBy := claims.Email
 
-	if err := module.store.Create(ctx, dbView); err != nil {
-		return valuer.UUID{}, err
+	dbView := savedviewtypes.SavedView{
+		TimeAuditable: types.TimeAuditable{
+			CreatedAt: createdAt,
+			UpdatedAt: updatedAt,
+		},
+		UserAuditable: types.UserAuditable{
+			CreatedBy: createBy,
+			UpdatedBy: updatedBy,
+		},
+		OrgID: orgID,
+		Identifiable: types.Identifiable{
+			ID: uuid,
+		},
+		Name:       view.Name,
+		Category:   view.Category,
+		SourcePage: view.SourcePage,
+		Tags:       strings.Join(view.Tags, ","),
+		Data:       string(data),
+		ExtraData:  view.ExtraData,
 	}
-	return dbView.ID, nil
-}
 
-func (module *module) GetView(ctx context.Context, orgID string, uuid valuer.UUID) (*savedviewtypes.SavedView, error) {
-	return module.store.Get(ctx, orgID, uuid)
-}
-
-func (module *module) UpdateView(ctx context.Context, orgID string, uuid valuer.UUID, view savedviewtypes.UpdatableSavedView) error {
-	claims, err := authtypes.ClaimsFromContext(ctx)
+	_, err = module.sqlstore.BunDB().NewInsert().Model(&dbView).Exec(ctx)
 	if err != nil {
+		return valuer.UUID{}, errors.WrapInternalf(err, errors.CodeInternal, "error in creating saved view")
+	}
+	return uuid, nil
+}
+
+func (module *module) GetView(ctx context.Context, orgID string, uuid valuer.UUID) (*v3.SavedView, error) {
+	var view savedviewtypes.SavedView
+	err := module.sqlstore.BunDB().NewSelect().Model(&view).Where("org_id = ? AND id = ?", orgID, uuid.StringValue()).Scan(ctx)
+	if err != nil {
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "error in getting saved view")
+	}
+
+	var compositeQuery v3.CompositeQuery
+	err = json.Unmarshal([]byte(view.Data), &compositeQuery)
+	if err != nil {
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "error in unmarshalling explorer query data")
+	}
+	return &v3.SavedView{
+		ID:             view.ID,
+		Name:           view.Name,
+		Category:       view.Category,
+		CreatedAt:      view.CreatedAt,
+		CreatedBy:      view.CreatedBy,
+		UpdatedAt:      view.UpdatedAt,
+		UpdatedBy:      view.UpdatedBy,
+		SourcePage:     view.SourcePage,
+		Tags:           strings.Split(view.Tags, ","),
+		CompositeQuery: &compositeQuery,
+		ExtraData:      view.ExtraData,
+	}, nil
+}
+
+func (module *module) UpdateView(ctx context.Context, orgID string, uuid valuer.UUID, view v3.SavedView) error {
+	data, err := json.Marshal(view.CompositeQuery)
+	if err != nil {
+		return errors.WrapInternalf(err, errors.CodeInternal, "error in marshalling explorer query data")
+	}
+
+	claims, errv2 := authtypes.ClaimsFromContext(ctx)
+	if errv2 != nil {
 		return errors.NewInternalf(errors.CodeInternal, "error in getting email from context")
 	}
 
-	return module.store.Update(ctx, view.ToSavedView(uuid, orgID, claims.Email))
+	updatedAt := time.Now()
+	updatedBy := claims.Email
+
+	_, err = module.sqlstore.BunDB().NewUpdate().
+		Model(&savedviewtypes.SavedView{}).
+		Set("updated_at = ?, updated_by = ?, name = ?, category = ?, source_page = ?, tags = ?, data = ?, extra_data = ?",
+			updatedAt, updatedBy, view.Name, view.Category, view.SourcePage, strings.Join(view.Tags, ","), data, view.ExtraData).
+		Where("id = ?", uuid.StringValue()).
+		Where("org_id = ?", orgID).
+		Exec(ctx)
+	if err != nil {
+		return errors.WrapInternalf(err, errors.CodeInternal, "error in updating saved view")
+	}
+	return nil
 }
 
 func (module *module) DeleteView(ctx context.Context, orgID string, uuid valuer.UUID) error {
-	return module.store.Delete(ctx, orgID, uuid)
+	_, err := module.sqlstore.BunDB().NewDelete().
+		Model(&savedviewtypes.SavedView{}).
+		Where("id = ?", uuid.StringValue()).
+		Where("org_id = ?", orgID).
+		Exec(ctx)
+	if err != nil {
+		return errors.WrapInternalf(err, errors.CodeInternal, "error in deleting explorer query")
+	}
+	return nil
 }
 
 func (module *module) Collect(ctx context.Context, orgID valuer.UUID) (map[string]any, error) {
-	savedViews, err := module.store.List(ctx, orgID.StringValue(), savedviewtypes.Source{}, "")
+	savedViews := []*savedviewtypes.SavedView{}
+
+	err := module.
+		sqlstore.
+		BunDB().
+		NewSelect().
+		Model(&savedViews).
+		Where("org_id = ?", orgID).
+		Scan(ctx)
 	if err != nil {
 		return nil, err
 	}

pkg/modules/savedview/implsavedview/module_test.go

@@ -1,299 +0,0 @@
-package implsavedview_test
-
-import (
-	"context"
-	"testing"
-
-	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/modules/savedview"
-	"github.com/SigNoz/signoz/pkg/modules/savedview/implsavedview"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/sqlstore/sqlstoretest"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes/savedviewtypestest"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func newTestStore() (savedview.Module, *savedviewtypestest.StoreTest) {
-	sqlStore := sqlstoretest.New(sqlstore.Config{Provider: "sqlite"}, sqlmock.QueryMatcherRegexp)
-	store := implsavedview.NewStore(sqlStore)
-	return implsavedview.NewModule(store), savedviewtypestest.New(store, sqlStore.Mock())
-}
-
-func testPostableSavedView(name string, source savedviewtypes.Source) savedviewtypes.PostableSavedView {
-	return savedviewtypes.PostableSavedView{
-		Name:   name,
-		Source: source,
-		Data: savedviewtypes.SavedViewData{
-			SchemaVersion: savedviewtypes.SavedViewSchemaVersion,
-			Spec: savedviewtypes.SavedViewSpec{
-				DisplayName: name,
-				PanelType:   savedviewtypes.PanelTypeGraph,
-				Queries: []qbtypes.QueryEnvelope{
-					{
-						Type: qbtypes.QueryTypeBuilder,
-						Spec: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
-							Signal:       telemetrytypes.SignalLogs,
-							Aggregations: []qbtypes.LogAggregation{{Expression: "count()"}},
-						},
-					},
-				},
-				SelectedFields: []telemetrytypes.TelemetryFieldKey{},
-			},
-		},
-	}
-}
-
-func testUpdatableSavedView(displayName string, source savedviewtypes.Source) savedviewtypes.UpdatableSavedView {
-	postable := testPostableSavedView(displayName, source)
-	return savedviewtypes.UpdatableSavedView{
-		Source: postable.Source,
-		Data:   postable.Data,
-	}
-}
-
-func testSavedView(orgID string, id valuer.UUID, updatedBy string, view savedviewtypes.PostableSavedView) *savedviewtypes.SavedView {
-	savedView := view.ToSavedView(orgID, "creator@signoz.io")
-	savedView.ID = id
-	savedView.UpdatedBy = updatedBy
-	return savedView
-}
-
-func contextWithClaims(orgID, email string) context.Context {
-	return authtypes.NewContextWithClaims(context.Background(), authtypes.Claims{
-		OrgID: orgID,
-		Email: email,
-	})
-}
-
-func TestModule_CreateAndGetView(t *testing.T) {
-	m, st := newTestStore()
-
-	orgID := valuer.GenerateUUID().StringValue()
-	ctx := contextWithClaims(orgID, "creator@signoz.io")
-	view := testPostableSavedView("my view", savedviewtypes.SourceLogs)
-
-	st.ExpectCreate()
-	id, err := m.CreateView(ctx, orgID, view)
-	require.NoError(t, err)
-	require.False(t, id.IsZero())
-
-	stored := testSavedView(orgID, id, "creator@signoz.io", view)
-	st.ExpectGet(orgID, id, stored)
-	got, err := m.GetView(ctx, orgID, id)
-	require.NoError(t, err)
-	assert.Equal(t, id, got.ID)
-	assert.Equal(t, "my view", got.Name)
-	assert.Equal(t, savedviewtypes.SourceLogs, got.Source)
-	assert.Equal(t, "creator@signoz.io", got.CreatedBy)
-	assert.Equal(t, "creator@signoz.io", got.UpdatedBy)
-	assert.Equal(t, savedviewtypes.PanelTypeGraph, got.Data.Spec.PanelType)
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_GetView_NotFound(t *testing.T) {
-	m, st := newTestStore()
-
-	orgID := valuer.GenerateUUID().StringValue()
-	id := valuer.GenerateUUID()
-
-	st.ExpectGet(orgID, id, nil)
-	_, err := m.GetView(contextWithClaims(orgID, "someone@signoz.io"), orgID, id)
-	require.Error(t, err)
-	assert.True(t, errors.Ast(err, errors.TypeNotFound), "expected a not-found error, got %v", err)
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_GetView_ScopedToOrg(t *testing.T) {
-	m, st := newTestStore()
-
-	orgB := valuer.GenerateUUID().StringValue()
-	id := valuer.GenerateUUID()
-
-	// The mock only has an expectation for orgB's WHERE clause; a lookup
-	// scoped to org A's real id must not accidentally match it.
-	st.ExpectGet(orgB, id, nil)
-	_, err := m.GetView(contextWithClaims(orgB, "b@signoz.io"), orgB, id)
-	require.Error(t, err, "a view created under org A must not be visible to org B")
-	assert.True(t, errors.Ast(err, errors.TypeNotFound), "expected a not-found error, got %v", err)
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_UpdateView(t *testing.T) {
-	m, st := newTestStore()
-
-	orgID := valuer.GenerateUUID().StringValue()
-	id := valuer.GenerateUUID()
-
-	existing := testSavedView(orgID, id, "creator@signoz.io", testPostableSavedView("my-view", savedviewtypes.SourceLogs))
-	existingName := existing.Name
-
-	updated := testUpdatableSavedView("renamed", savedviewtypes.SourceTraces)
-	updated.Data.Spec.PanelType = savedviewtypes.PanelTypeTable
-
-	st.ExpectUpdate(orgID, id, 1)
-	require.NoError(t, m.UpdateView(contextWithClaims(orgID, "updater@signoz.io"), orgID, id, updated))
-
-	stored := testSavedView(orgID, id, "updater@signoz.io", testPostableSavedView("renamed", savedviewtypes.SourceTraces))
-	stored.Name = existingName
-	stored.Data.Spec.PanelType = savedviewtypes.PanelTypeTable
-	st.ExpectGet(orgID, id, stored)
-	got, err := m.GetView(contextWithClaims(orgID, "creator@signoz.io"), orgID, id)
-	require.NoError(t, err)
-	assert.Equal(t, existingName, got.Name, "name must not change on update")
-	assert.Equal(t, "renamed", got.Data.Spec.DisplayName)
-	assert.Equal(t, savedviewtypes.SourceTraces, got.Source)
-	assert.Equal(t, savedviewtypes.PanelTypeTable, got.Data.Spec.PanelType)
-	assert.Equal(t, "updater@signoz.io", got.UpdatedBy)
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_UpdateView_NotFound(t *testing.T) {
-	m, st := newTestStore()
-
-	orgID := valuer.GenerateUUID().StringValue()
-	ctx := contextWithClaims(orgID, "someone@signoz.io")
-	id := valuer.GenerateUUID()
-
-	st.ExpectUpdate(orgID, id, 0)
-	err := m.UpdateView(ctx, orgID, id, testUpdatableSavedView("does-not-exist", savedviewtypes.SourceLogs))
-	require.Error(t, err)
-	assert.True(t, errors.Ast(err, errors.TypeNotFound), "expected a not-found error, got %v", err)
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_UpdateView_ScopedToOrg(t *testing.T) {
-	m, st := newTestStore()
-
-	orgB := valuer.GenerateUUID().StringValue()
-	id := valuer.GenerateUUID()
-
-	// Only an Update scoped to orgB's WHERE clause is registered; updating org
-	// A's view while authenticated as org B must not match it.
-	st.ExpectUpdate(orgB, id, 0)
-	err := m.UpdateView(contextWithClaims(orgB, "b@signoz.io"), orgB, id, testUpdatableSavedView("hijacked", savedviewtypes.SourceLogs))
-	require.Error(t, err, "org B must not be able to update org A's view")
-	assert.True(t, errors.Ast(err, errors.TypeNotFound))
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_DeleteView(t *testing.T) {
-	m, st := newTestStore()
-
-	orgID := valuer.GenerateUUID().StringValue()
-	ctx := contextWithClaims(orgID, "creator@signoz.io")
-	id := valuer.GenerateUUID()
-
-	st.ExpectDelete(orgID, id, 1)
-	require.NoError(t, m.DeleteView(ctx, orgID, id))
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_DeleteView_NotFound(t *testing.T) {
-	m, st := newTestStore()
-
-	orgID := valuer.GenerateUUID().StringValue()
-	ctx := contextWithClaims(orgID, "someone@signoz.io")
-	id := valuer.GenerateUUID()
-
-	st.ExpectDelete(orgID, id, 0)
-	err := m.DeleteView(ctx, orgID, id)
-	require.Error(t, err)
-	assert.True(t, errors.Ast(err, errors.TypeNotFound), "expected a not-found error, got %v", err)
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_DeleteView_ScopedToOrg(t *testing.T) {
-	m, st := newTestStore()
-
-	orgB := valuer.GenerateUUID().StringValue()
-	id := valuer.GenerateUUID()
-
-	st.ExpectDelete(orgB, id, 0)
-	err := m.DeleteView(contextWithClaims(orgB, "b@signoz.io"), orgB, id)
-	require.Error(t, err, "org B must not be able to delete org A's view")
-	assert.True(t, errors.Ast(err, errors.TypeNotFound))
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_GetViewsForFilters(t *testing.T) {
-	m, st := newTestStore()
-
-	orgID := valuer.GenerateUUID().StringValue()
-	ctx := contextWithClaims(orgID, "creator@signoz.io")
-
-	logsOverview := testSavedView(orgID, valuer.GenerateUUID(), "creator@signoz.io", testPostableSavedView("logs overview", savedviewtypes.SourceLogs))
-	logsErrors := testSavedView(orgID, valuer.GenerateUUID(), "creator@signoz.io", testPostableSavedView("logs errors", savedviewtypes.SourceLogs))
-	tracesOverview := testSavedView(orgID, valuer.GenerateUUID(), "creator@signoz.io", testPostableSavedView("traces overview", savedviewtypes.SourceTraces))
-
-	t.Run("filters by source page", func(t *testing.T) {
-		st.ExpectList(orgID, []*savedviewtypes.SavedView{logsOverview, logsErrors})
-		views, err := m.GetViewsForFilters(ctx, orgID, savedviewtypes.SourceLogs, "")
-		require.NoError(t, err)
-		assert.Len(t, views, 2)
-	})
-
-	t.Run("filters by name substring", func(t *testing.T) {
-		st.ExpectList(orgID, []*savedviewtypes.SavedView{logsErrors})
-		views, err := m.GetViewsForFilters(ctx, orgID, savedviewtypes.SourceLogs, "errors")
-		require.NoError(t, err)
-		require.Len(t, views, 1)
-		assert.Equal(t, "logs errors", views[0].Name)
-	})
-
-	t.Run("omitted source page returns everything, not nothing", func(t *testing.T) {
-		// Fixes a bug: source used to be an unconditional exact-match
-		// clause, so a zero-value source matched zero rows -- even though
-		// ListSavedViewsParams.Validate() treats a zero Source as valid
-		// ("no filter"). Store.List now only applies the source clause
-		// when it's non-zero.
-		st.ExpectList(orgID, []*savedviewtypes.SavedView{logsOverview, logsErrors, tracesOverview})
-		views, err := m.GetViewsForFilters(ctx, orgID, savedviewtypes.Source{}, "")
-		require.NoError(t, err)
-		assert.Len(t, views, 3)
-	})
-
-	t.Run("scoped to org", func(t *testing.T) {
-		otherOrgID := valuer.GenerateUUID().StringValue()
-		st.ExpectList(otherOrgID, nil)
-		views, err := m.GetViewsForFilters(ctx, otherOrgID, savedviewtypes.SourceLogs, "")
-		require.NoError(t, err)
-		assert.Empty(t, views)
-	})
-
-	require.NoError(t, st.AssertExpectations())
-}
-
-func TestModule_Collect(t *testing.T) {
-	m, st := newTestStore()
-
-	orgID := valuer.GenerateUUID()
-
-	logsA := testSavedView(orgID.StringValue(), valuer.GenerateUUID(), "creator@signoz.io", testPostableSavedView("logs a", savedviewtypes.SourceLogs))
-	logsB := testSavedView(orgID.StringValue(), valuer.GenerateUUID(), "creator@signoz.io", testPostableSavedView("logs b", savedviewtypes.SourceLogs))
-	tracesA := testSavedView(orgID.StringValue(), valuer.GenerateUUID(), "creator@signoz.io", testPostableSavedView("traces a", savedviewtypes.SourceTraces))
-
-	st.ExpectList(orgID.StringValue(), []*savedviewtypes.SavedView{logsA, logsB, tracesA})
-	stats, err := m.Collect(context.Background(), orgID)
-	require.NoError(t, err)
-	assert.Equal(t, int64(3), stats["savedview.count"])
-	assert.Equal(t, int64(2), stats["savedview.source.logs.count"])
-	assert.Equal(t, int64(1), stats["savedview.source.traces.count"])
-
-	require.NoError(t, st.AssertExpectations())
-}

pkg/modules/savedview/implsavedview/store.go

@@ -1,109 +0,0 @@
-package implsavedview
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type store struct {
-	sqlstore sqlstore.SQLStore
-}
-
-func NewStore(sqlstore sqlstore.SQLStore) savedviewtypes.Store {
-	return &store{sqlstore: sqlstore}
-}
-
-func (store *store) Create(ctx context.Context, view *savedviewtypes.SavedView) error {
-	_, err := store.sqlstore.BunDB().NewInsert().Model(view).Exec(ctx)
-	if err != nil {
-		return store.sqlstore.WrapAlreadyExistsErrf(err, errors.CodeAlreadyExists, "saved view with name %s already exists", view.Name)
-	}
-	return nil
-}
-
-func (store *store) Get(ctx context.Context, orgID string, id valuer.UUID) (*savedviewtypes.SavedView, error) {
-	var view savedviewtypes.SavedView
-	err := store.sqlstore.BunDB().NewSelect().Model(&view).Where("org_id = ? AND id = ?", orgID, id.StringValue()).Scan(ctx)
-	if err != nil {
-		return nil, store.sqlstore.WrapNotFoundErrf(err, savedviewtypes.ErrCodeSavedViewNotFound, "saved view %s not found", id.StringValue())
-	}
-
-	normalizeSelectedFields(&view)
-	return &view, nil
-}
-
-func (store *store) Update(ctx context.Context, view *savedviewtypes.SavedView) error {
-	res, err := store.sqlstore.BunDB().NewUpdate().
-		Model(&savedviewtypes.SavedView{}).
-		Set("updated_at = ?, updated_by = ?, source = ?, data = ?",
-			view.UpdatedAt, view.UpdatedBy, view.Source, view.Data).
-		Where("id = ?", view.ID.StringValue()).
-		Where("org_id = ?", view.OrgID).
-		Exec(ctx)
-	if err != nil {
-		return errors.WrapInternalf(err, errors.CodeInternal, "error in updating saved view")
-	}
-
-	rowsAffected, err := res.RowsAffected()
-	if err != nil {
-		return errors.WrapInternalf(err, errors.CodeInternal, "error in verifying the updated saved view")
-	}
-	if rowsAffected == 0 {
-		return errors.NewNotFoundf(savedviewtypes.ErrCodeSavedViewNotFound, "saved view %s not found", view.ID.StringValue())
-	}
-
-	return nil
-}
-
-func (store *store) Delete(ctx context.Context, orgID string, id valuer.UUID) error {
-	res, err := store.sqlstore.BunDB().NewDelete().
-		Model(&savedviewtypes.SavedView{}).
-		Where("id = ?", id.StringValue()).
-		Where("org_id = ?", orgID).
-		Exec(ctx)
-	if err != nil {
-		return errors.WrapInternalf(err, errors.CodeInternal, "error in deleting saved view")
-	}
-
-	rowsAffected, err := res.RowsAffected()
-	if err != nil {
-		return errors.WrapInternalf(err, errors.CodeInternal, "error in verifying the deleted saved view")
-	}
-	if rowsAffected == 0 {
-		return errors.NewNotFoundf(savedviewtypes.ErrCodeSavedViewNotFound, "saved view %s not found", id.StringValue())
-	}
-
-	return nil
-}
-
-func (store *store) List(ctx context.Context, orgID string, source savedviewtypes.Source, name string) ([]*savedviewtypes.SavedView, error) {
-	var views []*savedviewtypes.SavedView
-	q := store.sqlstore.BunDB().NewSelect().Model(&views).
-		Where("org_id = ?", orgID).
-		Where("name LIKE ?", "%"+name+"%")
-	if !source.IsZero() {
-		q = q.Where("source = ?", source)
-	}
-
-	if err := q.Scan(ctx); err != nil {
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "error in getting saved views")
-	}
-
-	for _, view := range views {
-		normalizeSelectedFields(view)
-	}
-
-	return views, nil
-}
-
-// normalizeSelectedFields fixes up a scanned row's nil SelectedFields.
-func normalizeSelectedFields(view *savedviewtypes.SavedView) {
-	if view.Data.Spec.SelectedFields == nil {
-		view.Data.Spec.SelectedFields = []telemetrytypes.TelemetryFieldKey{}
-	}
-}

pkg/modules/savedview/savedview.go

@@ -4,19 +4,19 @@ import (
 	"context"
 	"net/http"
 
+	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
 	"github.com/SigNoz/signoz/pkg/statsreporter"
-	"github.com/SigNoz/signoz/pkg/types/savedviewtypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
 type Module interface {
-	GetViewsForFilters(ctx context.Context, orgID string, source savedviewtypes.Source, name string) ([]*savedviewtypes.SavedView, error)
+	GetViewsForFilters(ctx context.Context, orgID string, sourcePage string, name string, category string) ([]*v3.SavedView, error)
 
-	CreateView(ctx context.Context, orgID string, view savedviewtypes.PostableSavedView) (valuer.UUID, error)
+	CreateView(ctx context.Context, orgID string, view v3.SavedView) (valuer.UUID, error)
 
-	GetView(ctx context.Context, orgID string, uuid valuer.UUID) (*savedviewtypes.SavedView, error)
+	GetView(ctx context.Context, orgID string, uuid valuer.UUID) (*v3.SavedView, error)
 
-	UpdateView(ctx context.Context, orgID string, uuid valuer.UUID, view savedviewtypes.UpdatableSavedView) error
+	UpdateView(ctx context.Context, orgID string, uuid valuer.UUID, view v3.SavedView) error
 
 	DeleteView(ctx context.Context, orgID string, uuid valuer.UUID) error
 
@@ -33,22 +33,9 @@ type Handler interface {
 	// Updates the saved view
 	Update(http.ResponseWriter, *http.Request)
 
-	// Deletes the saved view. Shared by both API generations -- delete has no
-	// request/response body to reshape.
+	// Deletes the saved view
 	Delete(http.ResponseWriter, *http.Request)
 
 	// Lists the saved views
 	List(http.ResponseWriter, *http.Request)
-
-	// CreateV2 is the /api/v2/saved_views typed-spec variant of Create.
-	CreateV2(http.ResponseWriter, *http.Request)
-
-	// GetV2 is the /api/v2/saved_views typed-spec variant of Get.
-	GetV2(http.ResponseWriter, *http.Request)
-
-	// UpdateV2 is the /api/v2/saved_views typed-spec variant of Update.
-	UpdateV2(http.ResponseWriter, *http.Request)
-
-	// ListV2 is the /api/v2/saved_views typed-spec variant of List.
-	ListV2(http.ResponseWriter, *http.Request)
 }

pkg/prometheus/clickhouseprometheusv2/classification_golden_test.go

@@ -1,162 +0,0 @@
-package clickhouseprometheusv2
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/prometheus/prometheus/promql/parser"
-	"github.com/stretchr/testify/require"
-)
-
-var updateGolden = flag.Bool("update", false, "rewrite the classification golden file")
-
-const goldenFile = "testdata/classification_golden.json"
-
-// corpusFile is the conformance corpus that the integration suite replays.
-// The golden freezes the route of every expression in it.
-const corpusFile = "../../../tests/integration/testdata/promqltestcorpus/corpus.json"
-
-// TestClassificationGolden freezes the route of every conformance-corpus
-// expression: "full", "hybrid(<units>)", or "fallback: <reason>". The route
-// is a correctness surface of its own. A change that silently sends a shape
-// to the engine loses the pushdown. A change that silently transpiles an
-// unproven shape risks wrong numbers. Both must show as a diff of this file.
-// The corpus suite's clickhousev2 leg then judges the numbers.
-//
-// The golden keys on the expression alone. The corpus evaluates each
-// expression on several grids, and the test requires the route to be the
-// same on all of them. If a classifier change ever makes the route depend
-// on the grid, this test fails and the key must grow.
-//
-// Regenerate after an intended classifier change:
-//
-//	go test ./pkg/prometheus/clickhouseprometheusv2 -run TestClassificationGolden -update
-func TestClassificationGolden(t *testing.T) {
-	raw, err := os.ReadFile(corpusFile)
-	require.NoError(t, err)
-
-	var corpus struct {
-		Cases []struct {
-			Expr    string `json:"expr"`
-			StartMs int64  `json:"start_ms"`
-			EndMs   int64  `json:"end_ms"`
-			StepMs  int64  `json:"step_ms"`
-		} `json:"cases"`
-	}
-	require.NoError(t, json.Unmarshal(raw, &corpus))
-	require.NotEmpty(t, corpus.Cases)
-
-	promParser := parser.NewParser(parser.Options{})
-	routes := map[string]string{}
-	for _, c := range corpus.Cases {
-		expr, err := promParser.ParseExpr(c.Expr)
-		require.NoError(t, err, "corpus expression must parse: %q", c.Expr)
-
-		var route string
-		plan, ok := classify(expr, gridContext{startMs: c.StartMs, endMs: c.EndMs, stepMs: c.StepMs})
-		switch {
-		case ok && plan.full:
-			route = "full"
-		case ok:
-			route = fmt.Sprintf("hybrid(%d)", len(plan.units))
-		default:
-			route = "fallback: " + fallbackShape(expr)
-		}
-
-		if prev, seen := routes[c.Expr]; seen {
-			require.Equal(t, prev, route,
-				"route differs between grids for %q — the golden key must grow to include the grid", c.Expr)
-			continue
-		}
-		routes[c.Expr] = route
-	}
-
-	// json.MarshalIndent sorts map keys: the file is deterministic.
-	got, err := json.MarshalIndent(routes, "", "  ")
-	require.NoError(t, err)
-	got = append(got, '\n')
-
-	if *updateGolden {
-		require.NoError(t, os.MkdirAll(filepath.Dir(goldenFile), 0o755))
-		require.NoError(t, os.WriteFile(goldenFile, got, 0o644))
-		return
-	}
-
-	want, err := os.ReadFile(goldenFile)
-	require.NoError(t, err, "golden missing — generate it with -update")
-	require.Equal(t, string(want), string(got),
-		"classification route changed; if intended, regenerate with -update and explain the diff in review")
-}
-
-// fallbackShape buckets a non-transpilable query by why it stays on the engine
-// path, to separate "already served well" (instant selectors on the last-sample-per-step
-// path) from genuine compiler gaps.
-func fallbackShape(expr parser.Expr) string {
-	var hasMatrix, hasSubquery, hasAt, hasDurationExpr, overTime bool
-	rangeFns := map[string]bool{"rate": true, "increase": true, "delta": true, "irate": true, "idelta": true}
-	var unsupportedFns []string
-	parser.Inspect(expr, func(node parser.Node, _ []parser.Node) error {
-		switch n := node.(type) {
-		case *parser.MatrixSelector:
-			hasMatrix = true
-			if n.RangeExpr != nil {
-				hasDurationExpr = true
-			}
-		case *parser.SubqueryExpr:
-			hasSubquery = true
-			if n.RangeExpr != nil || n.StepExpr != nil || n.OriginalOffsetExpr != nil {
-				hasDurationExpr = true
-			}
-		case *parser.VectorSelector:
-			if n.Timestamp != nil || n.StartOrEnd != 0 {
-				hasAt = true
-			}
-			if n.OriginalOffsetExpr != nil {
-				hasDurationExpr = true
-			}
-		case *parser.Call:
-			if strings.HasSuffix(n.Func.Name, "_over_time") {
-				overTime = true
-			} else if !rangeFns[n.Func.Name] {
-				unsupportedFns = append(unsupportedFns, n.Func.Name)
-			}
-		}
-		return nil
-	})
-
-	switch {
-	case hasDurationExpr:
-		return "duration expression (resolved only at evaluation time)"
-	case hasSubquery:
-		return "subquery"
-	case hasAt:
-		return "@ modifier"
-	case overTime:
-		return "*_over_time range function"
-	case !hasMatrix:
-		return "instant-selector shape (last-sample-per-step engine path)"
-	case len(unsupportedFns) > 0:
-		return fmt.Sprintf("range shape with unsupported function(s): %s", strings.Join(dedupe(unsupportedFns), ",")) //nolint:makezero
-	default:
-		return "other range shape"
-	}
-}
-
-func dedupe(in []string) []string {
-	seen := map[string]bool{}
-	var out []string
-	for _, s := range in {
-		if !seen[s] {
-			seen[s] = true
-			out = append(out, s)
-		}
-	}
-	sort.Strings(out)
-	return out
-}

pkg/prometheus/clickhouseprometheusv2/provider.go

@@ -2,27 +2,27 @@ package clickhouseprometheusv2
 
 import (
 	"context"
-	"time"
 
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/prometheus"
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
-	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/storage"
 )
 
+// provider ties the package together: its own engine and parser, and the
+// ClickHouse client behind the native storage.Querier. It stays unexported:
+// callers hold the prometheus.Prometheus interface, which is the boundary
+// between the two provider implementations.
 type provider struct {
 	settings factory.ScopedProviderSettings
 	engine   *prometheus.Engine
 	parser   prometheus.Parser
 	client   *client
-	executor *executor
 }
 
 var (
 	_ prometheus.Prometheus        = (*provider)(nil)
 	_ prometheus.StatementCapturer = (*provider)(nil)
-	_ prometheus.RangeExecutor     = (*provider)(nil)
 )
 
 func NewFactory(telemetryStore telemetrystore.TelemetryStore) factory.ProviderFactory[prometheus.Prometheus, prometheus.Config] {
@@ -43,14 +43,9 @@ func New(_ context.Context, providerSettings factory.ProviderSettings, config pr
 		engine:   engine,
 		parser:   parser,
 		client:   client,
-		executor: &executor{client: client, engine: engine, parser: parser},
 	}, nil
 }
 
-func (p *provider) TryExecuteRange(ctx context.Context, query string, start, end time.Time, step time.Duration) (promql.Matrix, bool, error) {
-	return p.executor.TryExecuteRange(ctx, query, start, end, step)
-}
-
 func (p *provider) Engine() *prometheus.Engine {
 	return p.engine
 }

pkg/prometheus/clickhouseprometheusv2/testdata/classification_golden.json

@@ -1,319 +0,0 @@
-{
-  "(metric1_total offset 2) ^ 2": "full",
-  "-metric_a or -metric_b": "hybrid(2)",
-  "-metric_total": "full",
-  "-{job=\"api\"}": "full",
-  "10 atan2 20": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "10 atan2 NaN": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "AVG(http_requests) BY (job)": "full",
-  "COUNT(http_requests) BY (job)": "full",
-  "MAX(http_requests) BY (job)": "full",
-  "MIN(http_requests) BY (job)": "full",
-  "SUM BY (group) (((http_requests{job=\"api-server\"})))": "full",
-  "SUM BY (group) (http_requests{job=\"api-server\"})": "full",
-  "SUM(http_requests)": "full",
-  "SUM(http_requests) BY (job)": "full",
-  "SUM(http_requests) BY (job, group)": "full",
-  "SUM(http_requests) BY (job, nonexistent)": "full",
-  "SUM(http_requests{instance=\"0\"}) BY(job)": "full",
-  "abs(-1 * http_requests{group=\"production\",job=\"api-server\"})": "hybrid(1)",
-  "acos(trig - 10.1)": "hybrid(1)",
-  "acosh(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "asin(trig - 10.1)": "hybrid(1)",
-  "asinh(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "atan(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "atanh(trig - 10.1)": "hybrid(1)",
-  "avg by (group) (data{test=\"nan\"})": "full",
-  "avg by (group) (data{test=\"neg_inf\"})": "full",
-  "avg by (group) (data{test=\"pos_inf\"})": "full",
-  "avg by (group) (http_requests{job=\"api-server\"})": "full",
-  "avg(data)": "full",
-  "avg(data{test=\"-big\"})": "full",
-  "avg(data{test=\"-inf\"})": "full",
-  "avg(data{test=\"-inf2\"})": "full",
-  "avg(data{test=\"-inf3\"})": "full",
-  "avg(data{test=\"big\"})": "full",
-  "avg(data{test=\"bigzero\"})": "full",
-  "avg(data{test=\"inf\"})": "full",
-  "avg(data{test=\"inf2\"})": "full",
-  "avg(data{test=\"inf3\"})": "full",
-  "avg(data{test=\"inf_inf\"})": "full",
-  "avg(data{test=\"nan\"})": "full",
-  "avg(data{test=\"ten\"})": "full",
-  "avg(foo) - 52": "full",
-  "avg(foo) == 52": "full",
-  "avg(topk(10, foo)) - 52": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "avg(topk(10, foo)) == 52": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "avg(topk(11, foo)) - 52": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "avg(topk(11, foo)) == 52": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "avg(topk(8, foo)) - 52": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "avg(topk(8, foo)) == 52": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "avg(topk(9, foo)) - 52": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "avg(topk(9, foo)) == 52": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "avg_over_time(foo[100s]) - 52": "full",
-  "avg_over_time(foo[100s]) == 52": "full",
-  "avg_over_time(foo[110s]) - 52": "full",
-  "avg_over_time(foo[110s]) == 52": "full",
-  "avg_over_time(foo[120s]) - 52": "full",
-  "avg_over_time(foo[120s]) == 52": "full",
-  "avg_over_time(foo[130s]) - 52": "full",
-  "avg_over_time(foo[130s]) == 52": "full",
-  "avg_over_time(metric10[1m])": "full",
-  "avg_over_time(metric11[1m])": "full",
-  "avg_over_time(metric1[1m])": "full",
-  "avg_over_time(metric2[1m])": "full",
-  "avg_over_time(metric3[1m])": "full",
-  "avg_over_time(metric4[1m])": "full",
-  "avg_over_time(metric5[1m])": "full",
-  "avg_over_time(metric6[1m])": "full",
-  "avg_over_time(metric7[1m])": "full",
-  "avg_over_time(metric8[1m])": "full",
-  "avg_over_time(metric9[1m])": "full",
-  "avg_over_time(metric[2m])": "full",
-  "avg_over_time(rate(http_requests_total[1m])[1m:1s])": "hybrid(1)",
-  "ceil(0.004 * http_requests{group=\"production\",job=\"api-server\"})": "hybrid(1)",
-  "changes(http_requests[1800])": "fallback: range shape with unsupported function(s): changes",
-  "changes(http_requests[30m])": "fallback: range shape with unsupported function(s): changes",
-  "changes(metric[1m])": "fallback: range shape with unsupported function(s): changes",
-  "changes(metric[5m])": "fallback: range shape with unsupported function(s): changes",
-  "changes(x[20m])": "fallback: range shape with unsupported function(s): changes",
-  "clamp(metric_total, 0, 100)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "cos(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "cosh(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "count by (group) (http_requests{job=\"api-server\"})": "full",
-  "count by(namespace, pod, cpu) (node_cpu_seconds_total{cpu=~\".*\",job=\"node-exporter\",mode=\"idle\",namespace=\"observability\",pod=\"node-exporter-l454v\"}) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{namespace=\"observability\",pod=\"node-exporter-l454v\"}": "hybrid(1)",
-  "count_over_time(metric1_total[range()])": "fallback: duration expression (resolved only at evaluation time)",
-  "count_over_time(metric1_total[step()])": "fallback: duration expression (resolved only at evaluation time)",
-  "count_over_time(metric[10])": "full",
-  "count_over_time(metric[10s])": "full",
-  "count_over_time(metric[1m])": "full",
-  "count_over_time(metric[1s])": "full",
-  "count_over_time(metric[20])": "full",
-  "count_over_time(metric[20s])": "full",
-  "deg(trig - 10)": "hybrid(1)",
-  "deg(trig - 20)": "hybrid(1)",
-  "deg(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "delta(metric[1m])": "full",
-  "floor(0.004 * http_requests{group=\"production\",job=\"api-server\"})": "hybrid(1)",
-  "foo \u003e 2 or bar": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "http_requests_total{foo!=\"bar\", job=\"api-server\"}": "full",
-  "http_requests_total{foo!=\"bar\"}": "full",
-  "http_requests_total{foo!~\"bar\", job=\"api-server\", instance=\"1\", x!=\"y\", z=\"\", group!=\"\"}": "full",
-  "http_requests_total{foo!~\"bar\", job=\"api-server\"}": "full",
-  "http_requests_total{group!=\"canary\"}": "full",
-  "http_requests_total{group=\"production\",job=\"api-server\"} offset 5m": "full",
-  "http_requests_total{group=\"production\",job=~\"api-.+\"}": "full",
-  "http_requests_total{job!~\"api-.+\",group!=\"canary\"}": "full",
-  "http_requests_total{job=~\".+-server\",group!=\"canary\"}": "full",
-  "increase(http_requests_total[100m])": "full",
-  "increase(http_requests_total[30m])": "full",
-  "increase(http_requests_total[50m])": "full",
-  "increase(metric[1m])": "full",
-  "increase(metric[5m])": "full",
-  "label_join(series, \"idx\", \",\", \"label\", \"label\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace((((testmetric))), ((\"dst\")), ((\"value-$1\")), ((\"src\")), ((\"non-matching-regex\")))": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace(series, \"idx\", \"replaced\", \"idx\", \".*\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace(sum by (__name__) (rate(metric_total{env=\"2\"}[5m])), \"__name__\", \"$1\", \"__name__\", \"(.+)\")": "fallback: range shape with unsupported function(s): label_replace",
-  "label_replace(testmetric, \"dst\", \"\", \"dst\", \".*\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace(testmetric, \"dst\", \"$1-value-$2\", \"src\", \"(.*)-value-(.*)\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace(testmetric, \"dst\", \"destination-value-$1\", \"src\", \"source-value-(.*)\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace(testmetric, \"dst\", \"destination-value-$1\", \"src\", \"value-(.*)\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace(testmetric, \"dst\", \"value-$1\", \"nonexistent-src\", \"(.*)\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace(testmetric, \"dst\", \"value-$1\", \"nonexistent-src\", \"source-value-(.*)\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "label_replace(testmetric, \"dst\", \"value-$1\", \"src\", \"non-matching-regex\")": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "last_over_time(metric_total{env=\"1\"}[10m])": "full",
-  "max_over_time(metric_total{env=\"1\"}[10m])": "full",
-  "metric": "full",
-  "metric1 offset 15m or metric2 offset 45m": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "metric1_total offset +min(step(), 1s)^0": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset -(min(step(), 1s))+8000": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset -min(step(), 1s)+8000": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset -min(step(), 1s)^0": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset -step()*2": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset 100 + 2": "full",
-  "metric1_total offset 2 ^ 2": "full",
-  "metric1_total offset STEP()": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset max(3s,min(step(), 1s))+8000": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset min(range(), 8s)": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset min(step(), 1s)": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset min(step(), 1s)+8000": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset min(step(), 1s)^0": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset range()": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset step()": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset step()*0": "fallback: duration expression (resolved only at evaluation time)",
-  "metric1_total offset step()^0": "fallback: duration expression (resolved only at evaluation time)",
-  "metricA + ignoring() metricB": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "metricA + metricB": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "metric_total * 2": "full",
-  "metric_total + another_metric_total": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "metric_total \u003c= another_metric_total": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "metric_total \u003c= bool another_metric_total": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "metric_total{env=\"1\"}": "full",
-  "min_over_time(metric_total[10s])": "full",
-  "min_over_time(metric_total[15s:10s])": "fallback: subquery",
-  "min_over_time(rate(metric_total[5m])[20m:1m])": "hybrid(1)",
-  "node_cpu % 2": "full",
-  "node_cpu * 2": "full",
-  "node_cpu * ignoring (role, mode) group_left (role) node_role": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "node_cpu * on (instance) group_left (role) node_role": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "node_cpu + 2": "full",
-  "node_cpu + on(dummy) group_left(foo) random*0": "hybrid(1)",
-  "node_cpu - 2": "full",
-  "node_cpu / 2": "full",
-  "node_cpu / ignoring (mode) group_left sum without (mode)(node_cpu)": "hybrid(1)",
-  "node_cpu / ignoring (mode) group_left(dummy) sum without (mode)(node_cpu)": "hybrid(1)",
-  "node_cpu / on (instance) group_left sum by (instance,job)(node_cpu)": "hybrid(1)",
-  "node_cpu \u003e on(job, instance) group_left(target) (threshold or on (job, instance) (sum by (job, instance)(node_cpu) * 0 + 1))": "hybrid(1)",
-  "node_cpu \u003e on(job, instance) group_left(target) threshold": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "node_cpu ^ 2": "full",
-  "node_role * ignoring (role) group_right (role) node_var": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "node_role * on (instance) group_right (role) node_var": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "node_var * ignoring (role) group_left (role) node_role": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "node_var * on (instance) group_left (role) node_role": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "other + fill": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "present_over_time(http_requests_total[10m])": "fallback: *_over_time range function",
-  "present_over_time(http_requests_total[16m])": "fallback: *_over_time range function",
-  "present_over_time(http_requests_total[5m])": "fallback: *_over_time range function",
-  "present_over_time(http_requests_total[6m])": "fallback: *_over_time range function",
-  "present_over_time(httpd_handshake_failures_total[1m])": "fallback: *_over_time range function",
-  "present_over_time(httpd_log_lines_total[30s])": "fallback: *_over_time range function",
-  "present_over_time(rate(http_requests_total[5m])[5m:1m])": "hybrid(1)",
-  "present_over_time({instance=\"127.0.0.1\"}[5m:5s])": "fallback: subquery",
-  "present_over_time({instance=\"127.0.0.1\"}[5m])": "fallback: *_over_time range function",
-  "present_over_time({job=\"grok\"}[20m])": "fallback: *_over_time range function",
-  "present_over_time({job=\"ingress\"}[4m])": "fallback: *_over_time range function",
-  "rad(trig - 10)": "hybrid(1)",
-  "rad(trig - 20)": "hybrid(1)",
-  "rad(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "random + on() metricA": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "rate(calculate_rate_offset_total[10m] offset 5m)": "full",
-  "rate(calculate_rate_window_total[50m])": "full",
-  "rate(http_requests_total[1m])": "full",
-  "rate(http_requests_total[40s]) - rate(http_requests_total[1m] offset 10000s)": "hybrid(2)",
-  "rate(http_requests_total{group=~\"((?i)PRO).*\"}[1m])": "full",
-  "rate(http_requests_total{group=~\"(?i:PRO).*\"}[1m])": "full",
-  "rate(http_requests_total{group=~\"(?i:PRODUCTION)\"}[1m])": "full",
-  "rate(http_requests_total{group=~\".*((?i)DUC).*\"}[1m])": "full",
-  "rate(http_requests_total{group=~\".*((?i)TION)\"}[1m])": "full",
-  "rate(http_requests_total{group=~\".*(?i:C).*\"}[1m])": "full",
-  "rate(http_requests_total{group=~\".*(?i:DUC).*\"}[1m])": "full",
-  "rate(http_requests_total{group=~\".*(?i:TION)\"}[1m])": "full",
-  "rate(http_requests_total{group=~\".*(?i:TION).*?\"}[1m])": "full",
-  "rate(http_requests_total{group=~\".*?(?i:PRO).*\"}[1m])": "full",
-  "rate(http_requests_total{group=~\".*ry\", instance=\"1\"}[1m])": "full",
-  "rate(http_requests_total{group=~\"pro.*\"}[1m:10s])": "fallback: subquery",
-  "rate(http_requests_total{group=~\"pro.*\"}[1m])": "full",
-  "rate(http_requests_total{instance!=\"3\"}[1m] offset 10000s)": "full",
-  "rate(metric_total[1m1s:10s])": "fallback: subquery",
-  "rate(metric_total[1m500ms:10s])": "fallback: subquery",
-  "rate(metric_total[1m])": "full",
-  "rate(metric_total[20s:10s])": "fallback: subquery",
-  "rate(metric_total[20s:5s])": "fallback: subquery",
-  "rate(metric_total{env=\"1\"}[10m])": "full",
-  "rate(sum_over_time((metric1_total+metric2_total+metric3_total)[30s:10s])[30s:10s])": "fallback: subquery",
-  "rate(sum_over_time(metric1_total[30s:10s])[50s:10s])": "fallback: subquery",
-  "rate(sum_over_time(metric2_total[30s:10s])[50s:10s])": "fallback: subquery",
-  "rate(sum_over_time(metric3_total[30s:10s])[50s:10s])": "fallback: subquery",
-  "rate(testcounter_reset_end_total[5m])": "full",
-  "rate(testcounter_reset_end_total[6m])": "full",
-  "rate(testcounter_reset_middle_total[50m])": "full",
-  "rate(testcounter_zero_cutoff_total[20m])": "full",
-  "requests * 2": "full",
-  "resets(metric[1m])": "fallback: range shape with unsupported function(s): resets",
-  "resets(metric[5m])": "fallback: range shape with unsupported function(s): resets",
-  "round(-1 * (0.004 * http_requests{group=\"production\",job=\"api-server\"}))": "hybrid(1)",
-  "round(-1 * (0.005 * http_requests{group=\"production\",job=\"api-server\"}))": "hybrid(1)",
-  "round(-1 * (1 + 0.005 * http_requests{group=\"production\",job=\"api-server\"}))": "hybrid(1)",
-  "round(-1 * (5.2 + 0.0005 * http_requests{group=\"production\",job=\"api-server\"}), 0.1)": "hybrid(1)",
-  "round(0.0005 * http_requests{group=\"production\",job=\"api-server\"}, 0.1)": "hybrid(1)",
-  "round(0.004 * http_requests{group=\"production\",job=\"api-server\"})": "hybrid(1)",
-  "round(0.005 * http_requests{group=\"production\",job=\"api-server\"})": "hybrid(1)",
-  "round(0.025 * http_requests{group=\"production\",job=\"api-server\"}, 5)": "hybrid(1)",
-  "round(0.045 * http_requests{group=\"production\",job=\"api-server\"}, 5)": "hybrid(1)",
-  "round(1 + 0.005 * http_requests{group=\"production\",job=\"api-server\"})": "hybrid(1)",
-  "round(2.1 + 0.0005 * http_requests{group=\"production\",job=\"api-server\"}, 0.1)": "hybrid(1)",
-  "round(5.2 + 0.0005 * http_requests{group=\"production\",job=\"api-server\"}, 0.1)": "hybrid(1)",
-  "round(metric_total)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "sin(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "sinh(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stddev (series)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stddev by (instance)(http_requests)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stddev by (label) (series)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stddev(http_requests)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stddev(series)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stddev_over_time(metric[1m])": "fallback: *_over_time range function",
-  "stdvar (series)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stdvar by (instance)(http_requests)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stdvar by (label) (series)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stdvar(http_requests)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stdvar(series)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "stdvar_over_time(metric[1m])": "fallback: *_over_time range function",
-  "sum by () (http_requests{job=\"api-server\"})": "full",
-  "sum by (__name__) (metric_total{env=\"1\"} or rate(metric_total{env=\"2\"}[5m]))": "fallback: other range shape",
-  "sum by (__name__) (metric_total{env=\"1\"})": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "sum by (__name__) (metric_total{env=\"3\"} or rate(metric_total{env=\"2\"}[5m]))": "fallback: other range shape",
-  "sum by (__name__) (rate(metric_total{env=\"2\"}[5m]) or metric_total{env=\"1\"})": "fallback: other range shape",
-  "sum by (__name__) (rate(metric_total{env=\"2\"}[5m]))": "fallback: other range shape",
-  "sum by (__name__) (rate(metric_total{env=\"3\"}[5m]) or metric_total{env=\"1\"})": "fallback: other range shape",
-  "sum by (__name__, env) (metric_total{env=\"1\"})": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "sum by (group) (data{test=\"nan\"})": "full",
-  "sum by (group) (data{test=\"neg_inf\"})": "full",
-  "sum by (group) (data{test=\"pos_inf\"})": "full",
-  "sum by (group) (http_requests{job=\"api-server\"})": "full",
-  "sum by (mode, job)(node_cpu) / on (job) group_left sum by (job)(node_cpu)": "hybrid(2)",
-  "sum without () (http_requests{job=\"api-server\",group=\"production\"})": "full",
-  "sum without (instance) (http_requests{job=\"api-server\"} or foo)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "sum without (instance) (http_requests{job=\"api-server\"})": "full",
-  "sum without (instance)(node_cpu) / ignoring (mode) group_left sum without (instance, mode)(node_cpu)": "hybrid(2)",
-  "sum(data{test=\"inf_inf\"})": "full",
-  "sum(data{test=\"ten\"})": "full",
-  "sum(http_requests) by (job) + min(http_requests) by (job) + max(http_requests) by (job) + avg(http_requests) by (job)": "hybrid(4)",
-  "sum(http_requests{job=\"api-server\"})": "full",
-  "sum(label_grouping_test) by (a, b)": "full",
-  "sum(sum by (group) (http_requests{job=\"api-server\"})) by (job)": "hybrid(1)",
-  "sum(sum by (mode, job)(node_cpu) / on (job) group_left sum by (job)(node_cpu))": "hybrid(2)",
-  "sum(sum without (instance)(node_cpu) / ignoring (mode) group_left sum without (instance, mode)(node_cpu))": "hybrid(2)",
-  "sum_over_time((metric1_total)[30:10] offset 3)": "fallback: subquery",
-  "sum_over_time((metric1_total)[30:10] offset 3s)": "fallback: subquery",
-  "sum_over_time((metric1_total)[30:10s] offset 3s)": "fallback: subquery",
-  "sum_over_time((metric1_total)[30s:10s] offset 3s)": "fallback: subquery",
-  "sum_over_time(bar[30s])": "full",
-  "sum_over_time(metric1_total[30:10] offset 3)": "fallback: subquery",
-  "sum_over_time(metric1_total[30s:10s] offset 10s)": "fallback: subquery",
-  "sum_over_time(metric1_total[30s:10s] offset 3s)": "fallback: subquery",
-  "sum_over_time(metric1_total[30s:10s] offset 5s)": "fallback: subquery",
-  "sum_over_time(metric1_total[30s:10s] offset 7s)": "fallback: subquery",
-  "sum_over_time(metric1_total[30s:10s] offset 9s)": "fallback: subquery",
-  "sum_over_time(metric1_total[30s:10s])": "fallback: subquery",
-  "sum_over_time(metric1_total[30s:5s])": "fallback: subquery",
-  "sum_over_time(metric[1000ms])": "full",
-  "sum_over_time(metric[1001ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric[1002ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric[1003ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric[2000ms])": "full",
-  "sum_over_time(metric[2001ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric[2002ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric[2003ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric[2m])": "full",
-  "sum_over_time(metric[3000ms])": "full",
-  "sum_over_time(metric[3001ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric[3002ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric[3003ms])": "fallback: *_over_time range function",
-  "sum_over_time(metric_total[50s:10s])": "fallback: subquery",
-  "sum_over_time(metric_total[50s:5s])": "fallback: subquery",
-  "sum_over_time(metric_total[60s:10s])": "fallback: subquery",
-  "tan(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "tanh(trig)": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "test_total \u003c bool test_smaller": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "test_total \u003c test_smaller": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "test_total \u003e bool test_smaller": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "test_total \u003e test_smaller": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "testmetric": "full",
-  "topk(10, sum by (__name__, env) (metric_total{env=\"1\"}))": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "topk(10, sum by (__name__, env) (rate(metric_total{env=\"1\"}[10m])))": "fallback: other range shape",
-  "trigy atan2 trigNaN": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "trigy atan2 trigx": "fallback: instant-selector shape (last-sample-per-step engine path)",
-  "x{y=\"testvalue\"}": "full",
-  "{__name__=~\".+\"}": "full",
-  "{job=~\".+-server\", job!~\"api-.+\"}": "full"
-}

pkg/prometheus/clickhouseprometheusv2/transpiler.go

@@ -1,470 +0,0 @@
-package clickhouseprometheusv2
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/prometheus/prometheus/model/labels"
-	"github.com/prometheus/prometheus/promql/parser"
-)
-
-// The transpiler turns allowlisted PromQL subtrees into single ClickHouse
-// statements on the timeSeries*ToGrid aggregate functions. Every other
-// shape falls back to the engine over this package's querier. See
-// docs/contributing/prometheus.md for the model, the allowlist, and the
-// correctness argument of each form.
-
-type rangeFn string
-
-const (
-	fnRate     rangeFn = "rate"
-	fnIncrease rangeFn = "increase"
-	fnDelta    rangeFn = "delta"
-	fnIRate    rangeFn = "irate"
-	fnIDelta   rangeFn = "idelta"
-)
-
-var gridFunction = map[rangeFn]string{
-	fnRate:     "timeSeriesRateToGrid",
-	fnIncrease: "timeSeriesRateToGrid", // increase == rate * range seconds, exactly (same factor algebra)
-	fnDelta:    "timeSeriesDeltaToGrid",
-	fnIRate:    "timeSeriesInstantRateToGrid",
-	fnIDelta:   "timeSeriesInstantDeltaToGrid",
-}
-
-// scalarOp runs in Go during assembly, with the same float64 operations
-// the engine uses.
-type scalarOp struct {
-	op           parser.ItemType
-	scalar       float64
-	scalarOnLeft bool
-	returnBool   bool
-}
-
-// Comparisons preserve the metric name; arithmetic drops it.
-func (o scalarOp) isComparison() bool {
-	return o.op.IsComparisonOperator()
-}
-
-type unitKind int
-
-const (
-	// unitRange: rate/increase/delta/irate/idelta over a matrix selector.
-	unitRange unitKind = iota
-	// unitInstant: a plain vector selector resolved per grid point with
-	// lookback and stale-marker shadowing.
-	unitInstant
-	// unitOverTime: avg/min/max/sum/count/last_over_time over a matrix
-	// selector (aggregation over the window's samples, stale rows excluded).
-	unitOverTime
-)
-
-// coreUnit is one transpilable subtree: selector [-> range function] ->
-// optional aggregation -> scalar-op pipeline.
-type coreUnit struct {
-	kind     unitKind
-	matchers []*labels.Matcher
-	offsetMs int64
-	fn       rangeFn // unitRange
-	overFn   string  // unitOverTime: avg|min|max|sum|count|last
-	rangeMs  int64   // unitRange/unitOverTime window
-
-	hasAgg   bool
-	aggOp    parser.ItemType // SUM MIN MAX AVG COUNT
-	by       bool
-	grouping []string
-
-	ops []scalarOp
-}
-
-// keepsName reports whether the unit's output series keep their real
-// __name__. Bare and comparison-filtered instant selectors keep it, and so
-// does last_over_time: they return the raw sample, name included. Range
-// functions, the other *_over_time functions, aggregations, arithmetic, and
-// bool comparisons all drop it. A bool comparison returns 0/1, not the
-// sample, so the engine drops the name there too. A unit that keeps the
-// name cannot become a synthetic series in a hybrid plan: the synthetic
-// name would replace the real one. It transpiles fine as a full plan, where
-// assembly emits the real names.
-func (u *coreUnit) keepsName() bool {
-	nameKeepingSelector := u.kind == unitInstant || (u.kind == unitOverTime && u.overFn == "last")
-	if !nameKeepingSelector || u.hasAgg {
-		return false
-	}
-	for _, op := range u.ops {
-		if !op.isComparison() || op.returnBool {
-			return false
-		}
-	}
-	return true
-}
-
-// gridContext is the evaluation grid a unit computes on. The query grid for
-// top-level units; for units inside subqueries, the subquery's own grid:
-// epoch-aligned multiples of its resolution covering the subquery window,
-// exactly as the engine derives it (engine.go, *parser.SubqueryExpr case).
-type gridContext struct {
-	startMs int64
-	endMs   int64
-	stepMs  int64
-}
-
-// subqueryGrid derives the inner grid for a subquery evaluated on outer:
-// interval S, end = outer end − offset, start = first multiple of S strictly
-// greater than outer start − offset − range.
-func subqueryGrid(outer gridContext, rangeMs, stepMs, offsetMs int64) gridContext {
-	lower := outer.startMs - offsetMs - rangeMs
-	start := stepMs * (lower / stepMs)
-	if start <= lower {
-		start += stepMs
-	}
-	return gridContext{startMs: start, endMs: outer.endMs - offsetMs, stepMs: stepMs}
-}
-
-type transpiledUnit struct {
-	core coreUnit
-	name string // __signoz_transpiled_<n>__
-	grid gridContext
-}
-
-type transpilePlan struct {
-	units []*transpiledUnit
-	grid  gridContext // the query's top-level grid
-	// full is set when the entire query is units[0]; otherwise rewritten
-	// holds the query with each unit replaced by a synthetic selector, to be
-	// evaluated by the engine over a hybrid storage.
-	full      bool
-	rewritten string
-}
-
-const syntheticNamePrefix = "__signoz_transpiled_"
-
-func syntheticName(i int) string {
-	return fmt.Sprintf("%s%d__", syntheticNamePrefix, i)
-}
-
-// classifyCore matches a subtree against the transpilable core shape.
-// stepMs gates second-granularity: the grid functions take whole-second step
-// and window parameters (grid *starts* are millisecond-precise).
-func classifyCore(node parser.Expr, stepMs int64) (*coreUnit, bool) {
-	unit := &coreUnit{}
-
-	expr := node
-	// Peel scalar ops and parens off the top, outermost first; ops apply in
-	// evaluation order, so prepend while peeling.
-	for {
-		switch n := expr.(type) {
-		case *parser.ParenExpr:
-			expr = n.Expr
-			continue
-		case *parser.UnaryExpr:
-			if n.Op != parser.SUB {
-				expr = n.Expr // unary '+' is a no-op
-				continue
-			}
-			// -x == -1 * x for every float64 (incl. NaN and signed zero).
-			unit.ops = append([]scalarOp{{op: parser.MUL, scalar: -1}}, unit.ops...)
-			expr = n.Expr
-			continue
-		case *parser.StepInvariantExpr:
-			// @-pinned expressions evaluate on a different grid.
-			return nil, false
-		case *parser.BinaryExpr:
-			lit, litOnLeft, ok := numberLiteralSide(n)
-			if !ok {
-				return nil, false
-			}
-			if !n.Op.IsOperator() && !n.Op.IsComparisonOperator() {
-				return nil, false
-			}
-			if n.Op == parser.ATAN2 {
-				// atan2 is arithmetic in PromQL but rarely used; keep the
-				// allowlist tight.
-				return nil, false
-			}
-			returnBool := n.ReturnBool
-			unit.ops = append([]scalarOp{{op: n.Op, scalar: lit, scalarOnLeft: litOnLeft, returnBool: returnBool}}, unit.ops...)
-			if litOnLeft {
-				expr = n.RHS
-			} else {
-				expr = n.LHS
-			}
-			continue
-		}
-		break
-	}
-
-	// Optional aggregation.
-	if agg, ok := expr.(*parser.AggregateExpr); ok {
-		switch agg.Op {
-		case parser.SUM, parser.MIN, parser.MAX, parser.AVG, parser.COUNT:
-		default:
-			return nil, false
-		}
-		for _, g := range agg.Grouping {
-			if g == metricNameLabel {
-				// by(__name__)/without(__name__) over synthetic or compiled
-				// output needs name bookkeeping the compiler doesn't do.
-				return nil, false
-			}
-		}
-		unit.hasAgg = true
-		unit.aggOp = agg.Op
-		unit.by = !agg.Without
-		unit.grouping = agg.Grouping
-		expr = agg.Expr
-		for {
-			if p, ok := expr.(*parser.ParenExpr); ok {
-				expr = p.Expr
-				continue
-			}
-			break
-		}
-	}
-
-	// The grid functions take whole-second steps; stepMs == 0 is an instant
-	// query (single-point grid).
-	if stepMs < 0 || stepMs%1000 != 0 {
-		return nil, false
-	}
-
-	// Bare instant selector: resolved per grid point with lookback and
-	// stale-marker shadowing (see compiler_sql.go).
-	if vs, ok := expr.(*parser.VectorSelector); ok {
-		// A duration expression (offset step(), offset range()*2, ...) is
-		// resolved into OriginalOffset only at evaluation time; at
-		// classification time the field still holds its zero value, so
-		// transpiling would silently use the wrong offset.
-		if vs.Timestamp != nil || vs.StartOrEnd != 0 || vs.Anchored || vs.Smoothed || vs.OriginalOffsetExpr != nil {
-			return nil, false
-		}
-		offsetMs := vs.OriginalOffset.Milliseconds()
-		if offsetMs < 0 {
-			return nil, false
-		}
-		unit.kind = unitInstant
-		unit.offsetMs = offsetMs
-		unit.matchers = vs.LabelMatchers
-		return unit, true
-	}
-
-	// Range or *_over_time function over a plain matrix selector.
-	call, ok := expr.(*parser.Call)
-	if !ok {
-		return nil, false
-	}
-	var fn rangeFn
-	var overFn string
-	switch call.Func.Name {
-	case "rate":
-		fn = fnRate
-	case "increase":
-		fn = fnIncrease
-	case "delta":
-		fn = fnDelta
-	case "irate":
-		fn = fnIRate
-	case "idelta":
-		fn = fnIDelta
-	case "avg_over_time", "min_over_time", "max_over_time", "sum_over_time", "count_over_time", "last_over_time":
-		overFn = strings.TrimSuffix(call.Func.Name, "_over_time")
-	default:
-		return nil, false
-	}
-	if len(call.Args) != 1 {
-		return nil, false
-	}
-	ms, ok := call.Args[0].(*parser.MatrixSelector)
-	if !ok {
-		return nil, false
-	}
-	vs, ok := ms.VectorSelector.(*parser.VectorSelector)
-	if !ok {
-		return nil, false
-	}
-	// Duration expressions resolve at evaluation time (see the instant
-	// selector case above); Range/OriginalOffset would be read as zero here.
-	if vs.Timestamp != nil || vs.StartOrEnd != 0 || vs.Anchored || vs.Smoothed || vs.OriginalOffsetExpr != nil || ms.RangeExpr != nil {
-		return nil, false
-	}
-
-	rangeMs := ms.Range.Milliseconds()
-	offsetMs := vs.OriginalOffset.Milliseconds()
-	if rangeMs <= 0 || rangeMs%1000 != 0 || offsetMs < 0 {
-		return nil, false
-	}
-
-	if overFn != "" {
-		unit.kind = unitOverTime
-		unit.overFn = overFn
-	} else {
-		unit.kind = unitRange
-		unit.fn = fn
-	}
-	unit.rangeMs = rangeMs
-	unit.offsetMs = offsetMs
-	unit.matchers = vs.LabelMatchers
-	return unit, true
-}
-
-// numberLiteralSide returns the number literal on one side of a binary
-// expression (peeling parens and unary minus), and which side it is on.
-func numberLiteralSide(b *parser.BinaryExpr) (float64, bool, bool) {
-	if v, ok := literalValue(b.LHS); ok {
-		return v, true, true
-	}
-	if v, ok := literalValue(b.RHS); ok {
-		return v, false, true
-	}
-	return 0, false, false
-}
-
-func literalValue(e parser.Expr) (float64, bool) {
-	neg := false
-	for {
-		switch n := e.(type) {
-		case *parser.ParenExpr:
-			e = n.Expr
-			continue
-		case *parser.StepInvariantExpr:
-			e = n.Expr
-			continue
-		case *parser.UnaryExpr:
-			if n.Op == parser.SUB {
-				neg = !neg
-			}
-			e = n.Expr
-			continue
-		case *parser.NumberLiteral:
-			if neg {
-				return -n.Val, true
-			}
-			return n.Val, true
-		default:
-			return 0, false
-		}
-	}
-}
-
-// classify builds the compile plan for a query: full when the root is a core
-// unit, hybrid when core units sit strictly below the root (including inside
-// fixed-resolution subqueries, computed on the subquery grid), none
-// otherwise.
-func classify(root parser.Expr, grid gridContext) (*transpilePlan, bool) {
-	if unit, ok := classifyCore(root, grid.stepMs); ok {
-		return &transpilePlan{
-			units: []*transpiledUnit{{core: *unit, name: syntheticName(0), grid: grid}},
-			grid:  grid,
-			full:  true,
-		}, true
-	}
-
-	plan := &transpilePlan{grid: grid}
-	rewritten := rewrite(root, grid, plan, false)
-	if len(plan.units) == 0 {
-		return nil, false
-	}
-	plan.rewritten = rewritten.String()
-	return plan, true
-}
-
-// rewrite walks top-down replacing maximal transpilable subtrees with synthetic
-// vector selectors. nameSensitive marks scopes where an ancestor's semantics
-// depend on __name__ (grouping or vector matching on it): synthetic series
-// carry a synthetic __name__, so substitution there would change results.
-// Fixed-resolution subqueries recurse with the subquery's own grid; scopes
-// whose evaluation grid is unknowable (@-pinned, default-resolution
-// subqueries) are not entered.
-func rewrite(node parser.Expr, grid gridContext, plan *transpilePlan, nameSensitive bool) parser.Expr {
-	if node == nil {
-		return nil
-	}
-
-	if !nameSensitive {
-		// Units whose output keeps the real __name__ (bare instant selectors)
-		// cannot be substituted: the synthetic name would replace it in the
-		// engine's output. They still compile as full plans.
-		if unit, ok := classifyCore(node, grid.stepMs); ok && !unit.keepsName() {
-			cu := &transpiledUnit{core: *unit, name: syntheticName(len(plan.units)), grid: grid}
-			plan.units = append(plan.units, cu)
-			return &parser.VectorSelector{
-				Name: cu.name,
-				LabelMatchers: []*labels.Matcher{
-					labels.MustNewMatcher(labels.MatchEqual, metricNameLabel, cu.name),
-				},
-				PosRange: node.PositionRange(),
-			}
-		}
-	}
-
-	switch n := node.(type) {
-	case *parser.ParenExpr:
-		n.Expr = rewrite(n.Expr, grid, plan, nameSensitive)
-	case *parser.UnaryExpr:
-		n.Expr = rewrite(n.Expr, grid, plan, nameSensitive)
-	case *parser.AggregateExpr:
-		sensitive := nameSensitive || groupingUsesName(n.Grouping)
-		n.Expr = rewrite(n.Expr, grid, plan, sensitive)
-		// n.Param is a scalar/string; nothing transpilable inside for our core.
-	case *parser.Call:
-		for i, arg := range n.Args {
-			n.Args[i] = rewrite(arg, grid, plan, nameSensitive)
-		}
-	case *parser.BinaryExpr:
-		sensitive := nameSensitive || vectorMatchingUsesName(n.VectorMatching)
-		n.LHS = rewrite(n.LHS, grid, plan, sensitive)
-		n.RHS = rewrite(n.RHS, grid, plan, sensitive)
-	case *parser.SubqueryExpr:
-		// The alert-smoothing idiom fn_over_time((expr)[R:S]) dominates real
-		// rule fleets; inner units evaluate on the subquery grid, and the
-		// engine does the smoothing over the synthetic series. Requires an
-		// explicit whole-second resolution (S == 0 needs the engine's
-		// default-interval function) and no @ pinning.
-		stepMs := n.Step.Milliseconds()
-		rangeMs := n.Range.Milliseconds()
-		offsetMs := n.OriginalOffset.Milliseconds()
-		if n.Timestamp == nil && n.StartOrEnd == 0 &&
-			n.RangeExpr == nil && n.StepExpr == nil && n.OriginalOffsetExpr == nil &&
-			stepMs > 0 && stepMs%1000 == 0 && rangeMs%1000 == 0 && offsetMs >= 0 {
-			inner := subqueryGrid(grid, rangeMs, stepMs, offsetMs)
-			n.Expr = rewrite(n.Expr, inner, plan, nameSensitive)
-		}
-	case *parser.StepInvariantExpr, *parser.MatrixSelector,
-		*parser.VectorSelector, *parser.NumberLiteral, *parser.StringLiteral:
-		// Leaves, or scopes substitution must not enter.
-	}
-	return node
-}
-
-func groupingUsesName(grouping []string) bool {
-	for _, g := range grouping {
-		if g == metricNameLabel {
-			return true
-		}
-	}
-	return false
-}
-
-func vectorMatchingUsesName(vm *parser.VectorMatching) bool {
-	if vm == nil {
-		return false
-	}
-	for _, l := range append(append([]string{}, vm.MatchingLabels...), vm.Include...) {
-		if l == metricNameLabel {
-			return true
-		}
-	}
-	// Default (all-labels) matching ignores __name__, and by()/ignoring()
-	// lists were checked above.
-	return false
-}
-
-// isSyntheticSelector reports whether matchers target a compiled unit.
-func isSyntheticSelector(matchers []*labels.Matcher) (string, bool) {
-	for _, m := range matchers {
-		if m.Name == metricNameLabel && m.Type == labels.MatchEqual && strings.HasPrefix(m.Value, syntheticNamePrefix) {
-			return m.Value, true
-		}
-	}
-	return "", false
-}

pkg/prometheus/clickhouseprometheusv2/transpiler_exec.go

@@ -1,541 +0,0 @@
-package clickhouseprometheusv2
-
-import (
-	"context"
-	"encoding/json"
-	"math"
-	"sort"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/prometheus"
-	"github.com/prometheus/prometheus/model/labels"
-	promValue "github.com/prometheus/prometheus/model/value"
-	"github.com/prometheus/prometheus/promql"
-	"github.com/prometheus/prometheus/promql/parser"
-	"github.com/prometheus/prometheus/storage"
-	"golang.org/x/sync/errgroup"
-)
-
-type executor struct {
-	client *client
-	engine *prometheus.Engine
-	parser prometheus.Parser
-}
-
-// maxWindowBuckets caps range/step for the windowed *_over_time form.
-// Every grid slot combines that many bucket partials. The fleet's windows
-// sit well under the cap ([1m]..[17m] at 30-60s steps). Anything larger is
-// a long-range query whose step a dashboard scales up anyway. The engine
-// path serves the rest.
-const maxWindowBuckets = 64
-
-func (e *executor) TryExecuteRange(ctx context.Context, qs string, start, end time.Time, step time.Duration) (promql.Matrix, bool, error) {
-	expr, err := e.parser.ParseExpr(qs)
-	if err != nil {
-		// Let the engine path produce the (enhanced) parse error.
-		return nil, false, nil
-	}
-
-	plan, ok := classify(expr, queryGrid(start, end, step))
-	if !ok {
-		return nil, false, nil
-	}
-
-	// timeSeriesLastToGrid widens its window to max(window, step). We
-	// probed this: a sample aged (window, step] still fills the slot. The
-	// rate/delta family enforces the window strictly. The Last-style kinds
-	// used to fall back when window < step because of that widening. The
-	// window-sliver filter (see samplesConditions) makes the widening
-	// harmless there: samples exist only inside (t_k - window, t_k]
-	// slivers, so the widened window intersected with the data IS the
-	// lookback window. If a future ClickHouse stops widening, the
-	// unwidened window is the sliver too. Correct either way. A
-	// non-positive window still falls back: the sliver argument needs a
-	// real window to filter to.
-	//
-	// The windowed *_over_time form gates only the range >= step regime.
-	// It decomposes the window into whole step buckets (see windowedInner).
-	// That is exact only when the range is a multiple of the step. The
-	// per-slot slide costs range/step bucket combines; maxWindowBuckets
-	// bounds it, so a long-range short-step query cannot turn the slide
-	// into the bottleneck. range < step needs neither gate: the windows
-	// are disjoint slivers, aggregated one slot each, with no slide. Every
-	// miss falls back to the engine path, which is exact.
-	for _, unit := range plan.units {
-		stepMs := unit.grid.stepMs
-		if stepMs == 0 {
-			stepMs = 1000
-		}
-		switch {
-		case unit.core.kind == unitInstant || (unit.core.kind == unitOverTime && unit.core.overFn == "last"):
-			windowMs := unit.core.rangeMs
-			if unit.core.kind == unitInstant {
-				windowMs = e.client.lookbackMs
-			}
-			if windowMs <= 0 {
-				return nil, false, nil
-			}
-		case unit.core.kind == unitOverTime:
-			if unit.core.rangeMs < unit.grid.stepMs {
-				// Disjoint slivers: no divisibility or width requirement.
-				continue
-			}
-			if unit.core.rangeMs%stepMs != 0 || unit.core.rangeMs/stepMs > maxWindowBuckets {
-				return nil, false, nil
-			}
-		}
-	}
-
-	// Evaluate every unit concurrently on its own grid (the query grid, or a
-	// subquery grid); each is one series lookup plus one grid query.
-	results := make([][]transpiledSeries, len(plan.units))
-	eg, egCtx := errgroup.WithContext(ctx)
-	for i, unit := range plan.units {
-		eg.Go(func() error {
-			res, err := e.executeUnit(egCtx, &unit.core, unit.grid)
-			if err != nil {
-				return err
-			}
-			results[i] = res
-			return nil
-		})
-	}
-	if err := eg.Wait(); err != nil {
-		return nil, true, err
-	}
-
-	if plan.full {
-		g := plan.units[0].grid
-		return toMatrix(results[0], g.startMs, g.stepMs), true, nil
-	}
-
-	matrix, err := e.executeHybrid(ctx, plan, results)
-	if err != nil {
-		return nil, true, err
-	}
-	return matrix, true, nil
-}
-
-// A step of 0 is an instant query: a single evaluation at end, whatever
-// start was.
-func queryGrid(start, end time.Time, step time.Duration) gridContext {
-	startMs, endMs, stepMs := start.UnixMilli(), end.UnixMilli(), step.Milliseconds()
-	if stepMs == 0 {
-		startMs = endMs
-	}
-	return gridContext{startMs: startMs, endMs: endMs, stepMs: stepMs}
-}
-
-// transpiledSeries holds one value pointer per grid point; nil is absent.
-type transpiledSeries struct {
-	lset   labels.Labels
-	values []*float64
-}
-
-func (e *executor) executeUnit(ctx context.Context, unit *coreUnit, grid gridContext) ([]transpiledSeries, error) {
-	startMs, endMs, stepMs := grid.startMs, grid.endMs, grid.stepMs
-	windowMs := unit.rangeMs
-	if unit.kind == unitInstant {
-		windowMs = e.client.lookbackMs
-	}
-	dataStart := startMs - unit.offsetMs - windowMs
-	dataEnd := endMs - unit.offsetMs
-
-	seriesQuery, seriesArgs, err := buildSeriesQuery(dataStart, dataEnd, unit.matchers)
-	if err != nil {
-		return nil, err
-	}
-	lookup, err := e.client.selectSeries(ctx, seriesQuery, seriesArgs)
-	if err != nil {
-		return nil, err
-	}
-	if len(lookup.fingerprints) == 0 {
-		return nil, nil
-	}
-
-	query, args, err := buildUnitSQL(unit, lookup.metricNames, dataStart, dataEnd, startMs, endMs, stepMs, e.client.lookbackMs)
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := e.client.telemetryStore.ClickhouseDB().Query(e.client.withContext(ctx, "transpiledUnit"), query, args...)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	// Name-dropping units keep __name__ in the SQL group key, so distinct
-	// metrics never merge server-side. The name comes off here. Two
-	// metrics can then share a labelset. The engine merges their samples
-	// into one series when they never overlap in time. It raises the
-	// duplicate-labelset error only when two samples land on the same
-	// evaluation timestamp. mergeSameLabelsetSeries reproduces exactly
-	// that.
-	stripName := !unit.hasAgg && !unit.keepsName()
-
-	// by (...) units return one plain column per grouped label. Everything
-	// else returns the single canonical JSON key (see groupKeyColumns).
-	keyNames := groupKeyColumns(unit)
-	keyVals := make([]string, max(len(keyNames), 1))
-	targets := make([]any, 0, len(keyVals)+1)
-	for i := range keyVals {
-		targets = append(targets, &keyVals[i])
-	}
-	var gridValues []*float64
-	targets = append(targets, &gridValues)
-
-	var out []transpiledSeries
-	for rows.Next() {
-		if err := rows.Scan(targets...); err != nil {
-			return nil, err
-		}
-		var lset labels.Labels
-		if keyNames != nil {
-			builder := labels.NewScratchBuilder(len(keyNames))
-			for i, name := range keyNames {
-				// An empty extracted value is the label being absent.
-				if keyVals[i] != "" {
-					builder.Add(name, keyVals[i])
-				}
-			}
-			builder.Sort()
-			lset = builder.Labels()
-		} else {
-			lset, err = labelsFromGroupKey(keyVals[0])
-			if err != nil {
-				return nil, err
-			}
-		}
-		if stripName {
-			lset = labels.NewBuilder(lset).Del(metricNameLabel).Labels()
-		}
-		values := make([]*float64, len(gridValues))
-		copy(values, gridValues)
-		applyScalarOps(unit.ops, values)
-		out = append(out, transpiledSeries{lset: lset, values: values})
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
-	if stripName {
-		if out, err = mergeSameLabelsetSeries(out); err != nil {
-			return nil, err
-		}
-	}
-	sort.Slice(out, func(i, j int) bool { return labels.Compare(out[i].lset, out[j].lset) < 0 })
-	return out, nil
-}
-
-// mergeSameLabelsetSeries combines series that a name strip left with
-// identical labelsets, slot by slot. The engine assembles its result matrix
-// by labelset. Post-strip twins whose points interleave in time are one
-// series to it. Two values on the same evaluation timestamp are its
-// duplicate-labelset error. v1 errors there too, so to silently pick one
-// value would be a divergence.
-func mergeSameLabelsetSeries(in []transpiledSeries) ([]transpiledSeries, error) {
-	index := make(map[uint64]int, len(in))
-	out := in[:0]
-	for _, s := range in {
-		hash := s.lset.Hash()
-		idx, ok := index[hash]
-		if ok && labels.Equal(out[idx].lset, s.lset) {
-			dst := out[idx].values
-			for k, v := range s.values {
-				if v == nil {
-					continue
-				}
-				if dst[k] != nil {
-					return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "vector cannot contain metrics with the same labelset")
-				}
-				dst[k] = v
-			}
-			continue
-		}
-		index[hash] = len(out)
-		out = append(out, s)
-	}
-	return out, nil
-}
-
-// labelsFromGroupKey parses the toJSONString'd sorted [key, value] pairs.
-func labelsFromGroupKey(gkey string) (labels.Labels, error) {
-	var pairs [][]string
-	if err := json.Unmarshal([]byte(gkey), &pairs); err != nil {
-		return labels.EmptyLabels(), errors.WrapInternalf(err, errors.CodeInternal, "malformed compiled group key %q", gkey)
-	}
-	builder := labels.NewScratchBuilder(len(pairs))
-	for _, p := range pairs {
-		if len(p) != 2 {
-			return labels.EmptyLabels(), errors.NewInternalf(errors.CodeInternal, "malformed compiled group key pair %q", gkey)
-		}
-		builder.Add(p[0], p[1])
-	}
-	builder.Sort()
-	return builder.Labels(), nil
-}
-
-// applyScalarOps applies the number-literal op pipeline in place, with the
-// same float64 arithmetic and comparison-filter semantics as the engine.
-func applyScalarOps(ops []scalarOp, values []*float64) {
-	for _, op := range ops {
-		for i, v := range values {
-			if v == nil {
-				continue
-			}
-			lhs, rhs := *v, op.scalar
-			if op.scalarOnLeft {
-				lhs, rhs = op.scalar, *v
-			}
-			switch op.op {
-			case parser.ADD:
-				res := lhs + rhs
-				values[i] = &res
-			case parser.SUB:
-				res := lhs - rhs
-				values[i] = &res
-			case parser.MUL:
-				res := lhs * rhs
-				values[i] = &res
-			case parser.DIV:
-				res := lhs / rhs
-				values[i] = &res
-			case parser.MOD:
-				res := math.Mod(lhs, rhs)
-				values[i] = &res
-			case parser.POW:
-				res := math.Pow(lhs, rhs)
-				values[i] = &res
-			default:
-				keep := compare(op.op, lhs, rhs)
-				switch {
-				case op.returnBool:
-					res := 0.0
-					if keep {
-						res = 1.0
-					}
-					values[i] = &res
-				case keep:
-					// Filter comparisons keep the vector-side value.
-					vec := *v
-					values[i] = &vec
-				default:
-					values[i] = nil
-				}
-			}
-		}
-	}
-}
-
-func compare(op parser.ItemType, lhs, rhs float64) bool {
-	switch op {
-	case parser.EQLC:
-		return lhs == rhs
-	case parser.NEQ:
-		return lhs != rhs
-	case parser.GTR:
-		return lhs > rhs
-	case parser.LSS:
-		return lhs < rhs
-	case parser.GTE:
-		return lhs >= rhs
-	case parser.LTE:
-		return lhs <= rhs
-	}
-	return false
-}
-
-// toMatrix converts a unit result to a promql matrix on the query grid.
-func toMatrix(series []transpiledSeries, startMs, stepMs int64) promql.Matrix {
-	matrix := make(promql.Matrix, 0, len(series))
-	for _, s := range series {
-		var floats []promql.FPoint
-		for i, v := range s.values {
-			if v == nil {
-				continue
-			}
-			floats = append(floats, promql.FPoint{T: startMs + int64(i)*stepMs, F: *v})
-		}
-		if len(floats) == 0 {
-			continue
-		}
-		matrix = append(matrix, promql.Series{Metric: s.lset, Floats: floats})
-	}
-	return matrix
-}
-
-// executeHybrid substitutes each unit's grids into the engine as synthetic
-// series. It evaluates the rewritten query over a storage that serves
-// synthetic selectors from memory and everything else from the live
-// querier. Absent grid points become stale markers, so the engine's
-// lookback cannot resurrect the previous grid point. Each unit's synthetic
-// samples sit on its own grid: the query grid, or the subquery grid for
-// units inside subqueries.
-func (e *executor) executeHybrid(ctx context.Context, plan *transpilePlan, results [][]transpiledSeries) (promql.Matrix, error) {
-	synthetic := make(map[string][]*series, len(plan.units))
-	staleMarker := math.Float64frombits(promValue.StaleNaN)
-
-	queryGrid := plan.grid
-
-	for i, unit := range plan.units {
-		g := unit.grid
-		gridLen := 1
-		if g.stepMs > 0 {
-			gridLen = int((g.endMs-g.startMs)/g.stepMs) + 1
-		}
-		list := make([]*series, 0, len(results[i]))
-		for _, cs := range results[i] {
-			builder := labels.NewBuilder(cs.lset)
-			builder.Set(metricNameLabel, unit.name)
-			s := &series{lset: builder.Labels()}
-			s.ts = make([]int64, 0, gridLen)
-			s.vs = make([]float64, 0, gridLen)
-			for idx := 0; idx < gridLen; idx++ {
-				t := g.startMs + int64(idx)*g.stepMs
-				var v float64
-				if idx < len(cs.values) && cs.values[idx] != nil {
-					v = *cs.values[idx]
-				} else {
-					v = staleMarker
-				}
-				s.ts = append(s.ts, t)
-				s.vs = append(s.vs, v)
-			}
-			list = append(list, s)
-		}
-		synthetic[unit.name] = list
-	}
-
-	hybrid := &hybridQueryable{client: e.client, synthetic: synthetic}
-
-	var qry promql.Query
-	var err error
-	if queryGrid.stepMs == 0 {
-		qry, err = e.engine.NewInstantQuery(ctx, hybrid, nil, plan.rewritten, time.UnixMilli(queryGrid.endMs))
-	} else {
-		qry, err = e.engine.NewRangeQuery(ctx, hybrid, nil, plan.rewritten, time.UnixMilli(queryGrid.startMs), time.UnixMilli(queryGrid.endMs), time.Duration(queryGrid.stepMs)*time.Millisecond)
-	}
-	if err != nil {
-		return nil, err
-	}
-	defer qry.Close()
-
-	res := qry.Exec(ctx)
-	if res.Err != nil {
-		return nil, res.Err
-	}
-
-	matrix, err := resultToMatrix(res)
-	if err != nil {
-		return nil, err
-	}
-
-	// Deep-copy before Close returns the result's slices to the engine pool,
-	// and drop the synthetic __name__ that filter comparisons preserve.
-	out := make(promql.Matrix, 0, len(matrix))
-	for _, s := range matrix {
-		lset := s.Metric
-		if name := lset.Get(metricNameLabel); len(name) >= len(syntheticNamePrefix) && name[:len(syntheticNamePrefix)] == syntheticNamePrefix {
-			builder := labels.NewBuilder(lset)
-			builder.Del(metricNameLabel)
-			lset = builder.Labels()
-		}
-		floats := make([]promql.FPoint, len(s.Floats))
-		copy(floats, s.Floats)
-		out = append(out, promql.Series{Metric: lset.Copy(), Floats: floats})
-	}
-	// The strip can leave twins: two units' outputs that only their
-	// synthetic names told apart (e.g. -metric_a or -metric_b, both {}
-	// once real names are dropped). The engine assembles its matrix by
-	// labelset. It merges such temporally-disjoint elements into one
-	// series. Reproduce that, with its duplicate error on same-timestamp
-	// overlap.
-	out, err = mergeMatrixByLabelset(out)
-	if err != nil {
-		return nil, err
-	}
-	sort.Slice(out, func(i, j int) bool { return labels.Compare(out[i].Metric, out[j].Metric) < 0 })
-	return out, nil
-}
-
-// mergeMatrixByLabelset merges series that share a labelset. It interleaves
-// their points in timestamp order. A timestamp present in both is the
-// engine's duplicate-labelset error.
-func mergeMatrixByLabelset(matrix promql.Matrix) (promql.Matrix, error) {
-	index := make(map[uint64]int, len(matrix))
-	out := matrix[:0]
-	for _, s := range matrix {
-		hash := s.Metric.Hash()
-		idx, ok := index[hash]
-		if ok && labels.Equal(out[idx].Metric, s.Metric) {
-			merged := make([]promql.FPoint, 0, len(out[idx].Floats)+len(s.Floats))
-			a, b := out[idx].Floats, s.Floats
-			for len(a) > 0 && len(b) > 0 {
-				switch {
-				case a[0].T < b[0].T:
-					merged, a = append(merged, a[0]), a[1:]
-				case b[0].T < a[0].T:
-					merged, b = append(merged, b[0]), b[1:]
-				default:
-					return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "vector cannot contain metrics with the same labelset")
-				}
-			}
-			out[idx].Floats = append(append(merged, a...), b...)
-			continue
-		}
-		index[hash] = len(out)
-		out = append(out, s)
-	}
-	return out, nil
-}
-
-func resultToMatrix(res *promql.Result) (promql.Matrix, error) {
-	switch v := res.Value.(type) {
-	case promql.Matrix:
-		return v, nil
-	case promql.Vector:
-		matrix := make(promql.Matrix, 0, len(v))
-		for _, s := range v {
-			matrix = append(matrix, promql.Series{Metric: s.Metric, Floats: []promql.FPoint{{T: s.T, F: s.F}}})
-		}
-		return matrix, nil
-	case promql.Scalar:
-		return promql.Matrix{{Metric: labels.EmptyLabels(), Floats: []promql.FPoint{{T: v.T, F: v.V}}}}, nil
-	default:
-		return nil, errors.NewInternalf(errors.CodeInternal, "unexpected hybrid result type %T", res.Value)
-	}
-}
-
-// hybridQueryable serves synthetic (compiled) selectors from memory and
-// everything else from the live storage.
-type hybridQueryable struct {
-	client    *client
-	synthetic map[string][]*series
-}
-
-func (h *hybridQueryable) Querier(mint, maxt int64) (storage.Querier, error) {
-	return &hybridQuerier{
-		querier:   querier{mint: mint, maxt: maxt, client: h.client},
-		synthetic: h.synthetic,
-	}, nil
-}
-
-type hybridQuerier struct {
-	querier
-	synthetic map[string][]*series
-}
-
-func (h *hybridQuerier) Select(ctx context.Context, sortSeries bool, hints *storage.SelectHints, matchers ...*labels.Matcher) storage.SeriesSet {
-	if name, ok := isSyntheticSelector(matchers); ok {
-		list := h.synthetic[name]
-		if sortSeries {
-			sorted := make([]*series, len(list))
-			copy(sorted, list)
-			sort.Slice(sorted, func(i, j int) bool { return labels.Compare(sorted[i].lset, sorted[j].lset) < 0 })
-			list = sorted
-		}
-		return newSeriesSet(list)
-	}
-	return h.querier.Select(ctx, sortSeries, hints, matchers...)
-}

pkg/prometheus/clickhouseprometheusv2/transpiler_sql.go

@@ -1,415 +0,0 @@
-package clickhouseprometheusv2
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/telemetryschema/metricstelemetryschema"
-	"github.com/huandu/go-sqlbuilder"
-)
-
-// experimental gate for the timeSeries*ToGrid aggregate functions; attached
-// as a SETTINGS clause so telemetrystore hooks cannot clobber it.
-const gridFunctionsSetting = "SETTINGS allow_experimental_ts_to_grid_aggregate_function = 1"
-
-var aggForEach = map[string]string{
-	"sum":   "sumForEach",
-	"min":   "minForEach",
-	"max":   "maxForEach",
-	"avg":   "avgForEach",
-	"count": "countForEach",
-}
-
-// buildUnitSQL renders the single ClickHouse statement that evaluates one
-// core unit over the [startMs, endMs] / stepMs grid. The inner level
-// computes per-series grids with a timeSeries*ToGrid aggregate, or with a
-// windowed aggregation for *_over_time. The outer level is the spatial
-// aggregation: -ForEach combinators grouped by the projected group key.
-//
-// The heavy level runs on the shards. The top-level FROM is the distributed
-// samples table. The group-key join partner is a subquery on the
-// shard-local time series table. So the shard rewrite executes the join and
-// the per-series aggregation next to the data. Fingerprint co-locality
-// makes this complete: samples and series shard on the same key. The
-// initiator only merges the per-series states and applies the spatial
-// -ForEach step. This is the same layout as the telemetrymetrics statement
-// builder. The windowed *_over_time form shares the frame but holds
-// per-bucket partials inside each series group (see windowedInner).
-//
-// The offset shifts the selector's data window. The grid indices map 1:1
-// onto the query grid: output ts = startMs + i*stepMs. Grid parameters
-// render as literals. They are aggregate-function parameters, not bindable
-// values.
-//
-// Statements nest builder-rendered SQL as text. So the returned args must
-// follow the position of each fragment in the final statement: ClickHouse
-// binds ? placeholders by position. A JOIN renders before WHERE, so a
-// joined subquery's args come before the outer query's condition args.
-//
-// Row shape: the group-key columns (see groupKeyColumns), then grid
-// Array(Nullable(Float64)). A NULL grid point is an absent point, the
-// engine's "no value here". The -ForEach combinators preserve it: an index
-// where every series is NULL aggregates to NULL, and countForEach's 0 maps
-// back to NULL.
-func buildUnitSQL(unit *coreUnit, metricNames []string, dataStart, dataEnd int64, startMs, endMs, stepMs, lookbackMs int64) (string, []any, error) {
-	selStart := startMs - unit.offsetMs
-	selEnd := endMs - unit.offsetMs
-	stepSec := stepMs / 1000
-	if stepSec == 0 {
-		// Instant query: start == end, so the grid has one point for any
-		// positive step.
-		stepSec = 1
-	}
-	windowMs := unit.rangeMs
-	if unit.kind == unitInstant {
-		windowMs = lookbackMs
-	}
-	windowSec := windowMs / 1000
-
-	adjustedTsStartU, _, _, localTsTable := metricstelemetryschema.WhichTSTableToUse(uint64(dataStart), uint64(dataEnd), false, nil)
-	adjustedTsStart := int64(adjustedTsStartU)
-	keyNames := groupKeyColumns(unit)
-
-	// seriesSub computes fingerprint -> group key columns. It reads the
-	// local series table when it rides inside the shard-rewritten samples
-	// query, and the distributed one when it joins at the initiator
-	// (windowed form).
-	seriesSub := func(table string) (string, []any, error) {
-		sub := sqlbuilder.NewSelectBuilder()
-		selects := []string{"fingerprint"}
-		if keyNames == nil {
-			selects = append(selects, groupKeyExpr(unit)+" AS gkey")
-		} else {
-			// by (...) grouping extracts exactly the listed labels as plain
-			// columns: no reason to build, sort and stringify every label
-			// pair per row when the projection is a known short list and
-			// the label names live in Go anyway.
-			for i, name := range keyNames {
-				selects = append(selects, fmt.Sprintf("JSONExtractString(labels, %s) AS g%d", sub.Var(name), i))
-			}
-		}
-		sub.Select(selects...)
-		sub.From(fmt.Sprintf("%s.%s", metricstelemetryschema.DBName, table))
-		if err := applySeriesConditions(sub, adjustedTsStart, dataEnd, unit.matchers); err != nil {
-			return "", nil, err
-		}
-		sub.GroupBy(append([]string{"fingerprint"}, keyColumnAliases(keyNames)...)...)
-		q, args := sub.BuildWithFlavor(sqlbuilder.ClickHouse)
-		return q, args, nil
-	}
-
-	// samplesConditions adds the samples-side WHERE. The group-key join
-	// restricts to the matched series; no fingerprint condition is added
-	// here.
-	samplesConditions := func(sb *sqlbuilder.SelectBuilder, excludeStale bool) {
-		switch len(metricNames) {
-		case 0:
-			// No name constraint derivable; correct but unable to use the
-			// metric_name primary-key prefix.
-		case 1:
-			sb.Where(sb.EQ("metric_name", metricNames[0]))
-		default:
-			sb.Where(sb.In("metric_name", sqlbuilder.List(metricNames)))
-		}
-		// temporality precedes metric_name in the samples primary key; the
-		// fingerprints already come from these temporalities, so this only
-		// helps granule pruning.
-		sb.Where("temporality IN ['Cumulative', 'Unspecified']")
-		// When the window is narrower than the step, the grid windows
-		// (t_k − window, t_k] cover only window/step of the timeline. A
-		// sample in a gap belongs to no window. It cannot move any grid
-		// point, but the grid aggregate buffers every row it is fed. This
-		// predicate keeps only the in-window rows. It cut a 36k-series
-		// one-week rate from 74s/28GiB to 16s/4.3GiB on fleet data: the
-		// read stays the same, and the aggregate input shrinks by the
-		// coverage ratio. The lattice anchors at selStart, because the end
-		// can sit off-lattice on unaligned grids. positiveModulo is
-		// necessary because samples above selStart make the dividend
-		// negative. The upper bound tightens to the last grid point: rows
-		// past it are equally windowless. When window >= step, the windows
-		// tile the timeline, and the plain bounds stay.
-		sliver := stepMs > 0 && windowMs > 0 && windowMs < stepMs
-		upper := selEnd
-		if sliver {
-			upper = selStart + (selEnd-selStart)/stepMs*stepMs
-		}
-		// Left-open window: a sample exactly at the window's lower boundary
-		// is never used (range selectors and lookback are both left-open).
-		sb.Where(sb.GT("unix_milli", selStart-windowMs), sb.LTE("unix_milli", upper))
-		if sliver {
-			sb.Where(fmt.Sprintf("positiveModulo(%s - unix_milli, %s) < %s",
-				sb.Var(selStart), sb.Var(stepMs), sb.Var(windowMs)))
-		}
-		if excludeStale {
-			// PromQL excludes stale markers from range vectors. Instant
-			// selectors need the stale rows for shadowing instead.
-			sb.Where("bitAnd(flags, 1) = 0")
-		}
-	}
-
-	keyCols := keyColumnAliases(keyNames)
-
-	// joinedInner builds the shard-side SELECT for the single-pass kinds:
-	// grid expression per (fingerprint, group key), group-key join against
-	// the local series table.
-	joinedInner := func(gridExpr string, excludeStale bool) (string, []any, error) {
-		seriesSQL, seriesArgs, err := seriesSub(localTsTable)
-		if err != nil {
-			return "", nil, err
-		}
-		sb := sqlbuilder.NewSelectBuilder()
-		selects := make([]string, 0, len(keyCols)+1)
-		// A fingerprint is the hash of one labelset, so every group-key
-		// column is functionally dependent on it: any() is exact, and
-		// grouping by the fingerprint alone spares hashing the joined
-		// string per sample row — measured -10-13% on a 1.9B-row rate.
-		for _, col := range keyCols {
-			selects = append(selects, fmt.Sprintf("any(series.%s) AS %s", col, col))
-		}
-		sb.Select(append(selects, gridExpr+" AS grid")...)
-		sb.From(fmt.Sprintf("%s.%s AS points", metricstelemetryschema.DBName, metricstelemetryschema.SamplesV4TableName))
-		sb.JoinWithOption(sqlbuilder.InnerJoin, fmt.Sprintf("(%s) AS series", seriesSQL), "points.fingerprint = series.fingerprint")
-		samplesConditions(sb, excludeStale)
-		sb.GroupBy("points.fingerprint")
-		q, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-		// The join text renders before WHERE: its args come first.
-		return q, append(seriesArgs, args...), nil
-	}
-
-	var inner string
-	var innerArgs []any
-	var err error
-	switch unit.kind {
-	case unitInstant:
-		// Instant selection with stale shadowing: the grid value is the last
-		// non-stale sample in (t-lookback, t], absent when the overall last
-		// sample in that window is a stale marker (verified semantics: the
-		// -If combinator applies to the grid aggregates, and NULL comparisons
-		// make a stale-latest point absent).
-		gridParams := fmt.Sprintf("(fromUnixTimestamp64Milli(%d), fromUnixTimestamp64Milli(%d), %d, %d)", selStart, selEnd, stepSec, windowSec)
-		gridExpr := fmt.Sprintf(
-			"arrayMap((tall, tok, vok) -> if(tall IS NULL OR tok IS NULL OR tall != tok, NULL, vok), timeSeriesLastToGrid%s(fromUnixTimestamp64Milli(unix_milli), toFloat64(unix_milli)), timeSeriesLastToGridIf%s(fromUnixTimestamp64Milli(unix_milli), toFloat64(unix_milli), bitAnd(flags, 1) = 0), timeSeriesLastToGridIf%s(fromUnixTimestamp64Milli(unix_milli), value, bitAnd(flags, 1) = 0))",
-			gridParams, gridParams, gridParams,
-		)
-		inner, innerArgs, err = joinedInner(gridExpr, false)
-	case unitOverTime:
-		if unit.overFn == "last" {
-			// last_over_time == last non-stale sample in the window: the
-			// stale rows are already excluded in WHERE.
-			gridExpr := fmt.Sprintf(
-				"timeSeriesLastToGrid(fromUnixTimestamp64Milli(%d), fromUnixTimestamp64Milli(%d), %d, %d)(fromUnixTimestamp64Milli(unix_milli), value)",
-				selStart, selEnd, stepSec, windowSec,
-			)
-			inner, innerArgs, err = joinedInner(gridExpr, true)
-			break
-		}
-		inner, innerArgs, err = windowedInner(unit, samplesConditions, seriesSub, keyCols, localTsTable, selStart, selEnd, stepMs, windowMs)
-	default: // unitRange
-		gridExpr := fmt.Sprintf(
-			"%s(fromUnixTimestamp64Milli(%d), fromUnixTimestamp64Milli(%d), %d, %d)(fromUnixTimestamp64Milli(unix_milli), value)",
-			gridFunction[unit.fn], selStart, selEnd, stepSec, windowSec,
-		)
-		if unit.fn == fnIncrease {
-			// increase == rate * range-seconds, exactly: extrapolatedRate
-			// divides by the range only when isRate.
-			gridExpr = fmt.Sprintf("arrayMap(x -> x * %d, %s)", windowSec, gridExpr)
-		}
-		inner, innerArgs, err = joinedInner(gridExpr, true)
-	}
-	if err != nil {
-		return "", nil, err
-	}
-
-	spatial := "maxForEach(grid)"
-	switch {
-	case !unit.hasAgg:
-		// Per-series output: one row per (labels-minus-__name__) group.
-		// Distinct fingerprints can collapse onto the same projected label
-		// set only via a regex __name__ selector over metrics with identical
-		// other labels; maxForEach is a deterministic NULL-skipping merge and
-		// the identity for the overwhelmingly common one-fingerprint group.
-	case unit.aggOp.String() == "count":
-		// count over an all-absent index is an absent point, not 0.
-		spatial = "arrayMap(c -> if(c = 0, NULL, toFloat64(c)), countForEach(grid))"
-	default:
-		spatial = fmt.Sprintf("%s(grid)", aggForEach[unit.aggOp.String()])
-	}
-
-	keyList := strings.Join(keyCols, ", ")
-	query := fmt.Sprintf("SELECT %s, %s AS grid FROM (%s) GROUP BY %s %s", keyList, spatial, inner, keyList, gridFunctionsSetting)
-	return query, innerArgs, nil
-}
-
-// groupKeyColumns returns the label names to extract as plain group-key
-// columns, or nil when the unit needs the canonical JSON key instead. Only
-// by (...) grouping qualifies: its projection is a known short list, so
-// extracting each label directly beats building, sorting and stringifying
-// every label pair per row. without and no-aggregation project a label SET
-// that varies per series — there the sorted-JSON key is load-bearing: the
-// sort is what makes two fingerprints with different stored JSON key order
-// land in one group, and the string carries the labels back out.
-func groupKeyColumns(unit *coreUnit) []string {
-	if unit.hasAgg && unit.by && len(unit.grouping) > 0 {
-		return unit.grouping
-	}
-	return nil
-}
-
-// keyColumnAliases names the group-key columns in every SELECT level: g0..gN
-// for direct extraction, the single canonical gkey otherwise.
-func keyColumnAliases(keyNames []string) []string {
-	if keyNames == nil {
-		return []string{"gkey"}
-	}
-	cols := make([]string, len(keyNames))
-	for i := range keyNames {
-		cols[i] = fmt.Sprintf("g%d", i)
-	}
-	return cols
-}
-
-// windowedInner builds the avg/min/max/sum/count _over_time form without
-// fanning samples out. It runs only when the range is a whole multiple of
-// the step (see the transpile gate), because then the window
-// (t_k - range, t_k] is exactly the union of W = range/step step buckets —
-// both are left-open on the same boundaries — so bucket membership fully
-// determines window membership. Fanning each sample into all W windows it
-// covers (ARRAY JOIN) multiplies rows by W, which at long ranges over short
-// steps is a row explosion measured in billions.
-//
-// The bucketing itself is the -Resample combinator: one group per (series,
-// group key) whose state is a fixed array of per-bucket aggregates, updated
-// in place per sample. Grouping by (series, bucket) instead — measured on a
-// 100k-series x 371-bucket workload — creates a 37M-entry hash aggregation
-// whose per-thread partial tables scale memory WITH max_threads (12 -> 48
-// GiB from 2 to 8 threads, dead at 16) and ships one row per group to the
-// initiator; the Resample form carries the same numbers in 100k compact
-// array states, like every other unit kind.
-//
-// The wrapper level slides the window: slot k combines buckets k..k+W-1 by
-// direct aggregation over at most W partials — no prefix-sum tricks, so no
-// large-minus-large cancellation against the engine's directly-summed
-// windows. A slot with zero window count is absent, which also keeps
-// min/max honest: their slices filter on the bucket counts, so an empty
-// bucket's zero-fill can never be mistaken for a value (a real sample can
-// legitimately be 0 or +Inf).
-func windowedInner(unit *coreUnit, samplesConditions func(*sqlbuilder.SelectBuilder, bool), seriesSub func(string) (string, []any, error), keyCols []string, localSeriesTable string, selStart, selEnd, stepMs, windowMs int64) (string, []any, error) {
-	effStepMs := stepMs
-	if effStepMs == 0 {
-		effStepMs = 1000
-	}
-	lastIdx := (selEnd - selStart) / effStepMs
-	gridLen := lastIdx + 1
-	w := windowMs / effStepMs
-	bucketLen := gridLen + w
-
-	// A window narrower than the step makes the windows (t_k - range, t_k]
-	// pairwise disjoint. There is nothing to slide. Each slot reads exactly
-	// its own window's aggregate. This is exact ONLY over sliver-filtered
-	// rows (samplesConditions adds the window<step predicate): the index
-	// below assigns every gap sample to the window above it, and the
-	// filter removes those samples. This needs a real step. Instant
-	// queries carry no sliver filter, so they keep the tiled form and its
-	// gates.
-	disjoint := stepMs > 0 && windowMs < stepMs
-	if disjoint {
-		w = 1
-		bucketLen = gridLen
-	}
-
-	seriesSQL, seriesArgs, err := seriesSub(localSeriesTable)
-	if err != nil {
-		return "", nil, err
-	}
-
-	// Bucket index, shifted so the earliest in-window sample lands at 0:
-	// jj = ceil((ts - selStart)/step) + W - 1, folded into one intDiv.
-	// Slot k's window is then buckets jj in [k, k+W-1]. In the disjoint
-	// form, the same ceil lands each in-window sample directly on its slot
-	// (W = 1). The numerator stays positive: the fetch floor is
-	// selStart - range > selStart - step.
-	jjShift := windowMs
-	if disjoint {
-		jjShift = effStepMs
-	}
-	jj := fmt.Sprintf("intDiv(unix_milli - %d + %d - 1, %d)", selStart, jjShift, effStepMs)
-	buckets := sqlbuilder.NewSelectBuilder()
-	selects := make([]string, 0, len(keyCols)+2)
-	// any() over the group key: exact because the key is functionally
-	// dependent on the fingerprint (see joinedInner).
-	for _, col := range keyCols {
-		selects = append(selects, fmt.Sprintf("any(series.%s) AS %s", col, col))
-	}
-	selects = append(selects, fmt.Sprintf("countResample(0, %d, 1)(value, %s) AS cnts", bucketLen, jj))
-	if unit.overFn != "count" {
-		selects = append(selects, fmt.Sprintf("%sResample(0, %d, 1)(value, %s) AS vals", map[string]string{
-			"avg": "sum",
-			"sum": "sum",
-			"min": "min",
-			"max": "max",
-		}[unit.overFn], bucketLen, jj))
-	}
-	buckets.Select(selects...)
-	buckets.From(fmt.Sprintf("%s.%s AS points", metricstelemetryschema.DBName, metricstelemetryschema.SamplesV4TableName))
-	buckets.JoinWithOption(sqlbuilder.InnerJoin, fmt.Sprintf("(%s) AS series", seriesSQL), "points.fingerprint = series.fingerprint")
-	samplesConditions(buckets, true)
-	buckets.GroupBy("points.fingerprint")
-	bucketsSQL, bucketsArgs := buckets.BuildWithFlavor(sqlbuilder.ClickHouse)
-
-	windowCnt := fmt.Sprintf("arraySum(arraySlice(cnts, k + 1, %d))", w)
-	var slot string
-	switch unit.overFn {
-	case "count":
-		slot = fmt.Sprintf("if(%s = 0, NULL, toFloat64(%s))", windowCnt, windowCnt)
-	case "sum":
-		slot = fmt.Sprintf("if(%s = 0, NULL, arraySum(arraySlice(vals, k + 1, %d)))", windowCnt, w)
-	case "avg":
-		slot = fmt.Sprintf("if(%s = 0, NULL, arraySum(arraySlice(vals, k + 1, %d)) / %s)", windowCnt, w, windowCnt)
-	case "min":
-		slot = fmt.Sprintf("if(%s = 0, NULL, arrayMin(arrayFilter((v, c) -> c > 0, arraySlice(vals, k + 1, %d), arraySlice(cnts, k + 1, %d))))", windowCnt, w, w)
-	case "max":
-		slot = fmt.Sprintf("if(%s = 0, NULL, arrayMax(arrayFilter((v, c) -> c > 0, arraySlice(vals, k + 1, %d), arraySlice(cnts, k + 1, %d))))", windowCnt, w, w)
-	}
-
-	keyList := strings.Join(keyCols, ", ")
-	inner := fmt.Sprintf(
-		"SELECT %s, arrayMap(k -> %s, range(toUInt64(%d))) AS grid FROM (%s)",
-		keyList, slot, gridLen, bucketsSQL,
-	)
-	return inner, append(seriesArgs, bucketsArgs...), nil
-}
-
-// groupKeyExpr renders the canonical JSON group key for the units whose
-// projected label SET varies per series (see groupKeyColumns): the sorted
-// [key, value] pairs of the projected labels, JSON-encoded.
-//   - by () with no labels: one constant group;
-//   - without (a, b): keep everything except the listed labels and __name__;
-//   - no aggregation: keep everything including __name__ — even when the
-//     unit drops the name from its OUTPUT, the key must keep it so distinct
-//     metrics never merge in SQL; executeUnit strips the name afterwards and
-//     turns a post-strip collision into the engine's duplicate-labelset
-//     error instead of a silently invented merge.
-func groupKeyExpr(unit *coreUnit) string {
-	// An empty label value means "label absent" in Prometheus; the stored
-	// labels JSON can carry empty attribute values, which must not become
-	// output labels or group keys.
-	pairs := "arraySort(JSONExtractKeysAndValues(labels, 'String'))"
-	if !unit.hasAgg {
-		return fmt.Sprintf("toJSONString(arrayFilter(p -> p.2 != '', %s))", pairs)
-	}
-	if unit.by {
-		// Non-empty by (...) never reaches here; groupKeyColumns extracts
-		// those labels as plain columns instead.
-		return "'[]'"
-	}
-	excluded := append([]string{metricNameLabel}, unit.grouping...)
-	return fmt.Sprintf("toJSONString(arrayFilter(p -> p.2 != '' AND p.1 NOT IN (%s), %s))", quotedList(excluded), pairs)
-}
-
-func quotedList(items []string) string {
-	quoted := make([]string, len(items))
-	for i, s := range items {
-		quoted[i] = "'" + strings.ReplaceAll(s, "'", "\\'") + "'"
-	}
-	return strings.Join(quoted, ", ")
-}