feat: handle inline edit flicker

.devenv/docker/clickhouse/compose.yaml

@@ -42,7 +42,7 @@ services:
       timeout: 5s
       retries: 3
   schema-migrator-sync:
-    image: signoz/signoz-schema-migrator:v0.129.12
+    image: signoz/signoz-schema-migrator:v0.129.7
     container_name: schema-migrator-sync
     command:
       - sync
@@ -55,7 +55,7 @@ services:
         condition: service_healthy
     restart: on-failure
   schema-migrator-async:
-    image: signoz/signoz-schema-migrator:v0.129.12
+    image: signoz/signoz-schema-migrator:v0.129.7
     container_name: schema-migrator-async
     command:
       - async

.github/CODEOWNERS

@@ -2,14 +2,10 @@
 # Owners are automatically requested for review for PRs that changes code
 # that they own.
 
-/frontend/ @YounixM @aks07
+/frontend/ @SigNoz/frontend @YounixM
 /frontend/src/container/MetricsApplication @srikanthccv
 /frontend/src/container/NewWidget/RightContainer/types.ts @srikanthccv
 
-# Onboarding
-/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.json @makeavish
-/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx @makeavish
-
 # Dashboard, Alert, Metrics, Service Map, Services
 /frontend/src/container/ListOfDashboard/ @srikanthccv
 /frontend/src/container/NewDashboard/ @srikanthccv

.github/workflows/build-community.yaml

@@ -3,8 +3,8 @@ name: build-community
 on:
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      - "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
 
 defaults:
   run:
@@ -69,13 +69,14 @@ jobs:
       GO_BUILD_CONTEXT: ./cmd/community
       GO_BUILD_FLAGS: >-
         -tags timetzdata
-        -ldflags='-s -w
+        -ldflags='-linkmode external -extldflags \"-static\" -s -w
         -X github.com/SigNoz/signoz/pkg/version.version=${{ needs.prepare.outputs.version }}
         -X github.com/SigNoz/signoz/pkg/version.variant=community
         -X github.com/SigNoz/signoz/pkg/version.hash=${{ needs.prepare.outputs.hash }}
         -X github.com/SigNoz/signoz/pkg/version.time=${{ needs.prepare.outputs.time }}
         -X github.com/SigNoz/signoz/pkg/version.branch=${{ needs.prepare.outputs.branch }}
         -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr'
+      GO_CGO_ENABLED: 1
       DOCKER_BASE_IMAGES: '{"alpine": "alpine:3.20.3"}'
       DOCKER_DOCKERFILE_PATH: ./cmd/community/Dockerfile.multi-arch
       DOCKER_MANIFEST: true

.github/workflows/build-enterprise.yaml

@@ -69,7 +69,6 @@ jobs:
           echo 'POSTHOG_KEY="${{ secrets.POSTHOG_KEY }}"' >> frontend/.env
           echo 'PYLON_APP_ID="${{ secrets.PYLON_APP_ID }}"' >> frontend/.env
           echo 'APPCUES_APP_ID="${{ secrets.APPCUES_APP_ID }}"' >> frontend/.env
-          echo 'PYLON_IDENTITY_SECRET="${{ secrets.PYLON_IDENTITY_SECRET }}"' >> frontend/.env
       - name: cache-dotenv
         uses: actions/cache@v4
         with:
@@ -85,7 +84,7 @@ jobs:
       JS_INPUT_ARTIFACT_CACHE_KEY: enterprise-dotenv-${{ github.sha }}
       JS_INPUT_ARTIFACT_PATH: frontend/.env
       JS_OUTPUT_ARTIFACT_CACHE_KEY: enterprise-jsbuild-${{ github.sha }}
-      JS_OUTPUT_ARTIFACT_PATH: frontend/build
+      JS_OUTPUT_ARTIFACT_PATH: frontend/build 
       DOCKER_BUILD: false
       DOCKER_MANIFEST: false
   go-build:
@@ -100,7 +99,7 @@ jobs:
       GO_BUILD_CONTEXT: ./cmd/enterprise
       GO_BUILD_FLAGS: >-
         -tags timetzdata
-        -ldflags='-s -w
+        -ldflags='-linkmode external -extldflags \"-static\" -s -w
         -X github.com/SigNoz/signoz/pkg/version.version=${{ needs.prepare.outputs.version }}
         -X github.com/SigNoz/signoz/pkg/version.variant=enterprise
         -X github.com/SigNoz/signoz/pkg/version.hash=${{ needs.prepare.outputs.hash }}
@@ -108,8 +107,10 @@ jobs:
         -X github.com/SigNoz/signoz/pkg/version.branch=${{ needs.prepare.outputs.branch }}
         -X github.com/SigNoz/signoz/ee/zeus.url=https://api.signoz.cloud
         -X github.com/SigNoz/signoz/ee/zeus.deprecatedURL=https://license.signoz.io
+        -X github.com/SigNoz/signoz/ee/query-service/constants.ZeusURL=https://api.signoz.cloud
         -X github.com/SigNoz/signoz/ee/query-service/constants.LicenseSignozIo=https://license.signoz.io/api/v1
         -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr'
+      GO_CGO_ENABLED: 1
       DOCKER_BASE_IMAGES: '{"alpine": "alpine:3.20.3"}'
       DOCKER_DOCKERFILE_PATH: ./cmd/enterprise/Dockerfile.multi-arch
       DOCKER_MANIFEST: true

.github/workflows/build-staging.yaml

@@ -68,7 +68,6 @@ jobs:
           echo 'TUNNEL_DOMAIN="${{ secrets.NP_TUNNEL_DOMAIN }}"' >> frontend/.env
           echo 'PYLON_APP_ID="${{ secrets.NP_PYLON_APP_ID }}"' >> frontend/.env
           echo 'APPCUES_APP_ID="${{ secrets.NP_APPCUES_APP_ID }}"' >> frontend/.env
-          echo 'PYLON_IDENTITY_SECRET="${{ secrets.NP_PYLON_IDENTITY_SECRET }}"' >> frontend/.env
       - name: cache-dotenv
         uses: actions/cache@v4
         with:
@@ -99,7 +98,7 @@ jobs:
       GO_BUILD_CONTEXT: ./cmd/enterprise
       GO_BUILD_FLAGS: >-
         -tags timetzdata
-        -ldflags='-s -w
+        -ldflags='-linkmode external -extldflags \"-static\" -s -w
         -X github.com/SigNoz/signoz/pkg/version.version=${{ needs.prepare.outputs.version }}
         -X github.com/SigNoz/signoz/pkg/version.variant=enterprise
         -X github.com/SigNoz/signoz/pkg/version.hash=${{ needs.prepare.outputs.hash }}
@@ -107,8 +106,10 @@ jobs:
         -X github.com/SigNoz/signoz/pkg/version.branch=${{ needs.prepare.outputs.branch }}
         -X github.com/SigNoz/signoz/ee/zeus.url=https://api.staging.signoz.cloud
         -X github.com/SigNoz/signoz/ee/zeus.deprecatedURL=https://license.staging.signoz.cloud
+        -X github.com/SigNoz/signoz/ee/query-service/constants.ZeusURL=https://api.staging.signoz.cloud
         -X github.com/SigNoz/signoz/ee/query-service/constants.LicenseSignozIo=https://license.staging.signoz.cloud/api/v1
         -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr'
+      GO_CGO_ENABLED: 1
       DOCKER_BASE_IMAGES: '{"alpine": "alpine:3.20.3"}'
       DOCKER_DOCKERFILE_PATH: ./cmd/enterprise/Dockerfile.multi-arch
       DOCKER_MANIFEST: true
@@ -124,4 +125,4 @@ jobs:
       GITHUB_SILENT: true
       GITHUB_REPOSITORY_NAME: charts-saas-v3-staging
       GITHUB_EVENT_NAME: releaser
-      GITHUB_EVENT_PAYLOAD: '{"deployment": "${{ needs.prepare.outputs.deployment }}", "signoz_version": "${{ needs.prepare.outputs.version }}"}'
+      GITHUB_EVENT_PAYLOAD: "{\"deployment\": \"${{ needs.prepare.outputs.deployment }}\", \"signoz_version\": \"${{ needs.prepare.outputs.version }}\"}"

.github/workflows/gor-signoz.yaml

@@ -35,7 +35,6 @@ jobs:
           echo 'POSTHOG_KEY="${{ secrets.POSTHOG_KEY }}"' >> .env
           echo 'PYLON_APP_ID="${{ secrets.PYLON_APP_ID }}"' >> .env
           echo 'APPCUES_APP_ID="${{ secrets.APPCUES_APP_ID }}"' >> .env
-          echo 'PYLON_IDENTITY_SECRET="${{ secrets.PYLON_IDENTITY_SECRET }}"' >> .env
       - name: build-frontend
         run:  make js-build
       - name: upload-frontend-artifact

.github/workflows/integrationci.yaml

@@ -17,8 +17,6 @@ jobs:
           - bootstrap
           - passwordauthn
           - callbackauthn
-          - cloudintegrations
-          - dashboard
           - querier
           - ttl
         sqlstore-provider:

.golangci.yml

@@ -1,63 +1,39 @@
-version: "2"
 linters:
-  default: none
+  default: standard
   enable:
     - bodyclose
-    - depguard
-    - errcheck
-    - forbidigo
-    - govet
-    - iface
-    - ineffassign
     - misspell
     - nilnil
     - sloglint
+    - depguard
+    - iface
     - unparam
-    - unused
-  settings:
-    depguard:
-      rules:
-        noerrors:
-          deny:
-            - pkg: errors
-              desc: Do not use errors package. Use github.com/SigNoz/signoz/pkg/errors instead.
-        nozap:
-          deny:
-            - pkg: go.uber.org/zap
-              desc: Do not use zap logger. Use slog instead.
-    forbidigo:
-      forbid:
-        - pattern: fmt.Errorf
-        - pattern: ^(fmt\.Print.*|print|println)$
-    iface:
-      enable:
-        - identical
-    sloglint:
-      no-mixed-args: true
-      kv-only: true
-      no-global: all
-      context: all
-      static-msg: true
-      key-naming-case: snake
-  exclusions:
-    generated: lax
-    presets:
-      - comments
-      - common-false-positives
-      - legacy
-      - std-error-handling
-    paths:
-      - pkg/query-service
-      - ee/query-service
-      - scripts/
-      - tmp/
-      - third_party$
-      - builtin$
-      - examples$
-formatters:
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+    - forbidigo
+
+linters-settings:
+  sloglint:
+    no-mixed-args: true
+    kv-only: true
+    no-global: all
+    context: all
+    static-msg: true
+    msg-style: lowercased
+    key-naming-case: snake
+  depguard:
+    rules:
+      nozap:
+        deny:
+          - pkg: "go.uber.org/zap"
+            desc: "Do not use zap logger. Use slog instead."
+      noerrors:
+        deny:
+          - pkg: "errors"
+            desc: "Do not use errors package. Use github.com/SigNoz/signoz/pkg/errors instead."
+  iface:
+    enable:
+      - identical
+issues:
+  exclude-dirs:
+    - "pkg/query-service"
+    - "ee/query-service"
+    - "scripts/"

Makefile

@@ -84,9 +84,10 @@ go-run-enterprise: ## Runs the enterprise go backend server
 	SIGNOZ_ALERTMANAGER_PROVIDER=signoz \
 	SIGNOZ_TELEMETRYSTORE_PROVIDER=clickhouse \
 	SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_DSN=tcp://127.0.0.1:9000 \
-	SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_CLUSTER=cluster \
 	go run -race \
-		$(GO_BUILD_CONTEXT_ENTERPRISE)/*.go server
+		$(GO_BUILD_CONTEXT_ENTERPRISE)/*.go \
+		--config ./conf/prometheus.yml \
+		--cluster cluster
 
 .PHONY: go-test
 go-test: ## Runs go unit tests
@@ -101,9 +102,10 @@ go-run-community: ## Runs the community go backend server
 	SIGNOZ_ALERTMANAGER_PROVIDER=signoz \
 	SIGNOZ_TELEMETRYSTORE_PROVIDER=clickhouse \
 	SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_DSN=tcp://127.0.0.1:9000 \
-	SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_CLUSTER=cluster \
 	go run -race \
-		$(GO_BUILD_CONTEXT_COMMUNITY)/*.go server
+		$(GO_BUILD_CONTEXT_COMMUNITY)/*.go server \
+		--config ./conf/prometheus.yml \
+		--cluster cluster
 
 .PHONY: go-build-community $(GO_BUILD_ARCHS_COMMUNITY)
 go-build-community: ## Builds the go backend server for community
@@ -112,9 +114,9 @@ $(GO_BUILD_ARCHS_COMMUNITY): go-build-community-%: $(TARGET_DIR)
 	@mkdir -p $(TARGET_DIR)/$(OS)-$*
 	@echo ">> building binary $(TARGET_DIR)/$(OS)-$*/$(NAME)-community"
 	@if [ $* = "arm64" ]; then \
-		GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_COMMUNITY) -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME)-community -ldflags "-s -w $(GO_BUILD_LDFLAGS_COMMUNITY)"; \
+		CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_COMMUNITY) -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME)-community -ldflags "-linkmode external -extldflags '-static' -s -w $(GO_BUILD_LDFLAGS_COMMUNITY)"; \
 	else \
-		GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_COMMUNITY) -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME)-community -ldflags "-s -w $(GO_BUILD_LDFLAGS_COMMUNITY)"; \
+		CGO_ENABLED=1 GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_COMMUNITY) -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME)-community -ldflags "-linkmode external -extldflags '-static' -s -w $(GO_BUILD_LDFLAGS_COMMUNITY)"; \
 	fi
 
 
@@ -125,9 +127,9 @@ $(GO_BUILD_ARCHS_ENTERPRISE): go-build-enterprise-%: $(TARGET_DIR)
 	@mkdir -p $(TARGET_DIR)/$(OS)-$*
 	@echo ">> building binary $(TARGET_DIR)/$(OS)-$*/$(NAME)"
 	@if [ $* = "arm64" ]; then \
-		GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_ENTERPRISE) -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME) -ldflags "-s -w $(GO_BUILD_LDFLAGS_ENTERPRISE)"; \
+		CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_ENTERPRISE) -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME) -ldflags "-linkmode external -extldflags '-static' -s -w $(GO_BUILD_LDFLAGS_ENTERPRISE)"; \
 	else \
-		GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_ENTERPRISE) -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME) -ldflags "-s -w $(GO_BUILD_LDFLAGS_ENTERPRISE)"; \
+		CGO_ENABLED=1 GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_ENTERPRISE) -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME) -ldflags "-linkmode external -extldflags '-static' -s -w $(GO_BUILD_LDFLAGS_ENTERPRISE)"; \
 	fi
 
 .PHONY: go-build-enterprise-race $(GO_BUILD_ARCHS_ENTERPRISE_RACE)
@@ -137,9 +139,9 @@ $(GO_BUILD_ARCHS_ENTERPRISE_RACE): go-build-enterprise-race-%: $(TARGET_DIR)
 	@mkdir -p $(TARGET_DIR)/$(OS)-$*
 	@echo ">> building binary $(TARGET_DIR)/$(OS)-$*/$(NAME)"
 	@if [ $* = "arm64" ]; then \
-		GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_ENTERPRISE) -race -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME) -ldflags "-s -w $(GO_BUILD_LDFLAGS_ENTERPRISE)"; \
+		CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_ENTERPRISE) -race -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME) -ldflags "-linkmode external -extldflags '-static' -s -w $(GO_BUILD_LDFLAGS_ENTERPRISE)"; \
 	else \
-		GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_ENTERPRISE) -race -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME) -ldflags "-s -w $(GO_BUILD_LDFLAGS_ENTERPRISE)"; \
+		CGO_ENABLED=1 GOARCH=$* GOOS=$(OS) go build -C $(GO_BUILD_CONTEXT_ENTERPRISE) -race -tags timetzdata -o $(TARGET_DIR)/$(OS)-$*/$(NAME) -ldflags "-linkmode external -extldflags '-static' -s -w $(GO_BUILD_LDFLAGS_ENTERPRISE)"; \
 	fi
 
 ##############################################################
@@ -206,4 +208,4 @@ py-lint: ## Run lint for integration tests
 
 .PHONY: py-test
 py-test: ## Runs integration tests
-	@cd tests/integration && poetry run pytest --basetemp=./tmp/ -vv --capture=no src/
+	@cd tests/integration && poetry run pytest --basetemp=./tmp/ -vv --capture=no src/

cmd/community/.goreleaser.yaml

@@ -12,6 +12,12 @@ builds:
   - id: signoz
     binary: bin/signoz
     main: ./cmd/community
+    env:
+      - CGO_ENABLED=1
+      - >-
+        {{- if eq .Os "linux" }}
+          {{- if eq .Arch "arm64" }}CC=aarch64-linux-gnu-gcc{{- end }}
+        {{- end }}
     goos:
       - linux
       - darwin
@@ -30,6 +36,8 @@ builds:
       - -X github.com/SigNoz/signoz/pkg/version.time={{ .CommitTimestamp }}
       - -X github.com/SigNoz/signoz/pkg/version.branch={{ .Branch }}
       - -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr
+      - >-
+        {{- if eq .Os "linux" }}-linkmode external -extldflags '-static'{{- end }}
     mod_timestamp: "{{ .CommitTimestamp }}"
     tags:
       - timetzdata

cmd/community/server.go

@@ -5,12 +5,9 @@ import (
 	"log/slog"
 
 	"github.com/SigNoz/signoz/cmd"
-	"github.com/SigNoz/signoz/ee/authz/openfgaauthz"
-	"github.com/SigNoz/signoz/ee/authz/openfgaschema"
 	"github.com/SigNoz/signoz/ee/sqlstore/postgressqlstore"
 	"github.com/SigNoz/signoz/pkg/analytics"
 	"github.com/SigNoz/signoz/pkg/authn"
-	"github.com/SigNoz/signoz/pkg/authz"
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/licensing"
 	"github.com/SigNoz/signoz/pkg/licensing/nooplicensing"
@@ -79,9 +76,6 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 		func(ctx context.Context, providerSettings factory.ProviderSettings, store authtypes.AuthNStore, licensing licensing.Licensing) (map[authtypes.AuthNProvider]authn.AuthN, error) {
 			return signoz.NewAuthNs(ctx, providerSettings, store, licensing)
 		},
-		func(ctx context.Context, sqlstore sqlstore.SQLStore) factory.ProviderFactory[authz.AuthZ, authz.Config] {
-			return openfgaauthz.NewProviderFactory(sqlstore, openfgaschema.NewSchema().Get(ctx))
-		},
 	)
 	if err != nil {
 		logger.ErrorContext(ctx, "failed to create signoz", "error", err)

cmd/enterprise/.goreleaser.yaml

@@ -12,6 +12,12 @@ builds:
   - id: signoz
     binary: bin/signoz
     main: ./cmd/enterprise
+    env:
+      - CGO_ENABLED=1
+      - >-
+        {{- if eq .Os "linux" }}
+          {{- if eq .Arch "arm64" }}CC=aarch64-linux-gnu-gcc{{- end }}
+        {{- end }}
     goos:
       - linux
       - darwin
@@ -31,8 +37,11 @@ builds:
       - -X github.com/SigNoz/signoz/pkg/version.branch={{ .Branch }}
       - -X github.com/SigNoz/signoz/ee/zeus.url=https://api.signoz.cloud
       - -X github.com/SigNoz/signoz/ee/zeus.deprecatedURL=https://license.signoz.io
+      - -X github.com/SigNoz/signoz/ee/query-service/constants.ZeusURL=https://api.signoz.cloud
       - -X github.com/SigNoz/signoz/ee/query-service/constants.LicenseSignozIo=https://license.signoz.io/api/v1
       - -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr
+      - >-
+        {{- if eq .Os "linux" }}-linkmode external -extldflags '-static'{{- end }}
     mod_timestamp: "{{ .CommitTimestamp }}"
     tags:
       - timetzdata

cmd/enterprise/server.go

@@ -8,8 +8,6 @@ import (
 	"github.com/SigNoz/signoz/cmd"
 	"github.com/SigNoz/signoz/ee/authn/callbackauthn/oidccallbackauthn"
 	"github.com/SigNoz/signoz/ee/authn/callbackauthn/samlcallbackauthn"
-	"github.com/SigNoz/signoz/ee/authz/openfgaauthz"
-	"github.com/SigNoz/signoz/ee/authz/openfgaschema"
 	enterpriselicensing "github.com/SigNoz/signoz/ee/licensing"
 	"github.com/SigNoz/signoz/ee/licensing/httplicensing"
 	enterpriseapp "github.com/SigNoz/signoz/ee/query-service/app"
@@ -19,7 +17,6 @@ import (
 	"github.com/SigNoz/signoz/ee/zeus/httpzeus"
 	"github.com/SigNoz/signoz/pkg/analytics"
 	"github.com/SigNoz/signoz/pkg/authn"
-	"github.com/SigNoz/signoz/pkg/authz"
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/licensing"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
@@ -108,9 +105,6 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 
 			return authNs, nil
 		},
-		func(ctx context.Context, sqlstore sqlstore.SQLStore) factory.ProviderFactory[authz.AuthZ, authz.Config] {
-			return openfgaauthz.NewProviderFactory(sqlstore, openfgaschema.NewSchema().Get(ctx))
-		},
 	)
 	if err != nil {
 		logger.ErrorContext(ctx, "failed to create signoz", "error", err)

conf/example.yaml

@@ -1,5 +1,5 @@
 ##################### SigNoz Configuration Example #####################
-#
+# 
 # Do not modify this file
 #
 
@@ -47,10 +47,10 @@ cache:
   provider: memory
   # memory: Uses in-memory caching.
   memory:
-    # Max items for the in-memory cache (10x the entries)
-    num_counters: 100000
-    # Total cost in bytes allocated bounded cache
-    max_cost: 67108864
+    # Time-to-live for cache entries in memory. Specify the duration in ns
+    ttl: 60000000000
+    # The interval at which the cache will be cleaned up
+    cleanup_interval: 1m
   # redis: Uses Redis as the caching backend.
   redis:
     # The hostname or IP address of the Redis server.
@@ -58,7 +58,7 @@ cache:
     # The port on which the Redis server is running. Default is usually 6379.
     port: 6379
     # The password for authenticating with the Redis server, if required.
-    password:
+    password: 
     # The Redis database number to use
     db: 0
 
@@ -71,10 +71,6 @@ sqlstore:
   sqlite:
     # The path to the SQLite database file.
     path: /var/lib/signoz/signoz.db
-    # Mode is the mode to use for the sqlite database.
-    mode: delete
-    # BusyTimeout is the timeout for the sqlite database to wait for a lock.
-    busy_timeout: 10s
 
 ##################### APIServer #####################
 apiserver:
@@ -242,6 +238,7 @@ statsreporter:
     # Whether to collect identities and traits (emails).
     identities: true
 
+
 ##################### Gateway (License only) #####################
 gateway:
   # The URL of the gateway's api.

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

@@ -176,7 +176,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.103.1
+    image: signoz/signoz:v0.97.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -209,7 +209,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.12
+    image: signoz/signoz-otel-collector:v0.129.7
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -233,7 +233,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.12
+    image: signoz/signoz-schema-migrator:v0.129.7
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker-swarm/docker-compose.yaml

@@ -117,7 +117,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.103.1
+    image: signoz/signoz:v0.97.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -150,7 +150,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.12
+    image: signoz/signoz-otel-collector:v0.129.7
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -176,7 +176,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.12
+    image: signoz/signoz-schema-migrator:v0.129.7
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker-swarm/otel-collector-config.yaml

@@ -1,10 +1,3 @@
-connectors:
-  signozmeter:
-    metrics_flush_interval: 1h
-    dimensions:
-      - name: service.name
-      - name: deployment.environment
-      - name: host.name
 receivers:
   otlp:
     protocols:
@@ -28,10 +21,6 @@ processors:
     send_batch_size: 10000
     send_batch_max_size: 11000
     timeout: 10s
-  batch/meter:
-    send_batch_max_size: 25000
-    send_batch_size: 20000
-    timeout: 1s
   resourcedetection:
     # Using OTEL_RESOURCE_ATTRIBUTES envvar, env detector adds custom labels.
     detectors: [env, system]
@@ -77,11 +66,6 @@ exporters:
     dsn: tcp://clickhouse:9000/signoz_logs
     timeout: 10s
     use_new_schema: true
-  signozclickhousemeter:
-    dsn: tcp://clickhouse:9000/signoz_meter
-    timeout: 45s
-    sending_queue:
-      enabled: false
 service:
   telemetry:
     logs:
@@ -93,20 +77,16 @@ service:
     traces:
       receivers: [otlp]
       processors: [signozspanmetrics/delta, batch]
-      exporters: [clickhousetraces, signozmeter]
+      exporters: [clickhousetraces]
     metrics:
       receivers: [otlp]
       processors: [batch]
-      exporters: [signozclickhousemetrics, signozmeter]
+      exporters: [signozclickhousemetrics]
     metrics/prometheus:
       receivers: [prometheus]
       processors: [batch]
-      exporters: [signozclickhousemetrics, signozmeter]
+      exporters: [signozclickhousemetrics]
     logs:
       receivers: [otlp]
       processors: [batch]
-      exporters: [clickhouselogsexporter, signozmeter]
-    metrics/meter:
-      receivers: [signozmeter]
-      processors: [batch/meter]
-      exporters: [signozclickhousemeter]
+      exporters: [clickhouselogsexporter]

deploy/docker/docker-compose.ha.yaml

@@ -179,7 +179,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.103.1}
+    image: signoz/signoz:${VERSION:-v0.97.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -213,7 +213,7 @@ services:
   # TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing?
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.12}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.7}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -239,7 +239,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.12}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.7}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -250,7 +250,7 @@ services:
         condition: service_healthy
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.12}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.7}
     container_name: schema-migrator-async
     command:
       - async

deploy/docker/docker-compose.yaml

@@ -111,7 +111,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.103.1}
+    image: signoz/signoz:${VERSION:-v0.97.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -144,7 +144,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.12}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.7}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -166,7 +166,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.12}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.7}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -178,7 +178,7 @@ services:
     restart: on-failure
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.12}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.7}
     container_name: schema-migrator-async
     command:
       - async

deploy/docker/otel-collector-config.yaml

@@ -1,10 +1,3 @@
-connectors:
-  signozmeter:
-    metrics_flush_interval: 1h
-    dimensions:
-      - name: service.name
-      - name: deployment.environment
-      - name: host.name
 receivers:
   otlp:
     protocols:
@@ -28,10 +21,6 @@ processors:
     send_batch_size: 10000
     send_batch_max_size: 11000
     timeout: 10s
-  batch/meter:
-    send_batch_max_size: 25000
-    send_batch_size: 20000
-    timeout: 1s
   resourcedetection:
     # Using OTEL_RESOURCE_ATTRIBUTES envvar, env detector adds custom labels.
     detectors: [env, system]
@@ -77,11 +66,6 @@ exporters:
     dsn: tcp://clickhouse:9000/signoz_logs
     timeout: 10s
     use_new_schema: true
-  signozclickhousemeter:
-    dsn: tcp://clickhouse:9000/signoz_meter
-    timeout: 45s
-    sending_queue:
-      enabled: false
 service:
   telemetry:
     logs:
@@ -93,20 +77,16 @@ service:
     traces:
       receivers: [otlp]
       processors: [signozspanmetrics/delta, batch]
-      exporters: [clickhousetraces, signozmeter]
+      exporters: [clickhousetraces]
     metrics:
       receivers: [otlp]
       processors: [batch]
-      exporters: [signozclickhousemetrics, signozmeter]
+      exporters: [signozclickhousemetrics]
     metrics/prometheus:
       receivers: [prometheus]
       processors: [batch]
-      exporters: [signozclickhousemetrics, signozmeter]
+      exporters: [signozclickhousemetrics]
     logs:
       receivers: [otlp]
       processors: [batch]
-      exporters: [clickhouselogsexporter, signozmeter]
-    metrics/meter:
-      receivers: [signozmeter]
-      processors: [batch/meter]
-      exporters: [signozclickhousemeter]
+      exporters: [clickhouselogsexporter]

docs/contributing/development.md

@@ -13,6 +13,8 @@ Before diving in, make sure you have these tools installed:
   - Download from [go.dev/dl](https://go.dev/dl/)
   - Check [go.mod](../../go.mod#L3) for the minimum version
 
+- **GCC** - Required for CGO dependencies
+  - Download from [gcc.gnu.org](https://gcc.gnu.org/)
 
 - **Node** - Powers our frontend
   - Download from [nodejs.org](https://nodejs.org)

docs/otel-demo-docs.md

@@ -103,19 +103,9 @@ Remember to replace the region and ingestion key with proper values as obtained
 
 Both SigNoz and OTel demo app [frontend-proxy service, to be accurate] share common port allocation at 8080. To prevent port allocation conflicts, modify the OTel demo application config to use port 8081 as the `ENVOY_PORT` value as shown below, and run docker compose command.
 
-Also, both SigNoz and OTel Demo App have the same `PROMETHEUS_PORT` configured, by default both of them try to start at `9090`, which may cause either of them to fail depending upon which one acquires it first. To prevent this, we need to mofify the value of `PROMETHEUS_PORT` too.
-
-
 ```sh
-ENVOY_PORT=8081 PROMETHEUS_PORT=9091 docker compose up -d
+ENVOY_PORT=8081 docker compose up -d
 ```
-
-Alternatively, we can modify these values using the `.env` file too, which reduces the command as just:
-
-```sh
-docker compose up -d
-```
-
 This spins up multiple microservices, with OpenTelemetry instrumentation enabled. you can verify this by,
 ```sh
 docker compose ps -a

ee/authn/callbackauthn/oidccallbackauthn/authn.go

@@ -129,12 +129,6 @@ func (a *AuthN) HandleCallback(ctx context.Context, query url.Values) (*authtype
 	return authtypes.NewCallbackIdentity("", email, authDomain.StorableAuthDomain().OrgID, state), nil
 }
 
-func (a *AuthN) ProviderInfo(ctx context.Context, authDomain *authtypes.AuthDomain) *authtypes.AuthNProviderInfo {
-	return &authtypes.AuthNProviderInfo{
-		RelayStatePath: nil,
-	}
-}
-
 func (a *AuthN) oidcProviderAndoauth2Config(ctx context.Context, siteURL *url.URL, authDomain *authtypes.AuthDomain) (*oidc.Provider, *oauth2.Config, error) {
 	if authDomain.AuthDomainConfig().OIDC.IssuerAlias != "" {
 		ctx = oidc.InsecureIssuerURLContext(ctx, authDomain.AuthDomainConfig().OIDC.IssuerAlias)

ee/authn/callbackauthn/samlcallbackauthn/authn.go

@@ -99,14 +99,6 @@ func (a *AuthN) HandleCallback(ctx context.Context, formValues url.Values) (*aut
 	return authtypes.NewCallbackIdentity("", email, authDomain.StorableAuthDomain().OrgID, state), nil
 }
 
-func (a *AuthN) ProviderInfo(ctx context.Context, authDomain *authtypes.AuthDomain) *authtypes.AuthNProviderInfo {
-	state := authtypes.NewState(&url.URL{Path: "login"}, authDomain.StorableAuthDomain().ID).URL.String()
-
-	return &authtypes.AuthNProviderInfo{
-		RelayStatePath: &state,
-	}
-}
-
 func (a *AuthN) serviceProvider(siteURL *url.URL, authDomain *authtypes.AuthDomain) (*saml2.SAMLServiceProvider, error) {
 	certStore, err := a.getCertificateStore(authDomain)
 	if err != nil {

ee/authz/openfgaauthz/provider.go

@@ -48,26 +48,7 @@ func (provider *provider) Check(ctx context.Context, tuple *openfgav1.TupleKey)
 }
 
 func (provider *provider) CheckWithTupleCreation(ctx context.Context, claims authtypes.Claims, orgID valuer.UUID, relation authtypes.Relation, _ authtypes.Relation, typeable authtypes.Typeable, selectors []authtypes.Selector) error {
-	subject, err := authtypes.NewSubject(authtypes.TypeableUser, claims.UserID, orgID, nil)
-	if err != nil {
-		return err
-	}
-
-	tuples, err := typeable.Tuples(subject, relation, selectors, orgID)
-	if err != nil {
-		return err
-	}
-
-	err = provider.BatchCheck(ctx, tuples)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (provider *provider) CheckWithTupleCreationWithoutClaims(ctx context.Context, orgID valuer.UUID, relation authtypes.Relation, _ authtypes.Relation, typeable authtypes.Typeable, selectors []authtypes.Selector) error {
-	subject, err := authtypes.NewSubject(authtypes.TypeableAnonymous, authtypes.AnonymousUser.String(), orgID, nil)
+	subject, err := authtypes.NewSubject(authtypes.TypeUser, claims.UserID, authtypes.Relation{})
 	if err != nil {
 		return err
 	}

ee/authz/openfgaschema/base.fga

@@ -15,18 +15,18 @@ type anonymous
 
 type role 
   relations
-    define assignee: [user, anonymous]
+    define assignee: [user]
 
     define read: [user, role#assignee]
     define update: [user, role#assignee]
     define delete: [user, role#assignee]
 
-type metaresources
+type resources
   relations
     define create: [user, role#assignee]
     define list: [user, role#assignee]
 
-type metaresource
+type resource
   relations
       define read: [user, anonymous, role#assignee]
       define update: [user, role#assignee]
@@ -35,6 +35,6 @@ type metaresource
       define block: [user, role#assignee]
 
 
-type telemetryresource
+type telemetry
   relations
-      define read: [user, role#assignee]
+      define read: [user, anonymous, role#assignee]

ee/licensing/config.go

@@ -1,10 +1,10 @@
 package licensing
 
 import (
+	"fmt"
 	"sync"
 	"time"
 
-	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/licensing"
 )
 
@@ -18,7 +18,7 @@ func Config(pollInterval time.Duration, failureThreshold int) licensing.Config {
 	once.Do(func() {
 		config = licensing.Config{PollInterval: pollInterval, FailureThreshold: failureThreshold}
 		if err := config.Validate(); err != nil {
-			panic(errors.WrapInternalf(err, errors.CodeInternal, "invalid licensing config"))
+			panic(fmt.Errorf("invalid licensing config: %w", err))
 		}
 	})
 

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

@@ -20,10 +20,6 @@ import (
 	basemodel "github.com/SigNoz/signoz/pkg/query-service/model"
 	rules "github.com/SigNoz/signoz/pkg/query-service/rules"
 	"github.com/SigNoz/signoz/pkg/signoz"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/dashboardtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/SigNoz/signoz/pkg/version"
 	"github.com/gorilla/mux"
 )
@@ -103,39 +99,6 @@ func (ah *APIHandler) RegisterRoutes(router *mux.Router, am *middleware.AuthZ) {
 	router.HandleFunc("/api/v1/billing", am.AdminAccess(ah.getBilling)).Methods(http.MethodGet)
 	router.HandleFunc("/api/v1/portal", am.AdminAccess(ah.LicensingAPI.Portal)).Methods(http.MethodPost)
 
-	// dashboards
-	router.HandleFunc("/api/v1/dashboards/{id}/public", am.AdminAccess(ah.Signoz.Handlers.Dashboard.CreatePublic)).Methods(http.MethodPost)
-	router.HandleFunc("/api/v1/dashboards/{id}/public", am.AdminAccess(ah.Signoz.Handlers.Dashboard.GetPublic)).Methods(http.MethodGet)
-	router.HandleFunc("/api/v1/dashboards/{id}/public", am.AdminAccess(ah.Signoz.Handlers.Dashboard.UpdatePublic)).Methods(http.MethodPut)
-	router.HandleFunc("/api/v1/dashboards/{id}/public", am.AdminAccess(ah.Signoz.Handlers.Dashboard.DeletePublic)).Methods(http.MethodDelete)
-
-	// public access for dashboards
-	router.HandleFunc("/api/v1/public/dashboards/{id}", am.CheckWithoutClaims(
-		ah.Signoz.Handlers.Dashboard.GetPublicData,
-		authtypes.RelationRead, authtypes.RelationRead,
-		dashboardtypes.TypeableMetaResourcePublicDashboard,
-		func(req *http.Request, orgs []*types.Organization) ([]authtypes.Selector, valuer.UUID, error) {
-			id, err := valuer.NewUUID(mux.Vars(req)["id"])
-			if err != nil {
-				return nil, valuer.UUID{}, err
-			}
-
-			return ah.Signoz.Modules.Dashboard.GetPublicDashboardOrgAndSelectors(req.Context(), id, orgs)
-		})).Methods(http.MethodGet)
-
-	router.HandleFunc("/api/v1/public/dashboards/{id}/widgets/{index}/query_range", am.CheckWithoutClaims(
-		ah.Signoz.Handlers.Dashboard.GetPublicWidgetQueryRange,
-		authtypes.RelationRead, authtypes.RelationRead,
-		dashboardtypes.TypeableMetaResourcePublicDashboard,
-		func(req *http.Request, orgs []*types.Organization) ([]authtypes.Selector, valuer.UUID, error) {
-			id, err := valuer.NewUUID(mux.Vars(req)["id"])
-			if err != nil {
-				return nil, valuer.UUID{}, err
-			}
-
-			return ah.Signoz.Modules.Dashboard.GetPublicDashboardOrgAndSelectors(req.Context(), id, orgs)
-		})).Methods(http.MethodGet)
-
 	// v3
 	router.HandleFunc("/api/v3/licenses", am.AdminAccess(ah.LicensingAPI.Activate)).Methods(http.MethodPost)
 	router.HandleFunc("/api/v3/licenses", am.AdminAccess(ah.LicensingAPI.Refresh)).Methods(http.MethodPut)

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

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/SigNoz/signoz/ee/query-service/constants"
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/http/render"
 	"github.com/SigNoz/signoz/pkg/modules/user"
@@ -76,7 +77,7 @@ func (ah *APIHandler) CloudIntegrationsGenerateConnectionParams(w http.ResponseW
 		return
 	}
 
-	ingestionUrl, signozApiUrl, apiErr := ah.getIngestionUrlAndSigNozAPIUrl(r.Context(), license.Key)
+	ingestionUrl, signozApiUrl, apiErr := getIngestionUrlAndSigNozAPIUrl(r.Context(), license.Key)
 	if apiErr != nil {
 		RespondError(w, basemodel.WrapApiError(
 			apiErr, "couldn't deduce ingestion url and signoz api url",
@@ -185,37 +186,48 @@ func (ah *APIHandler) getOrCreateCloudIntegrationUser(
 	return cloudIntegrationUser, nil
 }
 
-func (ah *APIHandler) getIngestionUrlAndSigNozAPIUrl(ctx context.Context, licenseKey string) (
+func getIngestionUrlAndSigNozAPIUrl(ctx context.Context, licenseKey string) (
 	string, string, *basemodel.ApiError,
 ) {
-	// TODO: remove this struct from here
+	url := fmt.Sprintf(
+		"%s%s",
+		strings.TrimSuffix(constants.ZeusURL, "/"),
+		"/v2/deployments/me",
+	)
+
 	type deploymentResponse struct {
-		Name        string `json:"name"`
-		ClusterInfo struct {
-			Region struct {
-				DNS string `json:"dns"`
-			} `json:"region"`
-		} `json:"cluster"`
+		Status string `json:"status"`
+		Error  string `json:"error"`
+		Data   struct {
+			Name string `json:"name"`
+
+			ClusterInfo struct {
+				Region struct {
+					DNS string `json:"dns"`
+				} `json:"region"`
+			} `json:"cluster"`
+		} `json:"data"`
 	}
 
-	respBytes, err := ah.Signoz.Zeus.GetDeployment(ctx, licenseKey)
-	if err != nil {
+	resp, apiErr := requestAndParseResponse[deploymentResponse](
+		ctx, url, map[string]string{"X-Signoz-Cloud-Api-Key": licenseKey}, nil,
+	)
+
+	if apiErr != nil {
+		return "", "", basemodel.WrapApiError(
+			apiErr, "couldn't query for deployment info",
+		)
+	}
+
+	if resp.Status != "success" {
 		return "", "", basemodel.InternalError(fmt.Errorf(
-			"couldn't query for deployment info: error: %w", err,
+			"couldn't query for deployment info: status: %s, error: %s",
+			resp.Status, resp.Error,
 		))
 	}
 
-	resp := new(deploymentResponse)
-
-	err = json.Unmarshal(respBytes, resp)
-	if err != nil {
-		return "", "", basemodel.InternalError(fmt.Errorf(
-			"couldn't unmarshal deployment info response: error: %w", err,
-		))
-	}
-
-	regionDns := resp.ClusterInfo.Region.DNS
-	deploymentName := resp.Name
+	regionDns := resp.Data.ClusterInfo.Region.DNS
+	deploymentName := resp.Data.Name
 
 	if len(regionDns) < 1 || len(deploymentName) < 1 {
 		// Fail early if actual response structure and expectation here ever diverge

ee/query-service/app/server.go

@@ -9,7 +9,6 @@ import (
 	_ "net/http/pprof" // http profiler
 	"slices"
 
-	"github.com/SigNoz/signoz/pkg/cache/memorycache"
 	"github.com/SigNoz/signoz/pkg/ruler/rulestore/sqlrulestore"
 	"go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux"
 	"go.opentelemetry.io/otel/propagation"
@@ -75,26 +74,13 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz) (*Server, error) {
 		return nil, err
 	}
 
-	cacheForTraceDetail, err := memorycache.New(context.TODO(), signoz.Instrumentation.ToProviderSettings(), cache.Config{
-		Provider: "memory",
-		Memory: cache.Memory{
-			NumCounters: 10 * 10000,
-			MaxCost:     1 << 27, // 128 MB
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-
 	reader := clickhouseReader.NewReader(
 		signoz.SQLStore,
 		signoz.TelemetryStore,
 		signoz.Prometheus,
 		signoz.TelemetryStore.Cluster(),
 		config.Querier.FluxInterval,
-		cacheForTraceDetail,
 		signoz.Cache,
-		nil,
 	)
 
 	rm, err := makeRulesManager(
@@ -206,7 +192,7 @@ func (s Server) HealthCheckStatus() chan healthcheck.Status {
 
 func (s *Server) createPublicServer(apiHandler *api.APIHandler, web web.Web) (*http.Server, error) {
 	r := baseapp.NewRouter()
-	am := middleware.NewAuthZ(s.signoz.Instrumentation.Logger(), s.signoz.Modules.OrgGetter, s.signoz.Authz)
+	am := middleware.NewAuthZ(s.signoz.Instrumentation.Logger())
 
 	r.Use(otelmux.Middleware(
 		"apiserver",

ee/query-service/constants/constants.go

@@ -10,6 +10,9 @@ var SaasSegmentKey = GetOrDefaultEnv("SIGNOZ_SAAS_SEGMENT_KEY", "")
 var FetchFeatures = GetOrDefaultEnv("FETCH_FEATURES", "false")
 var ZeusFeaturesURL = GetOrDefaultEnv("ZEUS_FEATURES_URL", "ZeusFeaturesURL")
 
+// this is set via build time variable
+var ZeusURL = "https://api.signoz.cloud"
+
 func GetOrDefaultEnv(key string, fallback string) string {
 	v := os.Getenv(key)
 	if len(v) == 0 {

ee/query-service/rules/anomaly.go

@@ -246,9 +246,7 @@ func (r *AnomalyRule) buildAndRunQuery(ctx context.Context, orgID valuer.UUID, t
 				continue
 			}
 		}
-		results, err := r.Threshold.Eval(*series, r.Unit(), ruletypes.EvalData{
-			ActiveAlerts: r.ActiveAlertsLabelFP(),
-		})
+		results, err := r.Threshold.ShouldAlert(*series, r.Unit())
 		if err != nil {
 			return nil, err
 		}
@@ -298,9 +296,7 @@ func (r *AnomalyRule) buildAndRunQueryV5(ctx context.Context, orgID valuer.UUID,
 				continue
 			}
 		}
-		results, err := r.Threshold.Eval(*series, r.Unit(), ruletypes.EvalData{
-			ActiveAlerts: r.ActiveAlertsLabelFP(),
-		})
+		results, err := r.Threshold.ShouldAlert(*series, r.Unit())
 		if err != nil {
 			return nil, err
 		}
@@ -414,7 +410,6 @@ func (r *AnomalyRule) Eval(ctx context.Context, ts time.Time) (interface{}, erro
 			GeneratorURL:      r.GeneratorURL(),
 			Receivers:         ruleReceiverMap[lbs.Map()[ruletypes.LabelThresholdName]],
 			Missing:           smpl.IsMissing,
-			IsRecovering:      smpl.IsRecovering,
 		}
 	}
 
@@ -427,9 +422,6 @@ func (r *AnomalyRule) Eval(ctx context.Context, ts time.Time) (interface{}, erro
 
 			alert.Value = a.Value
 			alert.Annotations = a.Annotations
-			// Update the recovering and missing state of existing alert
-			alert.IsRecovering = a.IsRecovering
-			alert.Missing = a.Missing
 			if v, ok := alert.Labels.Map()[ruletypes.LabelThresholdName]; ok {
 				alert.Receivers = ruleReceiverMap[v]
 			}
@@ -488,30 +480,6 @@ func (r *AnomalyRule) Eval(ctx context.Context, ts time.Time) (interface{}, erro
 				Value:        a.Value,
 			})
 		}
-
-		// We need to change firing alert to recovering if the returned sample meets recovery threshold
-		changeFiringToRecovering := a.State == model.StateFiring && a.IsRecovering
-		// We need to change recovering alerts to firing if the returned sample meets target threshold
-		changeRecoveringToFiring := a.State == model.StateRecovering && !a.IsRecovering && !a.Missing
-		// in any of the above case we need to update the status of alert
-		if changeFiringToRecovering || changeRecoveringToFiring {
-			state := model.StateRecovering
-			if changeRecoveringToFiring {
-				state = model.StateFiring
-			}
-			a.State = state
-			r.logger.DebugContext(ctx, "converting alert state", "name", r.Name(), "state", state)
-			itemsToAdd = append(itemsToAdd, model.RuleStateHistory{
-				RuleID:       r.ID(),
-				RuleName:     r.Name(),
-				State:        state,
-				StateChanged: true,
-				UnixMilli:    ts.UnixMilli(),
-				Labels:       model.LabelsString(labelsJSON),
-				Fingerprint:  a.QueryResultLables.Hash(),
-				Value:        a.Value,
-			})
-		}
 	}
 
 	currentState := r.State()

ee/sqlschema/postgressqlschema/formatter.go

@@ -30,8 +30,6 @@ func (formatter Formatter) DataTypeOf(dataType string) sqlschema.DataType {
 		return sqlschema.DataTypeBoolean
 	case "VARCHAR", "CHARACTER VARYING", "CHARACTER":
 		return sqlschema.DataTypeText
-	case "BYTEA":
-		return sqlschema.DataTypeBytea
 	}
 
 	return formatter.Formatter.DataTypeOf(dataType)

ee/sqlschema/postgressqlschema/provider.go

@@ -2,7 +2,6 @@ package postgressqlschema
 
 import (
 	"context"
-	"database/sql"
 
 	"github.com/SigNoz/signoz/pkg/factory"
 	"github.com/SigNoz/signoz/pkg/sqlschema"
@@ -48,45 +47,50 @@ func (provider *provider) Operator() sqlschema.SQLOperator {
 }
 
 func (provider *provider) GetTable(ctx context.Context, tableName sqlschema.TableName) (*sqlschema.Table, []*sqlschema.UniqueConstraint, error) {
-	columns := []struct {
-		ColumnName  string  `bun:"column_name"`
-		Nullable    bool    `bun:"nullable"`
-		SQLDataType string  `bun:"udt_name"`
-		DefaultVal  *string `bun:"column_default"`
-	}{}
-
-	err := provider.
+	rows, err := provider.
 		sqlstore.
 		BunDB().
-		NewRaw(`
+		QueryContext(ctx, `
 SELECT 
     c.column_name, 
-	c.is_nullable = 'YES' as nullable, 
+	c.is_nullable = 'YES', 
 	c.udt_name, 
 	c.column_default 
 FROM 
     information_schema.columns AS c
 WHERE
-    c.table_name = ?`, string(tableName)).
-		Scan(ctx, &columns)
+    c.table_name = ?`, string(tableName))
 	if err != nil {
 		return nil, nil, err
 	}
-	if len(columns) == 0 {
-		return nil, nil, sql.ErrNoRows
-	}
 
-	sqlschemaColumns := make([]*sqlschema.Column, 0)
-	for _, column := range columns {
-		columnDefault := ""
-		if column.DefaultVal != nil {
-			columnDefault = *column.DefaultVal
+	defer func() {
+		if err := rows.Close(); err != nil {
+			provider.settings.Logger().ErrorContext(ctx, "error closing rows", "error", err)
+		}
+	}()
+
+	columns := make([]*sqlschema.Column, 0)
+	for rows.Next() {
+		var (
+			name        string
+			sqlDataType string
+			nullable    bool
+			defaultVal  *string
+		)
+		if err := rows.Scan(&name, &nullable, &sqlDataType, &defaultVal); err != nil {
+			return nil, nil, err
 		}
 
-		sqlschemaColumns = append(sqlschemaColumns, &sqlschema.Column{
-			Name:     sqlschema.ColumnName(column.ColumnName),
-			Nullable: column.Nullable,
-			DataType: provider.fmter.DataTypeOf(column.SQLDataType),
+		columnDefault := ""
+		if defaultVal != nil {
+			columnDefault = *defaultVal
+		}
+
+		columns = append(columns, &sqlschema.Column{
+			Name:     sqlschema.ColumnName(name),
+			Nullable: nullable,
+			DataType: provider.fmter.DataTypeOf(sqlDataType),
 			Default:  columnDefault,
 		})
 	}
@@ -204,7 +208,7 @@ WHERE
 
 	return &sqlschema.Table{
 		Name:                  tableName,
-		Columns:               sqlschemaColumns,
+		Columns:               columns,
 		PrimaryKeyConstraint:  primaryKeyConstraint,
 		ForeignKeyConstraints: foreignKeyConstraints,
 	}, uniqueConstraints, nil

ee/sqlstore/postgressqlstore/formatter.go

@@ -1,153 +0,0 @@
-package postgressqlstore
-
-import (
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/uptrace/bun/schema"
-)
-
-type formatter struct {
-	bunf schema.Formatter
-}
-
-func newFormatter(dialect schema.Dialect) sqlstore.SQLFormatter {
-	return &formatter{bunf: schema.NewFormatter(dialect)}
-}
-
-func (f *formatter) JSONExtractString(column, path string) []byte {
-	var sql []byte
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgres(path)...)
-	return sql
-}
-
-func (f *formatter) JSONType(column, path string) []byte {
-	var sql []byte
-	sql = append(sql, "jsonb_typeof("...)
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgresWithMode(path, false)...)
-	sql = append(sql, ')')
-	return sql
-}
-
-func (f *formatter) JSONIsArray(column, path string) []byte {
-	var sql []byte
-	sql = append(sql, f.JSONType(column, path)...)
-	sql = append(sql, " = "...)
-	sql = schema.Append(f.bunf, sql, "array")
-	return sql
-}
-
-func (f *formatter) JSONArrayElements(column, path, alias string) ([]byte, []byte) {
-	var sql []byte
-	sql = append(sql, "jsonb_array_elements("...)
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgresWithMode(path, false)...)
-	sql = append(sql, ") AS "...)
-	sql = f.bunf.AppendIdent(sql, alias)
-
-	return sql, []byte(alias)
-}
-
-func (f *formatter) JSONArrayOfStrings(column, path, alias string) ([]byte, []byte) {
-	var sql []byte
-	sql = append(sql, "jsonb_array_elements_text("...)
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgresWithMode(path, false)...)
-	sql = append(sql, ") AS "...)
-	sql = f.bunf.AppendIdent(sql, alias)
-
-	return sql, append([]byte(alias), "::text"...)
-}
-
-func (f *formatter) JSONKeys(column, path, alias string) ([]byte, []byte) {
-	var sql []byte
-	sql = append(sql, "jsonb_each("...)
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgresWithMode(path, false)...)
-	sql = append(sql, ") AS "...)
-	sql = f.bunf.AppendIdent(sql, alias)
-
-	return sql, append([]byte(alias), ".key"...)
-}
-
-func (f *formatter) JSONArrayAgg(expression string) []byte {
-	var sql []byte
-	sql = append(sql, "jsonb_agg("...)
-	sql = append(sql, expression...)
-	sql = append(sql, ')')
-	return sql
-}
-
-func (f *formatter) JSONArrayLiteral(values ...string) []byte {
-	var sql []byte
-	sql = append(sql, "jsonb_build_array("...)
-	for idx, value := range values {
-		if idx > 0 {
-			sql = append(sql, ", "...)
-		}
-		sql = schema.Append(f.bunf, sql, value)
-	}
-	sql = append(sql, ')')
-	return sql
-}
-
-func (f *formatter) TextToJsonColumn(column string) []byte {
-	var sql []byte
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, "::jsonb"...)
-	return sql
-}
-
-func (f *formatter) convertJSONPathToPostgres(jsonPath string) []byte {
-	return f.convertJSONPathToPostgresWithMode(jsonPath, true)
-}
-
-func (f *formatter) convertJSONPathToPostgresWithMode(jsonPath string, asText bool) []byte {
-	path := strings.TrimPrefix(strings.TrimPrefix(jsonPath, "$"), ".")
-
-	if path == "" {
-		return nil
-	}
-
-	parts := strings.Split(path, ".")
-
-	var validParts []string
-	for _, part := range parts {
-		if part != "" {
-			validParts = append(validParts, part)
-		}
-	}
-
-	if len(validParts) == 0 {
-		return nil
-	}
-
-	var result []byte
-
-	for idx, part := range validParts {
-		if idx == len(validParts)-1 {
-			if asText {
-				result = append(result, "->>"...)
-			} else {
-				result = append(result, "->"...)
-			}
-			result = schema.Append(f.bunf, result, part)
-			return result
-		}
-
-		result = append(result, "->"...)
-		result = schema.Append(f.bunf, result, part)
-	}
-
-	return result
-}
-
-func (f *formatter) LowerExpression(expression string) []byte {
-	var sql []byte
-	sql = append(sql, "lower("...)
-	sql = append(sql, expression...)
-	sql = append(sql, ')')
-	return sql
-}

ee/sqlstore/postgressqlstore/formatter_test.go

@@ -1,500 +0,0 @@
-package postgressqlstore
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/uptrace/bun/dialect/pgdialect"
-)
-
-func TestJSONExtractString(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		expected string
-	}{
-		{
-			name:     "simple path",
-			column:   "data",
-			path:     "$.field",
-			expected: `"data"->>'field'`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.user.name",
-			expected: `"metadata"->'user'->>'name'`,
-		},
-		{
-			name:     "deeply nested path",
-			column:   "json_col",
-			path:     "$.level1.level2.level3",
-			expected: `"json_col"->'level1'->'level2'->>'level3'`,
-		},
-		{
-			name:     "root path",
-			column:   "json_col",
-			path:     "$",
-			expected: `"json_col"`,
-		},
-		{
-			name:     "empty path",
-			column:   "data",
-			path:     "",
-			expected: `"data"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONExtractString(tt.column, tt.path))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestJSONType(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		expected string
-	}{
-		{
-			name:     "simple path",
-			column:   "data",
-			path:     "$.field",
-			expected: `jsonb_typeof("data"->'field')`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.user.age",
-			expected: `jsonb_typeof("metadata"->'user'->'age')`,
-		},
-		{
-			name:     "root path",
-			column:   "json_col",
-			path:     "$",
-			expected: `jsonb_typeof("json_col")`,
-		},
-		{
-			name:     "empty path",
-			column:   "data",
-			path:     "",
-			expected: `jsonb_typeof("data")`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONType(tt.column, tt.path))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestJSONIsArray(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		expected string
-	}{
-		{
-			name:     "simple path",
-			column:   "data",
-			path:     "$.items",
-			expected: `jsonb_typeof("data"->'items') = 'array'`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.user.tags",
-			expected: `jsonb_typeof("metadata"->'user'->'tags') = 'array'`,
-		},
-		{
-			name:     "root path",
-			column:   "json_col",
-			path:     "$",
-			expected: `jsonb_typeof("json_col") = 'array'`,
-		},
-		{
-			name:     "empty path",
-			column:   "data",
-			path:     "",
-			expected: `jsonb_typeof("data") = 'array'`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONIsArray(tt.column, tt.path))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestJSONArrayElements(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		alias    string
-		expected string
-	}{
-		{
-			name:     "root path with dollar sign",
-			column:   "data",
-			path:     "$",
-			alias:    "elem",
-			expected: `jsonb_array_elements("data") AS "elem"`,
-		},
-		{
-			name:     "root path empty",
-			column:   "data",
-			path:     "",
-			alias:    "elem",
-			expected: `jsonb_array_elements("data") AS "elem"`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.items",
-			alias:    "item",
-			expected: `jsonb_array_elements("metadata"->'items') AS "item"`,
-		},
-		{
-			name:     "deeply nested path",
-			column:   "json_col",
-			path:     "$.user.tags",
-			alias:    "tag",
-			expected: `jsonb_array_elements("json_col"->'user'->'tags') AS "tag"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got, _ := f.JSONArrayElements(tt.column, tt.path, tt.alias)
-			assert.Equal(t, tt.expected, string(got))
-		})
-	}
-}
-
-func TestJSONArrayOfStrings(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		alias    string
-		expected string
-	}{
-		{
-			name:     "root path with dollar sign",
-			column:   "data",
-			path:     "$",
-			alias:    "str",
-			expected: `jsonb_array_elements_text("data") AS "str"`,
-		},
-		{
-			name:     "root path empty",
-			column:   "data",
-			path:     "",
-			alias:    "str",
-			expected: `jsonb_array_elements_text("data") AS "str"`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.strings",
-			alias:    "s",
-			expected: `jsonb_array_elements_text("metadata"->'strings') AS "s"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got, _ := f.JSONArrayOfStrings(tt.column, tt.path, tt.alias)
-			assert.Equal(t, tt.expected, string(got))
-		})
-	}
-}
-
-func TestJSONKeys(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		alias    string
-		expected string
-	}{
-		{
-			name:     "root path with dollar sign",
-			column:   "data",
-			path:     "$",
-			alias:    "k",
-			expected: `jsonb_each("data") AS "k"`,
-		},
-		{
-			name:     "root path empty",
-			column:   "data",
-			path:     "",
-			alias:    "k",
-			expected: `jsonb_each("data") AS "k"`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.object",
-			alias:    "key",
-			expected: `jsonb_each("metadata"->'object') AS "key"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got, _ := f.JSONKeys(tt.column, tt.path, tt.alias)
-			assert.Equal(t, tt.expected, string(got))
-		})
-	}
-}
-
-func TestJSONArrayAgg(t *testing.T) {
-	tests := []struct {
-		name       string
-		expression string
-		expected   string
-	}{
-		{
-			name:       "simple column",
-			expression: "id",
-			expected:   "jsonb_agg(id)",
-		},
-		{
-			name:       "expression with function",
-			expression: "DISTINCT name",
-			expected:   "jsonb_agg(DISTINCT name)",
-		},
-		{
-			name:       "complex expression",
-			expression: "data->>'field'",
-			expected:   "jsonb_agg(data->>'field')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONArrayAgg(tt.expression))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestJSONArrayLiteral(t *testing.T) {
-	tests := []struct {
-		name     string
-		values   []string
-		expected string
-	}{
-		{
-			name:     "empty array",
-			values:   []string{},
-			expected: "jsonb_build_array()",
-		},
-		{
-			name:     "single value",
-			values:   []string{"value1"},
-			expected: "jsonb_build_array('value1')",
-		},
-		{
-			name:     "multiple values",
-			values:   []string{"value1", "value2", "value3"},
-			expected: "jsonb_build_array('value1', 'value2', 'value3')",
-		},
-		{
-			name:     "values with special characters",
-			values:   []string{"test", "with space", "with-dash"},
-			expected: "jsonb_build_array('test', 'with space', 'with-dash')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONArrayLiteral(tt.values...))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestConvertJSONPathToPostgresWithMode(t *testing.T) {
-	tests := []struct {
-		name     string
-		jsonPath string
-		asText   bool
-		expected string
-	}{
-		{
-			name:     "simple path as text",
-			jsonPath: "$.field",
-			asText:   true,
-			expected: "->>'field'",
-		},
-		{
-			name:     "simple path as json",
-			jsonPath: "$.field",
-			asText:   false,
-			expected: "->'field'",
-		},
-		{
-			name:     "nested path as text",
-			jsonPath: "$.user.name",
-			asText:   true,
-			expected: "->'user'->>'name'",
-		},
-		{
-			name:     "nested path as json",
-			jsonPath: "$.user.name",
-			asText:   false,
-			expected: "->'user'->'name'",
-		},
-		{
-			name:     "deeply nested as text",
-			jsonPath: "$.a.b.c.d",
-			asText:   true,
-			expected: "->'a'->'b'->'c'->>'d'",
-		},
-		{
-			name:     "root path",
-			jsonPath: "$",
-			asText:   true,
-			expected: "",
-		},
-		{
-			name:     "empty path",
-			jsonPath: "",
-			asText:   true,
-			expected: "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New()).(*formatter)
-			got := string(f.convertJSONPathToPostgresWithMode(tt.jsonPath, tt.asText))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestTextToJsonColumn(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		expected string
-	}{
-		{
-			name:     "simple column name",
-			column:   "data",
-			expected: `"data"::jsonb`,
-		},
-		{
-			name:     "column with underscore",
-			column:   "user_data",
-			expected: `"user_data"::jsonb`,
-		},
-		{
-			name:     "column with special characters",
-			column:   "json-col",
-			expected: `"json-col"::jsonb`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.TextToJsonColumn(tt.column))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestLowerExpression(t *testing.T) {
-	tests := []struct {
-		name     string
-		expr     string
-		expected string
-	}{
-		{
-			name:     "simple column name",
-			expr:     "name",
-			expected: "lower(name)",
-		},
-		{
-			name:     "quoted column identifier",
-			expr:     `"column_name"`,
-			expected: `lower("column_name")`,
-		},
-		{
-			name:     "jsonb text extraction",
-			expr:     "data->>'field'",
-			expected: "lower(data->>'field')",
-		},
-		{
-			name:     "nested jsonb extraction",
-			expr:     "metadata->'user'->>'name'",
-			expected: "lower(metadata->'user'->>'name')",
-		},
-		{
-			name:     "jsonb_typeof expression",
-			expr:     "jsonb_typeof(data->'field')",
-			expected: "lower(jsonb_typeof(data->'field'))",
-		},
-		{
-			name:     "string concatenation",
-			expr:     "first_name || ' ' || last_name",
-			expected: "lower(first_name || ' ' || last_name)",
-		},
-		{
-			name:     "CAST expression",
-			expr:     "CAST(value AS TEXT)",
-			expected: "lower(CAST(value AS TEXT))",
-		},
-		{
-			name:     "COALESCE expression",
-			expr:     "COALESCE(name, 'default')",
-			expected: "lower(COALESCE(name, 'default'))",
-		},
-		{
-			name:     "subquery column",
-			expr:     "users.email",
-			expected: "lower(users.email)",
-		},
-		{
-			name:     "quoted identifier with special chars",
-			expr:     `"user-name"`,
-			expected: `lower("user-name")`,
-		},
-		{
-			name:     "jsonb to text cast",
-			expr:     "data::text",
-			expected: "lower(data::text)",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.LowerExpression(tt.expr))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}

ee/sqlstore/postgressqlstore/provider.go

@@ -15,11 +15,10 @@ import (
 )
 
 type provider struct {
-	settings  factory.ScopedProviderSettings
-	sqldb     *sql.DB
-	bundb     *sqlstore.BunDB
-	dialect   *dialect
-	formatter sqlstore.SQLFormatter
+	settings factory.ScopedProviderSettings
+	sqldb    *sql.DB
+	bundb    *sqlstore.BunDB
+	dialect  *dialect
 }
 
 func NewFactory(hookFactories ...factory.ProviderFactory[sqlstore.SQLStoreHook, sqlstore.Config]) factory.ProviderFactory[sqlstore.SQLStore, sqlstore.Config] {
@@ -56,14 +55,11 @@ func New(ctx context.Context, providerSettings factory.ProviderSettings, config
 
 	sqldb := stdlib.OpenDBFromPool(pool)
 
-	pgDialect := pgdialect.New()
-	bunDB := sqlstore.NewBunDB(settings, sqldb, pgDialect, hooks)
 	return &provider{
-		settings:  settings,
-		sqldb:     sqldb,
-		bundb:     bunDB,
-		dialect:   new(dialect),
-		formatter: newFormatter(bunDB.Dialect()),
+		settings: settings,
+		sqldb:    sqldb,
+		bundb:    sqlstore.NewBunDB(settings, sqldb, pgdialect.New(), hooks),
+		dialect:  new(dialect),
 	}, nil
 }
 
@@ -79,10 +75,6 @@ func (provider *provider) Dialect() sqlstore.SQLDialect {
 	return provider.dialect
 }
 
-func (provider *provider) Formatter() sqlstore.SQLFormatter {
-	return provider.formatter
-}
-
 func (provider *provider) BunDBCtx(ctx context.Context) bun.IDB {
 	return provider.bundb.BunDBCtx(ctx)
 }

ee/zeus/config.go

@@ -1,10 +1,10 @@
 package zeus
 
 import (
+	"fmt"
 	neturl "net/url"
 	"sync"
 
-	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/zeus"
 )
 
@@ -24,17 +24,17 @@ func Config() zeus.Config {
 	once.Do(func() {
 		parsedURL, err := neturl.Parse(url)
 		if err != nil {
-			panic(errors.WrapInternalf(err, errors.CodeInternal, "invalid zeus URL"))
+			panic(fmt.Errorf("invalid zeus URL: %w", err))
 		}
 
 		deprecatedParsedURL, err := neturl.Parse(deprecatedURL)
 		if err != nil {
-			panic(errors.WrapInternalf(err, errors.CodeInternal, "invalid zeus deprecated URL"))
+			panic(fmt.Errorf("invalid zeus deprecated URL: %w", err))
 		}
 
 		config = zeus.Config{URL: parsedURL, DeprecatedURL: deprecatedParsedURL}
 		if err := config.Validate(); err != nil {
-			panic(errors.WrapInternalf(err, errors.CodeInternal, "invalid zeus config"))
+			panic(fmt.Errorf("invalid zeus config: %w", err))
 		}
 	})
 

frontend/.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
-	ignorePatterns: ['src/parser/*.ts', 'scripts/update-registry.js'],
+	ignorePatterns: ['src/parser/*.ts'],
 	env: {
 		browser: true,
 		es2021: true,

frontend/example.env

@@ -3,6 +3,5 @@ BUNDLE_ANALYSER="true"
 FRONTEND_API_ENDPOINT="http://localhost:8080/"
 PYLON_APP_ID="pylon-app-id"
 APPCUES_APP_ID="appcess-app-id"
-PYLON_IDENTITY_SECRET="pylon-identity-secret"
 
 CI="1"

frontend/package.json

@@ -14,7 +14,7 @@
 		"jest": "jest",
 		"jest:coverage": "jest --coverage",
 		"jest:watch": "jest --watch",
-		"postinstall": "yarn i18n:generate-hash && (is-ci || yarn husky:configure)  && node scripts/update-registry.js",
+		"postinstall": "yarn i18n:generate-hash && (is-ci || yarn husky:configure)",
 		"husky:configure": "cd .. && husky install frontend/.husky && cd frontend && chmod ug+x .husky/*",
 		"commitlint": "commitlint --edit $1",
 		"test": "jest",
@@ -38,7 +38,7 @@
 		"@mdx-js/loader": "2.3.0",
 		"@mdx-js/react": "2.3.0",
 		"@monaco-editor/react": "^4.3.1",
-		"@playwright/test": "1.55.1",
+		"@playwright/test": "1.54.1",
 		"@radix-ui/react-tabs": "1.0.4",
 		"@radix-ui/react-tooltip": "1.0.7",
 		"@sentry/react": "8.41.0",
@@ -69,7 +69,7 @@
 		"antd": "5.11.0",
 		"antd-table-saveas-excel": "2.2.1",
 		"antlr4": "4.13.2",
-		"axios": "1.12.0",
+		"axios": "1.8.2",
 		"babel-eslint": "^10.1.0",
 		"babel-jest": "^29.6.4",
 		"babel-loader": "9.1.3",
@@ -83,7 +83,6 @@
 		"color": "^4.2.1",
 		"color-alpha": "1.1.3",
 		"cross-env": "^7.0.3",
-		"crypto-js": "4.2.0",
 		"css-loader": "5.0.0",
 		"css-minimizer-webpack-plugin": "5.0.1",
 		"d3-hierarchy": "3.1.2",
@@ -113,7 +112,7 @@
 		"overlayscrollbars": "^2.8.1",
 		"overlayscrollbars-react": "^0.5.6",
 		"papaparse": "5.4.1",
-		"posthog-js": "1.298.0",
+		"posthog-js": "1.215.5",
 		"rc-tween-one": "3.0.6",
 		"react": "18.2.0",
 		"react-addons-update": "15.6.3",
@@ -150,6 +149,7 @@
 		"tsconfig-paths-webpack-plugin": "^3.5.1",
 		"typescript": "^4.0.5",
 		"uplot": "1.6.31",
+		"userpilot": "1.3.9",
 		"uuid": "^8.3.2",
 		"web-vitals": "^0.2.4",
 		"webpack": "5.94.0",
@@ -186,7 +186,6 @@
 		"@types/color": "^3.0.3",
 		"@types/compression-webpack-plugin": "^9.0.0",
 		"@types/copy-webpack-plugin": "^8.0.1",
-		"@types/crypto-js": "4.2.2",
 		"@types/dompurify": "^2.4.0",
 		"@types/event-source-polyfill": "^1.0.0",
 		"@types/fontfaceobserver": "2.1.0",
@@ -281,7 +280,6 @@
 		"got": "11.8.5",
 		"form-data": "4.0.4",
 		"brace-expansion": "^2.0.2",
-		"on-headers": "^1.1.0",
-		"tmp": "0.2.4"
+		"on-headers": "^1.1.0"
 	}
 }

frontend/public/Logos/amazon-bedrock.svg

@@ -1 +0,0 @@
-<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/public/Logos/azure-openai.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24"><title>Azure</title><path fill="url(#a)" d="M7.242 1.613A1.11 1.11 0 0 1 8.295.857h6.977L8.03 22.316a1.11 1.11 0 0 1-1.052.755h-5.43a1.11 1.11 0 0 1-1.053-1.466z"/><path fill="#0078d4" d="M18.397 15.296H7.4a.51.51 0 0 0-.347.882l7.066 6.595c.206.192.477.298.758.298h6.226z"/><path fill="url(#b)" d="M15.272.857H7.497L0 23.071h7.775l1.596-4.73 5.068 4.73h6.665l-2.707-7.775h-7.998z"/><path fill="url(#c)" d="M17.193 1.613a1.11 1.11 0 0 0-1.052-.756h-7.81.035c.477 0 .9.304 1.052.756l6.748 19.992a1.11 1.11 0 0 1-1.052 1.466h-.12 7.895a1.11 1.11 0 0 0 1.052-1.466z"/><defs><linearGradient id="a" x1="8.247" x2="1.002" y1="1.626" y2="23.03" gradientUnits="userSpaceOnUse"><stop stop-color="#114a8b"/><stop offset="1" stop-color="#0669bc"/></linearGradient><linearGradient id="b" x1="14.042" x2="12.324" y1="15.302" y2="15.888" gradientUnits="userSpaceOnUse"><stop stop-opacity=".3"/><stop offset=".071" stop-opacity=".2"/><stop offset=".321" stop-opacity=".1"/><stop offset=".623" stop-opacity=".05"/><stop offset="1" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="12.841" x2="20.793" y1="1.626" y2="22.814" gradientUnits="userSpaceOnUse"><stop stop-color="#3ccbf4"/><stop offset="1" stop-color="#2892df"/></linearGradient></defs></svg>

frontend/public/Logos/crew-ai.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24"><title>CrewAI</title><path fill="#461816" d="M19.41 10.783a2.75 2.75 0 0 1 2.471 1.355c.483.806.622 1.772.385 2.68l-.136.522a10 10 0 0 1-3.156 5.058c-.605.517-1.283 1.062-2.083 1.524l-.028.017c-.402.232-.884.511-1.398.756-1.19.602-2.475.997-3.798 1.167-.854.111-1.716.155-2.577.132h-.018a8.6 8.6 0 0 1-5.046-1.87l-.012-.01-.012-.01A8.02 8.02 0 0 1 1.22 17.42a10.9 10.9 0 0 1-.102-3.779A15.6 15.6 0 0 1 2.88 8.4a21.8 21.8 0 0 1 2.432-3.678 15.4 15.4 0 0 1 3.56-3.182A10 10 0 0 1 12.44.104h.004l.003-.002c2.057-.384 3.743.374 5.024 1.26a8.3 8.3 0 0 1 2.395 2.513l.024.04.023.042a5.47 5.47 0 0 1 .508 4.012c-.239.97-.577 1.914-1.01 2.814z"/><path fill="#fff" d="M18.861 13.165a.748.748 0 0 1 1.256.031c.199.332.256.73.159 1.103l-.137.522a7.94 7.94 0 0 1-2.504 4.014c-.572.49-1.138.939-1.774 1.306-.427.247-.857.496-1.303.707a9.6 9.6 0 0 1-3.155.973 14.3 14.3 0 0 1-2.257.116 6.53 6.53 0 0 1-3.837-1.422 5.97 5.97 0 0 1-2.071-3.494 8.9 8.9 0 0 1-.085-3.08 13.6 13.6 0 0 1 1.54-4.568 19.7 19.7 0 0 1 2.212-3.348 13.4 13.4 0 0 1 3.088-2.76 7.9 7.9 0 0 1 2.832-1.14c1.307-.245 2.434.207 3.481.933a6.2 6.2 0 0 1 1.806 1.892c.423.767.536 1.668.314 2.515a12.4 12.4 0 0 1-.99 2.67l-.223.497q-.48 1.07-.97 2.137a.76.76 0 0 1-.97.467 3.39 3.39 0 0 1-2.283-2.49c-.095-.83.04-1.669.39-2.426.288-.746.61-1.477.933-2.208l.248-.563a.53.53 0 0 0-.204-.742 2.35 2.35 0 0 0-1.2.702 25 25 0 0 0-1.614 1.767 21.6 21.6 0 0 0-2.619 4.184 7.6 7.6 0 0 0-.816 2.753 7 7 0 0 0 .07 2.219 2.055 2.055 0 0 0 1.934 1.715c1.801.1 3.59-.363 5.116-1.328a19 19 0 0 0 1.675-1.294c.752-.71 1.376-1.519 1.958-2.36"/></svg>

frontend/public/Logos/pydantic-ai.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24"><title>PydanticAI</title><path fill="#e72564" d="M13.223 22.86c-.605.83-1.844.83-2.448 0L5.74 15.944a1.514 1.514 0 0 1 .73-2.322l5.035-1.738c.32-.11.668-.11.988 0l5.035 1.738c.962.332 1.329 1.5.73 2.322zm-1.224-1.259 4.688-6.439-4.688-1.618-4.688 1.618L12 21.602z"/><path fill="#e723a0" d="M23.71 13.463c.604.832.221 2.01-.756 2.328l-8.133 2.652a1.514 1.514 0 0 1-1.983-1.412l-.097-5.326c-.006-.338.101-.67.305-.94l3.209-4.25a1.514 1.514 0 0 1 2.434.022l5.022 6.926zm-1.574.775L17.46 7.79l-2.988 3.958.09 4.959z"/><path fill="#e520e9" d="M18.016.591a1.514 1.514 0 0 1 1.98 1.44l.009 8.554a1.514 1.514 0 0 1-1.956 1.45l-5.095-1.554a1.5 1.5 0 0 1-.8-.58l-3.05-4.366a1.514 1.514 0 0 1 .774-2.308zm.25 1.738L10.69 4.783l2.841 4.065 4.744 1.446-.008-7.965z"/><path fill="#e520e9" d="M5.99.595a1.514 1.514 0 0 0-1.98 1.44L4 10.588a1.514 1.514 0 0 0 1.956 1.45l5.095-1.554c.323-.098.605-.303.799-.58l3.052-4.366a1.514 1.514 0 0 0-.775-2.308zm-.25 1.738 7.577 2.454-2.842 4.065-4.743 1.446.007-7.965z"/><path fill="#e723a0" d="M.29 13.461a1.514 1.514 0 0 0 .756 2.329l8.133 2.651a1.514 1.514 0 0 0 1.983-1.412l.097-5.325a1.5 1.5 0 0 0-.305-.94L7.745 6.513a1.514 1.514 0 0 0-2.434.023L.289 13.461zm1.574.776L6.54 7.788l2.988 3.959-.09 4.958z"/><path fill="#ff96d1" d="m16.942 17.751 1.316-1.806q.178-.248.245-.523l-2.63.858-1.627 2.235a1.5 1.5 0 0 0 .575-.072zm-4.196-5.78.033 1.842 1.742.602-.034-1.843-1.741-.6zm7.257-3.622-1.314-1.812a1.5 1.5 0 0 0-.419-.393l.003 2.767 1.624 2.24q.107-.261.108-.566zm-5.038 2.746-1.762-.537 1.11-1.471 1.762.537zm-2.961-1.41 1.056-1.51-1.056-1.51-1.056 1.51zM9.368 3.509c.145-.122.316-.219.51-.282l2.12-.686 2.13.69c.191.062.36.157.503.276l-2.634.853zm1.433 7.053L9.691 9.09l-1.762.537 1.11 1.47 1.762-.537zm-6.696.584L5.733 8.9l.003-2.763c-.16.1-.305.232-.425.398L4.003 8.339l-.002 2.25q.002.299.104.557m7.149.824-1.741.601-.034 1.843 1.742-.601zM9.75 18.513l-1.628-2.237-2.629-.857q.068.276.247.525l1.313 1.804 2.126.693c.192.062.385.085.571.072"/></svg>

frontend/scripts/update-registry.js

@@ -1,50 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires, import/no-dynamic-require, simple-import-sort/imports, simple-import-sort/exports */
-const fs = require('fs');
-const path = require('path');
-
-// 1. Define paths
-const packageJsonPath = path.resolve(__dirname, '../package.json');
-const registryPath = path.resolve(
-	__dirname,
-	'../src/auto-import-registry.d.ts',
-);
-
-// 2. Read package.json
-const packageJson = require(packageJsonPath);
-
-// 3. Combine dependencies and devDependencies
-const allDeps = {
-	...packageJson.dependencies,
-	...packageJson.devDependencies,
-};
-
-// 4. Filter for @signozhq packages
-const signozPackages = Object.keys(allDeps).filter((dep) =>
-	dep.startsWith('@signozhq/'),
-);
-
-// 5. Generate file content
-const fileContent = `// -------------------------------------------------------------------------
-// AUTO-GENERATED FILE
-// -------------------------------------------------------------------------
-// This file is generated by scripts/update-registry.js automatically
-// whenever you run 'yarn install' or 'npm install'.
-//
-// It forces VS Code to index these specific packages to fix auto-import
-// performance issues in TypeScript 4.x.
-//
-// PR for reference: https://github.com/SigNoz/signoz/pull/9694
-// -------------------------------------------------------------------------
-
-${signozPackages.map((pkg) => `import '${pkg}';`).join('\n')}
-`;
-
-// 6. Write the file
-try {
-	fs.writeFileSync(registryPath, fileContent);
-	console.log(
-		`✅ Auto-import registry updated with ${signozPackages.length} @signozhq packages.`,
-	);
-} catch (err) {
-	console.error('❌ Failed to update auto-import registry:', err);
-}

frontend/src/AppRoutes/index.tsx

@@ -7,12 +7,11 @@ import AppLoading from 'components/AppLoading/AppLoading';
 import KBarCommandPalette from 'components/KBarCommandPalette/KBarCommandPalette';
 import NotFound from 'components/NotFound';
 import Spinner from 'components/Spinner';
+import UserpilotRouteTracker from 'components/UserpilotRouteTracker/UserpilotRouteTracker';
 import { FeatureKeys } from 'constants/features';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
 import AppLayout from 'container/AppLayout';
-import Hex from 'crypto-js/enc-hex';
-import HmacSHA256 from 'crypto-js/hmac-sha256';
 import { KeyboardHotkeysProvider } from 'hooks/hotkeys/useKeyboardHotkeys';
 import { useThemeConfig } from 'hooks/useDarkMode';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
@@ -34,6 +33,7 @@ import { Suspense, useCallback, useEffect, useState } from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
 import { CompatRouter } from 'react-router-dom-v5-compat';
 import { LicenseStatus } from 'types/api/licensesV3/getActive';
+import { Userpilot } from 'userpilot';
 import { extractDomain } from 'utils/app';
 
 import { Home } from './pageComponents';
@@ -84,9 +84,9 @@ function App(): JSX.Element {
 					email,
 					name: displayName,
 					company_name: orgName,
-					deployment_name: hostNameParts[0],
+					tenant_id: hostNameParts[0],
 					data_region: hostNameParts[1],
-					deployment_url: hostname,
+					tenant_url: hostname,
 					company_domain: domain,
 					source: 'signoz-ui',
 					role,
@@ -94,9 +94,9 @@ function App(): JSX.Element {
 
 				const groupTraits = {
 					name: orgName,
-					deployment_name: hostNameParts[0],
+					tenant_id: hostNameParts[0],
 					data_region: hostNameParts[1],
-					deployment_url: hostname,
+					tenant_url: hostname,
 					company_domain: domain,
 					source: 'signoz-ui',
 				};
@@ -111,23 +111,37 @@ function App(): JSX.Element {
 				if (window && window.Appcues) {
 					window.Appcues.identify(id, {
 						name: displayName,
-						deployment_name: hostNameParts[0],
+
+						tenant_id: hostNameParts[0],
 						data_region: hostNameParts[1],
-						deployment_url: hostname,
+						tenant_url: hostname,
 						company_domain: domain,
+
 						companyName: orgName,
 						email,
 						paidUser: !!trialInfo?.trialConvertedToSubscription,
 					});
 				}
 
+				Userpilot.identify(email, {
+					email,
+					name: displayName,
+					orgName,
+					tenant_id: hostNameParts[0],
+					data_region: hostNameParts[1],
+					tenant_url: hostname,
+					company_domain: domain,
+					source: 'signoz-ui',
+					isPaidUser: !!trialInfo?.trialConvertedToSubscription,
+				});
+
 				posthog?.identify(id, {
 					email,
 					name: displayName,
 					orgName,
-					deployment_name: hostNameParts[0],
+					tenant_id: hostNameParts[0],
 					data_region: hostNameParts[1],
-					deployment_url: hostname,
+					tenant_url: hostname,
 					company_domain: domain,
 					source: 'signoz-ui',
 					isPaidUser: !!trialInfo?.trialConvertedToSubscription,
@@ -135,9 +149,9 @@ function App(): JSX.Element {
 
 				posthog?.group('company', orgId, {
 					name: orgName,
-					deployment_name: hostNameParts[0],
+					tenant_id: hostNameParts[0],
 					data_region: hostNameParts[1],
-					deployment_url: hostname,
+					tenant_url: hostname,
 					company_domain: domain,
 					source: 'signoz-ui',
 					isPaidUser: !!trialInfo?.trialConvertedToSubscription,
@@ -256,20 +270,11 @@ function App(): JSX.Element {
 				!showAddCreditCardModal &&
 				(isCloudUser || isEnterpriseSelfHostedUser)
 			) {
-				const email = user.email || '';
-				const secret = process.env.PYLON_IDENTITY_SECRET || '';
-				let emailHash = '';
-
-				if (email && secret) {
-					emailHash = HmacSHA256(email, Hex.parse(secret)).toString(Hex);
-				}
-
 				window.pylon = {
 					chat_settings: {
 						app_id: process.env.PYLON_APP_ID,
 						email: user.email,
-						name: user.displayName || user.email,
-						email_hash: emailHash,
+						name: user.displayName,
 					},
 				};
 			}
@@ -303,6 +308,10 @@ function App(): JSX.Element {
 				});
 			}
 
+			if (process.env.USERPILOT_KEY) {
+				Userpilot.initialize(process.env.USERPILOT_KEY);
+			}
+
 			if (!isSentryInitialized) {
 				Sentry.init({
 					dsn: process.env.SENTRY_DSN,
@@ -363,6 +372,7 @@ function App(): JSX.Element {
 				<Router history={history}>
 					<CompatRouter>
 						<KBarCommandPaletteProvider>
+							<UserpilotRouteTracker />
 							<KBarCommandPalette />
 							<NotificationProvider>
 								<ErrorModalProvider>

frontend/src/api/common/logEvent.ts

@@ -1,8 +1,6 @@
-import { LogEventAxiosInstance as axios } from 'api';
-import getLocalStorageApi from 'api/browser/localstorage/get';
+import { ApiBaseInstance as axios } from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError } from 'axios';
-import { LOCALSTORAGE } from 'constants/localStorage';
 import { ErrorResponse, SuccessResponse } from 'types/api';
 import { EventSuccessPayloadProps } from 'types/api/events/types';
 
@@ -13,14 +11,9 @@ const logEvent = async (
 	rateLimited?: boolean,
 ): Promise<SuccessResponse<EventSuccessPayloadProps> | ErrorResponse> => {
 	try {
-		// add deployment_url and user_email to attributes
+		// add tenant_url to attributes
 		const { hostname } = window.location;
-		const userEmail = getLocalStorageApi(LOCALSTORAGE.LOGGED_IN_USER_EMAIL);
-		const updatedAttributes = {
-			...attributes,
-			deployment_url: hostname,
-			user_email: userEmail,
-		};
+		const updatedAttributes = { ...attributes, tenant_url: hostname };
 		const response = await axios.post('/event', {
 			eventName,
 			attributes: updatedAttributes,

frontend/src/api/dynamicVariables/__tests__/getFieldKeys.test.ts

@@ -1,11 +1,13 @@
 /* eslint-disable sonarjs/no-duplicate-string */
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 
 import { getFieldKeys } from '../getFieldKeys';
 
 // Mock the API instance
 jest.mock('api', () => ({
-	get: jest.fn(),
+	ApiBaseInstance: {
+		get: jest.fn(),
+	},
 }));
 
 describe('getFieldKeys API', () => {
@@ -29,33 +31,33 @@ describe('getFieldKeys API', () => {
 
 	it('should call API with correct parameters when no args provided', async () => {
 		// Mock successful API response
-		(axios.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
 
 		// Call function with no parameters
 		await getFieldKeys();
 
 		// Verify API was called correctly with empty params object
-		expect(axios.get).toHaveBeenCalledWith('/fields/keys', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/keys', {
 			params: {},
 		});
 	});
 
 	it('should call API with signal parameter when provided', async () => {
 		// Mock successful API response
-		(axios.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
 
 		// Call function with signal parameter
 		await getFieldKeys('traces');
 
 		// Verify API was called with signal parameter
-		expect(axios.get).toHaveBeenCalledWith('/fields/keys', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/keys', {
 			params: { signal: 'traces' },
 		});
 	});
 
 	it('should call API with name parameter when provided', async () => {
 		// Mock successful API response
-		(axios.get as jest.Mock).mockResolvedValueOnce({
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
 			status: 200,
 			data: {
 				status: 'success',
@@ -70,14 +72,14 @@ describe('getFieldKeys API', () => {
 		await getFieldKeys(undefined, 'service');
 
 		// Verify API was called with name parameter
-		expect(axios.get).toHaveBeenCalledWith('/fields/keys', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/keys', {
 			params: { name: 'service' },
 		});
 	});
 
 	it('should call API with both signal and name when provided', async () => {
 		// Mock successful API response
-		(axios.get as jest.Mock).mockResolvedValueOnce({
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
 			status: 200,
 			data: {
 				status: 'success',
@@ -92,14 +94,14 @@ describe('getFieldKeys API', () => {
 		await getFieldKeys('logs', 'service');
 
 		// Verify API was called with both parameters
-		expect(axios.get).toHaveBeenCalledWith('/fields/keys', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/keys', {
 			params: { signal: 'logs', name: 'service' },
 		});
 	});
 
 	it('should return properly formatted response', async () => {
 		// Mock API to return our response
-		(axios.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
 
 		// Call the function
 		const result = await getFieldKeys('traces');

frontend/src/api/dynamicVariables/__tests__/getFieldValues.test.ts

@@ -1,11 +1,13 @@
 /* eslint-disable sonarjs/no-duplicate-string */
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 
 import { getFieldValues } from '../getFieldValues';
 
 // Mock the API instance
 jest.mock('api', () => ({
-	get: jest.fn(),
+	ApiBaseInstance: {
+		get: jest.fn(),
+	},
 }));
 
 describe('getFieldValues API', () => {
@@ -15,7 +17,7 @@ describe('getFieldValues API', () => {
 
 	it('should call the API with correct parameters (no options)', async () => {
 		// Mock API response
-		(axios.get as jest.Mock).mockResolvedValueOnce({
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
 			status: 200,
 			data: {
 				status: 'success',
@@ -32,14 +34,14 @@ describe('getFieldValues API', () => {
 		await getFieldValues();
 
 		// Verify API was called correctly with empty params
-		expect(axios.get).toHaveBeenCalledWith('/fields/values', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
 			params: {},
 		});
 	});
 
 	it('should call the API with signal parameter', async () => {
 		// Mock API response
-		(axios.get as jest.Mock).mockResolvedValueOnce({
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
 			status: 200,
 			data: {
 				status: 'success',
@@ -56,14 +58,14 @@ describe('getFieldValues API', () => {
 		await getFieldValues('traces');
 
 		// Verify API was called with signal parameter
-		expect(axios.get).toHaveBeenCalledWith('/fields/values', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
 			params: { signal: 'traces' },
 		});
 	});
 
 	it('should call the API with name parameter', async () => {
 		// Mock API response
-		(axios.get as jest.Mock).mockResolvedValueOnce({
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
 			status: 200,
 			data: {
 				status: 'success',
@@ -80,14 +82,14 @@ describe('getFieldValues API', () => {
 		await getFieldValues(undefined, 'service.name');
 
 		// Verify API was called with name parameter
-		expect(axios.get).toHaveBeenCalledWith('/fields/values', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
 			params: { name: 'service.name' },
 		});
 	});
 
 	it('should call the API with value parameter', async () => {
 		// Mock API response
-		(axios.get as jest.Mock).mockResolvedValueOnce({
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
 			status: 200,
 			data: {
 				status: 'success',
@@ -104,14 +106,14 @@ describe('getFieldValues API', () => {
 		await getFieldValues(undefined, 'service.name', 'front');
 
 		// Verify API was called with value parameter
-		expect(axios.get).toHaveBeenCalledWith('/fields/values', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
 			params: { name: 'service.name', searchText: 'front' },
 		});
 	});
 
 	it('should call the API with time range parameters', async () => {
 		// Mock API response
-		(axios.get as jest.Mock).mockResolvedValueOnce({
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
 			status: 200,
 			data: {
 				status: 'success',
@@ -136,7 +138,7 @@ describe('getFieldValues API', () => {
 		);
 
 		// Verify API was called with time range parameters (converted to milliseconds)
-		expect(axios.get).toHaveBeenCalledWith('/fields/values', {
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
 			params: {
 				signal: 'logs',
 				name: 'service.name',
@@ -163,7 +165,7 @@ describe('getFieldValues API', () => {
 			},
 		};
 
-		(axios.get as jest.Mock).mockResolvedValueOnce(mockResponse);
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockResponse);
 
 		// Call the function
 		const result = await getFieldValues('traces', 'mixed.values');
@@ -194,7 +196,7 @@ describe('getFieldValues API', () => {
 		};
 
 		// Mock API to return our response
-		(axios.get as jest.Mock).mockResolvedValueOnce(mockApiResponse);
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockApiResponse);
 
 		// Call the function
 		const result = await getFieldValues('traces', 'service.name');

frontend/src/api/dynamicVariables/getFieldKeys.ts

@@ -1,4 +1,4 @@
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
 import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
@@ -24,7 +24,7 @@ export const getFieldKeys = async (
 	}
 
 	try {
-		const response = await axios.get('/fields/keys', { params });
+		const response = await ApiBaseInstance.get('/fields/keys', { params });
 
 		return {
 			httpStatusCode: response.status,

frontend/src/api/dynamicVariables/getFieldValues.ts

@@ -1,5 +1,5 @@
 /* eslint-disable sonarjs/cognitive-complexity */
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
 import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
@@ -47,7 +47,7 @@ export const getFieldValues = async (
 	}
 
 	try {
-		const response = await axios.get('/fields/values', { params });
+		const response = await ApiBaseInstance.get('/fields/values', { params });
 
 		// Normalize values from different types (stringValues, boolValues, etc.)
 		if (response.data?.data?.values) {

frontend/src/api/index.ts

@@ -86,9 +86,8 @@ const interceptorRejected = async (
 
 			if (
 				response.status === 401 &&
-				// if the session rotate call or the create session errors out with 401 or the delete sessions call returns 401 then we do not retry!
+				// if the session rotate call errors out with 401 or the delete sessions call returns 401 then we do not retry!
 				response.config.url !== '/sessions/rotate' &&
-				response.config.url !== '/sessions/email_password' &&
 				!(
 					response.config.url === '/sessions' && response.config.method === 'delete'
 				)
@@ -200,15 +199,15 @@ ApiV5Instance.interceptors.request.use(interceptorsRequestResponse);
 //
 
 // axios Base
-export const LogEventAxiosInstance = axios.create({
+export const ApiBaseInstance = axios.create({
 	baseURL: `${ENVIRONMENT.baseURL}${apiV1}`,
 });
 
-LogEventAxiosInstance.interceptors.response.use(
+ApiBaseInstance.interceptors.response.use(
 	interceptorsResponse,
 	interceptorRejectedBase,
 );
-LogEventAxiosInstance.interceptors.request.use(interceptorsRequestResponse);
+ApiBaseInstance.interceptors.request.use(interceptorsRequestResponse);
 //
 
 // gateway Api V1

frontend/src/api/infra/getHostAttributeKeys.ts

@@ -1,4 +1,4 @@
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError, AxiosResponse } from 'axios';
 import { baseAutoCompleteIdKeysOrder } from 'constants/queryBuilder';
@@ -17,7 +17,7 @@ export const getHostAttributeKeys = async (
 	try {
 		const response: AxiosResponse<{
 			data: IQueryAutocompleteResponse;
-		}> = await axios.get(
+		}> = await ApiBaseInstance.get(
 			`/${entity}/attribute_keys?dataSource=metrics&searchText=${searchText}`,
 			{
 				params: {

frontend/src/api/messagingQueues/onboarding/getOnboardingStatus.ts

@@ -1,4 +1,4 @@
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError } from 'axios';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
@@ -20,7 +20,7 @@ const getOnboardingStatus = async (props: {
 }): Promise<SuccessResponse<OnboardingStatusResponse> | ErrorResponse> => {
 	const { endpointService, ...rest } = props;
 	try {
-		const response = await axios.post(
+		const response = await ApiBaseInstance.post(
 			`/messaging-queues/kafka/onboarding/${endpointService || 'consumers'}`,
 			rest,
 		);

frontend/src/api/metrics/getService.ts

@@ -1,20 +1,13 @@
-import { ApiV2Instance } from 'api';
-import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
-import { AxiosError } from 'axios';
-import { ErrorV2Resp } from 'types/api';
+import axios from 'api';
 import { PayloadProps, Props } from 'types/api/metrics/getService';
 
 const getService = async (props: Props): Promise<PayloadProps> => {
-	try {
-		const response = await ApiV2Instance.post(`/services`, {
-			start: `${props.start}`,
-			end: `${props.end}`,
-			tags: props.selectedTags,
-		});
-		return response.data.data;
-	} catch (error) {
-		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
-	}
+	const response = await axios.post(`/services`, {
+		start: `${props.start}`,
+		end: `${props.end}`,
+		tags: props.selectedTags,
+	});
+	return response.data;
 };
 
 export default getService;

frontend/src/api/metrics/getTopOperations.ts

@@ -1,27 +1,22 @@
-import { ApiV2Instance } from 'api';
-import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
-import { AxiosError } from 'axios';
-import { ErrorV2Resp } from 'types/api';
+import axios from 'api';
 import { PayloadProps, Props } from 'types/api/metrics/getTopOperations';
 
 const getTopOperations = async (props: Props): Promise<PayloadProps> => {
-	try {
-		const endpoint = props.isEntryPoint
-			? '/service/entry_point_operations'
-			: '/service/top_operations';
+	const endpoint = props.isEntryPoint
+		? '/service/entry_point_operations'
+		: '/service/top_operations';
 
-		const response = await ApiV2Instance.post(endpoint, {
-			start: `${props.start}`,
-			end: `${props.end}`,
-			service: props.service,
-			tags: props.selectedTags,
-			limit: 5000,
-		});
+	const response = await axios.post(endpoint, {
+		start: `${props.start}`,
+		end: `${props.end}`,
+		service: props.service,
+		tags: props.selectedTags,
+	});
 
+	if (props.isEntryPoint) {
 		return response.data.data;
-	} catch (error) {
-		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
 	}
+	return response.data;
 };
 
 export default getTopOperations;

frontend/src/api/metricsExplorer/updateMetricMetadata.ts

@@ -9,7 +9,6 @@ export interface UpdateMetricMetadataProps {
 	metricType: MetricType;
 	temporality?: Temporality;
 	isMonotonic?: boolean;
-	unit?: string;
 }
 
 export interface UpdateMetricMetadataResponse {

frontend/src/api/quickFilters/getCustomFilters.ts

@@ -1,4 +1,4 @@
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError } from 'axios';
 import { ErrorResponse, SuccessResponse } from 'types/api';
@@ -9,7 +9,7 @@ const getCustomFilters = async (
 ): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {
 	const { signal } = props;
 	try {
-		const response = await axios.get(`/orgs/me/filters/${signal}`);
+		const response = await ApiBaseInstance.get(`orgs/me/filters/${signal}`);
 
 		return {
 			statusCode: 200,

frontend/src/api/quickFilters/updateCustomFilters.ts

@@ -1,4 +1,4 @@
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 import { AxiosError } from 'axios';
 import { SuccessResponse } from 'types/api';
 import { UpdateCustomFiltersProps } from 'types/api/quickFilters/updateCustomFilters';
@@ -6,7 +6,7 @@ import { UpdateCustomFiltersProps } from 'types/api/quickFilters/updateCustomFil
 const updateCustomFiltersAPI = async (
 	props: UpdateCustomFiltersProps,
 ): Promise<SuccessResponse<void> | AxiosError> =>
-	axios.put(`/orgs/me/filters`, {
+	ApiBaseInstance.put(`orgs/me/filters`, {
 		...props.data,
 	});
 

frontend/src/api/settings/setRetentionV2.ts

@@ -8,7 +8,7 @@ const setRetentionV2 = async ({
 	type,
 	defaultTTLDays,
 	coldStorageVolume,
-	coldStorageDurationDays,
+	coldStorageDuration,
 	ttlConditions,
 }: PropsV2): Promise<SuccessResponseV2<PayloadPropsV2>> => {
 	try {
@@ -16,7 +16,7 @@ const setRetentionV2 = async ({
 			type,
 			defaultTTLDays,
 			coldStorageVolume,
-			coldStorageDurationDays,
+			coldStorageDuration,
 			ttlConditions,
 		});
 

frontend/src/api/thirdPartyApis/listOverview.ts

@@ -1,4 +1,4 @@
-import axios from 'api';
+import { ApiBaseInstance } from 'api';
 import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
 import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
@@ -9,12 +9,15 @@ const listOverview = async (
 ): Promise<SuccessResponseV2<PayloadProps>> => {
 	const { start, end, show_ip: showIp, filter } = props;
 	try {
-		const response = await axios.post(`/third-party-apis/overview/list`, {
-			start,
-			end,
-			show_ip: showIp,
-			filter,
-		});
+		const response = await ApiBaseInstance.post(
+			`/third-party-apis/overview/list`,
+			{
+				start,
+				end,
+				show_ip: showIp,
+				filter,
+			},
+		);
 
 		return {
 			httpStatusCode: response.status,

frontend/src/api/trace/getSpanPercentiles.ts

@@ -1,28 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
-import { AxiosError } from 'axios';
-import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
-import {
-	GetSpanPercentilesProps,
-	GetSpanPercentilesResponseDataProps,
-} from 'types/api/trace/getSpanPercentiles';
-
-const getSpanPercentiles = async (
-	props: GetSpanPercentilesProps,
-): Promise<SuccessResponseV2<GetSpanPercentilesResponseDataProps>> => {
-	try {
-		const response = await axios.post('/span_percentile', {
-			...props,
-		});
-
-		return {
-			httpStatusCode: response.status,
-			data: response.data.data,
-		};
-	} catch (error) {
-		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
-		throw error;
-	}
-};
-
-export default getSpanPercentiles;

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

@@ -11,7 +11,7 @@ import {
 export const getQueryRangeV5 = async (
 	props: QueryRangePayloadV5,
 	version: string,
-	signal?: AbortSignal,
+	signal: AbortSignal,
 	headers?: Record<string, string>,
 ): Promise<SuccessResponseV2<MetricRangePayloadV5>> => {
 	try {

frontend/src/assets/AlertHistory/ConfigureIcon.tsx

@@ -1,30 +1,30 @@
 interface ConfigureIconProps {
 	width?: number;
 	height?: number;
-	color?: string;
+	fill?: string;
 }
 
 function ConfigureIcon({
 	width,
 	height,
-	color,
+	fill,
 }: ConfigureIconProps): JSX.Element {
 	return (
 		<svg
 			xmlns="http://www.w3.org/2000/svg"
 			width={width}
 			height={height}
-			fill="none"
+			fill={fill}
 		>
 			<path
-				stroke={color}
+				stroke="#C0C1C3"
 				strokeLinecap="round"
 				strokeLinejoin="round"
 				strokeWidth="1.333"
 				d="M9.71 4.745a.576.576 0 000 .806l.922.922a.576.576 0 00.806 0l2.171-2.171a3.455 3.455 0 01-4.572 4.572l-3.98 3.98a1.222 1.222 0 11-1.727-1.728l3.98-3.98a3.455 3.455 0 014.572-4.572L9.717 4.739l-.006.006z"
 			/>
 			<path
-				stroke={color}
+				stroke="#C0C1C3"
 				strokeLinecap="round"
 				strokeWidth="1.333"
 				d="M4 7L2.527 5.566a1.333 1.333 0 01-.013-1.898l.81-.81a1.333 1.333 0 011.991.119L5.333 3m5.417 7.988l1.179 1.178m0 0l-.138.138a.833.833 0 00.387 1.397v0a.833.833 0 00.792-.219l.446-.446a.833.833 0 00.176-.917v0a.833.833 0 00-1.355-.261l-.308.308z"
@@ -36,6 +36,6 @@ function ConfigureIcon({
 ConfigureIcon.defaultProps = {
 	width: 16,
 	height: 16,
-	color: 'currentColor',
+	fill: 'none',
 };
 export default ConfigureIcon;

frontend/src/auto-import-registry.d.ts

@@ -1,23 +0,0 @@
-// -------------------------------------------------------------------------
-// AUTO-GENERATED FILE
-// -------------------------------------------------------------------------
-// This file is generated by scripts/update-registry.js automatically
-// whenever you run 'yarn install' or 'npm install'.
-//
-// It forces VS Code to index these specific packages to fix auto-import
-// performance issues in TypeScript 4.x.
-//
-// PR for reference: https://github.com/SigNoz/signoz/pull/9694
-// -------------------------------------------------------------------------
-
-import '@signozhq/badge';
-import '@signozhq/button';
-import '@signozhq/calendar';
-import '@signozhq/callout';
-import '@signozhq/design-tokens';
-import '@signozhq/input';
-import '@signozhq/popover';
-import '@signozhq/resizable';
-import '@signozhq/sonner';
-import '@signozhq/table';
-import '@signozhq/tooltip';

frontend/src/components/CustomTimePicker/CustomTimePicker.styles.scss

@@ -2,8 +2,50 @@
 	display: flex;
 	flex-direction: column;
 
+	.date-time-picker-container {
+		position: relative;
+
+		.date-time-picker-input {
+			border-radius: 4px;
+			padding: 6px 6px 6px 8px;
+
+			border-radius: 2px;
+			border: 1px solid var(--Slate-400, #1d212d);
+			background: var(--Ink-300, #16181d);
+
+			&.custom-time {
+				.ant-input {
+					min-width: 280px;
+				}
+			}
+		}
+
+		.date-time-picker-content {
+			min-width: 580px;
+			max-width: 580px;
+
+			position: absolute;
+			top: 36px; // 32px + 4px
+			right: 0;
+			width: 100%;
+			z-index: 1000;
+
+			border-radius: 4px !important;
+			border: 1px solid var(--bg-slate-400);
+			box-shadow: 4px 10px 16px 2px rgba(0, 0, 0, 0.2) !important;
+			padding: 0px !important;
+			border-radius: 4px;
+			background: linear-gradient(
+				139deg,
+				rgba(18, 19, 23, 0.8) 0%,
+				rgba(18, 19, 23, 0.9) 98.68%
+			) !important;
+			backdrop-filter: blur(20px);
+		}
+	}
+
 	.timeSelection-input {
-		&:hover {
+		&:hover:not(.ant-input-affix-wrapper-status-error) {
 			border-color: #1d212d !important;
 		}
 	}
@@ -49,11 +91,16 @@
 	padding-left: 0px !important;
 
 	&.custom-time {
-		input:not(:focus) {
+		input {
 			min-width: 280px;
 		}
 	}
 
+	.ant-input {
+		background: var(--Ink-300, #16181d);
+		color: var(--bg-vanilla-100);
+	}
+
 	input::placeholder {
 		color: white;
 	}
@@ -120,6 +167,11 @@
 			color: var(---bg-ink-300);
 		}
 
+		.ant-input {
+			background: var(--bg-vanilla-100);
+			color: var(--bg-ink-400);
+		}
+
 		input:focus::placeholder {
 			color: rgba($color: #000000, $alpha: 0.4);
 		}
@@ -239,7 +291,7 @@
 	}
 
 	.custom-time-picker {
-		.timeSelection-input {
+		.timeSelection-input:not(.ant-input-affix-wrapper-status-error) {
 			&:hover {
 				border-color: var(--bg-vanilla-300) !important;
 			}

frontend/src/components/CustomTimePicker/CustomTimePicker.tsx

@@ -2,7 +2,8 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 import './CustomTimePicker.styles.scss';
 
-import { Input, Popover, Tooltip, Typography } from 'antd';
+import type { InputRef } from 'antd';
+import { Input, Tooltip, Typography } from 'antd';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
@@ -15,7 +16,6 @@ import {
 import dayjs from 'dayjs';
 import { isValidTimeFormat } from 'lib/getMinMax';
 import { defaultTo, isFunction, noop } from 'lodash-es';
-import debounce from 'lodash-es/debounce';
 import { CheckCircle, ChevronDown, Clock } from 'lucide-react';
 import { useTimezone } from 'providers/Timezone';
 import {
@@ -25,13 +25,13 @@ import {
 	useCallback,
 	useEffect,
 	useMemo,
+	useRef,
 	useState,
 } from 'react';
 import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { AppState } from 'store/reducers';
 import { GlobalReducer } from 'types/reducer/globalTime';
-import { popupContainer } from 'utils/selectPopupContainer';
 
 import CustomTimePickerPopoverContent from './CustomTimePickerPopoverContent';
 
@@ -64,6 +64,150 @@ interface CustomTimePickerProps {
 	onExitLiveLogs?: () => void;
 }
 
+const formatSelectedTimeValue = (selectedTime: string): string => {
+	console.log('selectedTime', selectedTime);
+
+	// format valid time format to 12-hour format
+	// 1m -> Last 1 minute
+	// 1h -> Last 1 hour
+	// 1d -> Last 1 day
+	// 1w -> Last 1 week
+	// 30m -> Last 30 minutes
+	// 6h -> Last 6 hours
+	// 3d -> Last 3 days
+	// 1w -> Last 1 week
+	// 1month -> Last 1 month
+	// 2months -> Last 2 months
+
+	// parse the string to generate the label
+	const regex = /^(\d+)([mhdw])$/;
+	const match = regex.exec(selectedTime);
+	if (match) {
+		const value = match[1];
+		const unit = match[2];
+
+		const intValue = parseInt(value, 10);
+
+		switch (unit) {
+			case 'm':
+				return `Last ${value} minutes`;
+			case 'h':
+				return `Last ${value} hour${intValue > 1 ? 's' : ''}`;
+			case 'd':
+				return `Last ${value} day${intValue > 1 ? 's' : ''}`;
+			case 'w':
+				return `Last ${value} week${intValue > 1 ? 's' : ''}`;
+			case 'month':
+				return `Last ${value} month${intValue > 1 ? 's' : ''}`;
+			default:
+				return '';
+		}
+	}
+
+	return '';
+};
+
+const getSelectedTimeRangeLabel = (
+	selectedTime: string,
+	selectedTimeValue: string,
+): string => {
+	let selectedTimeLabel = '';
+
+	if (selectedTime === 'custom') {
+		// TODO(shaheer): if the user preference is 12 hour format, then convert the date range string to 12-hour format (pick this up while working on 12/24 hour preference feature)
+		// // Convert the date range string to 12-hour format
+		// const dates = selectedTimeValue.split(' - ');
+		// if (dates.length === 2) {
+		// 	const startDate = dayjs(dates[0], DATE_TIME_FORMATS.UK_DATETIME);
+		// 	const endDate = dayjs(dates[1], DATE_TIME_FORMATS.UK_DATETIME);
+
+		// 	return `${startDate.format(DATE_TIME_FORMATS.UK_DATETIME)} - ${endDate.format(
+		// 		DATE_TIME_FORMATS.UK_DATETIME,
+		// 	)}`;
+		// }
+		return selectedTimeValue;
+	}
+
+	for (let index = 0; index < Options.length; index++) {
+		if (Options[index].value === selectedTime) {
+			selectedTimeLabel = Options[index].label;
+		}
+	}
+
+	for (
+		let index = 0;
+		index < RelativeDurationSuggestionOptions.length;
+		index++
+	) {
+		if (RelativeDurationSuggestionOptions[index].value === selectedTime) {
+			selectedTimeLabel = RelativeDurationSuggestionOptions[index].label;
+		}
+	}
+
+	for (let index = 0; index < FixedDurationSuggestionOptions.length; index++) {
+		if (FixedDurationSuggestionOptions[index].value === selectedTime) {
+			selectedTimeLabel = FixedDurationSuggestionOptions[index].label;
+		}
+	}
+
+	if (isValidTimeFormat(selectedTime)) {
+		selectedTimeLabel = formatSelectedTimeValue(selectedTime);
+	}
+
+	return selectedTimeLabel;
+};
+
+// const getFormattedSelectedTimeValue = (
+// 	selectedTime: string,
+// 	selectedTimeValue: string,
+// ): string => {
+// 	console.log('selectedTime', selectedTime);
+// 	console.log('selectedTimeValue', selectedTimeValue);
+
+// 	if (selectedTime === 'custom') {
+// 		// TODO(shaheer): if the user preference is 12 hour format, then convert the date range string to 12-hour format (pick this up while working on 12/24 hour preference feature)
+// 		// // Convert the date range string to 12-hour format
+// 		// const dates = selectedTimeValue.split(' - ');
+// 		// if (dates.length === 2) {
+// 		// 	const startDate = dayjs(dates[0], DATE_TIME_FORMATS.UK_DATETIME);
+// 		// 	const endDate = dayjs(dates[1], DATE_TIME_FORMATS.UK_DATETIME);
+
+// 		// 	return `${startDate.format(DATE_TIME_FORMATS.UK_DATETIME)} - ${endDate.format(
+// 		// 		DATE_TIME_FORMATS.UK_DATETIME,
+// 		// 	)}`;
+// 		// }
+// 		return selectedTimeValue;
+// 	}
+
+// 	for (let index = 0; index < Options.length; index++) {
+// 		if (Options[index].value === selectedTime) {
+// 			return Options[index].label;
+// 		}
+// 	}
+
+// 	for (
+// 		let index = 0;
+// 		index < RelativeDurationSuggestionOptions.length;
+// 		index++
+// 	) {
+// 		if (RelativeDurationSuggestionOptions[index].value === selectedTime) {
+// 			return RelativeDurationSuggestionOptions[index].label;
+// 		}
+// 	}
+
+// 	for (let index = 0; index < FixedDurationSuggestionOptions.length; index++) {
+// 		if (FixedDurationSuggestionOptions[index].value === selectedTime) {
+// 			return FixedDurationSuggestionOptions[index].label;
+// 		}
+// 	}
+
+// 	if (isValidTimeFormat(selectedTime)) {
+// 		return selectedTime;
+// 	}
+
+// 	return '';
+// };
+
 function CustomTimePicker({
 	onSelect,
 	onError,
@@ -91,18 +235,34 @@ function CustomTimePicker({
 		(state) => state.globalTime,
 	);
 
-	const [inputValue, setInputValue] = useState('');
+	const inputRef = useRef<InputRef | null>(null);
+
+	const [value, setValue] = useState<string>('');
+
 	const [inputStatus, setInputStatus] = useState<'' | 'error' | 'success'>('');
 	const [inputErrorMessage, setInputErrorMessage] = useState<string | null>(
 		null,
 	);
 	const location = useLocation();
+
+	const [showDateTimeOptions, setShowDateTimeOptions] = useState(open);
+
 	const [isInputFocused, setIsInputFocused] = useState(false);
 
 	const [activeView, setActiveView] = useState<ViewType>(DEFAULT_VIEW);
 
 	const { timezone, browserTimezone } = useTimezone();
+
 	const activeTimezoneOffset = timezone.offset;
+
+	useEffect(() => {
+		setShowDateTimeOptions(open);
+	}, [open]);
+
+	useEffect(() => {
+		setValue(getSelectedTimeRangeLabel(selectedTime, selectedValue));
+	}, [selectedTime, selectedValue]);
+
 	const isTimezoneOverridden = useMemo(
 		() => timezone.offset !== browserTimezone.offset,
 		[timezone, browserTimezone],
@@ -120,60 +280,14 @@ function CustomTimePicker({
 
 	const [isOpenedFromFooter, setIsOpenedFromFooter] = useState(false);
 
-	const getSelectedTimeRangeLabel = (
-		selectedTime: string,
-		selectedTimeValue: string,
-	): string => {
-		if (selectedTime === 'custom') {
-			// TODO(shaheer): if the user preference is 12 hour format, then convert the date range string to 12-hour format (pick this up while working on 12/24 hour preference feature)
-			// // Convert the date range string to 12-hour format
-			// const dates = selectedTimeValue.split(' - ');
-			// if (dates.length === 2) {
-			// 	const startDate = dayjs(dates[0], DATE_TIME_FORMATS.UK_DATETIME);
-			// 	const endDate = dayjs(dates[1], DATE_TIME_FORMATS.UK_DATETIME);
-
-			// 	return `${startDate.format(DATE_TIME_FORMATS.UK_DATETIME)} - ${endDate.format(
-			// 		DATE_TIME_FORMATS.UK_DATETIME,
-			// 	)}`;
-			// }
-			return selectedTimeValue;
-		}
-
-		for (let index = 0; index < Options.length; index++) {
-			if (Options[index].value === selectedTime) {
-				return Options[index].label;
-			}
-		}
-
-		for (
-			let index = 0;
-			index < RelativeDurationSuggestionOptions.length;
-			index++
-		) {
-			if (RelativeDurationSuggestionOptions[index].value === selectedTime) {
-				return RelativeDurationSuggestionOptions[index].label;
-			}
-		}
-
-		for (let index = 0; index < FixedDurationSuggestionOptions.length; index++) {
-			if (FixedDurationSuggestionOptions[index].value === selectedTime) {
-				return FixedDurationSuggestionOptions[index].label;
-			}
-		}
-
-		if (isValidTimeFormat(selectedTime)) {
-			return selectedTime;
-		}
-
-		return '';
-	};
-
 	useEffect(() => {
 		if (showLiveLogs) {
 			setSelectedTimePlaceholderValue('Live');
 		} else {
 			const value = getSelectedTimeRangeLabel(selectedTime, selectedValue);
 			setSelectedTimePlaceholderValue(value);
+
+			setValue(value);
 		}
 	}, [selectedTime, selectedValue, showLiveLogs]);
 
@@ -181,25 +295,52 @@ function CustomTimePicker({
 		setOpen(false);
 	};
 
-	const handleOpenChange = (newOpen: boolean): void => {
-		setOpen(newOpen);
-		if (!newOpen) {
-			setCustomDTPickerVisible?.(false);
-			setActiveView('datetime');
+	const handleCustomDateChange = (inputValue: string): void => {
+		const dates = inputValue.split(' - ');
+
+		const startDate = dayjs(dates[0], DATE_TIME_FORMATS.UK_DATETIME_SECONDS);
+		const endDate = dayjs(dates[1], DATE_TIME_FORMATS.UK_DATETIME_SECONDS);
+
+		if (!startDate.isValid() || !endDate.isValid()) {
+			setInputStatus('error');
+			onError(true);
+			setInputErrorMessage('Please enter valid date range');
+
+			return;
 		}
+
+		if (startDate.isAfter(endDate)) {
+			setInputStatus('error');
+			onError(true);
+			setInputErrorMessage('Start date should be before end date');
+
+			return;
+		}
+
+		onCustomDateHandler?.([startDate, endDate]);
+
+		setInputStatus('success');
+		onError(false);
+		setInputErrorMessage(null);
 	};
 
-	const debouncedHandleInputChange = debounce((inputValue): void => {
+	// eslint-disable-next-line sonarjs/cognitive-complexity
+	const handleDateTimeChange = (inputValue: string): void => {
+		if (!inputValue || inputValue === '') {
+			return;
+		}
+
 		const isValidFormat = /^(\d+)([mhdw])$/.test(inputValue);
-		if (isValidFormat) {
+
+		if (inputValue && isValidFormat) {
 			setInputStatus('success');
 			onError(false);
 			setInputErrorMessage(null);
 
 			const match = inputValue.match(/^(\d+)([mhdw])$/);
 
-			const value = parseInt(match[1], 10);
-			const unit = match[2];
+			const value = match ? parseInt(match[1], 10) : 0;
+			const unit = match ? match[2] : null;
 
 			const currentTime = dayjs();
 			const maxAllowedMinTime = currentTime.subtract(
@@ -239,6 +380,8 @@ function CustomTimePicker({
 					timeStr: inputValue,
 				});
 			}
+		} else if (selectedTime === 'custom') {
+			handleCustomDateChange(inputValue);
 		} else {
 			setInputStatus('error');
 			onError(true);
@@ -247,21 +390,6 @@ function CustomTimePicker({
 				onCustomTimeStatusUpdate(false);
 			}
 		}
-	}, 300);
-
-	const handleInputChange = (event: ChangeEvent<HTMLInputElement>): void => {
-		const inputValue = event.target.value;
-
-		if (inputValue.length > 0) {
-			setOpen(false);
-		} else {
-			setOpen(true);
-		}
-
-		setInputValue(inputValue);
-
-		// Call the debounced function with the input value
-		debouncedHandleInputChange(inputValue);
 	};
 
 	const handleSelect = (label: string, value: string): void => {
@@ -273,19 +401,30 @@ function CustomTimePicker({
 		onSelect(value);
 		setSelectedTimePlaceholderValue(label);
 		setInputStatus('');
+
+		inputRef.current?.input?.blur();
+		setIsInputFocused(false);
 		onError(false);
 		setInputErrorMessage(null);
-		setInputValue('');
 		if (value !== 'custom') {
 			hide();
 		}
 	};
 
+	const handleRecentlyUsedTimeRangeClick = (): void => {
+		setInputStatus('');
+		inputRef.current?.input?.blur();
+	};
+
 	const content = (
 		<div className="time-selection-dropdown-content">
 			<div className="time-options-container">
 				{items?.map(({ value, label }) => (
 					<div
+						onMouseDown={(e): void => {
+							// Prevent blur when clicking on options
+							e.preventDefault();
+						}}
 						onClick={(): void => {
 							handleSelect(label, value);
 						}}
@@ -304,19 +443,82 @@ function CustomTimePicker({
 
 	const handleFocus = (): void => {
 		setIsInputFocused(true);
-		setActiveView('datetime');
+		setInputStatus('');
+		setInputErrorMessage(null);
+
+		// Get the raw/editable format for the current selection
+		let editableValue = selectedTime;
+
+		// If it's a custom time, use the selectedValue (date range string)
+		if (selectedTime === 'custom') {
+			editableValue = selectedValue;
+		}
+		// If it's a predefined option, convert back to raw format
+		else if (selectedTime && selectedTime !== 'custom') {
+			// For predefined options, use the selectedTime as is (like "5m", "1h")
+			editableValue = selectedTime;
+		}
+
+		// Update state with the raw format for editing
+		setValue(editableValue);
+
+		setOpen(true);
+		// setCustomDTPickerVisible?.(true);
+		setShowDateTimeOptions(true);
+	};
+
+	const handleChange = (e: ChangeEvent<HTMLInputElement>): void => {
+		// Update the value state for controlled input
+		setValue(e.target.value);
+	};
+
+	const handleEnter = (): void => {
+		const newVal = value;
+		setValue('');
+
+		setIsInputFocused(false);
+		if (newVal !== selectedValue) {
+			handleDateTimeChange(newVal);
+		}
+		if (inputRef.current?.input) {
+			inputRef.current.input.blur();
+		}
 	};
 
 	const handleBlur = (): void => {
+		if (!isInputFocused) {
+			return;
+		}
+
+		// Don't close if custom date picker is visible
+		if (customDateTimeVisible) {
+			return;
+		}
+
 		setIsInputFocused(false);
+
+		const newVal = value;
+		setValue('');
+
+		if (newVal !== selectedValue) {
+			handleDateTimeChange(newVal);
+		}
+		if (inputRef.current?.input) {
+			inputRef.current.input.blur();
+		}
+
+		setOpen(false);
+		setCustomDTPickerVisible?.(false);
+		setShowDateTimeOptions(false);
 	};
 
+	// No need for manual DOM sync with controlled input
+
 	// this is required as TopNav component wraps the components and we need to clear the state on path change
 	useEffect(() => {
 		setInputStatus('');
 		onError(false);
 		setInputErrorMessage(null);
-		setInputValue('');
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [location.pathname]);
 
@@ -333,7 +535,7 @@ function CustomTimePicker({
 	};
 
 	const getTooltipTitle = (): string => {
-		if (selectedTime === 'custom' && inputValue === '' && !open) {
+		if (selectedTime === 'custom' && value === '' && !open) {
 			return `${dayjs(minTime / 1000_000)
 				.tz(timezone.value)
 				.format(DATE_TIME_FORMATS.DD_MMM_YYYY_HH_MM_SS)} - ${dayjs(
@@ -357,7 +559,7 @@ function CustomTimePicker({
 
 		return (
 			<div className="time-input-prefix">
-				{inputValue && inputStatus === 'success' ? (
+				{value && inputStatus === 'success' ? (
 					<CheckCircle size={14} color="#51E7A8" />
 				) : (
 					<Tooltip title="Enter time in format (e.g., 1m, 2h, 3d, 4w)">
@@ -371,57 +573,55 @@ function CustomTimePicker({
 	return (
 		<div className="custom-time-picker">
 			<Tooltip title={getTooltipTitle()} placement="top">
-				<Popover
-					className={cx(
-						'timeSelection-input-container',
-						selectedTime === 'custom' && inputValue === '' ? 'custom-time' : '',
-					)}
-					placement="bottomRight"
-					getPopupContainer={popupContainer}
-					rootClassName="date-time-root"
-					content={
-						newPopover ? (
-							<CustomTimePickerPopoverContent
-								setIsOpen={setOpen}
-								customDateTimeVisible={defaultTo(customDateTimeVisible, false)}
-								setCustomDTPickerVisible={defaultTo(setCustomDTPickerVisible, noop)}
-								onCustomDateHandler={defaultTo(onCustomDateHandler, noop)}
-								onSelectHandler={handleSelect}
-								onGoLive={defaultTo(onGoLive, noop)}
-								onExitLiveLogs={defaultTo(onExitLiveLogs, noop)}
-								options={items}
-								selectedTime={selectedTime}
-								activeView={activeView}
-								setActiveView={setActiveView}
-								setIsOpenedFromFooter={setIsOpenedFromFooter}
-								isOpenedFromFooter={isOpenedFromFooter}
-							/>
-						) : (
-							content
-						)
-					}
-					arrow={false}
-					trigger="click"
-					open={open}
-					onOpenChange={handleOpenChange}
-					style={{
-						padding: 0,
-					}}
-				>
-					<Input
-						className="timeSelection-input"
-						type="text"
-						status={inputValue && inputStatus === 'error' ? 'error' : ''}
-						placeholder={
-							isInputFocused
-								? 'Time Format (1m or 2h or 3d or 4w)'
-								: selectedTimePlaceholderValue
+				<div className="date-time-picker-container">
+					{/* <Popover
+						className={cx(
+							'timeSelection-input-container',
+							selectedTime === 'custom' && inputValue === '' ? 'custom-time' : '',
+						)}
+						placement="bottomRight"
+						getPopupContainer={popupContainer}
+						rootClassName="date-time-root"
+						content={
+							newPopover ? (
+								<CustomTimePickerPopoverContent
+									setIsOpen={setOpen}
+									customDateTimeVisible={defaultTo(customDateTimeVisible, false)}
+									setCustomDTPickerVisible={defaultTo(setCustomDTPickerVisible, noop)}
+									onCustomDateHandler={defaultTo(onCustomDateHandler, noop)}
+									onSelectHandler={handleSelect}
+									onGoLive={defaultTo(onGoLive, noop)}
+									onExitLiveLogs={defaultTo(onExitLiveLogs, noop)}
+									options={items}
+									selectedTime={selectedTime}
+									activeView={activeView}
+									setActiveView={setActiveView}
+									setIsOpenedFromFooter={setIsOpenedFromFooter}
+									isOpenedFromFooter={isOpenedFromFooter}
+								/>
+							) : (
+								content
+							)
 						}
-						value={inputValue}
-						onFocus={handleFocus}
-						onClick={handleFocus}
+						arrow={false}
+						trigger="click"
+						open={open}
+					> */}
+
+					<Input
+						className={cx(
+							'date-time-picker-input timeSelection-input',
+							selectedTime === 'custom' ? 'custom-time' : '',
+						)}
+						type="text"
+						status={value && inputStatus === 'error' ? 'error' : ''}
+						placeholder={selectedTimePlaceholderValue}
+						ref={inputRef}
+						value={isInputFocused ? value : ''}
+						onChange={handleChange}
 						onBlur={handleBlur}
-						onChange={handleInputChange}
+						onPressEnter={handleEnter}
+						onClick={handleFocus}
 						data-1p-ignore
 						prefix={getInputPrefix()}
 						suffix={
@@ -431,18 +631,45 @@ function CustomTimePicker({
 										<span>{activeTimezoneOffset}</span>
 									</div>
 								)}
-								<ChevronDown
-									size={14}
-									className="cursor-pointer time-input-suffix-icon-badge"
-									onClick={(e): void => {
-										e.stopPropagation();
-										handleViewChange('datetime');
-									}}
-								/>
+								<ChevronDown size={14} />
 							</div>
 						}
 					/>
-				</Popover>
+
+					{showDateTimeOptions && (
+						<div
+							className="date-time-picker-content date-time-root"
+							onMouseDown={(e): void => {
+								// Prevent blur when clicking inside the popover
+								e.preventDefault();
+							}}
+						>
+							{newPopover ? (
+								<CustomTimePickerPopoverContent
+									setIsOpen={setOpen}
+									customDateTimeVisible={defaultTo(customDateTimeVisible, false)}
+									setCustomDTPickerVisible={defaultTo(setCustomDTPickerVisible, noop)}
+									onCustomDateHandler={defaultTo(onCustomDateHandler, noop)}
+									onHandleRecentlyUsedTimeRangeClick={defaultTo(
+										handleRecentlyUsedTimeRangeClick,
+										noop,
+									)}
+									onSelectHandler={handleSelect}
+									onGoLive={defaultTo(onGoLive, noop)}
+									onExitLiveLogs={defaultTo(onExitLiveLogs, noop)}
+									options={items}
+									selectedTime={selectedTime}
+									activeView={activeView}
+									setActiveView={setActiveView}
+									setIsOpenedFromFooter={setIsOpenedFromFooter}
+									isOpenedFromFooter={isOpenedFromFooter}
+								/>
+							) : (
+								content
+							)}
+						</div>
+					)}
+				</div>
 			</Tooltip>
 			{inputStatus === 'error' && inputErrorMessage && (
 				<Typography.Title level={5} className="valid-format-error">

frontend/src/components/CustomTimePicker/CustomTimePickerPopoverContent.tsx

@@ -47,6 +47,7 @@ interface CustomTimePickerPopoverContentProps {
 	isOpenedFromFooter: boolean;
 	setIsOpenedFromFooter: Dispatch<SetStateAction<boolean>>;
 	onExitLiveLogs: () => void;
+	onHandleRecentlyUsedTimeRangeClick: () => void;
 }
 
 interface RecentlyUsedDateTimeRange {
@@ -72,6 +73,7 @@ function CustomTimePickerPopoverContent({
 	isOpenedFromFooter,
 	setIsOpenedFromFooter,
 	onExitLiveLogs,
+	onHandleRecentlyUsedTimeRangeClick,
 }: CustomTimePickerPopoverContentProps): JSX.Element {
 	const { pathname } = useLocation();
 
@@ -224,33 +226,37 @@ function CustomTimePickerPopoverContent({
 								<div>{getTimeChips(RelativeDurationSuggestionOptions)}</div>
 							</div>
 
-							<div className="recently-used-container">
-								<div className="time-heading">RECENTLY USED</div>
-								<div className="recently-used-range">
-									{recentlyUsedTimeRanges.map((range: RecentlyUsedDateTimeRange) => (
-										<div
-											className="recently-used-range-item"
-											role="button"
-											tabIndex={0}
-											onKeyDown={(e): void => {
-												if (e.key === 'Enter' || e.key === ' ') {
+							{recentlyUsedTimeRanges && recentlyUsedTimeRanges.length > 0 && (
+								<div className="recently-used-container">
+									<div className="time-heading">RECENTLY USED</div>
+									<div className="recently-used-range">
+										{recentlyUsedTimeRanges.map((range: RecentlyUsedDateTimeRange) => (
+											<div
+												className="recently-used-range-item"
+												role="button"
+												tabIndex={0}
+												onKeyDown={(e): void => {
+													if (e.key === 'Enter' || e.key === ' ') {
+														handleExitLiveLogs();
+														onCustomDateHandler([dayjs(range.from), dayjs(range.to)]);
+														onHandleRecentlyUsedTimeRangeClick();
+														setIsOpen(false);
+													}
+												}}
+												key={range.value}
+												onClick={(): void => {
 													handleExitLiveLogs();
 													onCustomDateHandler([dayjs(range.from), dayjs(range.to)]);
+													onHandleRecentlyUsedTimeRangeClick();
 													setIsOpen(false);
-												}
-											}}
-											key={range.value}
-											onClick={(): void => {
-												handleExitLiveLogs();
-												onCustomDateHandler([dayjs(range.from), dayjs(range.to)]);
-												setIsOpen(false);
-											}}
-										>
-											{range.label}
-										</div>
-									))}
+												}}
+											>
+												{range.label}
+											</div>
+										))}
+									</div>
 								</div>
-							</div>
+							)}
 						</div>
 					)}
 				</div>

frontend/src/components/CustomTimePicker/TimezonePicker.styles.scss

@@ -23,7 +23,7 @@ $item-spacing: 8px;
 }
 
 .timezone-picker {
-	width: 532px;
+	width: 100%;
 	color: var(--bg-vanilla-400);
 	font-family: $font-family;
 

frontend/src/components/DatePickerV2/DatePickerV2.tsx

@@ -49,6 +49,13 @@ function DatePickerV2({
 
 	const handleNext = (): void => {
 		if (selectedDateTimeFor === 'to') {
+			console.log(
+				'handleNext selectedFromDateTime',
+				selectedFromDateTime,
+				'selectedToDateTime',
+				selectedToDateTime,
+			);
+
 			onCustomDateHandler([selectedFromDateTime, selectedToDateTime]);
 
 			addCustomTimeRange([selectedFromDateTime, selectedToDateTime]);

frontend/src/components/Graph/__tests__/yAxisConfig.test.ts

@@ -1,372 +0,0 @@
-/* eslint-disable sonarjs/no-duplicate-string */
-import { PrecisionOptionsEnum } from '../types';
-import { getYAxisFormattedValue } from '../yAxisConfig';
-
-const testFullPrecisionGetYAxisFormattedValue = (
-	value: string,
-	format: string,
-): string => getYAxisFormattedValue(value, format, PrecisionOptionsEnum.FULL);
-
-describe('getYAxisFormattedValue - none (full precision legacy assertions)', () => {
-	test('large integers and decimals', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('250034', 'none')).toBe(
-			'250034',
-		);
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('250034897.12345', 'none'),
-		).toBe('250034897.12345');
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('250034897.02354', 'none'),
-		).toBe('250034897.02354');
-		expect(testFullPrecisionGetYAxisFormattedValue('9999999.9999', 'none')).toBe(
-			'9999999.9999',
-		);
-	});
-
-	test('preserves leading zeros after decimal until first non-zero', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1.0000234', 'none')).toBe(
-			'1.0000234',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.00003', 'none')).toBe(
-			'0.00003',
-		);
-	});
-
-	test('trims to three significant decimals and removes trailing zeros', () => {
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('0.000000250034', 'none'),
-		).toBe('0.000000250034');
-		expect(testFullPrecisionGetYAxisFormattedValue('0.00000025', 'none')).toBe(
-			'0.00000025',
-		);
-
-		// Big precision, limiting the javascript precision (~16 digits)
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('1.0000000000000001', 'none'),
-		).toBe('1');
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('1.00555555559595876', 'none'),
-		).toBe('1.005555555595958');
-
-		expect(testFullPrecisionGetYAxisFormattedValue('0.000000001', 'none')).toBe(
-			'0.000000001',
-		);
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('0.000000250000', 'none'),
-		).toBe('0.00000025');
-	});
-
-	test('whole numbers normalize', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1000', 'none')).toBe('1000');
-		expect(testFullPrecisionGetYAxisFormattedValue('99.5458', 'none')).toBe(
-			'99.5458',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1.234567', 'none')).toBe(
-			'1.234567',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('99.998', 'none')).toBe(
-			'99.998',
-		);
-	});
-
-	test('strip redundant decimal zeros', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1000.000', 'none')).toBe(
-			'1000',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('99.500', 'none')).toBe(
-			'99.5',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1.000', 'none')).toBe('1');
-	});
-
-	test('edge values', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0', 'none')).toBe('0');
-		expect(testFullPrecisionGetYAxisFormattedValue('-0', 'none')).toBe('0');
-		expect(testFullPrecisionGetYAxisFormattedValue('Infinity', 'none')).toBe('∞');
-		expect(testFullPrecisionGetYAxisFormattedValue('-Infinity', 'none')).toBe(
-			'-∞',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('invalid', 'none')).toBe(
-			'NaN',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('', 'none')).toBe('NaN');
-		expect(testFullPrecisionGetYAxisFormattedValue('abc123', 'none')).toBe('NaN');
-	});
-
-	test('small decimals keep precision as-is', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0.0001', 'none')).toBe(
-			'0.0001',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('-0.0001', 'none')).toBe(
-			'-0.0001',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.000000001', 'none')).toBe(
-			'0.000000001',
-		);
-	});
-
-	test('simple decimals preserved', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0.1', 'none')).toBe('0.1');
-		expect(testFullPrecisionGetYAxisFormattedValue('0.2', 'none')).toBe('0.2');
-		expect(testFullPrecisionGetYAxisFormattedValue('0.3', 'none')).toBe('0.3');
-		expect(testFullPrecisionGetYAxisFormattedValue('1.0000000001', 'none')).toBe(
-			'1.0000000001',
-		);
-	});
-});
-
-describe('getYAxisFormattedValue - units (full precision legacy assertions)', () => {
-	test('ms', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1500', 'ms')).toBe('1.5 s');
-		expect(testFullPrecisionGetYAxisFormattedValue('500', 'ms')).toBe('500 ms');
-		expect(testFullPrecisionGetYAxisFormattedValue('60000', 'ms')).toBe('1 min');
-		expect(testFullPrecisionGetYAxisFormattedValue('295.429', 'ms')).toBe(
-			'295.429 ms',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('4353.81', 'ms')).toBe(
-			'4.35381 s',
-		);
-	});
-
-	test('s', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('90', 's')).toBe('1.5 mins');
-		expect(testFullPrecisionGetYAxisFormattedValue('30', 's')).toBe('30 s');
-		expect(testFullPrecisionGetYAxisFormattedValue('3600', 's')).toBe('1 hour');
-	});
-
-	test('m', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('90', 'm')).toBe('1.5 hours');
-		expect(testFullPrecisionGetYAxisFormattedValue('30', 'm')).toBe('30 min');
-		expect(testFullPrecisionGetYAxisFormattedValue('1440', 'm')).toBe('1 day');
-	});
-
-	test('bytes', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1024', 'bytes')).toBe(
-			'1 KiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('512', 'bytes')).toBe('512 B');
-		expect(testFullPrecisionGetYAxisFormattedValue('1536', 'bytes')).toBe(
-			'1.5 KiB',
-		);
-	});
-
-	test('mbytes', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1024', 'mbytes')).toBe(
-			'1 GiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('512', 'mbytes')).toBe(
-			'512 MiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1536', 'mbytes')).toBe(
-			'1.5 GiB',
-		);
-	});
-
-	test('kbytes', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1024', 'kbytes')).toBe(
-			'1 MiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('512', 'kbytes')).toBe(
-			'512 KiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1536', 'kbytes')).toBe(
-			'1.5 MiB',
-		);
-	});
-
-	test('short', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1000', 'short')).toBe('1 K');
-		expect(testFullPrecisionGetYAxisFormattedValue('1500', 'short')).toBe(
-			'1.5 K',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('999', 'short')).toBe('999');
-
-		expect(testFullPrecisionGetYAxisFormattedValue('1000000', 'short')).toBe(
-			'1 Mil',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1555600', 'short')).toBe(
-			'1.5556 Mil',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('999999', 'short')).toBe(
-			'999.999 K',
-		);
-
-		expect(testFullPrecisionGetYAxisFormattedValue('1000000000', 'short')).toBe(
-			'1 Bil',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1500000000', 'short')).toBe(
-			'1.5 Bil',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('999999999', 'short')).toBe(
-			'999.999999 Mil',
-		);
-	});
-
-	test('percent', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0.15', 'percent')).toBe(
-			'0.15%',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.1234', 'percent')).toBe(
-			'0.1234%',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.123499', 'percent')).toBe(
-			'0.123499%',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1.5', 'percent')).toBe(
-			'1.5%',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.0001', 'percent')).toBe(
-			'0.0001%',
-		);
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('0.000000001', 'percent'),
-		).toBe('1e-9%');
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('0.000000250034', 'percent'),
-		).toBe('0.000000250034%');
-		expect(testFullPrecisionGetYAxisFormattedValue('0.00000025', 'percent')).toBe(
-			'0.00000025%',
-		);
-		// Big precision, limiting the javascript precision (~16 digits)
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('1.0000000000000001', 'percent'),
-		).toBe('1%');
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('1.00555555559595876', 'percent'),
-		).toBe('1.005555555595959%');
-	});
-
-	test('ratio', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0.5', 'ratio')).toBe(
-			'0.5 ratio',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1.25', 'ratio')).toBe(
-			'1.25 ratio',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('2.0', 'ratio')).toBe(
-			'2 ratio',
-		);
-	});
-
-	test('temperature units', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('25', 'celsius')).toBe(
-			'25 °C',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0', 'celsius')).toBe('0 °C');
-		expect(testFullPrecisionGetYAxisFormattedValue('-10', 'celsius')).toBe(
-			'-10 °C',
-		);
-
-		expect(testFullPrecisionGetYAxisFormattedValue('77', 'fahrenheit')).toBe(
-			'77 °F',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('32', 'fahrenheit')).toBe(
-			'32 °F',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('14', 'fahrenheit')).toBe(
-			'14 °F',
-		);
-	});
-
-	test('ms edge cases', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0', 'ms')).toBe('0 ms');
-		expect(testFullPrecisionGetYAxisFormattedValue('-1500', 'ms')).toBe('-1.5 s');
-		expect(testFullPrecisionGetYAxisFormattedValue('Infinity', 'ms')).toBe('∞');
-	});
-
-	test('bytes edge cases', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0', 'bytes')).toBe('0 B');
-		expect(testFullPrecisionGetYAxisFormattedValue('-1024', 'bytes')).toBe(
-			'-1 KiB',
-		);
-	});
-});
-
-describe('getYAxisFormattedValue - precision option tests', () => {
-	test('precision 0 drops decimal part', () => {
-		expect(getYAxisFormattedValue('1.2345', 'none', 0)).toBe('1');
-		expect(getYAxisFormattedValue('0.9999', 'none', 0)).toBe('0');
-		expect(getYAxisFormattedValue('12345.6789', 'none', 0)).toBe('12345');
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 0)).toBe('0');
-		expect(getYAxisFormattedValue('1000.000', 'none', 0)).toBe('1000');
-		expect(getYAxisFormattedValue('0.000000250034', 'none', 0)).toBe('0');
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 0)).toBe('1');
-
-		// with unit
-		expect(getYAxisFormattedValue('4353.81', 'ms', 0)).toBe('4 s');
-	});
-	test('precision 1,2,3,4 decimals', () => {
-		expect(getYAxisFormattedValue('1.2345', 'none', 1)).toBe('1.2');
-		expect(getYAxisFormattedValue('1.2345', 'none', 2)).toBe('1.23');
-		expect(getYAxisFormattedValue('1.2345', 'none', 3)).toBe('1.234');
-		expect(getYAxisFormattedValue('1.2345', 'none', 4)).toBe('1.2345');
-
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 1)).toBe('0.00001');
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 2)).toBe('0.000012');
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 3)).toBe('0.0000123');
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 4)).toBe('0.00001234');
-
-		expect(getYAxisFormattedValue('1000.000', 'none', 1)).toBe('1000');
-		expect(getYAxisFormattedValue('1000.000', 'none', 2)).toBe('1000');
-		expect(getYAxisFormattedValue('1000.000', 'none', 3)).toBe('1000');
-		expect(getYAxisFormattedValue('1000.000', 'none', 4)).toBe('1000');
-
-		expect(getYAxisFormattedValue('0.000000250034', 'none', 1)).toBe('0.0000002');
-		expect(getYAxisFormattedValue('0.000000250034', 'none', 2)).toBe(
-			'0.00000025',
-		); // leading zeros + 2 significant => same trimmed
-		expect(getYAxisFormattedValue('0.000000250034', 'none', 3)).toBe(
-			'0.00000025',
-		);
-		expect(getYAxisFormattedValue('0.000000250304', 'none', 4)).toBe(
-			'0.0000002503',
-		);
-
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 1)).toBe(
-			'1.005',
-		);
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 2)).toBe(
-			'1.0055',
-		);
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 3)).toBe(
-			'1.00555',
-		);
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 4)).toBe(
-			'1.005555',
-		);
-
-		// with unit
-		expect(getYAxisFormattedValue('4353.81', 'ms', 1)).toBe('4.4 s');
-		expect(getYAxisFormattedValue('4353.81', 'ms', 2)).toBe('4.35 s');
-		expect(getYAxisFormattedValue('4353.81', 'ms', 3)).toBe('4.354 s');
-		expect(getYAxisFormattedValue('4353.81', 'ms', 4)).toBe('4.3538 s');
-
-		// Percentages
-		expect(getYAxisFormattedValue('0.123456', 'percent', 2)).toBe('0.12%');
-		expect(getYAxisFormattedValue('0.123456', 'percent', 4)).toBe('0.1235%'); // approximation
-	});
-
-	test('precision full uses up to DEFAULT_SIGNIFICANT_DIGITS significant digits', () => {
-		expect(
-			getYAxisFormattedValue(
-				'0.00002625429914148441',
-				'none',
-				PrecisionOptionsEnum.FULL,
-			),
-		).toBe('0.000026254299141');
-		expect(
-			getYAxisFormattedValue(
-				'0.000026254299141484417',
-				's',
-				PrecisionOptionsEnum.FULL,
-			),
-		).toBe('26.254299141484417 µs');
-
-		expect(
-			getYAxisFormattedValue('4353.81', 'ms', PrecisionOptionsEnum.FULL),
-		).toBe('4.35381 s');
-		expect(getYAxisFormattedValue('500', 'ms', PrecisionOptionsEnum.FULL)).toBe(
-			'500 ms',
-		);
-	});
-});

frontend/src/components/Graph/types.ts

@@ -78,18 +78,3 @@ export interface ITimeRange {
 	minTime: number | null;
 	maxTime: number | null;
 }
-
-export const DEFAULT_SIGNIFICANT_DIGITS = 15;
-
-// max decimals to keep should not exceed 15 decimal places to avoid floating point precision issues
-export const MAX_DECIMALS = 15;
-
-export enum PrecisionOptionsEnum {
-	ZERO = 0,
-	ONE = 1,
-	TWO = 2,
-	THREE = 3,
-	FOUR = 4,
-	FULL = 'full',
-}
-export type PrecisionOption = 0 | 1 | 2 | 3 | 4 | PrecisionOptionsEnum.FULL;

frontend/src/components/Graph/utils.ts

@@ -16,12 +16,8 @@ import {
 } from './Plugin/IntersectionCursor';
 import {
 	CustomChartOptions,
-	DEFAULT_SIGNIFICANT_DIGITS,
 	GraphOnClickHandler,
 	IAxisTimeConfig,
-	MAX_DECIMALS,
-	PrecisionOption,
-	PrecisionOptionsEnum,
 	StaticLineProps,
 } from './types';
 import { getToolTipValue, getYAxisFormattedValue } from './yAxisConfig';
@@ -153,7 +149,6 @@ export const getGraphOptions = (
 	scales: {
 		x: {
 			stacked: isStacked,
-			offset: false,
 			grid: {
 				display: true,
 				color: getGridColor(),
@@ -246,68 +241,3 @@ declare module 'chart.js' {
 		custom: TooltipPositionerFunction<ChartType>;
 	}
 }
-
-/**
- * Formats a number for display, preserving leading zeros after the decimal point
- * and showing up to DEFAULT_SIGNIFICANT_DIGITS digits after the first non-zero decimal digit.
- * It avoids scientific notation and removes unnecessary trailing zeros.
- *
- * @example
- * formatDecimalWithLeadingZeros(1.2345); // "1.2345"
- * formatDecimalWithLeadingZeros(0.0012345); // "0.0012345"
- * formatDecimalWithLeadingZeros(5.0); // "5"
- *
- * @param value The number to format.
- * @returns The formatted string.
- */
-export const formatDecimalWithLeadingZeros = (
-	value: number,
-	precision: PrecisionOption,
-): string => {
-	if (value === 0) {
-		return '0';
-	}
-
-	// Use toLocaleString to get a full decimal representation without scientific notation.
-	const numStr = value.toLocaleString('en-US', {
-		useGrouping: false,
-		maximumFractionDigits: 20,
-	});
-
-	const [integerPart, decimalPart = ''] = numStr.split('.');
-
-	// If there's no decimal part, the integer part is the result.
-	if (!decimalPart) {
-		return integerPart;
-	}
-
-	// Find the index of the first non-zero digit in the decimal part.
-	const firstNonZeroIndex = decimalPart.search(/[^0]/);
-
-	// If the decimal part consists only of zeros, return just the integer part.
-	if (firstNonZeroIndex === -1) {
-		return integerPart;
-	}
-
-	// Determine the number of decimals to keep: leading zeros + up to N significant digits.
-	const significantDigits =
-		precision === PrecisionOptionsEnum.FULL
-			? DEFAULT_SIGNIFICANT_DIGITS
-			: precision;
-	const decimalsToKeep = firstNonZeroIndex + (significantDigits || 0);
-
-	// max decimals to keep should not exceed 15 decimal places to avoid floating point precision issues
-	const finalDecimalsToKeep = Math.min(decimalsToKeep, MAX_DECIMALS);
-	const trimmedDecimalPart = decimalPart.substring(0, finalDecimalsToKeep);
-
-	// If precision is 0, we drop the decimal part entirely.
-	if (precision === 0) {
-		return integerPart;
-	}
-
-	// Remove any trailing zeros from the result to keep it clean.
-	const finalDecimalPart = trimmedDecimalPart.replace(/0+$/, '');
-
-	// Return the integer part, or the integer and decimal parts combined.
-	return finalDecimalPart ? `${integerPart}.${finalDecimalPart}` : integerPart;
-};

frontend/src/components/Graph/yAxisConfig.ts

@@ -1,97 +1,58 @@
-/* eslint-disable sonarjs/cognitive-complexity */
 import { formattedValueToString, getValueFormat } from '@grafana/data';
-import * as Sentry from '@sentry/react';
-import { UniversalYAxisUnit } from 'components/YAxisUnitSelector/types';
-import { isUniversalUnit } from 'components/YAxisUnitSelector/utils';
-import { isNaN } from 'lodash-es';
 
-import { formatUniversalUnit } from '../YAxisUnitSelector/formatter';
-import {
-	DEFAULT_SIGNIFICANT_DIGITS,
-	PrecisionOption,
-	PrecisionOptionsEnum,
-} from './types';
-import { formatDecimalWithLeadingZeros } from './utils';
-
-/**
- * Formats a Y-axis value based on a given format string.
- *
- * @param value The string value from the axis.
- * @param format The format identifier (e.g. 'none', 'ms', 'bytes', 'short').
- * @returns A formatted string ready for display.
- */
 export const getYAxisFormattedValue = (
 	value: string,
 	format: string,
-	precision: PrecisionOption = 2, // default precision requested
 ): string => {
-	const numValue = parseFloat(value);
-
-	// Handle non-numeric or special values first.
-	if (isNaN(numValue)) return 'NaN';
-	if (numValue === Infinity) return '∞';
-	if (numValue === -Infinity) return '-∞';
-
-	// For all other standard formats, delegate to grafana/data's built-in formatter.
-	const computeDecimals = (): number | undefined => {
-		if (precision === PrecisionOptionsEnum.FULL) {
-			return DEFAULT_SIGNIFICANT_DIGITS;
-		}
-		return precision;
-	};
-
-	const fallbackFormat = (): string => {
-		if (precision === PrecisionOptionsEnum.FULL) return numValue.toString();
-		if (precision === 0) return Math.round(numValue).toString();
-		return precision !== undefined
-			? numValue
-					.toFixed(precision)
-					.replace(/(\.[0-9]*[1-9])0+$/, '$1') // trimming zeros
-					.replace(/\.$/, '')
-			: numValue.toString();
-	};
-
+	let decimalPrecision: number | undefined;
+	const parsedValue = getValueFormat(format)(
+		parseFloat(value),
+		undefined,
+		undefined,
+		undefined,
+	);
 	try {
-		// Use custom formatter for the 'none' format honoring precision
-		if (format === 'none') {
-			return formatDecimalWithLeadingZeros(numValue, precision);
+		const decimalSplitted = parsedValue.text.split('.');
+		if (decimalSplitted.length === 1) {
+			decimalPrecision = 0;
+		} else {
+			const decimalDigits = decimalSplitted[1].split('');
+			decimalPrecision = decimalDigits.length;
+			let nonZeroCtr = 0;
+			for (let idx = 0; idx < decimalDigits.length; idx += 1) {
+				if (decimalDigits[idx] !== '0') {
+					nonZeroCtr += 1;
+					if (nonZeroCtr >= 2) {
+						decimalPrecision = idx + 1;
+					}
+				} else if (nonZeroCtr) {
+					decimalPrecision = idx;
+					break;
+				}
+			}
 		}
 
-		// Separate logic for universal units// Separate logic for universal units
-		if (format && isUniversalUnit(format)) {
-			const decimals = computeDecimals();
-			return formatUniversalUnit(
-				numValue,
-				format as UniversalYAxisUnit,
-				precision,
-				decimals,
-			);
-		}
-
-		const formatter = getValueFormat(format);
-		const formattedValue = formatter(numValue, computeDecimals(), undefined);
-		if (formattedValue.text && formattedValue.text.includes('.')) {
-			formattedValue.text = formatDecimalWithLeadingZeros(
-				parseFloat(formattedValue.text),
-				precision,
-			);
-		}
-
-		return formattedValueToString(formattedValue);
+		return formattedValueToString(
+			getValueFormat(format)(
+				parseFloat(value),
+				decimalPrecision,
+				undefined,
+				undefined,
+			),
+		);
 	} catch (error) {
-		Sentry.captureEvent({
-			message: `Error applying formatter: ${
-				error instanceof Error ? error.message : 'Unknown error'
-			}`,
-			level: 'error',
-		});
-		return fallbackFormat();
+		console.error(error);
 	}
+	return `${parseFloat(value)}`;
 };
 
-export const getToolTipValue = (
-	value: string | number,
-	format?: string,
-	precision?: PrecisionOption,
-): string =>
-	getYAxisFormattedValue(value?.toString(), format || 'none', precision);
+export const getToolTipValue = (value: string, format?: string): string => {
+	try {
+		return formattedValueToString(
+			getValueFormat(format)(parseFloat(value), undefined, undefined, undefined),
+		);
+	} catch (error) {
+		console.error(error);
+	}
+	return `${value}`;
+};

frontend/src/components/HostMetricsDetail/Metrics/Metrics.tsx

@@ -60,14 +60,6 @@ function Metrics({
 		setElement,
 	} = useMultiIntersectionObserver(hostWidgetInfo.length, { threshold: 0.1 });
 
-	const legendScrollPositionRef = useRef<{
-		scrollTop: number;
-		scrollLeft: number;
-	}>({
-		scrollTop: 0,
-		scrollLeft: 0,
-	});
-
 	const queryPayloads = useMemo(
 		() =>
 			getHostQueryPayload(
@@ -155,13 +147,6 @@ function Metrics({
 					maxTimeScale: graphTimeIntervals[idx].end,
 					onDragSelect: (start, end) => onDragSelect(start, end, idx),
 					query: currentQuery,
-					legendScrollPosition: legendScrollPositionRef.current,
-					setLegendScrollPosition: (position: {
-						scrollTop: number;
-						scrollLeft: number;
-					}) => {
-						legendScrollPositionRef.current = position;
-					},
 				}),
 			),
 		[

frontend/src/components/InputWithLabel/InputWithLabel.styles.scss

@@ -37,6 +37,7 @@
 
 		border-radius: 2px 0px 0px 2px;
 		border: 1px solid var(--bg-slate-400);
+		background: var(--bg-ink-300);
 
 		border-right: none;
 		border-left: none;
@@ -44,12 +45,6 @@
 		border-bottom-right-radius: 0px;
 		border-top-left-radius: 0px;
 		border-bottom-left-radius: 0px;
-		font-size: 12px !important;
-		line-height: 27px;
-		&::placeholder {
-			color: var(--bg-vanilla-400) !important;
-			font-size: 12px !important;
-		}
 	}
 
 	.close-btn {

frontend/src/components/LogDetail/LogDetails.styles.scss

@@ -132,9 +132,9 @@
 			justify-content: center;
 		}
 
-		.log-detail-drawer__actions {
+		.json-action-btn {
 			display: flex;
-			gap: 4px;
+			gap: 8px;
 		}
 	}
 

frontend/src/components/LogDetail/index.tsx

@@ -319,35 +319,31 @@ function LogDetailInner({
 					</Radio.Button>
 				</Radio.Group>
 
-				<div className="log-detail-drawer__actions">
-					{selectedView === VIEW_TYPES.CONTEXT && (
-						<Tooltip
-							title="Show Filters"
-							placement="topLeft"
-							aria-label="Show Filters"
-						>
-							<Button
-								className="action-btn"
-								icon={<Filter size={16} />}
-								onClick={handleFilterVisible}
-							/>
-						</Tooltip>
-					)}
-
-					<Tooltip
-						title={selectedView === VIEW_TYPES.JSON ? 'Copy JSON' : 'Copy Log Link'}
-						placement="topLeft"
-						aria-label={
-							selectedView === VIEW_TYPES.JSON ? 'Copy JSON' : 'Copy Log Link'
-						}
-					>
+				{selectedView === VIEW_TYPES.JSON && (
+					<div className="json-action-btn">
 						<Button
 							className="action-btn"
 							icon={<Copy size={16} />}
-							onClick={selectedView === VIEW_TYPES.JSON ? handleJSONCopy : onLogCopy}
+							onClick={handleJSONCopy}
 						/>
-					</Tooltip>
-				</div>
+					</div>
+				)}
+
+				{selectedView === VIEW_TYPES.CONTEXT && (
+					<Button
+						className="action-btn"
+						icon={<Filter size={16} />}
+						onClick={handleFilterVisible}
+					/>
+				)}
+
+				<Tooltip title="Copy Log Link" placement="left" aria-label="Copy Log Link">
+					<Button
+						className="action-btn"
+						icon={<Copy size={16} />}
+						onClick={onLogCopy}
+					/>
+				</Tooltip>
 			</div>
 			{isFilterVisible && contextQuery?.builder.queryData[0] && (
 				<div className="log-detail-drawer-query-container">
@@ -387,8 +383,7 @@ function LogDetailInner({
 					podName={log.resources_string?.[RESOURCE_KEYS.POD_NAME] || ''}
 					nodeName={log.resources_string?.[RESOURCE_KEYS.NODE_NAME] || ''}
 					hostName={log.resources_string?.[RESOURCE_KEYS.HOST_NAME] || ''}
-					timestamp={log.timestamp.toString()}
-					dataSource={DataSource.LOGS}
+					logLineTimestamp={log.timestamp.toString()}
 				/>
 			)}
 		</Drawer>

frontend/src/components/Logs/CopyClipboardHOC.tsx

@@ -6,7 +6,6 @@ import { useCopyToClipboard } from 'react-use';
 function CopyClipboardHOC({
 	entityKey,
 	textToCopy,
-	tooltipText = 'Copy to clipboard',
 	children,
 }: CopyClipboardHOCProps): JSX.Element {
 	const [value, setCopy] = useCopyToClipboard();
@@ -32,7 +31,7 @@ function CopyClipboardHOC({
 		<span onClick={onClick} role="presentation" tabIndex={-1}>
 			<Popover
 				placement="top"
-				content={<span style={{ fontSize: '0.9rem' }}>{tooltipText}</span>}
+				content={<span style={{ fontSize: '0.9rem' }}>Copy to clipboard</span>}
 			>
 				{children}
 			</Popover>
@@ -43,11 +42,7 @@ function CopyClipboardHOC({
 interface CopyClipboardHOCProps {
 	entityKey: string | undefined;
 	textToCopy: string;
-	tooltipText?: string;
 	children: ReactNode;
 }
 
 export default CopyClipboardHOC;
-CopyClipboardHOC.defaultProps = {
-	tooltipText: 'Copy to clipboard',
-};

frontend/src/components/Logs/RawLogView/styles.ts

@@ -57,8 +57,8 @@ export const RawLogViewContainer = styled(Row)<{
 			  transition: background-color 2s ease-in;`
 			: ''}
 
-	${({ $isCustomHighlighted }): string =>
-		getCustomHighlightBackground($isCustomHighlighted)}
+	${({ $isCustomHighlighted, $isDarkMode, $logType }): string =>
+		getCustomHighlightBackground($isCustomHighlighted, $isDarkMode, $logType)}
 `;
 
 export const InfoIconWrapper = styled(Info)`

frontend/src/components/Logs/TableView/useTableView.tsx

@@ -153,9 +153,7 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {
 								children: (
 									<TableBodyContent
 										dangerouslySetInnerHTML={{
-											__html: getSanitizedLogBody(field as string, {
-												shouldEscapeHtml: true,
-											}),
+											__html: getSanitizedLogBody(field as string),
 										}}
 										fontSize={fontSize}
 										linesPerRow={linesPerRow}

frontend/src/components/LogsFormatOptionsMenu/LogsFormatOptionsMenu.tsx

@@ -471,13 +471,11 @@ function LogsFormatOptionsMenu({
 			rootClassName="format-options-popover"
 			destroyTooltipOnHide
 		>
-			<Tooltip title="Options">
-				<Button
-					className="periscope-btn ghost"
-					icon={<Sliders size={14} />}
-					data-testid="periscope-btn-format-options"
-				/>
-			</Tooltip>
+			<Button
+				className="periscope-btn ghost"
+				icon={<Sliders size={14} />}
+				data-testid="periscope-btn-format-options"
+			/>
 		</Popover>
 	);
 }

frontend/src/components/NewSelect/CustomMultiSelect.tsx

@@ -32,7 +32,6 @@ import { popupContainer } from 'utils/selectPopupContainer';
 
 import { CustomMultiSelectProps, CustomTagProps, OptionData } from './types';
 import {
-	ALL_SELECTED_VALUE,
 	filterOptionsBySearch,
 	handleScrollToBottom,
 	prioritizeOrAddOptionForMultiSelect,
@@ -44,6 +43,8 @@ enum ToggleTagValue {
 	All = 'All',
 }
 
+const ALL_SELECTED_VALUE = '__ALL__'; // Constant for the special value
+
 const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 	placeholder = 'Search...',
 	className,

frontend/src/components/NewSelect/utils.ts

@@ -5,8 +5,6 @@ import { OptionData } from './types';
 
 export const SPACEKEY = ' ';
 
-export const ALL_SELECTED_VALUE = '__ALL__'; // Constant for the special value
-
 export const prioritizeOrAddOptionForSingleSelect = (
 	options: OptionData[],
 	value: string,

frontend/src/components/QueryBuilderV2/QueryBuilderV2.styles.scss

@@ -251,10 +251,6 @@
 					.ant-input-group-addon {
 						border-top-left-radius: 0px !important;
 						border-top-right-radius: 0px !important;
-						background: var(--bg-ink-300);
-						color: var(--bg-vanilla-400);
-						font-size: 12px;
-						font-weight: 300;
 					}
 
 					.ant-input {
@@ -300,10 +296,6 @@
 				}
 			}
 			.qb-trace-operator-button-container {
-				display: flex;
-				align-items: center;
-				gap: 8px;
-
 				&-text {
 					display: flex;
 					align-items: center;
@@ -406,7 +398,7 @@
 	}
 
 	.qb-search-container {
-		.metrics-container {
+		.metrics-select-container {
 			margin-bottom: 12px;
 		}
 	}

frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx

@@ -22,8 +22,6 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 	showOnlyWhereClause = false,
 	showTraceOperator = false,
 	version,
-	onSignalSourceChange,
-	signalSourceChangeEnabled = false,
 }: QueryBuilderProps): JSX.Element {
 	const {
 		currentQuery,
@@ -177,9 +175,6 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 							queryVariant={config?.queryVariant || 'dropdown'}
 							showOnlyWhereClause={showOnlyWhereClause}
 							isListViewPanel={isListViewPanel}
-							onSignalSourceChange={onSignalSourceChange || ((): void => {})}
-							signalSourceChangeEnabled={signalSourceChangeEnabled}
-							queriesCount={1}
 						/>
 					) : (
 						currentQuery.builder.queryData.map((query, index) => (
@@ -198,10 +193,7 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 								queryVariant={config?.queryVariant || 'dropdown'}
 								showOnlyWhereClause={showOnlyWhereClause}
 								isListViewPanel={isListViewPanel}
-								signalSource={query.source as 'meter' | ''}
-								onSignalSourceChange={onSignalSourceChange || ((): void => {})}
-								signalSourceChangeEnabled={signalSourceChangeEnabled}
-								queriesCount={currentQuery.builder.queryData.length}
+								signalSource={config?.signalSource || ''}
 							/>
 						))
 					)}

frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.styles.scss

@@ -98,13 +98,6 @@
 					border-radius: 2px;
 					border: 1.005px solid var(--Slate-400, #1d212d);
 					background: var(--Ink-300, #16181d);
-					color: var(--bg-vanilla-400);
-					font-family: 'Geist Mono';
-					font-size: 13px;
-					font-style: normal;
-					font-weight: 400;
-					line-height: 20px;
-					letter-spacing: -0.07px;
 				}
 
 				.input-with-label {

frontend/src/components/QueryBuilderV2/QueryV2/MetricsSelect/MetricsSelect.styles.scss

@@ -1,23 +1,5 @@
-.metrics-source-select-container {
+.metrics-select-container {
 	margin-bottom: 8px;
-	display: flex;
-	flex-direction: row;
-	align-items: flex-start;
-	gap: 8px;
-	width: 100%;
-
-	.ant-select-selection-search-input {
-		font-size: 12px !important;
-		line-height: 27px;
-		&::placeholder {
-			color: var(--bg-vanilla-400) !important;
-			font-size: 12px !important;
-		}
-	}
-
-	.source-selector {
-		width: 120px;
-	}
 
 	.ant-select-selector {
 		width: 100%;
@@ -31,11 +13,6 @@
 		font-weight: 400;
 		line-height: 20px; /* 142.857% */
 		min-height: 36px;
-
-		.ant-select-selection-placeholder {
-			color: var(--bg-vanilla-400) !important;
-			font-size: 12px !important;
-		}
 	}
 
 	.ant-select-dropdown {
@@ -65,7 +42,7 @@
 }
 
 .lightMode {
-	.metrics-source-select-container {
+	.metrics-select-container {
 		.ant-select-selector {
 			border: 1px solid var(--bg-vanilla-300) !important;
 			background: var(--bg-vanilla-100);

frontend/src/components/QueryBuilderV2/QueryV2/MetricsSelect/MetricsSelect.tsx

@@ -1,121 +1,34 @@
 import './MetricsSelect.styles.scss';
 
-import { Select } from 'antd';
-import {
-	initialQueriesMap,
-	initialQueryMeterWithType,
-	PANEL_TYPES,
-} from 'constants/queryBuilder';
 import { AggregatorFilter } from 'container/QueryBuilder/filters';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
-import { memo, useCallback, useMemo, useState } from 'react';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { memo } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-import { SelectOption } from 'types/common/select';
-
-export const SOURCE_OPTIONS: SelectOption<string, string>[] = [
-	{ value: 'metrics', label: 'Metrics' },
-	{ value: 'meter', label: 'Meter' },
-];
 
 export const MetricsSelect = memo(function MetricsSelect({
 	query,
 	index,
 	version,
 	signalSource,
-	onSignalSourceChange,
-	signalSourceChangeEnabled = false,
 }: {
 	query: IBuilderQuery;
 	index: number;
 	version: string;
 	signalSource: 'meter' | '';
-	onSignalSourceChange: (value: string) => void;
-	signalSourceChangeEnabled: boolean;
 }): JSX.Element {
-	const [attributeKeys, setAttributeKeys] = useState<BaseAutocompleteData[]>([]);
-
 	const { handleChangeAggregatorAttribute } = useQueryOperations({
 		index,
 		query,
 		entityVersion: version,
 	});
 
-	const handleAggregatorAttributeChange = useCallback(
-		(value: BaseAutocompleteData, isEditMode?: boolean) => {
-			handleChangeAggregatorAttribute(value, isEditMode, attributeKeys || []);
-		},
-		[handleChangeAggregatorAttribute, attributeKeys],
-	);
-
-	const { updateAllQueriesOperators, handleSetQueryData } = useQueryBuilder();
-
-	const source = useMemo(
-		() => (signalSource === 'meter' ? 'meter' : 'metrics'),
-		[signalSource],
-	);
-
-	const defaultMeterQuery = useMemo(
-		() =>
-			updateAllQueriesOperators(
-				initialQueryMeterWithType,
-				PANEL_TYPES.BAR,
-				DataSource.METRICS,
-				'meter' as 'meter' | '',
-			),
-		[updateAllQueriesOperators],
-	);
-
-	const defaultMetricsQuery = useMemo(
-		() =>
-			updateAllQueriesOperators(
-				initialQueriesMap.metrics,
-				PANEL_TYPES.BAR,
-				DataSource.METRICS,
-				'',
-			),
-		[updateAllQueriesOperators],
-	);
-
-	const handleSignalSourceChange = (value: string): void => {
-		onSignalSourceChange(value);
-		handleSetQueryData(
-			index,
-			value === 'meter'
-				? {
-						...defaultMeterQuery.builder.queryData[0],
-						source: 'meter',
-						queryName: query.queryName,
-				  }
-				: {
-						...defaultMetricsQuery.builder.queryData[0],
-						source: '',
-						queryName: query.queryName,
-				  },
-		);
-	};
-
 	return (
-		<div className="metrics-source-select-container">
-			{signalSourceChangeEnabled && (
-				<Select
-					className="source-selector"
-					placeholder="Source"
-					options={SOURCE_OPTIONS}
-					value={source}
-					defaultValue="metrics"
-					onChange={handleSignalSourceChange}
-				/>
-			)}
-
+		<div className="metrics-select-container">
 			<AggregatorFilter
-				onChange={handleAggregatorAttributeChange}
+				onChange={handleChangeAggregatorAttribute}
 				query={query}
 				index={index}
 				signalSource={signalSource || ''}
-				setAttributeKeys={setAttributeKeys}
 			/>
 		</div>
 	);

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss

@@ -236,10 +236,6 @@
 					background: var(--bg-ink-100) !important;
 					opacity: 0.5 !important;
 				}
-
-				.cm-activeLine > span {
-					font-size: 12px !important;
-				}
 			}
 		}
 
@@ -275,9 +271,6 @@
 
 		box-sizing: border-box;
 		position: relative;
-		.cm-placeholder {
-			font-size: 12px !important;
-		}
 	}
 }
 

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx

@@ -500,10 +500,7 @@ function QueryAddOns({
 								}
 								value={addOn}
 							>
-								<div
-									className="add-on-tab-title"
-									data-testid={`query-add-on-${addOn.key}`}
-								>
+								<div className="add-on-tab-title">
 									{addOn.icon}
 									{addOn.label}
 								</div>

frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.styles.scss

@@ -20,8 +20,6 @@
 				border-radius: 2px;
 				flex: 1;
 				min-width: 0;
-				font-size: 12px;
-				color: var(--bg-vanilla-400) !important;
 
 				&.error {
 					.cm-editor {
@@ -233,9 +231,6 @@
 				.query-aggregation-interval-input {
 					input {
 						max-width: 120px;
-						&::placeholder {
-							color: var(--bg-vanilla-400);
-						}
 					}
 				}
 			}

frontend/src/components/QueryBuilderV2/QueryV2/QueryFooter/QueryFooter.styles.scss

@@ -1,7 +0,0 @@
-.add-trace-operator-button,
-.add-new-query-button,
-.add-formula-button {
-	border: 1px solid var(--bg-slate-400);
-	background: var(--bg-ink-300);
-	box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
-}

frontend/src/components/QueryBuilderV2/QueryV2/QueryFooter/QueryFooter.tsx

@@ -1,75 +1,7 @@
-import './QueryFooter.styles.scss';
-
 /* eslint-disable react/require-default-props */
 import { Button, Tooltip, Typography } from 'antd';
-import WarningPopover from 'components/WarningPopover/WarningPopover';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { DraftingCompass, Plus, Sigma } from 'lucide-react';
 import BetaTag from 'periscope/components/BetaTag/BetaTag';
-import { useMemo } from 'react';
-
-function TraceOperatorSection({
-	addTraceOperator,
-}: {
-	addTraceOperator?: () => void;
-}): JSX.Element {
-	const { currentQuery, panelType } = useQueryBuilder();
-
-	const showTraceOperatorWarning = useMemo(() => {
-		const isListViewPanel =
-			panelType === PANEL_TYPES.LIST || panelType === PANEL_TYPES.TRACE;
-		const hasMultipleQueries = currentQuery.builder.queryData.length > 1;
-		const hasTraceOperator =
-			currentQuery.builder.queryTraceOperator &&
-			currentQuery.builder.queryTraceOperator.length > 0;
-		return isListViewPanel && hasMultipleQueries && !hasTraceOperator;
-	}, [
-		currentQuery?.builder?.queryData,
-		currentQuery?.builder?.queryTraceOperator,
-		panelType,
-	]);
-
-	const traceOperatorWarning = useMemo(() => {
-		if (currentQuery.builder.queryData.length === 0) return '';
-		const firstQuery = currentQuery.builder.queryData[0];
-		return `Currently, you are only seeing results from query ${firstQuery.queryName}. Add a trace operator to combine results of multiple queries.`;
-	}, [currentQuery]);
-	return (
-		<div className="qb-trace-operator-button-container">
-			<Tooltip
-				title={
-					<div style={{ textAlign: 'center' }}>
-						Add Trace Matching
-						<Typography.Link
-							href="https://signoz.io/docs/userguide/query-builder-v5/#multi-query-analysis-trace-operators"
-							target="_blank"
-							style={{ textDecoration: 'underline' }}
-						>
-							{' '}
-							<br />
-							Learn more
-						</Typography.Link>
-					</div>
-				}
-			>
-				<Button
-					className="add-trace-operator-button periscope-btn"
-					icon={<DraftingCompass size={16} />}
-					onClick={(): void => addTraceOperator?.()}
-				>
-					<div className="qb-trace-operator-button-container-text">
-						Add Trace Matching
-						<BetaTag />
-					</div>
-				</Button>
-			</Tooltip>
-			{showTraceOperatorWarning && (
-				<WarningPopover message={traceOperatorWarning} />
-			)}
-		</div>
-	);
-}
 
 export default function QueryFooter({
 	addNewBuilderQuery,
@@ -90,7 +22,8 @@ export default function QueryFooter({
 				<div className="qb-add-new-query">
 					<Tooltip title={<div style={{ textAlign: 'center' }}>Add New Query</div>}>
 						<Button
-							className="add-new-query-button periscope-btn "
+							className="add-new-query-button periscope-btn secondary"
+							type="text"
 							icon={<Plus size={16} />}
 							onClick={addNewBuilderQuery}
 						/>
@@ -116,7 +49,7 @@ export default function QueryFooter({
 							}
 						>
 							<Button
-								className="add-formula-button periscope-btn "
+								className="add-formula-button periscope-btn secondary"
 								icon={<Sigma size={16} />}
 								onClick={addNewFormula}
 							>
@@ -126,7 +59,35 @@ export default function QueryFooter({
 					</div>
 				)}
 				{showAddTraceOperator && (
-					<TraceOperatorSection addTraceOperator={addTraceOperator} />
+					<div className="qb-trace-operator-button-container">
+						<Tooltip
+							title={
+								<div style={{ textAlign: 'center' }}>
+									Add Trace Matching
+									<Typography.Link
+										href="https://signoz.io/docs/userguide/query-builder-v5/#multi-query-analysis-trace-operators"
+										target="_blank"
+										style={{ textDecoration: 'underline' }}
+									>
+										{' '}
+										<br />
+										Learn more
+									</Typography.Link>
+								</div>
+							}
+						>
+							<Button
+								className="add-trace-operator-button periscope-btn secondary"
+								icon={<DraftingCompass size={16} />}
+								onClick={(): void => addTraceOperator?.()}
+							>
+								<div className="qb-trace-operator-button-container-text">
+									Add Trace Matching
+									<BetaTag />
+								</div>
+							</Button>
+						</Tooltip>
+					</div>
 				)}
 			</div>
 		</div>

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx

@@ -12,7 +12,6 @@ import {
 	startCompletion,
 } from '@codemirror/autocomplete';
 import { javascript } from '@codemirror/lang-javascript';
-import * as Sentry from '@sentry/react';
 import { Color } from '@signozhq/design-tokens';
 import { copilot } from '@uiw/codemirror-theme-copilot';
 import { githubLight } from '@uiw/codemirror-theme-github';
@@ -80,16 +79,6 @@ const stopEventsExtension = EditorView.domEventHandlers({
 	},
 });
 
-interface QuerySearchProps {
-	placeholder?: string;
-	onChange: (value: string) => void;
-	queryData: IBuilderQuery;
-	dataSource: DataSource;
-	signalSource?: string;
-	hardcodedAttributeKeys?: QueryKeyDataSuggestionsProps[];
-	onRun?: (query: string) => void;
-}
-
 function QuerySearch({
 	placeholder,
 	onChange,
@@ -98,8 +87,17 @@ function QuerySearch({
 	onRun,
 	signalSource,
 	hardcodedAttributeKeys,
-}: QuerySearchProps): JSX.Element {
+}: {
+	placeholder?: string;
+	onChange: (value: string) => void;
+	queryData: IBuilderQuery;
+	dataSource: DataSource;
+	signalSource?: string;
+	hardcodedAttributeKeys?: QueryKeyDataSuggestionsProps[];
+	onRun?: (query: string) => void;
+}): JSX.Element {
 	const isDarkMode = useIsDarkMode();
+	const [query, setQuery] = useState<string>(queryData.filter?.expression || '');
 	const [valueSuggestions, setValueSuggestions] = useState<any[]>([]);
 	const [activeKey, setActiveKey] = useState<string>('');
 	const [isLoadingSuggestions, setIsLoadingSuggestions] = useState(false);
@@ -109,12 +107,8 @@ function QuerySearch({
 		message: '',
 		errors: [],
 	});
-	const isProgrammaticChangeRef = useRef(false);
-	const [isEditorReady, setIsEditorReady] = useState(false);
-	const [isFocused, setIsFocused] = useState(false);
-	const editorRef = useRef<EditorView | null>(null);
 
-	const handleQueryValidation = useCallback((newQuery: string): void => {
+	const handleQueryValidation = (newQuery: string): void => {
 		try {
 			const validationResponse = validateQuery(newQuery);
 			setValidation(validationResponse);
@@ -125,67 +119,29 @@ function QuerySearch({
 				errors: [error as IDetailedError],
 			});
 		}
-	}, []);
+	};
 
-	const getCurrentQuery = useCallback(
-		(): string => editorRef.current?.state.doc.toString() || '',
-		[],
-	);
+	// Track if the query was changed externally (from queryData) vs internally (user input)
+	const [isExternalQueryChange, setIsExternalQueryChange] = useState(false);
+	const [lastExternalQuery, setLastExternalQuery] = useState<string>('');
 
-	const updateEditorValue = useCallback(
-		(value: string, options: { skipOnChange?: boolean } = {}): void => {
-			const view = editorRef.current;
-			if (!view) return;
+	useEffect(() => {
+		const newQuery = queryData.filter?.expression || '';
+		// Only mark as external change if the query actually changed from external source
+		if (newQuery !== lastExternalQuery) {
+			setQuery(newQuery);
+			setIsExternalQueryChange(true);
+			setLastExternalQuery(newQuery);
+		}
+	}, [queryData.filter?.expression, lastExternalQuery]);
 
-			const currentValue = view.state.doc.toString();
-			if (currentValue === value) return;
-
-			if (options.skipOnChange) {
-				isProgrammaticChangeRef.current = true;
-			}
-
-			view.dispatch({
-				changes: {
-					from: 0,
-					to: currentValue.length,
-					insert: value,
-				},
-				selection: {
-					anchor: value.length,
-				},
-			});
-		},
-		[],
-	);
-
-	const handleEditorCreate = useCallback((view: EditorView): void => {
-		editorRef.current = view;
-		setIsEditorReady(true);
-	}, []);
-
-	useEffect(
-		() => {
-			if (!isEditorReady) return;
-
-			const newQuery = queryData.filter?.expression || '';
-			const currentQuery = getCurrentQuery();
-
-			/* eslint-disable-next-line sonarjs/no-collapsible-if */
-			if (newQuery !== currentQuery && !isFocused) {
-				// Prevent clearing a non-empty editor when queryData becomes empty temporarily
-				// Only update if newQuery has a value, or if both are empty (initial state)
-				if (newQuery || !currentQuery) {
-					updateEditorValue(newQuery, { skipOnChange: true });
-
-					if (newQuery) {
-						handleQueryValidation(newQuery);
-					}
-				}
-			}
-		},
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[isEditorReady, queryData.filter?.expression, isFocused],
-	);
+	// Validate query when it changes externally (from queryData)
+	useEffect(() => {
+		if (isExternalQueryChange && query) {
+			handleQueryValidation(query);
+			setIsExternalQueryChange(false);
+		}
+	}, [isExternalQueryChange, query]);
 
 	const [keySuggestions, setKeySuggestions] = useState<
 		QueryKeyDataSuggestionsProps[] | null
@@ -194,6 +150,7 @@ function QuerySearch({
 	const [showExamples] = useState(false);
 
 	const [cursorPos, setCursorPos] = useState({ line: 0, ch: 0 });
+	const [isFocused, setIsFocused] = useState(false);
 
 	const [
 		isFetchingCompleteValuesList,
@@ -202,6 +159,8 @@ function QuerySearch({
 
 	const lastPosRef = useRef<{ line: number; ch: number }>({ line: 0, ch: 0 });
 
+	// Reference to the editor view for programmatic autocompletion
+	const editorRef = useRef<EditorView | null>(null);
 	const lastKeyRef = useRef<string>('');
 	const lastFetchedKeyRef = useRef<string>('');
 	const lastValueRef = useRef<string>('');
@@ -547,7 +506,6 @@ function QuerySearch({
 
 		if (!editorRef.current) {
 			editorRef.current = viewUpdate.view;
-			setIsEditorReady(true);
 		}
 
 		const selection = viewUpdate.view.state.selection.main;
@@ -563,15 +521,7 @@ function QuerySearch({
 		const lastPos = lastPosRef.current;
 
 		if (newPos.line !== lastPos.line || newPos.ch !== lastPos.ch) {
-			setCursorPos((lastPos) => {
-				if (newPos.ch !== lastPos.ch && newPos.ch === 0) {
-					Sentry.captureEvent({
-						message: `Cursor jumped to start of line from ${lastPos.ch} to ${newPos.ch}`,
-						level: 'warning',
-					});
-				}
-				return newPos;
-			});
+			setCursorPos(newPos);
 			lastPosRef.current = newPos;
 
 			if (doc) {
@@ -604,17 +554,16 @@ function QuerySearch({
 	}, []);
 
 	const handleChange = (value: string): void => {
-		if (isProgrammaticChangeRef.current) {
-			isProgrammaticChangeRef.current = false;
-			return;
-		}
-
+		setQuery(value);
 		onChange(value);
+		// Mark as internal change to avoid triggering external validation
+		setIsExternalQueryChange(false);
+		// Update lastExternalQuery to prevent external validation trigger
+		setLastExternalQuery(value);
 	};
 
 	const handleBlur = (): void => {
-		const currentQuery = getCurrentQuery();
-		handleQueryValidation(currentQuery);
+		handleQueryValidation(query);
 		setIsFocused(false);
 	};
 
@@ -633,11 +582,12 @@ function QuerySearch({
 
 	const handleExampleClick = (exampleQuery: string): void => {
 		// If there's an existing query, append the example with AND
-		const currentQuery = getCurrentQuery();
-		const newQuery = currentQuery
-			? `${currentQuery} AND ${exampleQuery}`
-			: exampleQuery;
-		updateEditorValue(newQuery);
+		const newQuery = query ? `${query} AND ${exampleQuery}` : exampleQuery;
+		setQuery(newQuery);
+		// Mark as internal change to avoid triggering external validation
+		setIsExternalQueryChange(false);
+		// Update lastExternalQuery to prevent external validation trigger
+		setLastExternalQuery(newQuery);
 	};
 
 	// Helper function to render a badge for the current context mode
@@ -672,10 +622,8 @@ function QuerySearch({
 		const word = context.matchBefore(/[a-zA-Z0-9_.:/?&=#%\-\[\]]*/);
 		if (word?.from === word?.to && !context.explicit) return null;
 
-		// Get current query from editor
-		const currentQuery = editorRef.current?.state.doc.toString() || '';
 		// Get the query context at the cursor position
-		const queryContext = getQueryContextAtCursor(currentQuery, cursorPos.ch);
+		const queryContext = getQueryContextAtCursor(query, cursorPos.ch);
 
 		// Define autocomplete options based on the context
 		let options: {
@@ -1171,8 +1119,7 @@ function QuerySearch({
 
 		if (queryContext.isInParenthesis) {
 			// Different suggestions based on the context within parenthesis or bracket
-			const currentQuery = editorRef.current?.state.doc.toString() || '';
-			const curChar = currentQuery.charAt(cursorPos.ch - 1) || '';
+			const curChar = query.charAt(cursorPos.ch - 1) || '';
 
 			if (curChar === '(' || curChar === '[') {
 				// Right after opening parenthesis/bracket
@@ -1321,7 +1268,7 @@ function QuerySearch({
 						style={{
 							position: 'absolute',
 							top: 8,
-							right: validation.isValid === false && getCurrentQuery() ? 40 : 8, // Move left when error shown
+							right: validation.isValid === false && query ? 40 : 8, // Move left when error shown
 							cursor: 'help',
 							zIndex: 10,
 							transition: 'right 0.2s ease',
@@ -1342,10 +1289,10 @@ function QuerySearch({
 				</Tooltip>
 
 				<CodeMirror
+					value={query}
 					theme={isDarkMode ? copilot : githubLight}
 					onChange={handleChange}
 					onUpdate={handleUpdate}
-					onCreateEditor={handleEditorCreate}
 					className={cx('query-where-clause-editor', {
 						isValid: validation.isValid === true,
 						hasErrors: validation.errors.length > 0,
@@ -1383,7 +1330,7 @@ function QuerySearch({
 									// Mod-Enter is usually Ctrl-Enter or Cmd-Enter based on OS
 									run: (): boolean => {
 										if (onRun && typeof onRun === 'function') {
-											onRun(getCurrentQuery());
+											onRun(query);
 										} else {
 											handleRunQuery();
 										}
@@ -1409,7 +1356,7 @@ function QuerySearch({
 					onBlur={handleBlur}
 				/>
 
-				{getCurrentQuery() && validation.isValid === false && !isFocused && (
+				{query && validation.isValid === false && !isFocused && (
 					<div
 						className={cx('query-status-container', {
 							hasErrors: validation.errors.length > 0,

frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx

@@ -9,13 +9,7 @@ import SpanScopeSelector from 'container/QueryBuilder/filters/QueryBuilderSearch
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
 import { Copy, Ellipsis, Trash } from 'lucide-react';
-import {
-	ForwardedRef,
-	forwardRef,
-	useCallback,
-	useMemo,
-	useState,
-} from 'react';
+import { memo, useCallback, useMemo, useState } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { HandleChangeQueryDataV5 } from 'types/common/operations.types';
 import { DataSource } from 'types/common/queryBuilder';
@@ -26,29 +20,20 @@ import QueryAddOns from './QueryAddOns/QueryAddOns';
 import QueryAggregation from './QueryAggregation/QueryAggregation';
 import QuerySearch from './QuerySearch/QuerySearch';
 
-export const QueryV2 = forwardRef(function QueryV2(
-	{
-		index,
-		queryVariant,
-		query,
-		filterConfigs,
-		isListViewPanel = false,
-		showTraceOperator = false,
-		hasTraceOperator = false,
-		version,
-		showOnlyWhereClause = false,
-		signalSource = '',
-		isMultiQueryAllowed = false,
-		onSignalSourceChange,
-		signalSourceChangeEnabled = false,
-		queriesCount = 1,
-	}: QueryProps & {
-		onSignalSourceChange: (value: string) => void;
-		signalSourceChangeEnabled: boolean;
-		queriesCount: number;
-	},
-	ref: ForwardedRef<HTMLDivElement>,
-): JSX.Element {
+export const QueryV2 = memo(function QueryV2({
+	ref,
+	index,
+	queryVariant,
+	query,
+	filterConfigs,
+	isListViewPanel = false,
+	showTraceOperator = false,
+	hasTraceOperator = false,
+	version,
+	showOnlyWhereClause = false,
+	signalSource = '',
+	isMultiQueryAllowed = false,
+}: QueryProps & { ref: React.RefObject<HTMLDivElement> }): JSX.Element {
 	const { cloneQuery, panelType } = useQueryBuilder();
 
 	const showFunctions = query?.functions?.length > 0;
@@ -201,16 +186,12 @@ export const QueryV2 = forwardRef(function QueryV2(
 												icon: <Copy size={14} />,
 												onClick: handleCloneEntity,
 											},
-											...(queriesCount && queriesCount > 1
-												? [
-														{
-															label: 'Delete',
-															key: 'delete-query',
-															icon: <Trash size={14} />,
-															onClick: handleDeleteQuery,
-														},
-												  ]
-												: []),
+											{
+												label: 'Delete',
+												key: 'delete-query',
+												icon: <Trash size={14} />,
+												onClick: handleDeleteQuery,
+											},
 										],
 									}}
 									placement="bottomRight"
@@ -226,14 +207,12 @@ export const QueryV2 = forwardRef(function QueryV2(
 					<div className="qb-elements-container">
 						<div className="qb-search-container">
 							{dataSource === DataSource.METRICS && (
-								<div className="metrics-container">
+								<div className="metrics-select-container">
 									<MetricsSelect
 										query={query}
 										index={index}
 										version={ENTITY_VERSION_V5}
 										signalSource={signalSource as 'meter' | ''}
-										onSignalSourceChange={onSignalSourceChange}
-										signalSourceChangeEnabled={signalSourceChangeEnabled}
 									/>
 								</div>
 							)}
@@ -279,7 +258,7 @@ export const QueryV2 = forwardRef(function QueryV2(
 								panelType={panelType}
 								query={query}
 								index={index}
-								key={`metrics-aggregate-section-${query.queryName}-${query.dataSource}-${signalSource}`}
+								key={`metrics-aggregate-section-${query.queryName}-${query.dataSource}`}
 								version="v4"
 								signalSource={signalSource as 'meter' | ''}
 							/>
@@ -302,5 +281,3 @@ export const QueryV2 = forwardRef(function QueryV2(
 		</div>
 	);
 });
-
-QueryV2.displayName = 'QueryV2';

frontend/src/components/QueryBuilderV2/QueryV2/TraceOperator/TraceOperator.styles.scss

@@ -92,9 +92,6 @@
 
 		.qb-trace-operator-editor-container {
 			flex: 1;
-			.cm-activeLine > span {
-				font-size: 12px;
-			}
 		}
 
 		&.arrow-left {
@@ -116,8 +113,6 @@
 			text-overflow: ellipsis;
 			padding: 0px 8px;
 			border-right: 1px solid var(--bg-slate-400);
-			font-size: 12px;
-			font-weight: 300;
 		}
 	}
 }