feat: api / ingestion keys - initial commit

* fix: logs explorer issues

* fix: jest test cases

.github/workflows/dependency-review.yml

@@ -19,4 +19,4 @@ jobs:
       - name: 'Dependency Review'
         with:
           fail-on-severity: high
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v2

.github/workflows/e2e-k3s.yaml

@@ -15,11 +15,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup golang
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.21"
-
       - name: Build query-service image
         env:
           DEV_BUILD: 1
@@ -70,9 +65,9 @@ jobs:
       - name: Kick off a sample-app workload
         run: |
           # start the locust swarm
-          kubectl --namespace sample-application run strzal --image=djbingham/curl \
-            --restart='OnFailure' -i --tty --rm --command -- curl -X POST -F \
-            'user_count=6' -F 'spawn_rate=2' http://locust-master:8089/swarm
+          kubectl -n sample-application run strzal --image=djbingham/curl \
+            --restart='OnFailure' -i --rm --command -- curl -X POST -F \
+            'locust_count=6' -F 'hatch_rate=2' http://locust-master:8089/swarm
 
       - name: Get short commit SHA, display tunnel URL and IP Address of the worker node
         id: get-subdomain

.github/workflows/push.yaml

@@ -20,13 +20,13 @@ jobs:
         with:
           go-version: "1.21"
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -64,13 +64,13 @@ jobs:
         with:
           go-version: "1.21"
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -115,11 +115,11 @@ jobs:
         run: npm run lint
         continue-on-error: true
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -152,12 +152,6 @@ jobs:
           echo 'INTERCOM_APP_ID="${{ secrets.INTERCOM_APP_ID }}"' > frontend/.env
           echo 'SEGMENT_ID="${{ secrets.SEGMENT_ID }}"' >> frontend/.env
           echo 'CLARITY_PROJECT_ID="${{ secrets.CLARITY_PROJECT_ID }}"' >> frontend/.env
-          echo 'SENTRY_AUTH_TOKEN="${{ secrets.SENTRY_AUTH_TOKEN }}"' >> frontend/.env
-          echo 'SENTRY_ORG="${{ secrets.SENTRY_ORG }}"' >> frontend/.env
-          echo 'SENTRY_PROJECT_ID="${{ secrets.SENTRY_PROJECT_ID }}"' >> frontend/.env
-          echo 'SENTRY_DSN="${{ secrets.SENTRY_DSN }}"' >> frontend/.env
-          echo 'TUNNEL_URL="${{ secrets.TUNNEL_URL }}"' >> frontend/.env
-          echo 'TUNNEL_DOMAIN="${{ secrets.TUNNEL_DOMAIN }}"' >> frontend/.env
       - name: Install dependencies
         working-directory: frontend
         run: yarn install
@@ -170,11 +164,11 @@ jobs:
         run: npm run lint
         continue-on-error: true
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/staging-deployment.yaml

@@ -11,7 +11,7 @@ jobs:
     environment: staging
     steps:
       - name: Executing remote ssh commands using ssh key
-        uses: appleboy/ssh-action@v1.0.3
+        uses: appleboy/ssh-action@v0.1.8
         env:
           GITHUB_BRANCH: develop
           GITHUB_SHA: ${{ github.sha }}

.github/workflows/testing-deployment.yaml

@@ -11,7 +11,7 @@ jobs:
     if: ${{ github.event.label.name == 'testing-deploy' }}
     steps:
       - name: Executing remote ssh commands using ssh key
-        uses: appleboy/ssh-action@v1.0.3
+        uses: appleboy/ssh-action@v0.1.8
         env:
           GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }}
           GITHUB_SHA: ${{ github.sha }}
@@ -33,11 +33,8 @@ jobs:
             git add .
             git stash push -m "stashed on $(date --iso-8601=seconds)"
             git fetch origin
-            git checkout develop
+            git checkout ${GITHUB_BRANCH}
             git pull
-            # This is added to include the scenerio when new commit in PR is force-pushed
-            git branch -D ${GITHUB_BRANCH}
-            git checkout --track origin/${GITHUB_BRANCH}
             make build-ee-query-service-amd64
             make build-frontend-amd64
             make run-signoz

README.md

@@ -108,7 +108,7 @@ We support [OpenTelemetry](https://opentelemetry.io) as the library which you ca
 
 - Java
 - Python
-- Node.js
+- NodeJS
 - Go
 - PHP
 - .NET

deploy/docker-swarm/clickhouse-setup/docker-compose.yaml

@@ -1,7 +1,7 @@
 version: "3.9"
 
 x-clickhouse-defaults: &clickhouse-defaults
-  image: clickhouse/clickhouse-server:24.1.2-alpine
+  image: clickhouse/clickhouse-server:23.11.1-alpine
   tty: true
   deploy:
     restart_policy:
@@ -133,7 +133,7 @@ services:
   #     - ./data/clickhouse-3/:/var/lib/clickhouse/
 
   alertmanager:
-    image: signoz/alertmanager:0.23.5
+    image: signoz/alertmanager:0.23.4
     volumes:
       - ./data/alertmanager:/data
     command:
@@ -146,7 +146,7 @@ services:
         condition: on-failure
 
   query-service:
-    image: signoz/query-service:0.39.0
+    image: signoz/query-service:0.37.1
     command:
       [
         "-config=/root/config/prometheus.yml",
@@ -160,7 +160,7 @@ services:
       - ../dashboards:/root/config/dashboards
       - ./data/signoz/:/var/lib/signoz/
     environment:
-      - ClickHouseUrl=tcp://clickhouse:9000
+      - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
       - ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/
       - SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
       - DASHBOARDS_PATH=/root/config/dashboards
@@ -186,7 +186,7 @@ services:
     <<: *db-depend
 
   frontend:
-    image: signoz/frontend:0.39.0
+    image: signoz/frontend:0.37.1
     deploy:
       restart_policy:
         condition: on-failure
@@ -199,7 +199,7 @@ services:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
   otel-collector:
-    image: signoz/signoz-otel-collector:0.88.12
+    image: signoz/signoz-otel-collector:0.88.8
     command:
       [
         "--config=/etc/otel-collector-config.yaml",
@@ -237,7 +237,7 @@ services:
       - query-service
 
   otel-collector-migrator:
-      image: signoz/signoz-schema-migrator:0.88.12
+      image: signoz/signoz-schema-migrator:0.88.8
       deploy:
         restart_policy:
           condition: on-failure

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

@@ -98,7 +98,6 @@ processors:
     latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
     dimensions_cache_size: 100000
     aggregation_temporality: AGGREGATION_TEMPORALITY_DELTA
-    enable_exp_histogram: true
     dimensions:
       - name: service.namespace
         default: default
@@ -124,7 +123,15 @@ exporters:
   clickhouselogsexporter:
     dsn: tcp://clickhouse:9000/
     docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER}
-    timeout: 10s
+    timeout: 5s
+    sending_queue:
+      queue_size: 100
+    retry_on_failure:
+      enabled: true
+      initial_interval: 5s
+      max_interval: 30s
+      max_elapsed_time: 300s
+
 extensions:
   health_check:
     endpoint: 0.0.0.0:13133

deploy/docker/clickhouse-setup/docker-compose-core.yaml

@@ -19,7 +19,7 @@ services:
       - ZOO_AUTOPURGE_INTERVAL=1
 
   clickhouse:
-    image: clickhouse/clickhouse-server:24.1.2-alpine
+    image: clickhouse/clickhouse-server:23.7.3-alpine
     container_name: signoz-clickhouse
     # ports:
     # - "9000:9000"
@@ -54,7 +54,7 @@ services:
 
   alertmanager:
     container_name: signoz-alertmanager
-    image: signoz/alertmanager:0.23.5
+    image: signoz/alertmanager:0.23.4
     volumes:
       - ./data/alertmanager:/data
     depends_on:
@@ -66,7 +66,7 @@ services:
       - --storage.path=/data
 
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.12}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.8}
     container_name: otel-migrator
     command:
       - "--dsn=tcp://clickhouse:9000"
@@ -81,7 +81,7 @@ services:
   # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
   otel-collector:
     container_name: signoz-otel-collector
-    image: signoz/signoz-otel-collector:0.88.12
+    image: signoz/signoz-otel-collector:0.88.8
     command:
       [
         "--config=/etc/otel-collector-config.yaml",

deploy/docker/clickhouse-setup/docker-compose.yaml

@@ -3,7 +3,7 @@ version: "2.4"
 x-clickhouse-defaults: &clickhouse-defaults
   restart: on-failure
   # addding non LTS version due to this fix https://github.com/ClickHouse/ClickHouse/commit/32caf8716352f45c1b617274c7508c86b7d1afab
-  image: clickhouse/clickhouse-server:24.1.2-alpine
+  image: clickhouse/clickhouse-server:23.11.1-alpine
   tty: true
   depends_on:
     - zookeeper-1
@@ -149,7 +149,7 @@ services:
   #     - ./user_scripts:/var/lib/clickhouse/user_scripts/
 
   alertmanager:
-    image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.5}
+    image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.4}
     container_name: signoz-alertmanager
     volumes:
       - ./data/alertmanager:/data
@@ -164,7 +164,7 @@ services:
   # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
 
   query-service:
-    image: signoz/query-service:${DOCKER_TAG:-0.39.0}
+    image: signoz/query-service:${DOCKER_TAG:-0.37.1}
     container_name: signoz-query-service
     command:
       [
@@ -179,7 +179,7 @@ services:
       - ../dashboards:/root/config/dashboards
       - ./data/signoz/:/var/lib/signoz/
     environment:
-      - ClickHouseUrl=tcp://clickhouse:9000
+      - ClickHouseUrl=tcp://clickhouse:9000/?database=signoz_traces
       - ALERTMANAGER_API_PREFIX=http://alertmanager:9093/api/
       - SIGNOZ_LOCAL_DB_PATH=/var/lib/signoz/signoz.db
       - DASHBOARDS_PATH=/root/config/dashboards
@@ -203,7 +203,7 @@ services:
     <<: *db-depend
 
   frontend:
-    image: signoz/frontend:${DOCKER_TAG:-0.39.0}
+    image: signoz/frontend:${DOCKER_TAG:-0.37.1}
     container_name: signoz-frontend
     restart: on-failure
     depends_on:
@@ -215,7 +215,7 @@ services:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.12}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.8}
     container_name: otel-migrator
     command:
       - "--dsn=tcp://clickhouse:9000"
@@ -229,7 +229,7 @@ services:
 
 
   otel-collector:
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.12}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.8}
     container_name: signoz-otel-collector
     command:
       [

deploy/docker/clickhouse-setup/otel-collector-config.yaml

@@ -101,7 +101,6 @@ processors:
     latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
     dimensions_cache_size: 100000
     aggregation_temporality: AGGREGATION_TEMPORALITY_DELTA
-    enable_exp_histogram: true
     dimensions:
       - name: service.namespace
         default: default
@@ -136,7 +135,14 @@ exporters:
   clickhouselogsexporter:
     dsn: tcp://clickhouse:9000/
     docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER}
-    timeout: 10s
+    timeout: 5s
+    sending_queue:
+      queue_size: 100
+    retry_on_failure:
+      enabled: true
+      initial_interval: 5s
+      max_interval: 30s
+      max_elapsed_time: 300s
 
 service:
   telemetry:

ee/query-service/Dockerfile

@@ -1,5 +1,5 @@
 # use a minimal alpine image
-FROM alpine:3.18.6
+FROM alpine:3.18.5
 
 # Add Maintainer Info
 LABEL maintainer="signoz"

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

@@ -10,7 +10,6 @@ import (
 	"go.signoz.io/signoz/ee/query-service/license"
 	"go.signoz.io/signoz/ee/query-service/usage"
 	baseapp "go.signoz.io/signoz/pkg/query-service/app"
-	"go.signoz.io/signoz/pkg/query-service/app/integrations"
 	"go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline"
 	"go.signoz.io/signoz/pkg/query-service/cache"
 	baseint "go.signoz.io/signoz/pkg/query-service/interfaces"
@@ -32,7 +31,6 @@ type APIHandlerOptions struct {
 	UsageManager                  *usage.Manager
 	FeatureFlags                  baseint.FeatureLookup
 	LicenseManager                *license.Manager
-	IntegrationsController        *integrations.Controller
 	LogsParsingPipelineController *logparsingpipeline.LogParsingPipelineController
 	Cache                         cache.Cache
 	// Querier Influx Interval
@@ -58,7 +56,6 @@ func NewAPIHandler(opts APIHandlerOptions) (*APIHandler, error) {
 		AppDao:                        opts.AppDao,
 		RuleManager:                   opts.RulesManager,
 		FeatureFlags:                  opts.FeatureFlags,
-		IntegrationsController:        opts.IntegrationsController,
 		LogsParsingPipelineController: opts.LogsParsingPipelineController,
 		Cache:                         opts.Cache,
 		FluxInterval:                  opts.FluxInterval,
@@ -155,10 +152,9 @@ func (ah *APIHandler) RegisterRoutes(router *mux.Router, am *baseapp.AuthMiddlew
 	router.HandleFunc("/api/v2/metrics/query_range", am.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost)
 
 	// PAT APIs
-	router.HandleFunc("/api/v1/pats", am.AdminAccess(ah.createPAT)).Methods(http.MethodPost)
-	router.HandleFunc("/api/v1/pats", am.AdminAccess(ah.getPATs)).Methods(http.MethodGet)
-	router.HandleFunc("/api/v1/pats/{id}", am.AdminAccess(ah.updatePAT)).Methods(http.MethodPut)
-	router.HandleFunc("/api/v1/pats/{id}", am.AdminAccess(ah.revokePAT)).Methods(http.MethodDelete)
+	router.HandleFunc("/api/v1/pat", am.AdminAccess(ah.createPAT)).Methods(http.MethodPost)
+	router.HandleFunc("/api/v1/pat", am.AdminAccess(ah.getPATs)).Methods(http.MethodGet)
+	router.HandleFunc("/api/v1/pat/{id}", am.AdminAccess(ah.deletePAT)).Methods(http.MethodDelete)
 
 	router.HandleFunc("/api/v1/checkout", am.AdminAccess(ah.checkout)).Methods(http.MethodPost)
 	router.HandleFunc("/api/v1/billing", am.AdminAccess(ah.getBilling)).Methods(http.MethodGet)

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

@@ -74,7 +74,7 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 	requestBody, err := io.ReadAll(r.Body)
 	if err != nil {
-		zap.L().Error("received no input in api", zap.Error(err))
+		zap.S().Errorf("received no input in api\n", err)
 		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
@@ -82,7 +82,7 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 	err = json.Unmarshal(requestBody, &req)
 
 	if err != nil {
-		zap.L().Error("received invalid user registration request", zap.Error(err))
+		zap.S().Errorf("received invalid user registration request", zap.Error(err))
 		RespondError(w, model.BadRequest(fmt.Errorf("failed to register user")), nil)
 		return
 	}
@@ -90,13 +90,13 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 	// get invite object
 	invite, err := baseauth.ValidateInvite(ctx, req)
 	if err != nil {
-		zap.L().Error("failed to validate invite token", zap.Error(err))
+		zap.S().Errorf("failed to validate invite token", err)
 		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
 	if invite == nil {
-		zap.L().Error("failed to validate invite token: it is either empty or invalid", zap.Error(err))
+		zap.S().Errorf("failed to validate invite token: it is either empty or invalid", err)
 		RespondError(w, model.BadRequest(basemodel.ErrSignupFailed{}), nil)
 		return
 	}
@@ -104,7 +104,7 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 	// get auth domain from email domain
 	domain, apierr := ah.AppDao().GetDomainByEmail(ctx, invite.Email)
 	if apierr != nil {
-		zap.L().Error("failed to get domain from email", zap.Error(apierr))
+		zap.S().Errorf("failed to get domain from email", apierr)
 		RespondError(w, model.InternalError(basemodel.ErrSignupFailed{}), nil)
 	}
 
@@ -205,24 +205,24 @@ func (ah *APIHandler) receiveGoogleAuth(w http.ResponseWriter, r *http.Request)
 	ctx := context.Background()
 
 	if !ah.CheckFeature(model.SSO) {
-		zap.L().Error("[receiveGoogleAuth] sso requested but feature unavailable in org domain")
+		zap.S().Errorf("[receiveGoogleAuth] sso requested but feature unavailable %s in org domain %s", model.SSO)
 		http.Redirect(w, r, fmt.Sprintf("%s?ssoerror=%s", redirectUri, "feature unavailable, please upgrade your billing plan to access this feature"), http.StatusMovedPermanently)
 		return
 	}
 
 	q := r.URL.Query()
 	if errType := q.Get("error"); errType != "" {
-		zap.L().Error("[receiveGoogleAuth] failed to login with google auth", zap.String("error", errType), zap.String("error_description", q.Get("error_description")))
+		zap.S().Errorf("[receiveGoogleAuth] failed to login with google auth", q.Get("error_description"))
 		http.Redirect(w, r, fmt.Sprintf("%s?ssoerror=%s", redirectUri, "failed to login through SSO "), http.StatusMovedPermanently)
 		return
 	}
 
 	relayState := q.Get("state")
-	zap.L().Debug("[receiveGoogleAuth] relay state received", zap.String("state", relayState))
+	zap.S().Debug("[receiveGoogleAuth] relay state received", zap.String("state", relayState))
 
 	parsedState, err := url.Parse(relayState)
 	if err != nil || relayState == "" {
-		zap.L().Error("[receiveGoogleAuth] failed to process response - invalid response from IDP", zap.Error(err), zap.Any("request", r))
+		zap.S().Errorf("[receiveGoogleAuth] failed to process response - invalid response from IDP", err, r)
 		handleSsoError(w, r, redirectUri)
 		return
 	}
@@ -244,14 +244,14 @@ func (ah *APIHandler) receiveGoogleAuth(w http.ResponseWriter, r *http.Request)
 
 	identity, err := callbackHandler.HandleCallback(r)
 	if err != nil {
-		zap.L().Error("[receiveGoogleAuth] failed to process HandleCallback ", zap.String("domain", domain.String()), zap.Error(err))
+		zap.S().Errorf("[receiveGoogleAuth] failed to process HandleCallback ", domain.String(), zap.Error(err))
 		handleSsoError(w, r, redirectUri)
 		return
 	}
 
 	nextPage, err := ah.AppDao().PrepareSsoRedirect(ctx, redirectUri, identity.Email)
 	if err != nil {
-		zap.L().Error("[receiveGoogleAuth] failed to generate redirect URI after successful login ", zap.String("domain", domain.String()), zap.Error(err))
+		zap.S().Errorf("[receiveGoogleAuth] failed to generate redirect URI after successful login ", domain.String(), zap.Error(err))
 		handleSsoError(w, r, redirectUri)
 		return
 	}
@@ -266,14 +266,14 @@ func (ah *APIHandler) receiveSAML(w http.ResponseWriter, r *http.Request) {
 	ctx := context.Background()
 
 	if !ah.CheckFeature(model.SSO) {
-		zap.L().Error("[receiveSAML] sso requested but feature unavailable in org domain")
+		zap.S().Errorf("[receiveSAML] sso requested but feature unavailable %s in org domain %s", model.SSO)
 		http.Redirect(w, r, fmt.Sprintf("%s?ssoerror=%s", redirectUri, "feature unavailable, please upgrade your billing plan to access this feature"), http.StatusMovedPermanently)
 		return
 	}
 
 	err := r.ParseForm()
 	if err != nil {
-		zap.L().Error("[receiveSAML] failed to process response - invalid response from IDP", zap.Error(err), zap.Any("request", r))
+		zap.S().Errorf("[receiveSAML] failed to process response - invalid response from IDP", err, r)
 		handleSsoError(w, r, redirectUri)
 		return
 	}
@@ -281,11 +281,11 @@ func (ah *APIHandler) receiveSAML(w http.ResponseWriter, r *http.Request) {
 	// the relay state is sent when a login request is submitted to
 	// Idp.
 	relayState := r.FormValue("RelayState")
-	zap.L().Debug("[receiveML] relay state", zap.String("relayState", relayState))
+	zap.S().Debug("[receiveML] relay state", zap.String("relayState", relayState))
 
 	parsedState, err := url.Parse(relayState)
 	if err != nil || relayState == "" {
-		zap.L().Error("[receiveSAML] failed to process response - invalid response from IDP", zap.Error(err), zap.Any("request", r))
+		zap.S().Errorf("[receiveSAML] failed to process response - invalid response from IDP", err, r)
 		handleSsoError(w, r, redirectUri)
 		return
 	}
@@ -302,34 +302,34 @@ func (ah *APIHandler) receiveSAML(w http.ResponseWriter, r *http.Request) {
 
 	sp, err := domain.PrepareSamlRequest(parsedState)
 	if err != nil {
-		zap.L().Error("[receiveSAML] failed to prepare saml request for domain", zap.String("domain", domain.String()), zap.Error(err))
+		zap.S().Errorf("[receiveSAML] failed to prepare saml request for domain (%s): %v", domain.String(), err)
 		handleSsoError(w, r, redirectUri)
 		return
 	}
 
 	assertionInfo, err := sp.RetrieveAssertionInfo(r.FormValue("SAMLResponse"))
 	if err != nil {
-		zap.L().Error("[receiveSAML] failed to retrieve assertion info from  saml response", zap.String("domain", domain.String()), zap.Error(err))
+		zap.S().Errorf("[receiveSAML] failed to retrieve assertion info from  saml response for organization (%s): %v", domain.String(), err)
 		handleSsoError(w, r, redirectUri)
 		return
 	}
 
 	if assertionInfo.WarningInfo.InvalidTime {
-		zap.L().Error("[receiveSAML] expired saml response", zap.String("domain", domain.String()), zap.Error(err))
+		zap.S().Errorf("[receiveSAML] expired saml response for organization (%s): %v", domain.String(), err)
 		handleSsoError(w, r, redirectUri)
 		return
 	}
 
 	email := assertionInfo.NameID
 	if email == "" {
-		zap.L().Error("[receiveSAML] invalid email in the SSO response", zap.String("domain", domain.String()))
+		zap.S().Errorf("[receiveSAML] invalid email in the SSO response (%s)", domain.String())
 		handleSsoError(w, r, redirectUri)
 		return
 	}
 
 	nextPage, err := ah.AppDao().PrepareSsoRedirect(ctx, redirectUri, email)
 	if err != nil {
-		zap.L().Error("[receiveSAML] failed to generate redirect URI after successful login ", zap.String("domain", domain.String()), zap.Error(err))
+		zap.S().Errorf("[receiveSAML] failed to generate redirect URI after successful login ", domain.String(), zap.Error(err))
 		handleSsoError(w, r, redirectUri)
 		return
 	}

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

@@ -12,20 +12,6 @@ import (
 	"go.uber.org/zap"
 )
 
-type DayWiseBreakdown struct {
-	Type      string        `json:"type"`
-	Breakdown []DayWiseData `json:"breakdown"`
-}
-
-type DayWiseData struct {
-	Timestamp int64   `json:"timestamp"`
-	Count     float64 `json:"count"`
-	Size      float64 `json:"size"`
-	UnitPrice float64 `json:"unitPrice"`
-	Quantity  float64 `json:"quantity"`
-	Total     float64 `json:"total"`
-}
-
 type tierBreakdown struct {
 	UnitPrice float64 `json:"unitPrice"`
 	Quantity  float64 `json:"quantity"`
@@ -35,10 +21,9 @@ type tierBreakdown struct {
 }
 
 type usageResponse struct {
-	Type             string           `json:"type"`
-	Unit             string           `json:"unit"`
-	Tiers            []tierBreakdown  `json:"tiers"`
-	DayWiseBreakdown DayWiseBreakdown `json:"dayWiseBreakdown"`
+	Type  string          `json:"type"`
+	Unit  string          `json:"unit"`
+	Tiers []tierBreakdown `json:"tiers"`
 }
 
 type details struct {
@@ -191,7 +176,7 @@ func (ah *APIHandler) listLicensesV2(w http.ResponseWriter, r *http.Request) {
 	url := fmt.Sprintf("%s/trial?licenseKey=%s", constants.LicenseSignozIo, currentActiveLicenseKey)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
-		zap.L().Error("Error while creating request for trial details", zap.Error(err))
+		zap.S().Error("Error while creating request for trial details", err)
 		// If there is an error in fetching trial details, we will still return the license details
 		// to avoid blocking the UI
 		ah.Respond(w, resp)
@@ -200,7 +185,7 @@ func (ah *APIHandler) listLicensesV2(w http.ResponseWriter, r *http.Request) {
 	req.Header.Add("X-SigNoz-SecretKey", constants.LicenseAPIKey)
 	trialResp, err := hClient.Do(req)
 	if err != nil {
-		zap.L().Error("Error while fetching trial details", zap.Error(err))
+		zap.S().Error("Error while fetching trial details", err)
 		// If there is an error in fetching trial details, we will still return the license details
 		// to avoid incorrectly blocking the UI
 		ah.Respond(w, resp)
@@ -211,7 +196,7 @@ func (ah *APIHandler) listLicensesV2(w http.ResponseWriter, r *http.Request) {
 	trialRespBody, err := io.ReadAll(trialResp.Body)
 
 	if err != nil || trialResp.StatusCode != http.StatusOK {
-		zap.L().Error("Error while fetching trial details", zap.Error(err))
+		zap.S().Error("Error while fetching trial details", err)
 		// If there is an error in fetching trial details, we will still return the license details
 		// to avoid incorrectly blocking the UI
 		ah.Respond(w, resp)
@@ -222,7 +207,7 @@ func (ah *APIHandler) listLicensesV2(w http.ResponseWriter, r *http.Request) {
 	var trialRespData model.SubscriptionServerResp
 
 	if err := json.Unmarshal(trialRespBody, &trialRespData); err != nil {
-		zap.L().Error("Error while decoding trial details", zap.Error(err))
+		zap.S().Error("Error while decoding trial details", err)
 		// If there is an error in fetching trial details, we will still return the license details
 		// to avoid incorrectly blocking the UI
 		ah.Respond(w, resp)

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

@@ -18,14 +18,14 @@ import (
 
 func (ah *APIHandler) queryRangeMetricsV2(w http.ResponseWriter, r *http.Request) {
 	if !ah.CheckFeature(basemodel.CustomMetricsFunction) {
-		zap.L().Info("CustomMetricsFunction feature is not enabled in this plan")
+		zap.S().Info("CustomMetricsFunction feature is not enabled in this plan")
 		ah.APIHandler.QueryRangeMetricsV2(w, r)
 		return
 	}
 	metricsQueryRangeParams, apiErrorObj := parser.ParseMetricQueryRangeParams(r)
 
 	if apiErrorObj != nil {
-		zap.L().Error("Error in parsing metric query params", zap.Error(apiErrorObj.Err))
+		zap.S().Errorf(apiErrorObj.Err.Error())
 		RespondError(w, apiErrorObj, nil)
 		return
 	}

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

@@ -12,7 +12,6 @@ import (
 	"github.com/gorilla/mux"
 	"go.signoz.io/signoz/ee/query-service/model"
 	"go.signoz.io/signoz/pkg/query-service/auth"
-	baseconstants "go.signoz.io/signoz/pkg/query-service/constants"
 	basemodel "go.signoz.io/signoz/pkg/query-service/model"
 	"go.uber.org/zap"
 )
@@ -29,74 +28,11 @@ func generatePATToken() string {
 func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) {
 	ctx := context.Background()
 
-	req := model.CreatePATRequestBody{}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		RespondError(w, model.BadRequest(err), nil)
-		return
-	}
-	user, err := auth.GetUserFromRequest(r)
-	if err != nil {
-		RespondError(w, &model.ApiError{
-			Typ: model.ErrorUnauthorized,
-			Err: err,
-		}, nil)
-		return
-	}
-	pat := model.PAT{
-		Name:      req.Name,
-		Role:      req.Role,
-		ExpiresAt: req.ExpiresInDays,
-	}
-	err = validatePATRequest(pat)
-	if err != nil {
-		RespondError(w, model.BadRequest(err), nil)
-		return
-	}
-
-	// All the PATs are associated with the user creating the PAT.
-	pat.UserID = user.Id
-	pat.CreatedAt = time.Now().Unix()
-	pat.UpdatedAt = time.Now().Unix()
-	pat.LastUsed = 0
-	pat.Token = generatePATToken()
-
-	if pat.ExpiresAt != 0 {
-		// convert expiresAt to unix timestamp from days
-		pat.ExpiresAt = time.Now().Unix() + (pat.ExpiresAt * 24 * 60 * 60)
-	}
-
-	zap.L().Info("Got Create PAT request", zap.Any("pat", pat))
-	var apierr basemodel.BaseApiError
-	if pat, apierr = ah.AppDao().CreatePAT(ctx, pat); apierr != nil {
-		RespondError(w, apierr, nil)
-		return
-	}
-
-	ah.Respond(w, &pat)
-}
-
-func validatePATRequest(req model.PAT) error {
-	if req.Role == "" || (req.Role != baseconstants.ViewerGroup && req.Role != baseconstants.EditorGroup && req.Role != baseconstants.AdminGroup) {
-		return fmt.Errorf("valid role is required")
-	}
-	if req.ExpiresAt < 0 {
-		return fmt.Errorf("valid expiresAt is required")
-	}
-	if req.Name == "" {
-		return fmt.Errorf("valid name is required")
-	}
-	return nil
-}
-
-func (ah *APIHandler) updatePAT(w http.ResponseWriter, r *http.Request) {
-	ctx := context.Background()
-
 	req := model.PAT{}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
-
 	user, err := auth.GetUserFromRequest(r)
 	if err != nil {
 		RespondError(w, &model.ApiError{
@@ -106,23 +42,29 @@ func (ah *APIHandler) updatePAT(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = validatePATRequest(req)
-	if err != nil {
-		RespondError(w, model.BadRequest(err), nil)
-		return
+	// All the PATs are associated with the user creating the PAT. Hence, the permissions
+	// associated with the PAT is also equivalent to that of the user.
+	req.UserID = user.Id
+	req.CreatedAt = time.Now().Unix()
+	req.Token = generatePATToken()
+
+	// default expiry is 30 days
+	if req.ExpiresAt == 0 {
+		req.ExpiresAt = time.Now().AddDate(0, 0, 30).Unix()
+	}
+	// max expiry is 1 year
+	if req.ExpiresAt > time.Now().AddDate(1, 0, 0).Unix() {
+		req.ExpiresAt = time.Now().AddDate(1, 0, 0).Unix()
 	}
 
-	req.UpdatedByUserID = user.Id
-	id := mux.Vars(r)["id"]
-	req.UpdatedAt = time.Now().Unix()
-	zap.L().Info("Got Update PAT request", zap.Any("pat", req))
+	zap.S().Debugf("Got PAT request: %+v", req)
 	var apierr basemodel.BaseApiError
-	if apierr = ah.AppDao().UpdatePAT(ctx, req, id); apierr != nil {
+	if req, apierr = ah.AppDao().CreatePAT(ctx, req); apierr != nil {
 		RespondError(w, apierr, nil)
 		return
 	}
 
-	ah.Respond(w, map[string]string{"data": "pat updated successfully"})
+	ah.Respond(w, &req)
 }
 
 func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) {
@@ -135,8 +77,8 @@ func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) {
 		}, nil)
 		return
 	}
-	zap.L().Info("Get PATs for user", zap.String("user_id", user.Id))
-	pats, apierr := ah.AppDao().ListPATs(ctx)
+	zap.S().Infof("Get PATs for user: %+v", user.Id)
+	pats, apierr := ah.AppDao().ListPATs(ctx, user.Id)
 	if apierr != nil {
 		RespondError(w, apierr, nil)
 		return
@@ -144,7 +86,7 @@ func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) {
 	ah.Respond(w, pats)
 }
 
-func (ah *APIHandler) revokePAT(w http.ResponseWriter, r *http.Request) {
+func (ah *APIHandler) deletePAT(w http.ResponseWriter, r *http.Request) {
 	ctx := context.Background()
 	id := mux.Vars(r)["id"]
 	user, err := auth.GetUserFromRequest(r)
@@ -155,11 +97,22 @@ func (ah *APIHandler) revokePAT(w http.ResponseWriter, r *http.Request) {
 		}, nil)
 		return
 	}
-
-	zap.L().Info("Revoke PAT with id", zap.String("id", id))
-	if apierr := ah.AppDao().RevokePAT(ctx, id, user.Id); apierr != nil {
+	pat, apierr := ah.AppDao().GetPATByID(ctx, id)
+	if apierr != nil {
 		RespondError(w, apierr, nil)
 		return
 	}
-	ah.Respond(w, map[string]string{"data": "pat revoked successfully"})
+	if pat.UserID != user.Id {
+		RespondError(w, &model.ApiError{
+			Typ: model.ErrorUnauthorized,
+			Err: fmt.Errorf("unauthorized PAT delete request"),
+		}, nil)
+		return
+	}
+	zap.S().Debugf("Delete PAT with id: %+v", id)
+	if apierr := ah.AppDao().DeletePAT(ctx, id); apierr != nil {
+		RespondError(w, apierr, nil)
+		return
+	}
+	ah.Respond(w, map[string]string{"data": "pat deleted successfully"})
 }

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

@@ -15,7 +15,7 @@ import (
 func (ah *APIHandler) searchTraces(w http.ResponseWriter, r *http.Request) {
 
 	if !ah.CheckFeature(basemodel.SmartTraceDetail) {
-		zap.L().Info("SmartTraceDetail feature is not enabled in this plan")
+		zap.S().Info("SmartTraceDetail feature is not enabled in this plan")
 		ah.APIHandler.SearchTraces(w, r)
 		return
 	}
@@ -26,7 +26,7 @@ func (ah *APIHandler) searchTraces(w http.ResponseWriter, r *http.Request) {
 	}
 	spanLimit, err := strconv.Atoi(constants.SpanLimitStr)
 	if err != nil {
-		zap.L().Error("Error during strconv.Atoi() on SPAN_LIMIT env variable", zap.Error(err))
+		zap.S().Error("Error during strconv.Atoi() on SPAN_LIMIT env variable: ", err)
 		return
 	}
 	result, err := ah.opts.DataConnector.SearchTraces(r.Context(), traceId, spanId, levelUpInt, levelDownInt, spanLimit, db.SmartTraceAlgorithm)

ee/query-service/app/db/metrics.go

@@ -22,7 +22,7 @@ import (
 func (r *ClickhouseReader) GetMetricResultEE(ctx context.Context, query string) ([]*basemodel.Series, string, error) {
 
 	defer utils.Elapsed("GetMetricResult")()
-	zap.L().Info("Executing metric result query: ", zap.String("query", query))
+	zap.S().Infof("Executing metric result query: %s", query)
 
 	var hash string
 	// If getSubTreeSpans function is used in the clickhouse query
@@ -38,8 +38,9 @@ func (r *ClickhouseReader) GetMetricResultEE(ctx context.Context, query string)
 	}
 
 	rows, err := r.conn.Query(ctx, query)
+	zap.S().Debug(query)
 	if err != nil {
-		zap.L().Error("Error in processing query", zap.Error(err))
+		zap.S().Debug("Error in processing query: ", err)
 		return nil, "", fmt.Errorf("error in processing query")
 	}
 
@@ -116,7 +117,7 @@ func (r *ClickhouseReader) GetMetricResultEE(ctx context.Context, query string)
 					groupAttributes[colName] = fmt.Sprintf("%v", reflect.ValueOf(v).Elem().Int())
 				}
 			default:
-				zap.L().Error("invalid var found in metric builder query result", zap.Any("var", v), zap.String("colName", colName))
+				zap.S().Errorf("invalid var found in metric builder query result", v, colName)
 			}
 		}
 		sort.Strings(groupBy)
@@ -139,7 +140,7 @@ func (r *ClickhouseReader) GetMetricResultEE(ctx context.Context, query string)
 	}
 	// err = r.conn.Exec(ctx, "DROP TEMPORARY TABLE IF EXISTS getSubTreeSpans"+hash)
 	// if err != nil {
-	// 	zap.L().Error("Error in dropping temporary table: ", err)
+	// 	zap.S().Error("Error in dropping temporary table: ", err)
 	// 	return nil, err
 	// }
 	if hash == "" {
@@ -151,7 +152,7 @@ func (r *ClickhouseReader) GetMetricResultEE(ctx context.Context, query string)
 
 func (r *ClickhouseReader) getSubTreeSpansCustomFunction(ctx context.Context, query string, hash string) (string, string, error) {
 
-	zap.L().Debug("Executing getSubTreeSpans function")
+	zap.S().Debugf("Executing getSubTreeSpans function")
 
 	// str1 := `select fromUnixTimestamp64Milli(intDiv( toUnixTimestamp64Milli ( timestamp ), 100) * 100) AS interval, toFloat64(count()) as count from (select timestamp, spanId, parentSpanId, durationNano from getSubTreeSpans(select * from signoz_traces.signoz_index_v2 where serviceName='frontend' and name='/driver.DriverService/FindNearest' and  traceID='00000000000000004b0a863cb5ed7681') where name='FindDriverIDs' group by interval order by interval asc;`
 
@@ -161,28 +162,28 @@ func (r *ClickhouseReader) getSubTreeSpansCustomFunction(ctx context.Context, qu
 
 	err := r.conn.Exec(ctx, "DROP TABLE IF EXISTS getSubTreeSpans"+hash)
 	if err != nil {
-		zap.L().Error("Error in dropping temporary table", zap.Error(err))
+		zap.S().Error("Error in dropping temporary table: ", err)
 		return query, hash, err
 	}
 
 	// Create temporary table to store the getSubTreeSpans() results
-	zap.L().Debug("Creating temporary table getSubTreeSpans", zap.String("hash", hash))
+	zap.S().Debugf("Creating temporary table getSubTreeSpans%s", hash)
 	err = r.conn.Exec(ctx, "CREATE TABLE IF NOT EXISTS "+"getSubTreeSpans"+hash+" (timestamp DateTime64(9) CODEC(DoubleDelta, LZ4), traceID FixedString(32) CODEC(ZSTD(1)), spanID String CODEC(ZSTD(1)), parentSpanID String CODEC(ZSTD(1)), rootSpanID String CODEC(ZSTD(1)), serviceName LowCardinality(String) CODEC(ZSTD(1)), name LowCardinality(String) CODEC(ZSTD(1)), rootName LowCardinality(String) CODEC(ZSTD(1)), durationNano UInt64 CODEC(T64, ZSTD(1)), kind Int8 CODEC(T64, ZSTD(1)), tagMap Map(LowCardinality(String), String) CODEC(ZSTD(1)), events Array(String) CODEC(ZSTD(2))) ENGINE = MergeTree() ORDER BY (timestamp)")
 	if err != nil {
-		zap.L().Error("Error in creating temporary table", zap.Error(err))
+		zap.S().Error("Error in creating temporary table: ", err)
 		return query, hash, err
 	}
 
 	var getSpansSubQueryDBResponses []model.GetSpansSubQueryDBResponse
 	getSpansSubQuery := subtreeInput
 	// Execute the subTree query
-	zap.L().Debug("Executing subTree query", zap.String("query", getSpansSubQuery))
+	zap.S().Debugf("Executing subTree query: %s", getSpansSubQuery)
 	err = r.conn.Select(ctx, &getSpansSubQueryDBResponses, getSpansSubQuery)
 
-	// zap.L().Info(getSpansSubQuery)
+	// zap.S().Info(getSpansSubQuery)
 
 	if err != nil {
-		zap.L().Error("Error in processing sql query", zap.Error(err))
+		zap.S().Debug("Error in processing sql query: ", err)
 		return query, hash, fmt.Errorf("Error in processing sql query")
 	}
 
@@ -195,16 +196,16 @@ func (r *ClickhouseReader) getSubTreeSpansCustomFunction(ctx context.Context, qu
 	if len(getSpansSubQueryDBResponses) == 0 {
 		return query, hash, fmt.Errorf("No spans found for the given query")
 	}
-	zap.L().Debug("Executing query to fetch all the spans from the same TraceID: ", zap.String("modelQuery", modelQuery))
+	zap.S().Debugf("Executing query to fetch all the spans from the same TraceID: %s", modelQuery)
 	err = r.conn.Select(ctx, &searchScanResponses, modelQuery, getSpansSubQueryDBResponses[0].TraceID)
 
 	if err != nil {
-		zap.L().Error("Error in processing sql query", zap.Error(err))
+		zap.S().Debug("Error in processing sql query: ", err)
 		return query, hash, fmt.Errorf("Error in processing sql query")
 	}
 
 	// Process model to fetch the spans
-	zap.L().Debug("Processing model to fetch the spans")
+	zap.S().Debugf("Processing model to fetch the spans")
 	searchSpanResponses := []basemodel.SearchSpanResponseItem{}
 	for _, item := range searchScanResponses {
 		var jsonItem basemodel.SearchSpanResponseItem
@@ -217,17 +218,17 @@ func (r *ClickhouseReader) getSubTreeSpansCustomFunction(ctx context.Context, qu
 	}
 	// Build the subtree and store all the subtree spans in temporary table getSubTreeSpans+hash
 	// Use map to store pointer to the spans to avoid duplicates and save memory
-	zap.L().Debug("Building the subtree to store all the subtree spans in temporary table getSubTreeSpans", zap.String("hash", hash))
+	zap.S().Debugf("Building the subtree to store all the subtree spans in temporary table getSubTreeSpans%s", hash)
 
 	treeSearchResponse, err := getSubTreeAlgorithm(searchSpanResponses, getSpansSubQueryDBResponses)
 	if err != nil {
-		zap.L().Error("Error in getSubTreeAlgorithm function", zap.Error(err))
+		zap.S().Error("Error in getSubTreeAlgorithm function: ", err)
 		return query, hash, err
 	}
-	zap.L().Debug("Preparing batch to store subtree spans in temporary table getSubTreeSpans", zap.String("hash", hash))
+	zap.S().Debugf("Preparing batch to store subtree spans in temporary table getSubTreeSpans%s", hash)
 	statement, err := r.conn.PrepareBatch(context.Background(), fmt.Sprintf("INSERT INTO getSubTreeSpans"+hash))
 	if err != nil {
-		zap.L().Error("Error in preparing batch statement", zap.Error(err))
+		zap.S().Error("Error in preparing batch statement: ", err)
 		return query, hash, err
 	}
 	for _, span := range treeSearchResponse {
@@ -250,14 +251,14 @@ func (r *ClickhouseReader) getSubTreeSpansCustomFunction(ctx context.Context, qu
 			span.Events,
 		)
 		if err != nil {
-			zap.L().Error("Error in processing sql query", zap.Error(err))
+			zap.S().Debug("Error in processing sql query: ", err)
 			return query, hash, err
 		}
 	}
-	zap.L().Debug("Inserting the subtree spans in temporary table getSubTreeSpans", zap.String("hash", hash))
+	zap.S().Debugf("Inserting the subtree spans in temporary table getSubTreeSpans%s", hash)
 	err = statement.Send()
 	if err != nil {
-		zap.L().Error("Error in sending statement", zap.Error(err))
+		zap.S().Error("Error in sending statement: ", err)
 		return query, hash, err
 	}
 	return query, hash, nil
@@ -322,7 +323,7 @@ func getSubTreeAlgorithm(payload []basemodel.SearchSpanResponseItem, getSpansSub
 		spans = append(spans, span)
 	}
 
-	zap.L().Debug("Building Tree")
+	zap.S().Debug("Building Tree")
 	roots, err := buildSpanTrees(&spans)
 	if err != nil {
 		return nil, err
@@ -332,7 +333,7 @@ func getSubTreeAlgorithm(payload []basemodel.SearchSpanResponseItem, getSpansSub
 	// For each root, get the subtree spans
 	for _, getSpansSubQueryDBResponse := range getSpansSubQueryDBResponses {
 		targetSpan := &model.SpanForTraceDetails{}
-		// zap.L().Debug("Building tree for span id: " + getSpansSubQueryDBResponse.SpanID + " " + strconv.Itoa(i+1) + " of " + strconv.Itoa(len(getSpansSubQueryDBResponses)))
+		// zap.S().Debug("Building tree for span id: " + getSpansSubQueryDBResponse.SpanID + " " + strconv.Itoa(i+1) + " of " + strconv.Itoa(len(getSpansSubQueryDBResponses)))
 		// Search target span object in the tree
 		for _, root := range roots {
 			targetSpan, err = breadthFirstSearch(root, getSpansSubQueryDBResponse.SpanID)
@@ -340,7 +341,7 @@ func getSubTreeAlgorithm(payload []basemodel.SearchSpanResponseItem, getSpansSub
 				break
 			}
 			if err != nil {
-				zap.L().Error("Error during BreadthFirstSearch()", zap.Error(err))
+				zap.S().Error("Error during BreadthFirstSearch(): ", err)
 				return nil, err
 			}
 		}

ee/query-service/app/db/trace.go

@@ -49,7 +49,7 @@ func SmartTraceAlgorithm(payload []basemodel.SearchSpanResponseItem, targetSpanI
 			break
 		}
 		if err != nil {
-			zap.L().Error("Error during BreadthFirstSearch()", zap.Error(err))
+			zap.S().Error("Error during BreadthFirstSearch(): ", err)
 			return nil, err
 		}
 	}
@@ -186,7 +186,7 @@ func buildSpanTrees(spansPtr *[]*model.SpanForTraceDetails) ([]*model.SpanForTra
 
 		// If the parent span is not found, add current span to list of roots
 		if parent == nil {
-			// zap.L().Debug("Parent Span not found parent_id: ", span.ParentID)
+			// zap.S().Debug("Parent Span not found parent_id: ", span.ParentID)
 			roots = append(roots, span)
 			span.ParentID = ""
 			continue

ee/query-service/app/server.go

@@ -20,11 +20,10 @@ import (
 	"github.com/soheilhy/cmux"
 	"go.signoz.io/signoz/ee/query-service/app/api"
 	"go.signoz.io/signoz/ee/query-service/app/db"
-	"go.signoz.io/signoz/ee/query-service/auth"
 	"go.signoz.io/signoz/ee/query-service/constants"
 	"go.signoz.io/signoz/ee/query-service/dao"
 	"go.signoz.io/signoz/ee/query-service/interfaces"
-	baseauth "go.signoz.io/signoz/pkg/query-service/auth"
+	"go.signoz.io/signoz/pkg/query-service/auth"
 	baseInterface "go.signoz.io/signoz/pkg/query-service/interfaces"
 	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
 
@@ -35,10 +34,10 @@ import (
 	baseapp "go.signoz.io/signoz/pkg/query-service/app"
 	"go.signoz.io/signoz/pkg/query-service/app/dashboards"
 	baseexplorer "go.signoz.io/signoz/pkg/query-service/app/explorer"
-	"go.signoz.io/signoz/pkg/query-service/app/integrations"
 	"go.signoz.io/signoz/pkg/query-service/app/logparsingpipeline"
 	"go.signoz.io/signoz/pkg/query-service/app/opamp"
 	opAmpModel "go.signoz.io/signoz/pkg/query-service/app/opamp/model"
+	baseauth "go.signoz.io/signoz/pkg/query-service/auth"
 	"go.signoz.io/signoz/pkg/query-service/cache"
 	baseconst "go.signoz.io/signoz/pkg/query-service/constants"
 	"go.signoz.io/signoz/pkg/query-service/healthcheck"
@@ -134,7 +133,7 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
 	var reader interfaces.DataConnector
 	storage := os.Getenv("STORAGE")
 	if storage == "clickhouse" {
-		zap.L().Info("Using ClickHouse as datastore ...")
+		zap.S().Info("Using ClickHouse as datastore ...")
 		qb := db.NewDataConnector(
 			localDB,
 			serverOptions.PromConfigPath,
@@ -172,22 +171,13 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
 	}
 
 	// initiate opamp
-	_, err = opAmpModel.InitDB(localDB)
+	_, err = opAmpModel.InitDB(baseconst.RELATIONAL_DATASOURCE_PATH)
 	if err != nil {
 		return nil, err
 	}
 
-	integrationsController, err := integrations.NewController(localDB)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"couldn't create integrations controller: %w", err,
-		)
-	}
-
 	// ingestion pipelines manager
-	logParsingPipelineController, err := logparsingpipeline.NewLogParsingPipelinesController(
-		localDB, "sqlite", integrationsController.GetPipelinesForInstalledIntegrations,
-	)
+	logParsingPipelineController, err := logparsingpipeline.NewLogParsingPipelinesController(localDB, "sqlite")
 	if err != nil {
 		return nil, err
 	}
@@ -243,7 +233,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
 		UsageManager:                  usageManager,
 		FeatureFlags:                  lm,
 		LicenseManager:                lm,
-		IntegrationsController:        integrationsController,
 		LogsParsingPipelineController: logParsingPipelineController,
 		Cache:                         c,
 		FluxInterval:                  fluxInterval,
@@ -289,7 +278,6 @@ func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server,
 
 	r := mux.NewRouter()
 
-	r.Use(baseapp.LogCommentEnricher)
 	r.Use(setTimeoutMiddleware)
 	r.Use(s.analyticsMiddleware)
 	r.Use(loggingMiddlewarePrivate)
@@ -316,13 +304,25 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, e
 
 	r := mux.NewRouter()
 
-	// add auth middleware
 	getUserFromRequest := func(r *http.Request) (*basemodel.UserPayload, error) {
-		return auth.GetUserFromRequest(r, apiHandler)
+		patToken := r.Header.Get("SIGNOZ-API-KEY")
+		if len(patToken) > 0 {
+			zap.S().Debugf("Received a non-zero length PAT token")
+			ctx := context.Background()
+			dao := apiHandler.AppDao()
+
+			user, err := dao.GetUserByPAT(ctx, patToken)
+			if err == nil && user != nil {
+				zap.S().Debugf("Found valid PAT user: %+v", user)
+				return user, nil
+			}
+			if err != nil {
+				zap.S().Debugf("Error while getting user for PAT: %+v", err)
+			}
+		}
+		return baseauth.GetUserFromRequest(r)
 	}
 	am := baseapp.NewAuthMiddleware(getUserFromRequest)
-
-	r.Use(baseapp.LogCommentEnricher)
 	r.Use(setTimeoutMiddleware)
 	r.Use(s.analyticsMiddleware)
 	r.Use(loggingMiddleware)
@@ -330,7 +330,6 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, e
 	apiHandler.RegisterRoutes(r, am)
 	apiHandler.RegisterMetricsRoutes(r, am)
 	apiHandler.RegisterLogsRoutes(r, am)
-	apiHandler.RegisterIntegrationRoutes(r, am)
 	apiHandler.RegisterQueryRangeV3Routes(r, am)
 	apiHandler.RegisterQueryRangeV4Routes(r, am)
 
@@ -419,33 +418,30 @@ func extractQueryRangeV3Data(path string, r *http.Request) (map[string]interface
 
 	signozMetricsUsed := false
 	signozLogsUsed := false
-	signozTracesUsed := false
+	dataSources := []string{}
 	if postData != nil {
 
 		if postData.CompositeQuery != nil {
 			data["queryType"] = postData.CompositeQuery.QueryType
 			data["panelType"] = postData.CompositeQuery.PanelType
 
-			signozLogsUsed, signozMetricsUsed, signozTracesUsed = telemetry.GetInstance().CheckSigNozSignals(postData)
+			signozLogsUsed, signozMetricsUsed = telemetry.GetInstance().CheckSigNozSignals(postData)
 		}
 	}
 
-	if signozMetricsUsed || signozLogsUsed || signozTracesUsed {
+	if signozMetricsUsed || signozLogsUsed {
 		if signozMetricsUsed {
+			dataSources = append(dataSources, "metrics")
 			telemetry.GetInstance().AddActiveMetricsUser()
 		}
 		if signozLogsUsed {
+			dataSources = append(dataSources, "logs")
 			telemetry.GetInstance().AddActiveLogsUser()
 		}
-		if signozTracesUsed {
-			telemetry.GetInstance().AddActiveTracesUser()
-		}
-		data["metricsUsed"] = signozMetricsUsed
-		data["logsUsed"] = signozLogsUsed
-		data["tracesUsed"] = signozTracesUsed
-		userEmail, err := baseauth.GetEmailFromJwt(r.Context())
+		data["dataSources"] = dataSources
+		userEmail, err := auth.GetEmailFromJwt(r.Context())
 		if err == nil {
-			telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_QUERY_RANGE_API, data, userEmail, true, false)
+			telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_QUERY_RANGE_V3, data, userEmail, true)
 		}
 	}
 	return data, true
@@ -467,7 +463,7 @@ func getActiveLogs(path string, r *http.Request) {
 
 func (s *Server) analyticsMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx := baseauth.AttachJwtToContext(r.Context(), r)
+		ctx := auth.AttachJwtToContext(r.Context(), r)
 		r = r.WithContext(ctx)
 		route := mux.CurrentRoute(r)
 		path, _ := route.GetPathTemplate()
@@ -486,9 +482,9 @@ func (s *Server) analyticsMiddleware(next http.Handler) http.Handler {
 		}
 
 		if _, ok := telemetry.EnabledPaths()[path]; ok {
-			userEmail, err := baseauth.GetEmailFromJwt(r.Context())
+			userEmail, err := auth.GetEmailFromJwt(r.Context())
 			if err == nil {
-				telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_PATH, data, userEmail, true, false)
+				telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_PATH, data, userEmail)
 			}
 		}
 
@@ -525,7 +521,7 @@ func (s *Server) initListeners() error {
 		return err
 	}
 
-	zap.L().Info(fmt.Sprintf("Query server started listening on %s...", s.serverOptions.HTTPHostPort))
+	zap.S().Info(fmt.Sprintf("Query server started listening on %s...", s.serverOptions.HTTPHostPort))
 
 	// listen on private port to support internal services
 	privateHostPort := s.serverOptions.PrivateHostPort
@@ -538,7 +534,7 @@ func (s *Server) initListeners() error {
 	if err != nil {
 		return err
 	}
-	zap.L().Info(fmt.Sprintf("Query server started listening on private port %s...", s.serverOptions.PrivateHostPort))
+	zap.S().Info(fmt.Sprintf("Query server started listening on private port %s...", s.serverOptions.PrivateHostPort))
 
 	return nil
 }
@@ -550,7 +546,7 @@ func (s *Server) Start() error {
 	if !s.serverOptions.DisableRules {
 		s.ruleManager.Start()
 	} else {
-		zap.L().Info("msg: Rules disabled as rules.disable is set to TRUE")
+		zap.S().Info("msg: Rules disabled as rules.disable is set to TRUE")
 	}
 
 	err := s.initListeners()
@@ -564,23 +560,23 @@ func (s *Server) Start() error {
 	}
 
 	go func() {
-		zap.L().Info("Starting HTTP server", zap.Int("port", httpPort), zap.String("addr", s.serverOptions.HTTPHostPort))
+		zap.S().Info("Starting HTTP server", zap.Int("port", httpPort), zap.String("addr", s.serverOptions.HTTPHostPort))
 
 		switch err := s.httpServer.Serve(s.httpConn); err {
 		case nil, http.ErrServerClosed, cmux.ErrListenerClosed:
 			// normal exit, nothing to do
 		default:
-			zap.L().Error("Could not start HTTP server", zap.Error(err))
+			zap.S().Error("Could not start HTTP server", zap.Error(err))
 		}
 		s.unavailableChannel <- healthcheck.Unavailable
 	}()
 
 	go func() {
-		zap.L().Info("Starting pprof server", zap.String("addr", baseconst.DebugHttpPort))
+		zap.S().Info("Starting pprof server", zap.String("addr", baseconst.DebugHttpPort))
 
 		err = http.ListenAndServe(baseconst.DebugHttpPort, nil)
 		if err != nil {
-			zap.L().Error("Could not start pprof server", zap.Error(err))
+			zap.S().Error("Could not start pprof server", zap.Error(err))
 		}
 	}()
 
@@ -590,14 +586,14 @@ func (s *Server) Start() error {
 	}
 
 	go func() {
-		zap.L().Info("Starting Private HTTP server", zap.Int("port", privatePort), zap.String("addr", s.serverOptions.PrivateHostPort))
+		zap.S().Info("Starting Private HTTP server", zap.Int("port", privatePort), zap.String("addr", s.serverOptions.PrivateHostPort))
 
 		switch err := s.privateHTTP.Serve(s.privateConn); err {
 		case nil, http.ErrServerClosed, cmux.ErrListenerClosed:
 			// normal exit, nothing to do
-			zap.L().Info("private http server closed")
+			zap.S().Info("private http server closed")
 		default:
-			zap.L().Error("Could not start private HTTP server", zap.Error(err))
+			zap.S().Error("Could not start private HTTP server", zap.Error(err))
 		}
 
 		s.unavailableChannel <- healthcheck.Unavailable
@@ -605,10 +601,10 @@ func (s *Server) Start() error {
 	}()
 
 	go func() {
-		zap.L().Info("Starting OpAmp Websocket server", zap.String("addr", baseconst.OpAmpWsEndpoint))
+		zap.S().Info("Starting OpAmp Websocket server", zap.String("addr", baseconst.OpAmpWsEndpoint))
 		err := s.opampServer.Start(baseconst.OpAmpWsEndpoint)
 		if err != nil {
-			zap.L().Error("opamp ws server failed to start", zap.Error(err))
+			zap.S().Info("opamp ws server failed to start", err)
 			s.unavailableChannel <- healthcheck.Unavailable
 		}
 	}()
@@ -684,7 +680,7 @@ func makeRulesManager(
 		return nil, fmt.Errorf("rule manager error: %v", err)
 	}
 
-	zap.L().Info("rules manager is ready")
+	zap.S().Info("rules manager is ready")
 
 	return manager, nil
 }

ee/query-service/auth/auth.go

@@ -1,56 +0,0 @@
-package auth
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"time"
-
-	"go.signoz.io/signoz/ee/query-service/app/api"
-	baseauth "go.signoz.io/signoz/pkg/query-service/auth"
-	basemodel "go.signoz.io/signoz/pkg/query-service/model"
-	"go.signoz.io/signoz/pkg/query-service/telemetry"
-
-	"go.uber.org/zap"
-)
-
-func GetUserFromRequest(r *http.Request, apiHandler *api.APIHandler) (*basemodel.UserPayload, error) {
-	patToken := r.Header.Get("SIGNOZ-API-KEY")
-	if len(patToken) > 0 {
-		zap.L().Debug("Received a non-zero length PAT token")
-		ctx := context.Background()
-		dao := apiHandler.AppDao()
-
-		pat, err := dao.GetPAT(ctx, patToken)
-		if err == nil && pat != nil {
-			zap.L().Debug("Found valid PAT: ", zap.Any("pat", pat))
-			if pat.ExpiresAt < time.Now().Unix() && pat.ExpiresAt != 0 {
-				zap.L().Info("PAT has expired: ", zap.Any("pat", pat))
-				return nil, fmt.Errorf("PAT has expired")
-			}
-			group, apiErr := dao.GetGroupByName(ctx, pat.Role)
-			if apiErr != nil {
-				zap.L().Error("Error while getting group for PAT: ", zap.Any("apiErr", apiErr))
-				return nil, apiErr
-			}
-			user, err := dao.GetUser(ctx, pat.UserID)
-			if err != nil {
-				zap.L().Error("Error while getting user for PAT: ", zap.Error(err))
-				return nil, err
-			}
-			telemetry.GetInstance().SetPatTokenUser()
-			dao.UpdatePATLastUsed(ctx, patToken, time.Now().Unix())
-			user.User.GroupId = group.Id
-			user.User.Id = pat.Id
-			return &basemodel.UserPayload{
-				User: user.User,
-				Role: pat.Role,
-			}, nil
-		}
-		if err != nil {
-			zap.L().Error("Error while getting user for PAT: ", zap.Error(err))
-			return nil, err
-		}
-	}
-	return baseauth.GetUserFromRequest(r)
-}

ee/query-service/dao/interface.go

@@ -34,11 +34,9 @@ type ModelDao interface {
 	GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, basemodel.BaseApiError)
 
 	CreatePAT(ctx context.Context, p model.PAT) (model.PAT, basemodel.BaseApiError)
-	UpdatePAT(ctx context.Context, p model.PAT, id string) (basemodel.BaseApiError)
 	GetPAT(ctx context.Context, pat string) (*model.PAT, basemodel.BaseApiError)
-	UpdatePATLastUsed(ctx context.Context, pat string, lastUsed int64) basemodel.BaseApiError
 	GetPATByID(ctx context.Context, id string) (*model.PAT, basemodel.BaseApiError)
 	GetUserByPAT(ctx context.Context, token string) (*basemodel.UserPayload, basemodel.BaseApiError)
-	ListPATs(ctx context.Context) ([]model.PAT, basemodel.BaseApiError)
-	RevokePAT(ctx context.Context, id string, userID string) basemodel.BaseApiError
+	ListPATs(ctx context.Context, userID string) ([]model.PAT, basemodel.BaseApiError)
+	DeletePAT(ctx context.Context, id string) basemodel.BaseApiError
 }

ee/query-service/dao/sqlite/auth.go

@@ -22,19 +22,19 @@ func (m *modelDao) createUserForSAMLRequest(ctx context.Context, email string) (
 	domain, apierr := m.GetDomainByEmail(ctx, email)
 
 	if apierr != nil {
-		zap.L().Error("failed to get domain from email", zap.Error(apierr))
+		zap.S().Errorf("failed to get domain from email", apierr)
 		return nil, model.InternalErrorStr("failed to get domain from email")
 	}
 
 	hash, err := baseauth.PasswordHash(utils.GeneratePassowrd())
 	if err != nil {
-		zap.L().Error("failed to generate password hash when registering a user via SSO redirect", zap.Error(err))
+		zap.S().Errorf("failed to generate password hash when registering a user via SSO redirect", zap.Error(err))
 		return nil, model.InternalErrorStr("failed to generate password hash")
 	}
 
 	group, apiErr := m.GetGroupByName(ctx, baseconst.ViewerGroup)
 	if apiErr != nil {
-		zap.L().Error("GetGroupByName failed", zap.Error(apiErr))
+		zap.S().Debugf("GetGroupByName failed, err: %v\n", apiErr.Err)
 		return nil, apiErr
 	}
 
@@ -51,7 +51,7 @@ func (m *modelDao) createUserForSAMLRequest(ctx context.Context, email string) (
 
 	user, apiErr = m.CreateUser(ctx, user, false)
 	if apiErr != nil {
-		zap.L().Error("CreateUser failed", zap.Error(apiErr))
+		zap.S().Debugf("CreateUser failed, err: %v\n", apiErr.Err)
 		return nil, apiErr
 	}
 
@@ -65,7 +65,7 @@ func (m *modelDao) PrepareSsoRedirect(ctx context.Context, redirectUri, email st
 
 	userPayload, apierr := m.GetUserByEmail(ctx, email)
 	if !apierr.IsNil() {
-		zap.L().Error("failed to get user with email received from auth provider", zap.String("error", apierr.Error()))
+		zap.S().Errorf(" failed to get user with email received from auth provider", apierr.Error())
 		return "", model.BadRequestStr("invalid user email received from the auth provider")
 	}
 
@@ -75,7 +75,7 @@ func (m *modelDao) PrepareSsoRedirect(ctx context.Context, redirectUri, email st
 		newUser, apiErr := m.createUserForSAMLRequest(ctx, email)
 		user = newUser
 		if apiErr != nil {
-			zap.L().Error("failed to create user with email received from auth provider", zap.Error(apiErr))
+			zap.S().Errorf("failed to create user with email received from auth provider: %v", apierr.Error())
 			return "", apiErr
 		}
 	} else {
@@ -84,7 +84,7 @@ func (m *modelDao) PrepareSsoRedirect(ctx context.Context, redirectUri, email st
 
 	tokenStore, err := baseauth.GenerateJWTForUser(user)
 	if err != nil {
-		zap.L().Error("failed to generate token for SSO login user", zap.Error(err))
+		zap.S().Errorf("failed to generate token for SSO login user", err)
 		return "", model.InternalErrorStr("failed to generate token for the user")
 	}
 
@@ -143,8 +143,8 @@ func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (
 			// do nothing, just skip sso
 			ssoAvailable = false
 		default:
-			zap.L().Error("feature check failed", zap.String("featureKey", model.SSO), zap.Error(err))
-			return resp, model.BadRequestStr(err.Error())
+			zap.S().Errorf("feature check failed", zap.String("featureKey", model.SSO), zap.Error(err))
+			return resp, model.BadRequest(err)
 		}
 	}
 
@@ -160,7 +160,7 @@ func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (
 			if len(emailComponents) > 0 {
 				emailDomain = emailComponents[1]
 			}
-			zap.L().Error("failed to get org domain from email", zap.String("emailDomain", emailDomain), zap.Error(apierr.ToError()))
+			zap.S().Errorf("failed to get org domain from email", zap.String("emailDomain", emailDomain), apierr.ToError())
 			return resp, apierr
 		}
 
@@ -176,7 +176,7 @@ func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (
 			escapedUrl, _ := url.QueryUnescape(sourceUrl)
 			siteUrl, err := url.Parse(escapedUrl)
 			if err != nil {
-				zap.L().Error("failed to parse referer", zap.Error(err))
+				zap.S().Errorf("failed to parse referer", err)
 				return resp, model.InternalError(fmt.Errorf("failed to generate login request"))
 			}
 
@@ -185,7 +185,7 @@ func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (
 			resp.SsoUrl, err = orgDomain.BuildSsoUrl(siteUrl)
 
 			if err != nil {
-				zap.L().Error("failed to prepare saml request for domain", zap.String("domain", orgDomain.Name), zap.Error(err))
+				zap.S().Errorf("failed to prepare saml request for domain", zap.String("domain", orgDomain.Name), err)
 				return resp, model.InternalError(err)
 			}
 

ee/query-service/dao/sqlite/domain.go

@@ -48,13 +48,13 @@ func (m *modelDao) GetDomainFromSsoResponse(ctx context.Context, relayState *url
 	if domainIdStr != "" {
 		domainId, err := uuid.Parse(domainIdStr)
 		if err != nil {
-			zap.L().Error("failed to parse domainId from relay state", zap.Error(err))
+			zap.S().Errorf("failed to parse domainId from relay state", err)
 			return nil, fmt.Errorf("failed to parse domainId from IdP response")
 		}
 
 		domain, err = m.GetDomain(ctx, domainId)
 		if (err != nil) || domain == nil {
-			zap.L().Error("failed to find domain from domainId received in IdP response", zap.Error(err))
+			zap.S().Errorf("failed to find domain from domainId received in IdP response", err.Error())
 			return nil, fmt.Errorf("invalid credentials")
 		}
 	}
@@ -64,7 +64,7 @@ func (m *modelDao) GetDomainFromSsoResponse(ctx context.Context, relayState *url
 		domainFromDB, err := m.GetDomainByName(ctx, domainNameStr)
 		domain = domainFromDB
 		if (err != nil) || domain == nil {
-			zap.L().Error("failed to find domain from domainName received in IdP response", zap.Error(err))
+			zap.S().Errorf("failed to find domain from domainName received in IdP response", err.Error())
 			return nil, fmt.Errorf("invalid credentials")
 		}
 	}
@@ -132,7 +132,7 @@ func (m *modelDao) ListDomains(ctx context.Context, orgId string) ([]model.OrgDo
 	for _, s := range stored {
 		domain := model.OrgDomain{Id: s.Id, Name: s.Name, OrgId: s.OrgId}
 		if err := domain.LoadConfig(s.Data); err != nil {
-			zap.L().Error("ListDomains() failed", zap.Error(err))
+			zap.S().Errorf("ListDomains() failed", zap.Error(err))
 		}
 		domains = append(domains, domain)
 	}
@@ -153,7 +153,7 @@ func (m *modelDao) CreateDomain(ctx context.Context, domain *model.OrgDomain) ba
 
 	configJson, err := json.Marshal(domain)
 	if err != nil {
-		zap.L().Error("failed to unmarshal domain config", zap.Error(err))
+		zap.S().Errorf("failed to unmarshal domain config", zap.Error(err))
 		return model.InternalError(fmt.Errorf("domain creation failed"))
 	}
 
@@ -167,7 +167,7 @@ func (m *modelDao) CreateDomain(ctx context.Context, domain *model.OrgDomain) ba
 		time.Now().Unix())
 
 	if err != nil {
-		zap.L().Error("failed to insert domain in db", zap.Error(err))
+		zap.S().Errorf("failed to insert domain in db", zap.Error(err))
 		return model.InternalError(fmt.Errorf("domain creation failed"))
 	}
 
@@ -178,13 +178,13 @@ func (m *modelDao) CreateDomain(ctx context.Context, domain *model.OrgDomain) ba
 func (m *modelDao) UpdateDomain(ctx context.Context, domain *model.OrgDomain) basemodel.BaseApiError {
 
 	if domain.Id == uuid.Nil {
-		zap.L().Error("domain update failed", zap.Error(fmt.Errorf("OrgDomain.Id is null")))
+		zap.S().Errorf("domain update failed", zap.Error(fmt.Errorf("OrgDomain.Id is null")))
 		return model.InternalError(fmt.Errorf("domain update failed"))
 	}
 
 	configJson, err := json.Marshal(domain)
 	if err != nil {
-		zap.L().Error("domain update failed", zap.Error(err))
+		zap.S().Errorf("domain update failed", zap.Error(err))
 		return model.InternalError(fmt.Errorf("domain update failed"))
 	}
 
@@ -195,7 +195,7 @@ func (m *modelDao) UpdateDomain(ctx context.Context, domain *model.OrgDomain) ba
 		domain.Id)
 
 	if err != nil {
-		zap.L().Error("domain update failed", zap.Error(err))
+		zap.S().Errorf("domain update failed", zap.Error(err))
 		return model.InternalError(fmt.Errorf("domain update failed"))
 	}
 
@@ -206,7 +206,7 @@ func (m *modelDao) UpdateDomain(ctx context.Context, domain *model.OrgDomain) ba
 func (m *modelDao) DeleteDomain(ctx context.Context, id uuid.UUID) basemodel.BaseApiError {
 
 	if id == uuid.Nil {
-		zap.L().Error("domain delete failed", zap.Error(fmt.Errorf("OrgDomain.Id is null")))
+		zap.S().Errorf("domain delete failed", zap.Error(fmt.Errorf("OrgDomain.Id is null")))
 		return model.InternalError(fmt.Errorf("domain delete failed"))
 	}
 
@@ -215,7 +215,7 @@ func (m *modelDao) DeleteDomain(ctx context.Context, id uuid.UUID) basemodel.Bas
 		id)
 
 	if err != nil {
-		zap.L().Error("domain delete failed", zap.Error(err))
+		zap.S().Errorf("domain delete failed", zap.Error(err))
 		return model.InternalError(fmt.Errorf("domain delete failed"))
 	}
 

ee/query-service/dao/sqlite/modelDao.go

@@ -7,7 +7,6 @@ import (
 	basedao "go.signoz.io/signoz/pkg/query-service/dao"
 	basedsql "go.signoz.io/signoz/pkg/query-service/dao/sqlite"
 	baseint "go.signoz.io/signoz/pkg/query-service/interfaces"
-	"go.uber.org/zap"
 )
 
 type modelDao struct {
@@ -29,41 +28,6 @@ func (m *modelDao) checkFeature(key string) error {
 	return m.flags.CheckFeature(key)
 }
 
-func columnExists(db *sqlx.DB, tableName, columnName string) bool {
-	query := fmt.Sprintf("PRAGMA table_info(%s);", tableName)
-	rows, err := db.Query(query)
-	if err != nil {
-		zap.L().Error("Failed to query table info", zap.Error(err))
-		return false
-	}
-	defer rows.Close()
-
-	var (
-		cid        int
-		name       string
-		ctype      string
-		notnull    int
-		dflt_value *string
-		pk         int
-	)
-	for rows.Next() {
-		err := rows.Scan(&cid, &name, &ctype, &notnull, &dflt_value, &pk)
-		if err != nil {
-			zap.L().Error("Failed to scan table info", zap.Error(err))
-			return false
-		}
-		if name == columnName {
-			return true
-		}
-	}
-	err = rows.Err()
-	if err != nil {
-		zap.L().Error("Failed to scan table info", zap.Error(err))
-		return false
-	}
-	return false
-}
-
 // InitDB creates and extends base model DB repository
 func InitDB(dataSourceName string) (*modelDao, error) {
 	dao, err := basedsql.InitDB(dataSourceName)
@@ -87,16 +51,11 @@ func InitDB(dataSourceName string) (*modelDao, error) {
 	);
 	CREATE TABLE IF NOT EXISTS personal_access_tokens (
 		id INTEGER PRIMARY KEY AUTOINCREMENT,
-		role TEXT NOT NULL,
 		user_id TEXT NOT NULL,
 		token TEXT NOT NULL UNIQUE,
 		name TEXT NOT NULL,
 		created_at INTEGER NOT NULL,
 		expires_at INTEGER NOT NULL,
-		updated_at INTEGER NOT NULL,
-		last_used INTEGER NOT NULL,
-		revoked BOOLEAN NOT NULL,
-		updated_by_user_id TEXT NOT NULL,
 		FOREIGN KEY(user_id) REFERENCES users(id)
 	);
 	`
@@ -106,36 +65,6 @@ func InitDB(dataSourceName string) (*modelDao, error) {
 		return nil, fmt.Errorf("error in creating tables: %v", err.Error())
 	}
 
-	if !columnExists(m.DB(), "personal_access_tokens", "role") {
-		_, err = m.DB().Exec("ALTER TABLE personal_access_tokens ADD COLUMN role TEXT NOT NULL DEFAULT 'ADMIN';")
-		if err != nil {
-			return nil, fmt.Errorf("error in adding column: %v", err.Error())
-		}
-	}
-	if !columnExists(m.DB(), "personal_access_tokens", "updated_at") {
-		_, err = m.DB().Exec("ALTER TABLE personal_access_tokens ADD COLUMN updated_at INTEGER NOT NULL DEFAULT 0;")
-		if err != nil {
-			return nil, fmt.Errorf("error in adding column: %v", err.Error())
-		}
-	}
-	if !columnExists(m.DB(), "personal_access_tokens", "last_used") {
-		_, err = m.DB().Exec("ALTER TABLE personal_access_tokens ADD COLUMN last_used INTEGER NOT NULL DEFAULT 0;")
-		if err != nil {
-			return nil, fmt.Errorf("error in adding column: %v", err.Error())
-		}
-	}
-	if !columnExists(m.DB(), "personal_access_tokens", "revoked") {
-		_, err = m.DB().Exec("ALTER TABLE personal_access_tokens ADD COLUMN revoked BOOLEAN NOT NULL DEFAULT FALSE;")
-		if err != nil {
-			return nil, fmt.Errorf("error in adding column: %v", err.Error())
-		}
-	}
-	if !columnExists(m.DB(), "personal_access_tokens", "updated_by_user_id") {
-		_, err = m.DB().Exec("ALTER TABLE personal_access_tokens ADD COLUMN updated_by_user_id TEXT NOT NULL DEFAULT '';")
-		if err != nil {
-			return nil, fmt.Errorf("error in adding column: %v", err.Error())
-		}
-	}
 	return m, nil
 }
 

ee/query-service/dao/sqlite/pat.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"time"
 
 	"go.signoz.io/signoz/ee/query-service/model"
 	basemodel "go.signoz.io/signoz/pkg/query-service/model"
@@ -13,124 +12,40 @@ import (
 
 func (m *modelDao) CreatePAT(ctx context.Context, p model.PAT) (model.PAT, basemodel.BaseApiError) {
 	result, err := m.DB().ExecContext(ctx,
-		"INSERT INTO personal_access_tokens (user_id, token, role, name, created_at, expires_at, updated_at, updated_by_user_id, last_used, revoked) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)",
+		"INSERT INTO personal_access_tokens (user_id, token, name, created_at, expires_at) VALUES ($1, $2, $3, $4, $5)",
 		p.UserID,
 		p.Token,
-		p.Role,
 		p.Name,
 		p.CreatedAt,
-		p.ExpiresAt,
-		p.UpdatedAt,
-		p.UpdatedByUserID,
-		p.LastUsed,
-		p.Revoked,
-	)
+		p.ExpiresAt)
 	if err != nil {
-		zap.L().Error("Failed to insert PAT in db, err: %v", zap.Error(err))
+		zap.S().Errorf("Failed to insert PAT in db, err: %v", zap.Error(err))
 		return model.PAT{}, model.InternalError(fmt.Errorf("PAT insertion failed"))
 	}
 	id, err := result.LastInsertId()
 	if err != nil {
-		zap.L().Error("Failed to get last inserted id, err: %v", zap.Error(err))
+		zap.S().Errorf("Failed to get last inserted id, err: %v", zap.Error(err))
 		return model.PAT{}, model.InternalError(fmt.Errorf("PAT insertion failed"))
 	}
 	p.Id = strconv.Itoa(int(id))
-	createdByUser, _ := m.GetUser(ctx, p.UserID)
-	if createdByUser == nil {
-		p.CreatedByUser = model.User{
-			NotFound: true,
-		}
-	} else {
-		p.CreatedByUser = model.User{
-			Id:                createdByUser.Id,
-			Name:              createdByUser.Name,
-			Email:             createdByUser.Email,
-			CreatedAt:         createdByUser.CreatedAt,
-			ProfilePictureURL: createdByUser.ProfilePictureURL,
-			NotFound:          false,
-		}
-	}
 	return p, nil
 }
 
-func (m *modelDao) UpdatePAT(ctx context.Context, p model.PAT, id string) basemodel.BaseApiError {
-	_, err := m.DB().ExecContext(ctx,
-		"UPDATE personal_access_tokens SET role=$1, name=$2, updated_at=$3, updated_by_user_id=$4 WHERE id=$5 and revoked=false;",
-		p.Role,
-		p.Name,
-		p.UpdatedAt,
-		p.UpdatedByUserID,
-		id)
-	if err != nil {
-		zap.L().Error("Failed to update PAT in db, err: %v", zap.Error(err))
-		return model.InternalError(fmt.Errorf("PAT update failed"))
-	}
-	return nil
-}
-
-func (m *modelDao) UpdatePATLastUsed(ctx context.Context, token string, lastUsed int64) basemodel.BaseApiError {
-	_, err := m.DB().ExecContext(ctx,
-		"UPDATE personal_access_tokens SET last_used=$1 WHERE token=$2 and revoked=false;",
-		lastUsed,
-		token)
-	if err != nil {
-		zap.L().Error("Failed to update PAT last used in db, err: %v", zap.Error(err))
-		return model.InternalError(fmt.Errorf("PAT last used update failed"))
-	}
-	return nil
-}
-
-func (m *modelDao) ListPATs(ctx context.Context) ([]model.PAT, basemodel.BaseApiError) {
+func (m *modelDao) ListPATs(ctx context.Context, userID string) ([]model.PAT, basemodel.BaseApiError) {
 	pats := []model.PAT{}
 
-	if err := m.DB().Select(&pats, "SELECT * FROM personal_access_tokens WHERE revoked=false ORDER by updated_at DESC;"); err != nil {
-		zap.L().Error("Failed to fetch PATs err: %v", zap.Error(err))
+	if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE user_id=?;`, userID); err != nil {
+		zap.S().Errorf("Failed to fetch PATs for user: %s, err: %v", userID, zap.Error(err))
 		return nil, model.InternalError(fmt.Errorf("failed to fetch PATs"))
 	}
-	for i := range pats {
-		createdByUser, _ := m.GetUser(ctx, pats[i].UserID)
-		if createdByUser == nil {
-			pats[i].CreatedByUser = model.User{
-				NotFound: true,
-			}
-		} else {
-			pats[i].CreatedByUser = model.User{
-				Id:                createdByUser.Id,
-				Name:              createdByUser.Name,
-				Email:             createdByUser.Email,
-				CreatedAt:         createdByUser.CreatedAt,
-				ProfilePictureURL: createdByUser.ProfilePictureURL,
-				NotFound:          false,
-			}
-		}
-
-		updatedByUser, _ := m.GetUser(ctx, pats[i].UpdatedByUserID)
-		if updatedByUser == nil {
-			pats[i].UpdatedByUser = model.User{
-				NotFound: true,
-			}
-		} else {
-			pats[i].UpdatedByUser = model.User{
-				Id:                updatedByUser.Id,
-				Name:              updatedByUser.Name,
-				Email:             updatedByUser.Email,
-				CreatedAt:         updatedByUser.CreatedAt,
-				ProfilePictureURL: updatedByUser.ProfilePictureURL,
-				NotFound:          false,
-			}
-		}
-	}
 	return pats, nil
 }
 
-func (m *modelDao) RevokePAT(ctx context.Context, id string, userID string) basemodel.BaseApiError {
-	updatedAt := time.Now().Unix()
-	_, err := m.DB().ExecContext(ctx,
-		"UPDATE personal_access_tokens SET revoked=true, updated_by_user_id = $1, updated_at=$2 WHERE id=$3",
-		userID, updatedAt, id)
+func (m *modelDao) DeletePAT(ctx context.Context, id string) basemodel.BaseApiError {
+	_, err := m.DB().ExecContext(ctx, `DELETE from personal_access_tokens where id=?;`, id)
 	if err != nil {
-		zap.L().Error("Failed to revoke PAT in db, err: %v", zap.Error(err))
-		return model.InternalError(fmt.Errorf("PAT revoke failed"))
+		zap.S().Errorf("Failed to delete PAT, err: %v", zap.Error(err))
+		return model.InternalError(fmt.Errorf("failed to delete PAT"))
 	}
 	return nil
 }
@@ -138,7 +53,7 @@ func (m *modelDao) RevokePAT(ctx context.Context, id string, userID string) base
 func (m *modelDao) GetPAT(ctx context.Context, token string) (*model.PAT, basemodel.BaseApiError) {
 	pats := []model.PAT{}
 
-	if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE token=? and revoked=false;`, token); err != nil {
+	if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE token=?;`, token); err != nil {
 		return nil, model.InternalError(fmt.Errorf("failed to fetch PAT"))
 	}
 
@@ -155,7 +70,7 @@ func (m *modelDao) GetPAT(ctx context.Context, token string) (*model.PAT, basemo
 func (m *modelDao) GetPATByID(ctx context.Context, id string) (*model.PAT, basemodel.BaseApiError) {
 	pats := []model.PAT{}
 
-	if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE id=? and revoked=false;`, id); err != nil {
+	if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE id=?;`, id); err != nil {
 		return nil, model.InternalError(fmt.Errorf("failed to fetch PAT"))
 	}
 
@@ -169,7 +84,6 @@ func (m *modelDao) GetPATByID(ctx context.Context, id string) (*model.PAT, basem
 	return &pats[0], nil
 }
 
-// deprecated
 func (m *modelDao) GetUserByPAT(ctx context.Context, token string) (*basemodel.UserPayload, basemodel.BaseApiError) {
 	users := []basemodel.UserPayload{}
 

ee/query-service/integrations/signozio/signozio.go

@@ -47,13 +47,13 @@ func ActivateLicense(key, siteId string) (*ActivationResponse, *model.ApiError)
 	httpResponse, err := http.Post(C.Prefix+"/licenses/activate", APPLICATION_JSON, bytes.NewBuffer(reqString))
 
 	if err != nil {
-		zap.L().Error("failed to connect to license.signoz.io", zap.Error(err))
+		zap.S().Errorf("failed to connect to license.signoz.io", err)
 		return nil, model.BadRequest(fmt.Errorf("unable to connect with license.signoz.io, please check your network connection"))
 	}
 
 	httpBody, err := io.ReadAll(httpResponse.Body)
 	if err != nil {
-		zap.L().Error("failed to read activation response from license.signoz.io", zap.Error(err))
+		zap.S().Errorf("failed to read activation response from license.signoz.io", err)
 		return nil, model.BadRequest(fmt.Errorf("failed to read activation response from license.signoz.io"))
 	}
 
@@ -63,7 +63,7 @@ func ActivateLicense(key, siteId string) (*ActivationResponse, *model.ApiError)
 	result := ActivationResult{}
 	err = json.Unmarshal(httpBody, &result)
 	if err != nil {
-		zap.L().Error("failed to marshal activation response from license.signoz.io", zap.Error(err))
+		zap.S().Errorf("failed to marshal activation response from license.signoz.io", err)
 		return nil, model.InternalError(errors.Wrap(err, "failed to marshal license activation response"))
 	}
 

ee/query-service/license/db.go

@@ -97,7 +97,7 @@ func (r *Repo) InsertLicense(ctx context.Context, l *model.License) error {
 		l.ValidationMessage)
 
 	if err != nil {
-		zap.L().Error("error in inserting license data: ", zap.Error(err))
+		zap.S().Errorf("error in inserting license data: ", zap.Error(err))
 		return fmt.Errorf("failed to insert license in db: %v", err)
 	}
 
@@ -121,7 +121,7 @@ func (r *Repo) UpdatePlanDetails(ctx context.Context,
 	_, err := r.db.ExecContext(ctx, query, planDetails, time.Now(), key)
 
 	if err != nil {
-		zap.L().Error("error in updating license: ", zap.Error(err))
+		zap.S().Errorf("error in updating license: ", zap.Error(err))
 		return fmt.Errorf("failed to update license in db: %v", err)
 	}
 

ee/query-service/license/manager.go

@@ -100,7 +100,7 @@ func (lm *Manager) SetActive(l *model.License) {
 
 	err := lm.InitFeatures(lm.activeFeatures)
 	if err != nil {
-		zap.L().Panic("Couldn't activate features", zap.Error(err))
+		zap.S().Panicf("Couldn't activate features: %v", err)
 	}
 	if !lm.validatorRunning {
 		// we want to make sure only one validator runs,
@@ -125,13 +125,13 @@ func (lm *Manager) LoadActiveLicense() error {
 	if active != nil {
 		lm.SetActive(active)
 	} else {
-		zap.L().Info("No active license found, defaulting to basic plan")
+		zap.S().Info("No active license found, defaulting to basic plan")
 		// if no active license is found, we default to basic(free) plan with all default features
 		lm.activeFeatures = model.BasicPlan
 		setDefaultFeatures(lm)
 		err := lm.InitFeatures(lm.activeFeatures)
 		if err != nil {
-			zap.L().Error("Couldn't initialize features", zap.Error(err))
+			zap.S().Error("Couldn't initialize features: ", err)
 			return err
 		}
 	}
@@ -191,7 +191,7 @@ func (lm *Manager) Validator(ctx context.Context) {
 
 // Validate validates the current active license
 func (lm *Manager) Validate(ctx context.Context) (reterr error) {
-	zap.L().Info("License validation started")
+	zap.S().Info("License validation started")
 	if lm.activeLicense == nil {
 		return nil
 	}
@@ -201,12 +201,12 @@ func (lm *Manager) Validate(ctx context.Context) (reterr error) {
 
 		lm.lastValidated = time.Now().Unix()
 		if reterr != nil {
-			zap.L().Error("License validation completed with error", zap.Error(reterr))
+			zap.S().Errorf("License validation completed with error", reterr)
 			atomic.AddUint64(&lm.failedAttempts, 1)
 			telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_LICENSE_CHECK_FAILED,
-				map[string]interface{}{"err": reterr.Error()}, "", true, false)
+				map[string]interface{}{"err": reterr.Error()}, "")
 		} else {
-			zap.L().Info("License validation completed with no errors")
+			zap.S().Info("License validation completed with no errors")
 		}
 
 		lm.mutex.Unlock()
@@ -214,7 +214,7 @@ func (lm *Manager) Validate(ctx context.Context) (reterr error) {
 
 	response, apiError := validate.ValidateLicense(lm.activeLicense.ActivationId)
 	if apiError != nil {
-		zap.L().Error("failed to validate license", zap.Error(apiError.Err))
+		zap.S().Errorf("failed to validate license", apiError)
 		return apiError.Err
 	}
 
@@ -235,7 +235,7 @@ func (lm *Manager) Validate(ctx context.Context) (reterr error) {
 		}
 
 		if err := l.ParsePlan(); err != nil {
-			zap.L().Error("failed to parse updated license", zap.Error(err))
+			zap.S().Errorf("failed to parse updated license", zap.Error(err))
 			return err
 		}
 
@@ -245,7 +245,7 @@ func (lm *Manager) Validate(ctx context.Context) (reterr error) {
 			if err != nil {
 				// unexpected db write issue but we can let the user continue
 				// and wait for update to work in next cycle.
-				zap.L().Error("failed to validate license", zap.Error(err))
+				zap.S().Errorf("failed to validate license", zap.Error(err))
 			}
 		}
 
@@ -263,14 +263,14 @@ func (lm *Manager) Activate(ctx context.Context, key string) (licenseResponse *m
 			userEmail, err := auth.GetEmailFromJwt(ctx)
 			if err == nil {
 				telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_LICENSE_ACT_FAILED,
-					map[string]interface{}{"err": errResponse.Err.Error()}, userEmail, true, false)
+					map[string]interface{}{"err": errResponse.Err.Error()}, userEmail)
 			}
 		}
 	}()
 
 	response, apiError := validate.ActivateLicense(key, "")
 	if apiError != nil {
-		zap.L().Error("failed to activate license", zap.Error(apiError.Err))
+		zap.S().Errorf("failed to activate license", zap.Error(apiError.Err))
 		return nil, apiError
 	}
 
@@ -284,14 +284,14 @@ func (lm *Manager) Activate(ctx context.Context, key string) (licenseResponse *m
 	err := l.ParsePlan()
 
 	if err != nil {
-		zap.L().Error("failed to activate license", zap.Error(err))
+		zap.S().Errorf("failed to activate license", zap.Error(err))
 		return nil, model.InternalError(err)
 	}
 
 	// store the license before activating it
 	err = lm.repo.InsertLicense(ctx, l)
 	if err != nil {
-		zap.L().Error("failed to activate license", zap.Error(err))
+		zap.S().Errorf("failed to activate license", zap.Error(err))
 		return nil, model.InternalError(err)
 	}
 

ee/query-service/main.go

@@ -14,10 +14,10 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 	"go.signoz.io/signoz/ee/query-service/app"
 	"go.signoz.io/signoz/pkg/query-service/auth"
+	"go.signoz.io/signoz/pkg/query-service/constants"
 	baseconst "go.signoz.io/signoz/pkg/query-service/constants"
 	"go.signoz.io/signoz/pkg/query-service/version"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
 
 	zapotlpencoder "github.com/SigNoz/zap_otlp/zap_otlp_encoder"
 	zapotlpsync "github.com/SigNoz/zap_otlp/zap_otlp_sync"
@@ -27,19 +27,18 @@ import (
 )
 
 func initZapLog(enableQueryServiceLogOTLPExport bool) *zap.Logger {
-	config := zap.NewProductionConfig()
+	config := zap.NewDevelopmentConfig()
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
 	defer stop()
 
-	config.EncoderConfig.EncodeDuration = zapcore.MillisDurationEncoder
-	config.EncoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
+	config.EncoderConfig.EncodeDuration = zapcore.StringDurationEncoder
+	otlpEncoder := zapotlpencoder.NewOTLPEncoder(config.EncoderConfig)
+	consoleEncoder := zapcore.NewConsoleEncoder(config.EncoderConfig)
+	defaultLogLevel := zapcore.DebugLevel
+	config.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
 	config.EncoderConfig.TimeKey = "timestamp"
 	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
 
-	otlpEncoder := zapotlpencoder.NewOTLPEncoder(config.EncoderConfig)
-	consoleEncoder := zapcore.NewJSONEncoder(config.EncoderConfig)
-	defaultLogLevel := zapcore.InfoLevel
-
 	res := resource.NewWithAttributes(
 		semconv.SchemaURL,
 		semconv.ServiceNameKey.String("query-service"),
@@ -49,15 +48,14 @@ func initZapLog(enableQueryServiceLogOTLPExport bool) *zap.Logger {
 		zapcore.NewCore(consoleEncoder, os.Stdout, defaultLogLevel),
 	)
 
-	if enableQueryServiceLogOTLPExport {
-		ctx, _ := context.WithTimeout(ctx, time.Second*30)
-		conn, err := grpc.DialContext(ctx, baseconst.OTLPTarget, grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if enableQueryServiceLogOTLPExport == true {
+		conn, err := grpc.DialContext(ctx, constants.OTLPTarget, grpc.WithBlock(), grpc.WithInsecure(), grpc.WithTimeout(time.Second*30))
 		if err != nil {
-			log.Fatalf("failed to establish connection: %v", err)
+			log.Println("failed to connect to otlp collector to export query service logs with error:", err)
 		} else {
 			logExportBatchSizeInt, err := strconv.Atoi(baseconst.LogExportBatchSize)
 			if err != nil {
-				logExportBatchSizeInt = 512
+				logExportBatchSizeInt = 1000
 			}
 			ws := zapcore.AddSync(zapotlpsync.NewOtlpSyncer(conn, zapotlpsync.Options{
 				BatchSize:      logExportBatchSizeInt,
@@ -115,6 +113,7 @@ func main() {
 	zap.ReplaceGlobals(loggerMgr)
 	defer loggerMgr.Sync() // flushes buffer, if any
 
+	logger := loggerMgr.Sugar()
 	version.PrintVersion()
 
 	serverOptions := &app.ServerOptions{
@@ -138,22 +137,22 @@ func main() {
 	auth.JwtSecret = os.Getenv("SIGNOZ_JWT_SECRET")
 
 	if len(auth.JwtSecret) == 0 {
-		zap.L().Warn("No JWT secret key is specified.")
+		zap.S().Warn("No JWT secret key is specified.")
 	} else {
-		zap.L().Info("JWT secret key set successfully.")
+		zap.S().Info("No JWT secret key set successfully.")
 	}
 
 	server, err := app.NewServer(serverOptions)
 	if err != nil {
-		zap.L().Fatal("Failed to create server", zap.Error(err))
+		logger.Fatal("Failed to create server", zap.Error(err))
 	}
 
 	if err := server.Start(); err != nil {
-		zap.L().Fatal("Could not start server", zap.Error(err))
+		logger.Fatal("Could not start servers", zap.Error(err))
 	}
 
 	if err := auth.InitAuthCache(context.Background()); err != nil {
-		zap.L().Fatal("Failed to initialize auth cache", zap.Error(err))
+		logger.Fatal("Failed to initialize auth cache", zap.Error(err))
 	}
 
 	signalsChannel := make(chan os.Signal, 1)
@@ -162,9 +161,9 @@ func main() {
 	for {
 		select {
 		case status := <-server.HealthCheckStatus():
-			zap.L().Info("Received HealthCheck status: ", zap.Int("status", int(status)))
+			logger.Info("Received HealthCheck status: ", zap.Int("status", int(status)))
 		case <-signalsChannel:
-			zap.L().Fatal("Received OS Interrupt Signal ... ")
+			logger.Fatal("Received OS Interrupt Signal ... ")
 			server.Stop()
 		}
 	}

ee/query-service/model/domain.go

@@ -9,8 +9,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	saml2 "github.com/russellhaering/gosaml2"
-	"go.signoz.io/signoz/ee/query-service/sso"
 	"go.signoz.io/signoz/ee/query-service/sso/saml"
+	"go.signoz.io/signoz/ee/query-service/sso"
 	basemodel "go.signoz.io/signoz/pkg/query-service/model"
 	"go.uber.org/zap"
 )
@@ -24,16 +24,16 @@ const (
 
 // OrgDomain identify org owned web domains for auth and other purposes
 type OrgDomain struct {
-	Id         uuid.UUID `json:"id"`
-	Name       string    `json:"name"`
-	OrgId      string    `json:"orgId"`
-	SsoEnabled bool      `json:"ssoEnabled"`
-	SsoType    SSOType   `json:"ssoType"`
+	Id         uuid.UUID   `json:"id"`
+	Name       string      `json:"name"`
+	OrgId      string      `json:"orgId"`
+	SsoEnabled bool        `json:"ssoEnabled"`
+	SsoType    SSOType     `json:"ssoType"`
 
-	SamlConfig       *SamlConfig        `json:"samlConfig"`
+	SamlConfig *SamlConfig `json:"samlConfig"`
 	GoogleAuthConfig *GoogleOAuthConfig `json:"googleAuthConfig"`
 
-	Org *basemodel.Organization
+	Org        *basemodel.Organization
 }
 
 func (od *OrgDomain) String() string {
@@ -100,8 +100,8 @@ func (od *OrgDomain) GetSAMLCert() string {
 	return ""
 }
 
-// PrepareGoogleOAuthProvider creates GoogleProvider that is used in
-// requesting OAuth and also used in processing response from google
+// PrepareGoogleOAuthProvider creates GoogleProvider that is used in 
+// requesting OAuth and also used in processing response from google 
 func (od *OrgDomain) PrepareGoogleOAuthProvider(siteUrl *url.URL) (sso.OAuthCallbackProvider, error) {
 	if od.GoogleAuthConfig == nil {
 		return nil, fmt.Errorf("Google auth is not setup correctly for this domain")
@@ -137,36 +137,38 @@ func (od *OrgDomain) PrepareSamlRequest(siteUrl *url.URL) (*saml2.SAMLServicePro
 }
 
 func (od *OrgDomain) BuildSsoUrl(siteUrl *url.URL) (ssoUrl string, err error) {
+	
 
 	fmtDomainId := strings.Replace(od.Id.String(), "-", ":", -1)
-
+	
 	// build redirect url from window.location sent by frontend
 	redirectURL := fmt.Sprintf("%s://%s%s", siteUrl.Scheme, siteUrl.Host, siteUrl.Path)
 
 	// prepare state that gets relayed back when the auth provider
 	// calls back our url. here we pass the app url (where signoz runs)
 	// and the domain Id. The domain Id helps in identifying sso config
-	// when the call back occurs and the app url is useful in redirecting user
-	// back to the right path.
+	// when the call back occurs and the app url is useful in redirecting user 
+	// back to the right path. 
 	// why do we need to pass app url? the callback typically is handled by backend
 	// and sometimes backend might right at a different port or is unaware of frontend
 	// endpoint (unless SITE_URL param is set). hence, we receive this build sso request
-	// along with frontend window.location and use it to relay the information through
-	// auth provider to the backend (HandleCallback or HandleSSO method).
+	// along with frontend window.location and use it to relay the information through 
+	// auth provider to the backend (HandleCallback or HandleSSO method). 
 	relayState := fmt.Sprintf("%s?domainId=%s", redirectURL, fmtDomainId)
+		
 
-	switch od.SsoType {
+	switch (od.SsoType) {
 	case SAML:
 
 		sp, err := od.PrepareSamlRequest(siteUrl)
 		if err != nil {
 			return "", err
 		}
-
+	
 		return sp.BuildAuthURL(relayState)
-
+	
 	case GoogleAuth:
-
+		
 		googleProvider, err := od.PrepareGoogleOAuthProvider(siteUrl)
 		if err != nil {
 			return "", err
@@ -174,8 +176,9 @@ func (od *OrgDomain) BuildSsoUrl(siteUrl *url.URL) (ssoUrl string, err error) {
 		return googleProvider.BuildAuthURL(relayState)
 
 	default:
-		zap.L().Error("found unsupported SSO config for the org domain", zap.String("orgDomain", od.Name))
-		return "", fmt.Errorf("unsupported SSO config for the domain")
+		zap.S().Errorf("found unsupported SSO config for the org domain", zap.String("orgDomain", od.Name))
+		return "", fmt.Errorf("unsupported SSO config for the domain") 
 	}
 
+
 }

ee/query-service/model/pat.go

@@ -1,32 +1,10 @@
 package model
 
-type User struct {
-	Id                string `json:"id" db:"id"`
-	Name              string `json:"name" db:"name"`
-	Email             string `json:"email" db:"email"`
-	CreatedAt         int64  `json:"createdAt" db:"created_at"`
-	ProfilePictureURL string `json:"profilePictureURL" db:"profile_picture_url"`
-	NotFound          bool   `json:"notFound"`
-}
-
-type CreatePATRequestBody struct {
-	Name          string `json:"name"`
-	Role          string `json:"role"`
-	ExpiresInDays int64  `json:"expiresInDays"`
-}
-
 type PAT struct {
-	Id              string `json:"id" db:"id"`
-	UserID          string `json:"userId" db:"user_id"`
-	CreatedByUser   User   `json:"createdByUser"`
-	UpdatedByUser   User   `json:"updatedByUser"`
-	Token           string `json:"token" db:"token"`
-	Role            string `json:"role" db:"role"`
-	Name            string `json:"name" db:"name"`
-	CreatedAt       int64  `json:"createdAt" db:"created_at"`
-	ExpiresAt       int64  `json:"expiresAt" db:"expires_at"`
-	UpdatedAt       int64  `json:"updatedAt" db:"updated_at"`
-	LastUsed        int64  `json:"lastUsed" db:"last_used"`
-	Revoked         bool   `json:"revoked" db:"revoked"`
-	UpdatedByUserID string `json:"updatedByUserId" db:"updated_by_user_id"`
+	Id        string `json:"id" db:"id"`
+	UserID    string `json:"userId" db:"user_id"`
+	Token     string `json:"token" db:"token"`
+	Name      string `json:"name" db:"name"`
+	CreatedAt int64  `json:"createdAt" db:"created_at"`
+	ExpiresAt int64  `json:"expiresAt" db:"expires_at"`
 }

ee/query-service/model/plans.go

@@ -90,13 +90,6 @@ var BasicPlan = basemodel.FeatureSet{
 		UsageLimit: -1,
 		Route:      "",
 	},
-	basemodel.Feature{
-		Name:       basemodel.AlertChannelEmail,
-		Active:     true,
-		Usage:      0,
-		UsageLimit: -1,
-		Route:      "",
-	},
 	basemodel.Feature{
 		Name:       basemodel.AlertChannelMsTeams,
 		Active:     false,
@@ -184,13 +177,6 @@ var ProPlan = basemodel.FeatureSet{
 		UsageLimit: -1,
 		Route:      "",
 	},
-	basemodel.Feature{
-		Name:       basemodel.AlertChannelEmail,
-		Active:     true,
-		Usage:      0,
-		UsageLimit: -1,
-		Route:      "",
-	},
 	basemodel.Feature{
 		Name:       basemodel.AlertChannelMsTeams,
 		Active:     true,
@@ -278,13 +264,6 @@ var EnterprisePlan = basemodel.FeatureSet{
 		UsageLimit: -1,
 		Route:      "",
 	},
-	basemodel.Feature{
-		Name:       basemodel.AlertChannelEmail,
-		Active:     true,
-		Usage:      0,
-		UsageLimit: -1,
-		Route:      "",
-	},
 	basemodel.Feature{
 		Name:       basemodel.AlertChannelMsTeams,
 		Active:     true,
@@ -300,17 +279,17 @@ var EnterprisePlan = basemodel.FeatureSet{
 		Route:      "",
 	},
 	basemodel.Feature{
-		Name:       Onboarding,
-		Active:     true,
-		Usage:      0,
+		Name: Onboarding,
+		Active: true,
+		Usage: 0,
 		UsageLimit: -1,
-		Route:      "",
+		Route: "",
 	},
 	basemodel.Feature{
-		Name:       ChatSupport,
-		Active:     true,
-		Usage:      0,
+		Name: ChatSupport,
+		Active: true,
+		Usage: 0,
 		UsageLimit: -1,
-		Route:      "",
+		Route: "",
 	},
 }

ee/query-service/sso/saml/request.go

@@ -102,6 +102,6 @@ func PrepareRequest(issuer, acsUrl, audience, entity, idp, certString string) (*
 		IDPCertificateStore: certStore,
 		SPKeyStore:          randomKeyStore,
 	}
-	zap.L().Debug("SAML request", zap.Any("sp", sp))
+	zap.S().Debugf("SAML request:", sp)
 	return sp, nil
 }

ee/query-service/usage/manager.go

@@ -91,12 +91,12 @@ func (lm *Manager) UploadUsage() {
 	// check if license is present or not
 	license, err := lm.licenseRepo.GetActiveLicense(ctx)
 	if err != nil {
-		zap.L().Error("failed to get active license", zap.Error(err))
+		zap.S().Errorf("failed to get active license: %v", zap.Error(err))
 		return
 	}
 	if license == nil {
 		// we will not start the usage reporting if license is not present.
-		zap.L().Info("no license present, skipping usage reporting")
+		zap.S().Info("no license present, skipping usage reporting")
 		return
 	}
 
@@ -123,7 +123,7 @@ func (lm *Manager) UploadUsage() {
 		dbusages := []model.UsageDB{}
 		err := lm.clickhouseConn.Select(ctx, &dbusages, fmt.Sprintf(query, db, db), time.Now().Add(-(24 * time.Hour)))
 		if err != nil && !strings.Contains(err.Error(), "doesn't exist") {
-			zap.L().Error("failed to get usage from clickhouse: %v", zap.Error(err))
+			zap.S().Errorf("failed to get usage from clickhouse: %v", zap.Error(err))
 			return
 		}
 		for _, u := range dbusages {
@@ -133,33 +133,37 @@ func (lm *Manager) UploadUsage() {
 	}
 
 	if len(usages) <= 0 {
-		zap.L().Info("no snapshots to upload, skipping.")
+		zap.S().Info("no snapshots to upload, skipping.")
 		return
 	}
 
-	zap.L().Info("uploading usage data")
+	zap.S().Info("uploading usage data")
 
+	// Try to get the org name
 	orgName := ""
-	orgNames, orgError := lm.modelDao.GetOrgs(ctx)
-	if orgError != nil {
-		zap.L().Error("failed to get org data: %v", zap.Error(orgError))
-	}
-	if len(orgNames) == 1 {
-		orgName = orgNames[0].Name
+	orgNames, err := lm.modelDao.GetOrgs(ctx)
+	if err != nil {
+		zap.S().Errorf("failed to get org data: %v", zap.Error(err))
+	} else {
+		if len(orgNames) != 1 {
+			zap.S().Errorf("expected one org but got %d orgs", len(orgNames))
+		} else {
+			orgName = orgNames[0].Name
+		}
 	}
 
 	usagesPayload := []model.Usage{}
 	for _, usage := range usages {
 		usageDataBytes, err := encryption.Decrypt([]byte(usage.ExporterID[:32]), []byte(usage.Data))
 		if err != nil {
-			zap.L().Error("error while decrypting usage data: %v", zap.Error(err))
+			zap.S().Errorf("error while decrypting usage data: %v", zap.Error(err))
 			return
 		}
 
 		usageData := model.Usage{}
 		err = json.Unmarshal(usageDataBytes, &usageData)
 		if err != nil {
-			zap.L().Error("error while unmarshalling usage data: %v", zap.Error(err))
+			zap.S().Errorf("error while unmarshalling usage data: %v", zap.Error(err))
 			return
 		}
 
@@ -184,13 +188,13 @@ func (lm *Manager) UploadUsageWithExponentalBackOff(ctx context.Context, payload
 	for i := 1; i <= MaxRetries; i++ {
 		apiErr := licenseserver.SendUsage(ctx, payload)
 		if apiErr != nil && i == MaxRetries {
-			zap.L().Error("retries stopped : %v", zap.Error(apiErr))
+			zap.S().Errorf("retries stopped : %v", zap.Error(apiErr))
 			// not returning error here since it is captured in the failed count
 			return
 		} else if apiErr != nil {
 			// sleeping for exponential backoff
 			sleepDuration := RetryInterval * time.Duration(i)
-			zap.L().Error("failed to upload snapshot retrying after %v secs : %v", zap.Duration("sleepDuration", sleepDuration), zap.Error(apiErr.Err))
+			zap.S().Errorf("failed to upload snapshot retrying after %v secs : %v", sleepDuration.Seconds(), zap.Error(apiErr.Err))
 			time.Sleep(sleepDuration)
 		} else {
 			break
@@ -201,7 +205,7 @@ func (lm *Manager) UploadUsageWithExponentalBackOff(ctx context.Context, payload
 func (lm *Manager) Stop() {
 	lm.scheduler.Stop()
 
-	zap.L().Info("sending usage data before shutting down")
+	zap.S().Debug("sending usage data before shutting down")
 	// send usage before shutting down
 	lm.UploadUsage()
 

frontend/jest.config.ts

@@ -20,11 +20,9 @@ const config: Config.InitialOptions = {
 	transform: {
 		'^.+\\.(ts|tsx)?$': 'ts-jest',
 		'^.+\\.(js|jsx)$': 'babel-jest',
-		'^.+\\.(css|scss|sass|less)$': 'jest-preview/transforms/css',
-		'^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)': 'jest-preview/transforms/file',
 	},
 	transformIgnorePatterns: [
-		'node_modules/(?!(lodash-es|react-dnd|core-dnd|@react-dnd|dnd-core|react-dnd-html5-backend|axios|@signozhq/design-tokens|d3-interpolate|d3-color)/)',
+		'node_modules/(?!(lodash-es|react-dnd|core-dnd|@react-dnd|dnd-core|react-dnd-html5-backend|axios|@signozhq/design-tokens)/)',
 	],
 	setupFilesAfterEnv: ['<rootDir>jest.setup.ts'],
 	testPathIgnorePatterns: ['/node_modules/', '/public/'],

frontend/jest.setup.ts

@@ -7,7 +7,6 @@
  */
 import '@testing-library/jest-dom';
 import 'jest-styled-components';
-import './src/styles.scss';
 
 import { server } from './src/mocks-server/server';
 // Establish API mocking before all tests.

frontend/package.json

@@ -13,8 +13,6 @@
 		"jest": "jest",
 		"jest:coverage": "jest --coverage",
 		"jest:watch": "jest --watch",
-		"jest-preview": "jest-preview",
-		"test:debug": "npm-run-all -p test jest-preview",
 		"postinstall": "is-ci || yarn husky:configure",
 		"playwright": "npm run i18n:generate-hash && NODE_ENV=testing playwright test --config=./playwright.config.ts",
 		"playwright:local:debug": "PWDEBUG=console yarn playwright --headed --browser=chromium",
@@ -40,8 +38,6 @@
 		"@monaco-editor/react": "^4.3.1",
 		"@radix-ui/react-tabs": "1.0.4",
 		"@radix-ui/react-tooltip": "1.0.7",
-		"@sentry/react": "7.102.1",
-		"@sentry/webpack-plugin": "2.14.2",
 		"@signozhq/design-tokens": "0.0.8",
 		"@uiw/react-md-editor": "3.23.5",
 		"@xstate/react": "^3.0.0",
@@ -73,7 +69,6 @@
 		"fontfaceobserver": "2.3.0",
 		"history": "4.10.1",
 		"html-webpack-plugin": "5.5.0",
-		"http-proxy-middleware": "2.0.6",
 		"i18next": "^21.6.12",
 		"i18next-browser-languagedetector": "^6.1.3",
 		"i18next-http-backend": "^1.3.2",
@@ -87,7 +82,6 @@
 		"papaparse": "5.4.1",
 		"react": "18.2.0",
 		"react-addons-update": "15.6.3",
-		"react-beautiful-dnd": "13.1.1",
 		"react-dnd": "16.0.1",
 		"react-dnd-html5-backend": "16.0.1",
 		"react-dom": "18.2.0",
@@ -107,7 +101,6 @@
 		"react-virtuoso": "4.0.3",
 		"redux": "^4.0.5",
 		"redux-thunk": "^2.3.0",
-		"rehype-raw": "7.0.0",
 		"stream": "^0.0.2",
 		"style-loader": "1.3.0",
 		"styled-components": "^5.3.11",
@@ -162,7 +155,6 @@
 		"@types/papaparse": "5.3.7",
 		"@types/react": "18.0.26",
 		"@types/react-addons-update": "0.14.21",
-		"@types/react-beautiful-dnd": "13.1.8",
 		"@types/react-dom": "18.0.10",
 		"@types/react-grid-layout": "^1.1.2",
 		"@types/react-helmet-async": "1.0.3",
@@ -200,11 +192,9 @@
 		"husky": "^7.0.4",
 		"is-ci": "^3.0.1",
 		"jest-playwright-preset": "^1.7.2",
-		"jest-preview": "0.3.1",
 		"jest-styled-components": "^7.0.8",
 		"lint-staged": "^12.5.0",
 		"msw": "1.3.2",
-		"npm-run-all": "latest",
 		"portfinder-sync": "^0.0.2",
 		"prettier": "2.2.1",
 		"raw-loader": "4.0.2",
@@ -222,8 +212,7 @@
 	},
 	"lint-staged": {
 		"*.(js|jsx|ts|tsx)": [
-			"eslint --fix",
-			"sh scripts/typecheck-staged.sh"
+			"eslint --fix"
 		]
 	},
 	"resolutions": {

frontend/public/Icons/cable-car.svg

@@ -1 +0,0 @@
-<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#prefix__clip0_2022_1972)" stroke="#fff" stroke-width="1.333" stroke-linecap="round" stroke-linejoin="round"><path d="M6.667 2h.006M9.333 1.333h.007M1.333 6l13.334-3.333M8 8V4.333M11.333 8H4.667a2 2 0 00-2 2v2.667a2 2 0 002 2h6.666a2 2 0 002-2V10a2 2 0 00-2-2zM6 8v3.333M10 8v3.333M2.667 11.334h10.666"/></g><defs><clipPath id="prefix__clip0_2022_1972"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>

frontend/public/Icons/configure.svg

@@ -1 +0,0 @@
-<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><g stroke="#C0C1C3" stroke-width="1.333" stroke-linecap="round"><path 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" stroke-linejoin="round"/><path d="M4 7L2.527 5.566a1.333 1.333 0 01-.013-1.898l.81-.81a1.333 1.333 0 011.991.119L5.333 3M10.75 10.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"/></g></svg>

frontend/public/Icons/group.svg

@@ -1 +0,0 @@
-<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><g stroke="#C0C1C3" stroke-width="1.333" stroke-linecap="round" stroke-linejoin="round"><path d="M2 4.667V3.333C2 2.6 2.6 2 3.333 2h1.334M11.333 2h1.334C13.4 2 14 2.6 14 3.333v1.334M14 11.334v1.333C14 13.4 13.4 14 12.667 14h-1.334M4.667 14H3.333C2.6 14 2 13.4 2 12.667v-1.333M8.667 4.667H5.333a.667.667 0 00-.666.666v2c0 .368.298.667.666.667h3.334a.667.667 0 00.666-.667v-2a.667.667 0 00-.666-.667zM10.667 8H7.333a.667.667 0 00-.666.667v2c0 .368.298.666.666.666h3.334a.667.667 0 00.666-.666v-2A.667.667 0 0010.667 8z"/></g></svg>

frontend/public/Icons/promQL.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12 2c1 2.538 2.5 2.962 3.5 3.808.942.78 1.481 1.845 1.5 2.961 0 1.122-.527 2.198-1.464 2.992C14.598 12.554 13.326 13 12 13s-2.598-.446-3.536-1.24C7.527 10.968 7 9.892 7 8.77c0-.255 0-.508.1-.762.085.25.236.48.443.673.207.193.463.342.75.437a2.334 2.334 0 001.767-.128c.263-.135.485-.32.65-.539.166-.22.269-.468.301-.727a1.452 1.452 0 00-.11-.765 1.699 1.699 0 00-.501-.644C8 4.115 11 2 12 2zM17 16l-5 6-5-6h10z" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>

frontend/public/Icons/redis-logo.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M23.06 17.526c-1.281.668-7.916 3.396-9.328 4.132-1.413.736-2.198.73-3.314.196C9.303 21.32 2.242 18.468.97 17.86c-.636-.303-.97-.56-.97-.802v-2.426s9.192-2.001 10.676-2.534c1.484-.532 1.999-.551 3.262-.089 1.263.463 8.814 1.826 10.062 2.283v2.391c0 .24-.288.503-.94.843z" fill="#912626"/><path d="M23.06 15.114c-1.281.668-7.916 3.396-9.329 4.132-1.412.737-2.197.73-3.313.196C9.302 18.91 2.242 16.056.97 15.45c-1.272-.608-1.298-1.027-.049-1.516 1.25-.49 8.271-3.244 9.755-3.776 1.484-.533 1.999-.552 3.262-.09 1.263.463 7.858 3.088 9.106 3.546 1.248.457 1.296.834.015 1.501z" fill="#C6302B"/><path d="M23.06 13.6c-1.281.668-7.916 3.396-9.328 4.133-1.413.736-2.198.73-3.314.196S2.242 14.543.97 13.935c-.636-.304-.97-.56-.97-.802v-2.426s9.192-2.001 10.676-2.534c1.484-.532 1.999-.551 3.262-.089C15.2 8.547 22.752 9.91 24 10.366v2.392c0 .24-.288.503-.94.843z" fill="#912626"/><path d="M23.06 11.19c-1.281.667-7.916 3.395-9.329 4.131-1.412.737-2.197.73-3.313.196-1.116-.533-8.176-3.386-9.448-3.993-1.272-.608-1.298-1.027-.049-1.516 1.25-.49 8.271-3.244 9.755-3.776 1.484-.533 1.999-.552 3.262-.09 1.263.463 7.858 3.088 9.106 3.545 1.248.458 1.296.835.015 1.502z" fill="#C6302B"/><path d="M23.06 9.53c-1.281.668-7.916 3.396-9.328 4.132-1.413.737-2.198.73-3.314.196-1.116-.533-8.176-3.386-9.448-3.993C.334 9.56 0 9.305 0 9.062V6.636s9.192-2 10.676-2.533c1.484-.533 1.999-.552 3.262-.09C15.2 4.477 22.752 5.84 24 6.297v2.392c0 .24-.288.502-.94.842z" fill="#912626"/><path d="M23.06 7.118c-1.281.668-7.916 3.396-9.329 4.132-1.412.737-2.197.73-3.313.196C9.303 10.913 2.242 8.061.97 7.453-.302 6.845-.328 6.427.921 5.937c1.25-.489 8.271-3.244 9.755-3.776 1.484-.532 1.999-.552 3.262-.089 1.263.463 7.858 3.088 9.106 3.545 1.248.457 1.296.834.015 1.501z" fill="#C6302B"/><path d="M14.933 4.758l-2.064.215-.462 1.111-.746-1.24L9.28 4.63l1.778-.641-.534-.985 1.665.651 1.569-.513-.424 1.017 1.6.6zm-2.649 5.393l-3.85-1.597 5.517-.847-1.667 2.444zM6.945 5.376c1.63 0 2.95.512 2.95 1.143 0 .632-1.32 1.144-2.95 1.144-1.629 0-2.95-.512-2.95-1.144 0-.63 1.321-1.143 2.95-1.143z" fill="#fff"/><path d="M17.371 5.062l3.266 1.29-3.263 1.29-.003-2.58z" fill="#621B1C"/><path d="M13.758 6.492l3.613-1.43.003 2.58-.354.139-3.262-1.29z" fill="#9A2928"/></svg>

frontend/public/Logos/ec2.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>Icon-Architecture/64/Arch_Amazon-EC2_64</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="0%" y1="100%" x2="100%" y2="0%" id="linearGradient-1">
-            <stop stop-color="#C8511B" offset="0%"></stop>
-            <stop stop-color="#FF9900" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Icon-Architecture/64/Arch_Amazon-EC2_64" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Icon-Architecture-BG/64/Compute" fill="url(#linearGradient-1)">
-            <rect id="Rectangle" x="0" y="0" width="80" height="80"></rect>
-        </g>
-        <path d="M27,53 L52,53 L52,28 L27,28 L27,53 Z M54,28 L58,28 L58,30 L54,30 L54,34 L58,34 L58,36 L54,36 L54,39 L58,39 L58,41 L54,41 L54,45 L58,45 L58,47 L54,47 L54,51 L58,51 L58,53 L54,53 L54,53.136 C54,54.164 53.164,55 52.136,55 L52,55 L52,59 L50,59 L50,55 L46,55 L46,59 L44,59 L44,55 L41,55 L41,59 L39,59 L39,55 L35,55 L35,59 L33,59 L33,55 L29,55 L29,59 L27,59 L27,55 L26.864,55 C25.836,55 25,54.164 25,53.136 L25,53 L22,53 L22,51 L25,51 L25,47 L22,47 L22,45 L25,45 L25,41 L22,41 L22,39 L25,39 L25,36 L22,36 L22,34 L25,34 L25,30 L22,30 L22,28 L25,28 L25,27.864 C25,26.836 25.836,26 26.864,26 L27,26 L27,22 L29,22 L29,26 L33,26 L33,22 L35,22 L35,26 L39,26 L39,22 L41,22 L41,26 L44,26 L44,22 L46,22 L46,26 L50,26 L50,22 L52,22 L52,26 L52.136,26 C53.164,26 54,26.836 54,27.864 L54,28 Z M41,65.876 C41,65.944 40.944,66 40.876,66 L14.124,66 C14.056,66 14,65.944 14,65.876 L14,39.124 C14,39.056 14.056,39 14.124,39 L20,39 L20,37 L14.124,37 C12.953,37 12,37.953 12,39.124 L12,65.876 C12,67.047 12.953,68 14.124,68 L40.876,68 C42.047,68 43,67.047 43,65.876 L43,61 L41,61 L41,65.876 Z M68,14.124 L68,40.876 C68,42.047 67.047,43 65.876,43 L60,43 L60,41 L65.876,41 C65.944,41 66,40.944 66,40.876 L66,14.124 C66,14.056 65.944,14 65.876,14 L39.124,14 C39.056,14 39,14.056 39,14.124 L39,20 L37,20 L37,14.124 C37,12.953 37.953,12 39.124,12 L65.876,12 C67.047,12 68,12.953 68,14.124 L68,14.124 Z" id="Amazon-EC2_Icon_64_Squid" fill="#FFFFFF"></path>
-    </g>
-</svg>

frontend/public/Logos/ecs.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>Icon-Architecture/64/Arch_Amazon-Elastic-Container-Service_64</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="0%" y1="100%" x2="100%" y2="0%" id="linearGradient-1">
-            <stop stop-color="#C8511B" offset="0%"></stop>
-            <stop stop-color="#FF9900" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Icon-Architecture/64/Arch_Amazon-Elastic-Container-Service_64" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Icon-Architecture-BG/64/Containers" fill="url(#linearGradient-1)">
-            <rect id="Rectangle" x="0" y="0" width="80" height="80"></rect>
-        </g>
-        <path d="M64,48.2340095 L56,43.4330117 L56,32.0000169 C56,31.6440171 55.812,31.3150172 55.504,31.1360173 L44,24.4260204 L44,14.7520248 L64,26.5710194 L64,48.2340095 Z M65.509,25.13902 L43.509,12.139026 C43.199,11.9560261 42.818,11.9540261 42.504,12.131026 C42.193,12.3090259 42,12.6410257 42,13.0000256 L42,25.0000201 C42,25.3550199 42.189,25.6840198 42.496,25.8640197 L54,32.5740166 L54,44.0000114 C54,44.3510113 54.185,44.6770111 54.486,44.857011 L64.486,50.8570083 C64.644,50.9520082 64.822,51 65,51 C65.17,51 65.34,50.9570082 65.493,50.8700083 C65.807,50.6930084 66,50.3600085 66,50 L66,26.0000196 C66,25.6460198 65.814,25.31902 65.509,25.13902 L65.509,25.13902 Z M40.445,66.863001 L17,54.3990067 L17,26.5710194 L37,14.7520248 L37,24.4510204 L26.463,31.1560173 C26.175,31.3400172 26,31.6580171 26,32.0000169 L26,49.0000091 C26,49.373009 26.208,49.7150088 26.538,49.8870087 L39.991,56.8870055 C40.28,57.0370055 40.624,57.0380055 40.912,56.8880055 L53.964,50.1440086 L61.996,54.9640064 L40.445,66.863001 Z M64.515,54.1420068 L54.515,48.1420095 C54.217,47.9640096 53.849,47.9520096 53.541,48.1120095 L40.455,54.8730065 L28,48.3930094 L28,32.5490167 L38.537,25.8440197 C38.825,25.6600198 39,25.3420199 39,25.0000201 L39,13.0000256 C39,12.6410257 38.808,12.3090259 38.496,12.131026 C38.184,11.9540261 37.802,11.9560261 37.491,12.139026 L15.491,25.13902 C15.187,25.31902 15,25.6460198 15,26.0000196 L15,55 C15,55.3690062 15.204,55.7090061 15.53,55.883006 L39.984,68.8830001 C40.131,68.961 40.292,69 40.453,69 C40.62,69 40.786,68.958 40.937,68.8750001 L64.484,55.875006 C64.797,55.7020061 64.993,55.3750062 65.0001416,55.0180064 C65.006,54.6600066 64.821,54.3260067 64.515,54.1420068 L64.515,54.1420068 Z" id="Amazon-Elastic-Container-Service_Icon_64_Squid" fill="#FFFFFF"></path>
-    </g>
-</svg>

frontend/public/Logos/eks.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="none"><path fill="url(#amazon-eks-color-16__paint0_linear_879_141)" fill-rule="evenodd" d="M6.381 10.148h.897V8.121l1.837 2.027h1.164L7.997 7.642l2.169-2.195H8.963L7.278 7.146V5.447h-.897v4.701z" clip-rule="evenodd"/><path fill="url(#amazon-eks-color-16__paint1_linear_879_141)" d="M8.532 3.803l3.186 1.81a.173.173 0 01.088.149v3.62c0 .06.033.118.088.149l2.842 1.615a.176.176 0 00.264-.15V3.947a.173.173 0 00-.088-.15L8.708.274a.176.176 0 00-.264.15v3.23c0 .062.034.119.088.15z"/><path fill="url(#amazon-eks-color-16__paint2_linear_879_141)" d="M11.273 10.288l-3.185 1.81a.178.178 0 01-.176 0l-3.63-2.062a.173.173 0 01-.088-.15V5.762c0-.062.034-.119.088-.15l3.186-1.81a.172.172 0 00.088-.15V.424a.176.176 0 00-.264-.15L1.088 3.798a.173.173 0 00-.088.15V11.7c0 .061.033.118.088.15l6.824 3.876c.054.03.122.03.176 0l6.204-3.524a.172.172 0 000-.3l-2.843-1.615a.178.178 0 00-.176 0z"/><defs><linearGradient id="amazon-eks-color-16__paint0_linear_879_141" x1="10.691" x2="8.521" y1="9.879" y2="4.634" gradientUnits="userSpaceOnUse"><stop stop-color="#426DDB"/><stop offset="1" stop-color="#3B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-16__paint1_linear_879_141" x1="15.693" x2="9.546" y1="10.544" y2="-.213" gradientUnits="userSpaceOnUse"><stop stop-color="#426DDB"/><stop offset="1" stop-color="#3B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-16__paint2_linear_879_141" x1="9.433" x2="2.732" y1="14.904" y2="2.88" gradientUnits="userSpaceOnUse"><stop stop-color="#2775FF"/><stop offset="1" stop-color="#188DFF"/></linearGradient></defs></svg>

frontend/public/locales/en-GB/alerts.json

@@ -37,16 +37,11 @@
 	"text_condition1": "Send a notification when",
 	"text_condition2": "the threshold",
 	"text_condition3": "during the last",
-	"option_1min": "1 min",
 	"option_5min": "5 mins",
 	"option_10min": "10 mins",
 	"option_15min": "15 mins",
-	"option_30min": "30 mins",
 	"option_60min": "60 mins",
 	"option_4hours": "4 hours",
-	"option_3hours": "3 hours",
-	"option_6hours": "6 hours",
-	"option_12hours": "12 hours",
 	"option_24hours": "24 hours",
 	"field_threshold": "Alert Threshold",
 	"option_allthetimes": "all the times",
@@ -116,8 +111,5 @@
 	"exceptions_based_alert": "Exceptions-based Alert",
 	"exceptions_based_alert_desc": "Send a notification when a condition occurs in the exceptions data.",
 	"field_unit": "Threshold unit",
-	"text_alert_on_absent": "Send a notification if data is missing for",
-	"text_alert_frequency": "Run alert every",
-	"text_for": "minutes",
 	"selected_query_placeholder": "Select query"
 }

frontend/public/locales/en-GB/dashboard.json

@@ -25,5 +25,5 @@
 	"dashboard_unsave_changes": "There are unsaved changes in the Query builder, please stage and run the query or the changes will be lost. Press OK to discard.",
 	"dashboard_save_changes": "Your graph built with {{queryTag}} query will be saved. Press OK to confirm.",
 	"your_graph_build_with": "Your graph built with",
-	"dashboard_ok_confirm": "query will be saved. Press OK to confirm."
+	"dashboar_ok_confirm": "query will be saved. Press OK to confirm."
 }

frontend/public/locales/en-GB/organizationsettings.json

@@ -14,5 +14,6 @@
 	"delete_domain_message": "Are you sure you want to delete this domain?",
 	"delete_domain": "Delete Domain",
 	"add_domain": "Add Domains",
-	"saml_settings": "Your SAML settings have been saved, please login from incognito window to confirm that it has been set up correctly"
+	"saml_settings": "Your SAML settings have been saved, please login from incognito window to confirm that it has been set up correctly",
+	"invite_link_share_manually": "After inviting members, please copy the invite link and send them the link manually"
 }

frontend/public/locales/en-GB/routes.json

@@ -3,7 +3,7 @@
 	"alert_channels": "Alert Channels",
 	"organization_settings": "Organization Settings",
 	"ingestion_settings": "Ingestion Settings",
-	"api_keys": "Access Tokens",
+	"api_keys": "API Keys",
 	"my_settings": "My Settings",
 	"overview_metrics": "Overview Metrics",
 	"dbcall_metrics": "Database Calls",

frontend/public/locales/en-GB/titles.json

@@ -26,7 +26,7 @@
 	"MY_SETTINGS": "SigNoz | My Settings",
 	"ORG_SETTINGS": "SigNoz | Organization Settings",
 	"INGESTION_SETTINGS": "SigNoz | Ingestion Settings",
-	"API_KEYS": "SigNoz | Access Tokens",
+	"API_KEYS": "SigNoz | API Keys",
 	"SOMETHING_WENT_WRONG": "SigNoz | Something Went Wrong",
 	"UN_AUTHORIZED": "SigNoz | Unauthorized",
 	"NOT_FOUND": "SigNoz | Page Not Found",

frontend/public/locales/en/alerts.json

@@ -37,16 +37,11 @@
 	"text_condition1": "Send a notification when",
 	"text_condition2": "the threshold",
 	"text_condition3": "during the last",
-	"option_1min": "1 min",
 	"option_5min": "5 mins",
 	"option_10min": "10 mins",
 	"option_15min": "15 mins",
-	"option_30min": "30 mins",
 	"option_60min": "60 mins",
-	"option_3hours": "3 hours",
 	"option_4hours": "4 hours",
-	"option_6hours": "6 hours",
-	"option_12hours": "12 hours",
 	"option_24hours": "24 hours",
 	"field_threshold": "Alert Threshold",
 	"option_allthetimes": "all the times",
@@ -116,8 +111,5 @@
 	"exceptions_based_alert": "Exceptions-based Alert",
 	"exceptions_based_alert_desc": "Send a notification when a condition occurs in the exceptions data.",
 	"field_unit": "Threshold unit",
-	"text_alert_on_absent": "Send a notification if data is missing for",
-	"text_alert_frequency": "Run alert every",
-	"text_for": "minutes",
 	"selected_query_placeholder": "Select query"
 }

frontend/public/locales/en/apiKeys.json

@@ -1,3 +1,3 @@
 {
-	"delete_confirm_message": "Are you sure you want to delete {{keyName}} token? Deleting a token is irreversible and cannot be undone."
+	"delete_confirm_message": "Are you sure you want to delete {{keyName}} key? Deleting a key is irreversible and cannot be undone."
 }

frontend/public/locales/en/billings.json

@@ -1,14 +0,0 @@
-{
-	"days_remaining": "days remaining in your billing period.",
-	"billing": "Billing",
-	"manage_billing_and_costs": "Manage your billing information, invoices, and monitor costs.",
-	"enterprise_cloud": "Enterprise Cloud",
-	"enterprise": "Enterprise",
-	"card_details_recieved_and_billing_info": "We have received your card details, your billing will only start after the end of your free trial period.",
-	"upgrade_plan": "Upgrade Plan",
-	"manage_billing": "Manage Billing",
-	"upgrade_now_text": "Upgrade now to have uninterrupted access",
-	"billing_start_info": "Your billing will start only after the trial period",
-	"checkout_plans": "Check out features in paid plans",
-	"here": "here"
-}

frontend/public/locales/en/channels.json

@@ -23,12 +23,6 @@
   "field_opsgenie_api_key": "API Key",
   "field_opsgenie_description": "Description",
   "placeholder_opsgenie_description": "Description",
-  "help_email_to": "Email address(es) to send alerts to (comma separated)",
-  "field_email_to": "To",
-  "placeholder_email_to": "To",
-  "help_email_html": "Send email in html format",
-  "field_email_html": "Email body template",
-  "placeholder_email_html": "Email body template",
   "field_webhook_username": "User Name (optional)",
   "field_webhook_password": "Password (optional)",
   "field_pager_routing_key": "Routing Key",

frontend/public/locales/en/dashboard.json

@@ -28,5 +28,5 @@
 	"dashboard_unsave_changes": "There are unsaved changes in the Query builder, please stage and run the query or the changes will be lost. Press OK to discard.",
 	"dashboard_save_changes": "Your graph built with {{queryTag}} query will be saved. Press OK to confirm.",
 	"your_graph_build_with": "Your graph built with",
-	"dashboard_ok_confirm": "query will be saved. Press OK to confirm."
+	"dashboar_ok_confirm": "query will be saved. Press OK to confirm."
 }

frontend/public/locales/en/organizationsettings.json

@@ -14,5 +14,6 @@
 	"delete_domain_message": "Are you sure you want to delete this domain?",
 	"delete_domain": "Delete Domain",
 	"add_domain": "Add Domains",
-	"saml_settings": "Your SAML settings have been saved, please login from incognito window to confirm that it has been set up correctly"
+	"saml_settings": "Your SAML settings have been saved, please login from incognito window to confirm that it has been set up correctly",
+	"invite_link_share_manually": "After inviting members, please copy the invite link and send them the link manually"
 }

frontend/public/locales/en/routes.json

@@ -3,7 +3,7 @@
 	"alert_channels": "Alert Channels",
 	"organization_settings": "Organization Settings",
 	"ingestion_settings": "Ingestion Settings",
-	"api_keys": "Access Tokens",
+	"api_keys": "API Keys",
 	"my_settings": "My Settings",
 	"overview_metrics": "Overview Metrics",
 	"dbcall_metrics": "Database Calls",

frontend/public/locales/en/titles.json

@@ -4,10 +4,6 @@
 	"SERVICE_METRICS": "SigNoz | Service Metrics",
 	"SERVICE_MAP": "SigNoz | Service Map",
 	"GET_STARTED": "SigNoz | Get Started",
-	"GET_STARTED_APPLICATION_MONITORING": "SigNoz | Get Started | APM",
-	"GET_STARTED_LOGS_MANAGEMENT": "SigNoz | Get Started | Logs",
-	"GET_STARTED_INFRASTRUCTURE_MONITORING": "SigNoz | Get Started | Infrastructure",
-	"GET_STARTED_AWS_MONITORING": "SigNoz | Get Started | AWS",
 	"TRACE": "SigNoz | Trace",
 	"TRACE_DETAIL": "SigNoz | Trace Detail",
 	"TRACES_EXPLORER": "SigNoz | Traces Explorer",
@@ -30,7 +26,7 @@
 	"MY_SETTINGS": "SigNoz | My Settings",
 	"ORG_SETTINGS": "SigNoz | Organization Settings",
 	"INGESTION_SETTINGS": "SigNoz | Ingestion Settings",
-	"API_KEYS": "SigNoz | Access Tokens",
+	"API_KEYS": "SigNoz | API Keys",
 	"SOMETHING_WENT_WRONG": "SigNoz | Something Went Wrong",
 	"UN_AUTHORIZED": "SigNoz | Unauthorized",
 	"NOT_FOUND": "SigNoz | Page Not Found",
@@ -44,9 +40,7 @@
 	"LIST_LICENSES": "SigNoz | List of Licenses",
 	"WORKSPACE_LOCKED": "SigNoz | Workspace Locked",
 	"SUPPORT": "SigNoz | Support",
-	"LOGS_SAVE_VIEWS": "SigNoz | Logs Saved Views",
-	"TRACES_SAVE_VIEWS": "SigNoz | Traces Saved Views",
-	"DEFAULT": "Open source Observability Platform | SigNoz",
-	"SHORTCUTS": "SigNoz | Shortcuts",
-	"INTEGRATIONS_INSTALLED": "SigNoz | Integrations"
+	"LOGS_SAVE_VIEWS": "SigNoz | Logs Save Views",
+	"TRACES_SAVE_VIEWS": "SigNoz | Traces Save Views",
+	"DEFAULT": "Open source Observability Platform | SigNoz"
 }

frontend/scripts/typecheck-staged.sh

@@ -1,25 +0,0 @@
-files="";
-
-# lint-staged will pass all files in $1 $2 $3 etc. iterate and concat.
-for var in "$@"
-do
-    files="$files \"$var\","
-done
-
-# create temporary tsconfig which includes only passed files
-str="{
-  \"extends\": \"./tsconfig.json\",
-  \"include\": [ \"src/typings/**/*.ts\",\"src/**/*.d.ts\", \"./babel.config.js\", \"./jest.config.ts\", \"./.eslintrc.js\",\"./__mocks__\",\"./conf/default.conf\",\"./public\",\"./tests\",\"./playwright.config.ts\",\"./commitlint.config.ts\",\"./webpack.config.js\",\"./webpack.config.prod.js\",\"./jest.setup.ts\",\"./**/*.d.ts\",$files]
-}"
-echo $str > tsconfig.tmp
-
-# run typecheck using temp config
-tsc -p ./tsconfig.tmp
-
-# capture exit code of tsc
-code=$?
-
-# delete temp config
-rm ./tsconfig.tmp
-
-exit $code

frontend/src/AppRoutes/Private.tsx

@@ -20,21 +20,16 @@ import { UPDATE_USER_IS_FETCH } from 'types/actions/app';
 import AppReducer from 'types/reducer/app';
 import { routePermission } from 'utils/permission';
 
-import routes, {
-	LIST_LICENSES,
-	oldNewRoutesMapping,
-	oldRoutes,
-} from './routes';
+import routes from './routes';
 import afterLogin from './utils';
 
 function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
-	const location = useLocation();
-	const { pathname } = location;
+	const { pathname } = useLocation();
 
 	const mapRoutes = useMemo(
 		() =>
 			new Map(
-				[...routes, LIST_LICENSES].map((e) => {
+				routes.map((e) => {
 					const currentPath = matchPath(pathname, {
 						path: e.path,
 					});
@@ -64,8 +59,6 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 
 	const currentRoute = mapRoutes.get('current');
 
-	const isOldRoute = oldRoutes.indexOf(pathname) > -1;
-
 	const isLocalStorageLoggedIn =
 		getLocalStorageApi(LOCALSTORAGE.IS_LOGGED_IN) === 'true';
 
@@ -165,16 +158,6 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 	useEffect(() => {
 		(async (): Promise<void> => {
 			try {
-				if (isOldRoute) {
-					const redirectUrl = oldNewRoutesMapping[pathname];
-
-					const newLocation = {
-						...location,
-						pathname: redirectUrl,
-					};
-					history.replace(newLocation);
-				}
-
 				if (currentRoute) {
 					const { isPrivate, key } = currentRoute;
 

frontend/src/AppRoutes/index.tsx

@@ -8,7 +8,6 @@ import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
 import AppLayout from 'container/AppLayout';
 import useAnalytics from 'hooks/analytics/useAnalytics';
-import { KeyboardHotkeysProvider } from 'hooks/hotkeys/useKeyboardHotkeys';
 import { useThemeConfig } from 'hooks/useDarkMode';
 import useGetFeatureFlag from 'hooks/useGetFeatureFlag';
 import useLicense, { LICENSE_PLAN_KEY } from 'hooks/useLicense';
@@ -178,24 +177,22 @@ function App(): JSX.Element {
 						<ResourceProvider>
 							<QueryBuilderProvider>
 								<DashboardProvider>
-									<KeyboardHotkeysProvider>
-										<AppLayout>
-											<Suspense fallback={<Spinner size="large" tip="Loading..." />}>
-												<Switch>
-													{routes.map(({ path, component, exact }) => (
-														<Route
-															key={`${path}`}
-															exact={exact}
-															path={path}
-															component={component}
-														/>
-													))}
+									<AppLayout>
+										<Suspense fallback={<Spinner size="large" tip="Loading..." />}>
+											<Switch>
+												{routes.map(({ path, component, exact }) => (
+													<Route
+														key={`${path}`}
+														exact={exact}
+														path={path}
+														component={component}
+													/>
+												))}
 
-													<Route path="*" component={NotFound} />
-												</Switch>
-											</Suspense>
-										</AppLayout>
-									</KeyboardHotkeysProvider>
+												<Route path="*" component={NotFound} />
+											</Switch>
+										</Suspense>
+									</AppLayout>
 								</DashboardProvider>
 							</QueryBuilderProvider>
 						</ResourceProvider>

frontend/src/AppRoutes/pageComponents.ts

@@ -186,22 +186,3 @@ export const WorkspaceBlocked = Loadable(
 	() =>
 		import(/* webpackChunkName: "WorkspaceLocked" */ 'pages/WorkspaceLocked'),
 );
-
-export const ShortcutsPage = Loadable(
-	() => import(/* webpackChunkName: "ShortcutsPage" */ 'pages/Shortcuts'),
-);
-
-export const InstalledIntegrations = Loadable(
-	() =>
-		import(
-			/* webpackChunkName: "InstalledIntegrations" */ 'pages/IntegrationsModulePage'
-		),
-);
-
-export const IntegrationsMarketPlace = Loadable(
-	// eslint-disable-next-line sonarjs/no-identical-functions
-	() =>
-		import(
-			/* webpackChunkName: "IntegrationsMarketPlace" */ 'pages/IntegrationsModulePage'
-		),
-);

frontend/src/AppRoutes/routes.ts

@@ -1,4 +1,5 @@
 import ROUTES from 'constants/routes';
+import WorkspaceBlocked from 'pages/WorkspaceLocked';
 import { RouteProps } from 'react-router-dom';
 
 import {
@@ -14,8 +15,6 @@ import {
 	EditRulesPage,
 	ErrorDetails,
 	IngestionSettings,
-	InstalledIntegrations,
-	IntegrationsMarketPlace,
 	LicensePage,
 	ListAllALertsPage,
 	LiveLogs,
@@ -35,7 +34,6 @@ import {
 	ServiceMetricsPage,
 	ServicesTablePage,
 	SettingsPage,
-	ShortcutsPage,
 	SignupPage,
 	SomethingWentWrong,
 	StatusPage,
@@ -46,7 +44,6 @@ import {
 	TracesSaveViews,
 	UnAuthorized,
 	UsageExplorerPage,
-	WorkspaceBlocked,
 } from './pageComponents';
 
 const routes: AppRoutes[] = [
@@ -59,7 +56,7 @@ const routes: AppRoutes[] = [
 	},
 	{
 		path: ROUTES.GET_STARTED,
-		exact: false,
+		exact: true,
 		component: Onboarding,
 		isPrivate: true,
 		key: 'GET_STARTED',
@@ -281,13 +278,6 @@ const routes: AppRoutes[] = [
 		key: 'LIVE_LOGS',
 		isPrivate: true,
 	},
-	{
-		path: ROUTES.LOGS_PIPELINES,
-		exact: true,
-		component: PipelinePage,
-		key: 'LOGS_PIPELINES',
-		isPrivate: true,
-	},
 	{
 		path: ROUTES.LOGIN,
 		exact: true,
@@ -316,6 +306,13 @@ const routes: AppRoutes[] = [
 		key: 'SOMETHING_WENT_WRONG',
 		isPrivate: false,
 	},
+	{
+		path: ROUTES.LOGS_PIPELINES,
+		exact: true,
+		component: PipelinePage,
+		key: 'LOGS_PIPELINES',
+		isPrivate: true,
+	},
 	{
 		path: ROUTES.BILLING,
 		exact: true,
@@ -330,27 +327,6 @@ const routes: AppRoutes[] = [
 		isPrivate: true,
 		key: 'WORKSPACE_LOCKED',
 	},
-	{
-		path: ROUTES.SHORTCUTS,
-		exact: true,
-		component: ShortcutsPage,
-		isPrivate: true,
-		key: 'SHORTCUTS',
-	},
-	{
-		path: ROUTES.INTEGRATIONS_INSTALLED,
-		exact: true,
-		component: InstalledIntegrations,
-		isPrivate: true,
-		key: 'INTEGRATIONS_INSTALLED',
-	},
-	{
-		path: ROUTES.INTEGRATIONS_MARKETPLACE,
-		exact: true,
-		component: IntegrationsMarketPlace,
-		isPrivate: true,
-		key: 'INTEGRATIONS_MARKETPLACE',
-	},
 ];
 
 export const SUPPORT_ROUTE: AppRoutes = {
@@ -369,26 +345,6 @@ export const LIST_LICENSES: AppRoutes = {
 	key: 'LIST_LICENSES',
 };
 
-export const oldRoutes = [
-	'/pipelines',
-	'/logs/old-logs-explorer',
-	'/logs-explorer',
-	'/logs-explorer/live',
-	'/logs-save-views',
-	'/traces-save-views',
-	'/settings/api-keys',
-];
-
-export const oldNewRoutesMapping: Record<string, string> = {
-	'/pipelines': '/logs/pipelines',
-	'/logs/old-logs-explorer': '/logs/old-logs-explorer',
-	'/logs-explorer': '/logs/logs-explorer',
-	'/logs-explorer/live': '/logs/logs-explorer/live',
-	'/logs-save-views': '/logs/saved-views',
-	'/traces-save-views': '/traces/saved-views',
-	'/settings/api-keys': '/settings/access-tokens',
-};
-
 export interface AppRoutes {
 	component: RouteProps['component'];
 	path: RouteProps['path'];

frontend/src/api/APIKeys/createAPIKey.ts

@@ -1,26 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { APIKeyProps, CreateAPIKeyProps } from 'types/api/pat/types';
-
-const createAPIKey = async (
-	props: CreateAPIKeyProps,
-): Promise<SuccessResponse<APIKeyProps> | ErrorResponse> => {
-	try {
-		const response = await axios.post('/pats', {
-			...props,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default createAPIKey;

frontend/src/api/APIKeys/deleteAPIKey.ts

@@ -1,24 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { AllAPIKeyProps } from 'types/api/pat/types';
-
-const deleteAPIKey = async (
-	id: string,
-): Promise<SuccessResponse<AllAPIKeyProps> | ErrorResponse> => {
-	try {
-		const response = await axios.delete(`/pats/${id}`);
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default deleteAPIKey;

frontend/src/api/APIKeys/getAPIKey.ts

@@ -1,24 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { PayloadProps, Props } from 'types/api/alerts/get';
-
-const get = async (
-	props: Props,
-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {
-	try {
-		const response = await axios.get(`/pats/${props.id}`);
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default get;

frontend/src/api/APIKeys/getAllAPIKeys.ts

@@ -1,6 +0,0 @@
-import axios from 'api';
-import { AxiosResponse } from 'axios';
-import { AllAPIKeyProps } from 'types/api/pat/types';
-
-export const getAllAPIKeys = (): Promise<AxiosResponse<AllAPIKeyProps>> =>
-	axios.get(`/pats`);

frontend/src/api/APIKeys/updateAPIKey.ts

@@ -1,26 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { PayloadProps, UpdateAPIKeyProps } from 'types/api/pat/types';
-
-const updateAPIKey = async (
-	props: UpdateAPIKeyProps,
-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {
-	try {
-		const response = await axios.put(`/pats/${props.id}`, {
-			...props.data,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default updateAPIKey;

frontend/src/api/ErrorResponseHandler.ts

@@ -30,8 +30,7 @@ export function ErrorResponseHandler(error: AxiosError): ErrorResponse {
 				statusCode,
 				payload: null,
 				error: errorMessage,
-				message: (response.data as any)?.status,
-				body: JSON.stringify((response.data as any).data),
+				message: null,
 			};
 		}
 

frontend/src/api/Integrations/getAllIntegrations.ts

@@ -1,7 +0,0 @@
-import axios from 'api';
-import { AxiosResponse } from 'axios';
-import { AllIntegrationsProps } from 'types/api/integrations/types';
-
-export const getAllIntegrations = (): Promise<
-	AxiosResponse<AllIntegrationsProps>
-> => axios.get(`/integrations`);

frontend/src/api/Integrations/getIntegration.ts

@@ -1,11 +0,0 @@
-import axios from 'api';
-import { AxiosResponse } from 'axios';
-import {
-	GetIntegrationPayloadProps,
-	GetIntegrationProps,
-} from 'types/api/integrations/types';
-
-export const getIntegration = (
-	props: GetIntegrationPayloadProps,
-): Promise<AxiosResponse<GetIntegrationProps>> =>
-	axios.get(`/integrations/${props.integrationId}`);

frontend/src/api/Integrations/getIntegrationStatus.ts

@@ -1,11 +0,0 @@
-import axios from 'api';
-import { AxiosResponse } from 'axios';
-import {
-	GetIntegrationPayloadProps,
-	GetIntegrationStatusProps,
-} from 'types/api/integrations/types';
-
-export const getIntegrationStatus = (
-	props: GetIntegrationPayloadProps,
-): Promise<AxiosResponse<GetIntegrationStatusProps>> =>
-	axios.get(`/integrations/${props.integrationId}/connection_status`);

frontend/src/api/Integrations/installIntegration.ts

@@ -1,31 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import {
-	InstalledIntegrationsSuccessResponse,
-	InstallIntegrationKeyProps,
-} from 'types/api/integrations/types';
-
-const installIntegration = async (
-	props: InstallIntegrationKeyProps,
-): Promise<
-	SuccessResponse<InstalledIntegrationsSuccessResponse> | ErrorResponse
-> => {
-	try {
-		const response = await axios.post('/integrations/install', {
-			...props,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default installIntegration;

frontend/src/api/Integrations/uninstallIntegration.ts

@@ -1,31 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import {
-	UninstallIntegrationProps,
-	UninstallIntegrationSuccessResponse,
-} from 'types/api/integrations/types';
-
-const unInstallIntegration = async (
-	props: UninstallIntegrationProps,
-): Promise<
-	SuccessResponse<UninstallIntegrationSuccessResponse> | ErrorResponse
-> => {
-	try {
-		const response = await axios.post('/integrations/uninstall', {
-			...props,
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default unInstallIntegration;

frontend/src/api/SAML/listAllDomain.ts

@@ -8,7 +8,7 @@ const listAllDomain = async (
 	props: Props,
 ): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {
 	try {
-		const response = await axios.get(`/orgs/${props.orgId}/domains`);
+		const response = await axios.get(`orgs/${props.orgId}/domains`);
 
 		return {
 			statusCode: 200,

frontend/src/api/apiV1.ts

@@ -2,7 +2,6 @@ const apiV1 = '/api/v1/';
 
 export const apiV2 = '/api/v2/';
 export const apiV3 = '/api/v3/';
-export const apiV4 = '/api/v4/';
 export const apiAlertManager = '/api/alertmanager';
 
 export default apiV1;

frontend/src/api/billing/getUsage.ts

@@ -13,7 +13,6 @@ export interface UsageResponsePayloadProps {
 		billTotal: number;
 	};
 	discount: number;
-	subscriptionStatus?: string;
 }
 
 const getUsage = async (

frontend/src/api/channels/createEmail.ts

@@ -1,34 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { PayloadProps, Props } from 'types/api/channels/createEmail';
-
-const create = async (
-	props: Props,
-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {
-	try {
-		const response = await axios.post('/channels', {
-			name: props.name,
-			email_configs: [
-				{
-					send_resolved: true,
-					to: props.to,
-					html: props.html,
-					headers: props.headers,
-				},
-			],
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: 'Success',
-			payload: response.data.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default create;

frontend/src/api/channels/editEmail.ts

@@ -1,34 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { PayloadProps, Props } from 'types/api/channels/editEmail';
-
-const editEmail = async (
-	props: Props,
-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {
-	try {
-		const response = await axios.put(`/channels/${props.id}`, {
-			name: props.name,
-			email_configs: [
-				{
-					send_resolved: true,
-					to: props.to,
-					html: props.html,
-					headers: props.headers,
-				},
-			],
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: 'Success',
-			payload: response.data.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default editEmail;

frontend/src/api/channels/testEmail.ts

@@ -1,34 +0,0 @@
-import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
-import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { PayloadProps, Props } from 'types/api/channels/createEmail';
-
-const testEmail = async (
-	props: Props,
-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {
-	try {
-		const response = await axios.post('/testChannel', {
-			name: props.name,
-			email_configs: [
-				{
-					send_resolved: true,
-					to: props.to,
-					html: props.html,
-					headers: props.headers,
-				},
-			],
-		});
-
-		return {
-			statusCode: 200,
-			error: null,
-			message: 'Success',
-			payload: response.data.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
-	}
-};
-
-export default testEmail;

frontend/src/api/index.ts

@@ -9,7 +9,7 @@ import { ENVIRONMENT } from 'constants/env';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import store from 'store';
 
-import apiV1, { apiAlertManager, apiV2, apiV3, apiV4 } from './apiV1';
+import apiV1, { apiAlertManager, apiV2, apiV3 } from './apiV1';
 import { Logout } from './utils';
 
 const interceptorsResponse = (
@@ -114,7 +114,6 @@ ApiV2Instance.interceptors.request.use(interceptorsRequestResponse);
 export const ApiV3Instance = axios.create({
 	baseURL: `${ENVIRONMENT.baseURL}${apiV3}`,
 });
-
 ApiV3Instance.interceptors.response.use(
 	interceptorsResponse,
 	interceptorRejected,
@@ -122,18 +121,6 @@ ApiV3Instance.interceptors.response.use(
 ApiV3Instance.interceptors.request.use(interceptorsRequestResponse);
 //
 
-// axios V4
-export const ApiV4Instance = axios.create({
-	baseURL: `${ENVIRONMENT.baseURL}${apiV4}`,
-});
-
-ApiV4Instance.interceptors.response.use(
-	interceptorsResponse,
-	interceptorRejected,
-);
-ApiV4Instance.interceptors.request.use(interceptorsRequestResponse);
-//
-
 AxiosAlertManagerInstance.interceptors.response.use(
 	interceptorsResponse,
 	interceptorRejected,

frontend/src/api/metrics/getQueryRange.ts

@@ -1,7 +1,6 @@
-import { ApiV3Instance, ApiV4Instance } from 'api';
+import { ApiV3Instance as axios } from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError } from 'axios';
-import { ENTITY_VERSION_V4 } from 'constants/app';
 import { ErrorResponse, SuccessResponse } from 'types/api';
 import {
 	MetricRangePayloadV3,
@@ -10,23 +9,10 @@ import {
 
 export const getMetricsQueryRange = async (
 	props: QueryRangePayload,
-	version: string,
 	signal: AbortSignal,
 ): Promise<SuccessResponse<MetricRangePayloadV3> | ErrorResponse> => {
 	try {
-		if (version && version === ENTITY_VERSION_V4) {
-			const response = await ApiV4Instance.post('/query_range', props, { signal });
-
-			return {
-				statusCode: 200,
-				error: null,
-				message: response.data.status,
-				payload: response.data,
-				params: props,
-			};
-		}
-
-		const response = await ApiV3Instance.post('/query_range', props, { signal });
+		const response = await axios.post('/query_range', props, { signal });
 
 		return {
 			statusCode: 200,

frontend/src/api/queryBuilder/getAggregateAttribute.ts

@@ -24,7 +24,7 @@ export const getAggregateAttribute = async ({
 		const response: AxiosResponse<{
 			data: IQueryAutocompleteResponse;
 		}> = await ApiV3Instance.get(
-			`/autocomplete/aggregate_attributes?${createQueryParams({
+			`autocomplete/aggregate_attributes?${createQueryParams({
 				aggregateOperator,
 				searchText,
 				dataSource,

frontend/src/api/queryBuilder/getAttributeKeys.ts

@@ -25,7 +25,7 @@ export const getAggregateKeys = async ({
 		const response: AxiosResponse<{
 			data: IQueryAutocompleteResponse;
 		}> = await ApiV3Instance.get(
-			`/autocomplete/attribute_keys?${createQueryParams({
+			`autocomplete/attribute_keys?${createQueryParams({
 				aggregateOperator,
 				searchText,
 				dataSource,

frontend/src/api/saveView/deleteView.ts

@@ -2,4 +2,4 @@ import axios from 'api';
 import { DeleteViewPayloadProps } from 'types/api/saveViews/types';
 
 export const deleteView = (uuid: string): Promise<DeleteViewPayloadProps> =>
-	axios.delete(`/explorer/views/${uuid}`);
+	axios.delete(`explorer/views/${uuid}`);

frontend/src/api/saveView/getAllViews.ts

@@ -6,4 +6,4 @@ import { DataSource } from 'types/common/queryBuilder';
 export const getAllViews = (
 	sourcepage: DataSource,
 ): Promise<AxiosResponse<AllViewsProps>> =>
-	axios.get(`/explorer/views?sourcePage=${sourcepage}`);
+	axios.get(`explorer/views?sourcePage=${sourcepage}`);

frontend/src/api/saveView/saveView.ts

@@ -8,7 +8,7 @@ export const saveView = ({
 	viewName,
 	extraData,
 }: SaveViewProps): Promise<AxiosResponse<SaveViewPayloadProps>> =>
-	axios.post('/explorer/views', {
+	axios.post('explorer/views', {
 		name: viewName,
 		sourcePage,
 		compositeQuery,

frontend/src/api/saveView/updateView.ts

@@ -11,7 +11,7 @@ export const updateView = ({
 	sourcePage,
 	viewKey,
 }: UpdateViewProps): Promise<UpdateViewPayloadProps> =>
-	axios.put(`/explorer/views/${viewKey}`, {
+	axios.put(`explorer/views/${viewKey}`, {
 		name: viewName,
 		compositeQuery,
 		extraData,

frontend/src/assets/Dashboard/BarIcon.tsx

@@ -1,41 +0,0 @@
-import { CSSProperties } from 'react';
-
-function BarIcon({
-	fillColor,
-}: {
-	fillColor: CSSProperties['color'];
-}): JSX.Element {
-	return (
-		<svg
-			width="30"
-			height="30"
-			viewBox="0 0 24 24"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<path
-				d="M8 2H6C4.89543 2 4 2.89543 4 4V16C4 17.1046 4.89543 18 6 18H8C9.10457 18 10 17.1046 10 16V4C10 2.89543 9.10457 2 8 2Z"
-				stroke={fillColor}
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-			/>
-			<path
-				d="M18 9H16C14.8954 9 14 9.89543 14 11V16C14 17.1046 14.8954 18 16 18H18C19.1046 18 20 17.1046 20 16V11C20 9.89543 19.1046 9 18 9Z"
-				stroke={fillColor}
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-			/>
-			<path
-				d="M22 22H2"
-				stroke={fillColor}
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-			/>
-		</svg>
-	);
-}
-
-export default BarIcon;

frontend/src/assets/Dashboard/List.tsx

@@ -1,30 +0,0 @@
-import { CSSProperties } from 'react';
-
-function ListIcon({
-	fillColor,
-}: {
-	fillColor: CSSProperties['color'];
-}): JSX.Element {
-	return (
-		<svg
-			xmlns="http://www.w3.org/2000/svg"
-			width="30"
-			height="30"
-			viewBox="0 0 24 24"
-			fill="none"
-			stroke={fillColor}
-			strokeWidth="2"
-			strokeLinecap="round"
-			strokeLinejoin="round"
-		>
-			<line x1="8" x2="21" y1="6" y2="6" />
-			<line x1="8" x2="21" y1="12" y2="12" />
-			<line x1="8" x2="21" y1="18" y2="18" />
-			<line x1="3" x2="3.01" y1="6" y2="6" />
-			<line x1="3" x2="3.01" y1="12" y2="12" />
-			<line x1="3" x2="3.01" y1="18" y2="18" />
-		</svg>
-	);
-}
-
-export default ListIcon;

frontend/src/assets/Dashboard/Table.tsx

@@ -1,48 +1,18 @@
-import { CSSProperties } from 'react';
-
-function TableIcon({
-	fillColor,
-}: {
-	fillColor: CSSProperties['color'];
-}): JSX.Element {
+function Table(): JSX.Element {
 	return (
 		<svg
-			width="24"
-			height="24"
-			viewBox="0 0 24 24"
+			width="48"
+			height="48"
+			viewBox="0 0 48 48"
 			fill="none"
 			xmlns="http://www.w3.org/2000/svg"
 		>
 			<path
-				d="M12 3V21"
-				stroke={fillColor}
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-			/>
-			<path
-				d="M19 3H5C3.89543 3 3 3.89543 3 5V19C3 20.1046 3.89543 21 5 21H19C20.1046 21 21 20.1046 21 19V5C21 3.89543 20.1046 3 19 3Z"
-				stroke={fillColor}
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-			/>
-			<path
-				d="M3 9H21"
-				stroke={fillColor}
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-			/>
-			<path
-				d="M3 15H21"
-				stroke={fillColor}
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
+				d="M41.0667 0H6.39993C2.87982 0 0 2.87982 0 6.39993V41.6001C0 45.1202 2.87982 48 6.39993 48H41.0667C44.5868 48 47.4667 45.1202 47.4667 41.6001V6.39993C47.4667 2.87982 44.5868 0 41.0667 0ZM44.2669 6.39993V9.60013H32.0002V3.2002H41.0668C42.8268 3.2002 44.267 4.63992 44.267 6.40003L44.2669 6.39993ZM17.6002 9.60013V3.2002H29.8669V9.60013H17.6002ZM29.8669 11.7333V44.8001H17.6002L17.6005 11.7333H29.8669ZM6.40012 3.20011H15.4667V9.60004H3.20001V6.39984C3.20001 4.63983 4.64011 3.20001 6.40022 3.20001L6.40012 3.20011ZM3.19992 41.6003V11.7335H15.4666V44.8003H6.40003C4.64002 44.8003 3.19982 43.3606 3.19982 41.6005L3.19992 41.6003ZM41.0667 44.8001H32.0001V11.7333H44.2668V41.6001C44.2668 43.3601 42.8267 44.7999 41.0666 44.7999L41.0667 44.8001ZM5.33326 18.6666C5.33326 18.08 5.81317 17.6001 6.39983 17.6001H12.2667C12.8534 17.6001 13.3333 18.08 13.3333 18.6666C13.3333 19.2533 12.8534 19.7332 12.2667 19.7332H6.39983C5.81315 19.7332 5.33326 19.2533 5.33326 18.6666ZM13.3333 25.0666C13.3333 25.6533 12.8534 26.1332 12.2667 26.1332H6.39983C5.81315 26.1332 5.33326 25.6532 5.33326 25.0666C5.33326 24.4799 5.81317 24 6.39983 24H12.2667C12.8534 24 13.3333 24.4799 13.3333 25.0666ZM13.3333 31.4665C13.3333 32.0532 12.8534 32.5331 12.2667 32.5331H6.39983C5.81315 32.5331 5.33326 32.0532 5.33326 31.4665C5.33326 30.8798 5.81317 30.3999 6.39983 30.3999H12.2667C12.8534 30.3999 13.3333 30.8798 13.3333 31.4665ZM13.3333 37.8668C13.3333 38.4535 12.8534 38.9334 12.2667 38.9334H6.39983C5.81315 38.9334 5.33326 38.4535 5.33326 37.8668C5.33326 37.2801 5.81317 36.8002 6.39983 36.8002H12.2667C12.8534 36.7999 13.3333 37.2802 13.3333 37.8668ZM19.7332 18.6667C19.7332 18.0801 20.2131 17.6002 20.7998 17.6002H26.6667C27.2534 17.6002 27.7333 18.0801 27.7333 18.6667C27.7333 19.2534 27.2533 19.7333 26.6667 19.7333H20.7998C20.2131 19.7333 19.7332 19.2534 19.7332 18.6667ZM19.7332 25.0667C19.7332 24.48 20.2131 24.0001 20.7998 24.0001H26.6667C27.2534 24.0001 27.7333 24.48 27.7333 25.0667C27.7333 25.6534 27.2533 26.1332 26.6667 26.1332H20.7998C20.2131 26.1332 19.7332 25.6533 19.7332 25.0667ZM19.7332 31.4666C19.7332 30.8799 20.2131 30.4 20.7998 30.4H26.6667C27.2534 30.4 27.7333 30.8799 27.7333 31.4666C27.7333 32.0533 27.2533 32.5332 26.6667 32.5332H20.7998C20.2131 32.5336 19.7332 32.0533 19.7332 31.4666ZM27.7333 37.8669C27.7333 38.4536 27.2533 38.9335 26.6667 38.9335H20.7998C20.2131 38.9335 19.7332 38.4536 19.7332 37.8669C19.7332 37.2802 20.2131 36.8003 20.7998 36.8003H26.6667C27.2534 36.8 27.7333 37.2803 27.7333 37.8669ZM42.1333 18.6668C42.1333 19.2535 41.6534 19.7334 41.0667 19.7334H35.1999C34.6132 19.7334 34.1333 19.2535 34.1333 18.6668C34.1333 18.0802 34.6132 17.6003 35.1999 17.6003H41.0667C41.6534 17.6003 42.1333 18.0802 42.1333 18.6668ZM42.1333 25.0668C42.1333 25.6535 41.6534 26.1333 41.0667 26.1333H35.1999C34.6132 26.1333 34.1333 25.6534 34.1333 25.0668C34.1333 24.4801 34.6132 24.0002 35.1999 24.0002H41.0667C41.6534 24.0002 42.1333 24.4801 42.1333 25.0668ZM42.1333 31.4667C42.1333 32.0534 41.6534 32.5333 41.0667 32.5333H35.1999C34.6132 32.5333 34.1333 32.0534 34.1333 31.4667C34.1333 30.88 34.6132 30.4001 35.1999 30.4001H41.0667C41.6534 30.4001 42.1333 30.88 42.1333 31.4667ZM42.1333 37.867C42.1333 38.4537 41.6534 38.9336 41.0667 38.9336H35.1999C34.6132 38.9336 34.1333 38.4537 34.1333 37.867C34.1333 37.2803 34.6132 36.8004 35.1999 36.8004H41.0667C41.6534 36.8001 42.1333 37.2803 42.1333 37.867Z"
+				fill="#1668DC"
 			/>
 		</svg>
 	);
 }
 
-export default TableIcon;
+export default Table;

frontend/src/assets/Dashboard/Value.tsx

@@ -1,29 +1,19 @@
-import { CSSProperties } from 'react';
-
-function Value({
-	fillColor,
-}: {
-	fillColor: CSSProperties['color'];
-}): JSX.Element {
+function Value(): JSX.Element {
 	return (
 		<svg
-			width="30"
-			height="30"
-			viewBox="0 0 24 24"
+			width="68"
+			height="48"
+			viewBox="0 0 68 48"
 			fill="none"
 			xmlns="http://www.w3.org/2000/svg"
 		>
 			<path
-				d="M9 3H5C4.46957 3 3.96086 3.21071 3.58579 3.58579C3.21071 3.96086 3 4.46957 3 5V9M9 3H19C19.5304 3 20.0391 3.21071 20.4142 3.58579C20.7893 3.96086 21 4.46957 21 5V9M9 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V9M9 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V9"
-				stroke="white"
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-				fill={fillColor}
+				d="M0 5.914V42.086C0 43.6542 0.62289 45.1585 1.73183 46.2675C2.84078 47.3771 4.34511 48 5.91329 48H61.5019C63.0701 48 64.5744 47.3771 65.6834 46.2675C66.7923 45.1585 67.4152 43.6542 67.4152 42.086V5.914C67.4152 4.34578 66.7923 2.84152 65.6834 1.73253C64.5744 0.623576 63.0701 0 61.5019 0H5.91329C4.34508 0 2.84082 0.623576 1.73183 1.73253C0.622872 2.84149 0 4.34581 0 5.914ZM63.4735 5.914V42.086C63.4735 42.6092 63.2659 43.1104 62.896 43.4803C62.5261 43.8495 62.0249 44.0571 61.5024 44.0571H5.91382C4.82549 44.0571 3.94277 43.175 3.94277 42.086V5.91403C3.94277 4.8257 4.82553 3.94298 5.91382 3.94298H61.5024C62.0249 3.94298 62.5261 4.15061 62.896 4.52048C63.2659 4.88968 63.4735 5.39148 63.4735 5.914Z"
+				fill="#1554AD"
 			/>
 			<path
-				d="M9.76562 15.6221C9.19922 15.6221 8.78906 15.3047 8.78906 14.6406V14.3818H6.58691C5.83984 14.3818 5.32227 13.9082 5.32227 13.2246C5.32227 12.8486 5.44922 12.4531 5.72266 11.9648C6.18164 11.1396 6.61621 10.4219 7.1582 9.57227C7.74414 8.64941 8.22266 8.33203 9.02832 8.33203C10.0586 8.33203 10.7422 8.90332 10.7422 9.76758V12.7949H10.9033C11.4453 12.7949 11.7041 13.1318 11.7041 13.5908C11.7041 14.0498 11.4404 14.3818 10.8984 14.3818H10.7422V14.6406C10.7422 15.3047 10.3271 15.6221 9.76562 15.6221ZM8.84766 12.8779V9.83594H8.80859C8.10059 10.8711 7.58789 11.6914 7.0166 12.8193V12.8779H8.84766ZM13.2959 15.5C12.6221 15.5 12.3291 15.124 12.3291 14.6064C12.3291 14.2256 12.5049 13.9326 12.8955 13.6055L14.834 11.9453C15.625 11.2666 15.8496 10.959 15.8496 10.5391C15.8496 10.0947 15.5078 9.78711 15.0049 9.78711C14.6338 9.78711 14.3799 9.95801 14.1162 10.3389C13.8428 10.7393 13.5938 10.8857 13.1982 10.8857C12.6709 10.8857 12.3486 10.5781 12.3486 10.0801C12.3486 9.91895 12.3779 9.76758 12.4414 9.62109C12.8125 8.78125 13.8037 8.25879 15.0342 8.25879C16.748 8.25879 17.8418 9.12305 17.8418 10.4023C17.8418 11.3496 17.3535 11.8428 16.2598 12.79L14.9756 13.8984V13.9375H17.2119C17.7295 13.9375 18.0225 14.2451 18.0225 14.7188C18.0225 15.1826 17.7295 15.5 17.2119 15.5H13.2959Z"
-				fill={fillColor}
+				d="M13.7695 17.668C10.1016 17.668 7.48828 20.1758 7.48828 23.6094V23.6328C7.48828 26.8438 9.76172 29.2109 13.0078 29.2109C15.3281 29.2109 16.8047 28.0273 17.4258 26.6914H17.6602C17.6602 26.8203 17.6484 26.9492 17.6484 27.0781C17.5195 30.3125 16.3828 32.9375 13.6992 32.9375C12.2109 32.9375 11.168 32.1641 10.7227 30.9805L10.6875 30.8633H7.71094L7.73438 30.9922C8.27344 33.582 10.5938 35.4219 13.6992 35.4219C17.9531 35.4219 20.5195 32.0469 20.5195 26.3516V26.3281C20.5195 20.2344 17.3789 17.668 13.7695 17.668ZM13.7578 26.8906C11.8359 26.8906 10.4414 25.4844 10.4414 23.5273V23.5039C10.4414 21.6172 11.9297 20.1289 13.793 20.1289C15.668 20.1289 17.1328 21.6406 17.1328 23.5742V23.5977C17.1328 25.5078 15.668 26.8906 13.7578 26.8906ZM24.832 35.2344C25.9102 35.2344 26.6953 34.4258 26.6953 33.3828C26.6953 32.3398 25.9102 31.5312 24.832 31.5312C23.7656 31.5312 22.9688 32.3398 22.9688 33.3828C22.9688 34.4258 23.7656 35.2344 24.832 35.2344ZM37.8633 35H40.7578V31.7539H43.0312V29.2578H40.7578V18.0898H36.4805C34.1836 21.582 31.7812 25.4727 29.5898 29.2812V31.7539H37.8633V35ZM32.4023 29.3281V29.1523C34.043 26.2812 36 23.1523 37.7344 20.5039H37.9102V29.3281H32.4023ZM52.6406 35.4219C56.3086 35.4219 58.9219 32.9141 58.9219 29.4805V29.457C58.9219 26.2461 56.6484 23.8789 53.4023 23.8789C51.082 23.8789 49.6055 25.0625 48.9844 26.3984H48.75C48.75 26.2695 48.7617 26.1406 48.7617 26.0117C48.8906 22.7773 50.0273 20.1523 52.7109 20.1523C54.1992 20.1523 55.2422 20.9258 55.6875 22.1094L55.7344 22.2266H58.6992L58.6758 22.0977C58.1367 19.5078 55.8164 17.668 52.7109 17.668C48.457 17.668 45.8906 21.043 45.8906 26.7383V26.7617C45.8906 32.8555 49.0312 35.4219 52.6406 35.4219ZM49.2773 29.5156V29.4922C49.2773 27.582 50.7422 26.1992 52.6523 26.1992C54.5742 26.1992 55.9688 27.6055 55.9688 29.5625V29.5859C55.9688 31.4727 54.4922 32.9609 52.6172 32.9609C50.7422 32.9609 49.2773 31.4492 49.2773 29.5156Z"
+				fill="#1668DC"
 			/>
 		</svg>
 	);

frontend/src/assets/Integrations/ConfigureIcon.tsx

@@ -1,23 +0,0 @@
-import { Color } from '@signozhq/design-tokens';
-import { useIsDarkMode } from 'hooks/useDarkMode';
-
-function ConfigureIcon(): JSX.Element {
-	const isDarkMode = useIsDarkMode();
-	return (
-		<svg width="14" height="14" fill="none" xmlns="http://www.w3.org/2000/svg">
-			<g
-				stroke={isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500}
-				strokeWidth="1.333"
-				strokeLinecap="round"
-			>
-				<path
-					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"
-					strokeLinejoin="round"
-				/>
-				<path d="M4 7L2.527 5.566a1.333 1.333 0 01-.013-1.898l.81-.81a1.333 1.333 0 011.991.119L5.333 3M10.75 10.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" />
-			</g>
-		</svg>
-	);
-}
-
-export default ConfigureIcon;

frontend/src/components/CustomTimePicker/CustomTimePicker.tsx

@@ -5,14 +5,13 @@ import './CustomTimePicker.styles.scss';
 import { Input, Popover, Tooltip, Typography } from 'antd';
 import cx from 'classnames';
 import { DateTimeRangeType } from 'container/TopNav/CustomDateTimeModal';
+import { Options } from 'container/TopNav/DateTimeSelection/config';
 import {
 	FixedDurationSuggestionOptions,
-	Options,
 	RelativeDurationSuggestionOptions,
 } from 'container/TopNav/DateTimeSelectionV2/config';
 import dayjs from 'dayjs';
-import { isValidTimeFormat } from 'lib/getMinMax';
-import { defaultTo, isFunction, noop } from 'lodash-es';
+import { defaultTo, noop } from 'lodash-es';
 import debounce from 'lodash-es/debounce';
 import { CheckCircle, ChevronDown, Clock } from 'lucide-react';
 import {
@@ -22,7 +21,6 @@ import {
 	useEffect,
 	useState,
 } from 'react';
-import { useLocation } from 'react-router-dom';
 import { popupContainer } from 'utils/selectPopupContainer';
 
 import CustomTimePickerPopoverContent from './CustomTimePickerPopoverContent';
@@ -34,14 +32,7 @@ interface CustomTimePickerProps {
 	onError: (value: boolean) => void;
 	selectedValue: string;
 	selectedTime: string;
-	onValidCustomDateChange: ({
-		time: [t1, t2],
-		timeStr,
-	}: {
-		time: [dayjs.Dayjs | null, dayjs.Dayjs | null];
-		timeStr: string;
-	}) => void;
-	onCustomTimeStatusUpdate?: (isValid: boolean) => void;
+	onValidCustomDateChange: ([t1, t2]: any[]) => void;
 	open: boolean;
 	setOpen: Dispatch<SetStateAction<boolean>>;
 	items: any[];
@@ -61,7 +52,6 @@ function CustomTimePicker({
 	open,
 	setOpen,
 	onValidCustomDateChange,
-	onCustomTimeStatusUpdate,
 	newPopover,
 	customDateTimeVisible,
 	setCustomDTPickerVisible,
@@ -78,7 +68,6 @@ function CustomTimePicker({
 	const [inputErrorMessage, setInputErrorMessage] = useState<string | null>(
 		null,
 	);
-	const location = useLocation();
 	const [isInputFocused, setIsInputFocused] = useState(false);
 
 	const getSelectedTimeRangeLabel = (
@@ -94,7 +83,6 @@ function CustomTimePicker({
 				return Options[index].label;
 			}
 		}
-
 		for (
 			let index = 0;
 			index < RelativeDurationSuggestionOptions.length;
@@ -104,17 +92,12 @@ function CustomTimePicker({
 				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 '';
 	};
 
@@ -130,9 +113,6 @@ function CustomTimePicker({
 
 	const handleOpenChange = (newOpen: boolean): void => {
 		setOpen(newOpen);
-		if (!newOpen) {
-			setCustomDTPickerVisible?.(false);
-		}
 	};
 
 	const debouncedHandleInputChange = debounce((inputValue): void => {
@@ -172,26 +152,17 @@ function CustomTimePicker({
 					break;
 			}
 
-			if (minTime && (!minTime.isValid() || minTime < maxAllowedMinTime)) {
+			if (minTime && minTime < maxAllowedMinTime) {
 				setInputStatus('error');
 				onError(true);
 				setInputErrorMessage('Please enter time less than 6 months');
-				if (isFunction(onCustomTimeStatusUpdate)) {
-					onCustomTimeStatusUpdate(true);
-				}
 			} else {
-				onValidCustomDateChange({
-					time: [minTime, currentTime],
-					timeStr: inputValue,
-				});
+				onValidCustomDateChange([minTime, currentTime]);
 			}
 		} else {
 			setInputStatus('error');
 			onError(true);
 			setInputErrorMessage(null);
-			if (isFunction(onCustomTimeStatusUpdate)) {
-				onCustomTimeStatusUpdate(false);
-			}
 		}
 	}, 300);
 
@@ -251,15 +222,6 @@ function CustomTimePicker({
 		setIsInputFocused(false);
 	};
 
-	// 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]);
-
 	return (
 		<div className="custom-time-picker">
 			<Popover
@@ -344,5 +306,4 @@ CustomTimePicker.defaultProps = {
 	setCustomDTPickerVisible: noop,
 	onCustomDateHandler: noop,
 	handleGoLive: noop,
-	onCustomTimeStatusUpdate: noop,
 };

frontend/src/components/CustomTimePicker/CustomTimePickerPopoverContent.tsx

@@ -1,28 +1,26 @@
 import './CustomTimePicker.styles.scss';
 
-import { Button } from 'antd';
+import { Button, DatePicker } from 'antd';
 import cx from 'classnames';
 import ROUTES from 'constants/routes';
 import { DateTimeRangeType } from 'container/TopNav/CustomDateTimeModal';
 import {
-	LexicalContext,
 	Option,
 	RelativeDurationSuggestionOptions,
 } from 'container/TopNav/DateTimeSelectionV2/config';
+import dayjs, { Dayjs } from 'dayjs';
 import { Dispatch, SetStateAction, useMemo } from 'react';
+import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
-
-import RangePickerModal from './RangePickerModal';
+import { AppState } from 'store/reducers';
+import { GlobalReducer } from 'types/reducer/globalTime';
 
 interface CustomTimePickerPopoverContentProps {
 	options: any[];
 	setIsOpen: Dispatch<SetStateAction<boolean>>;
 	customDateTimeVisible: boolean;
 	setCustomDTPickerVisible: Dispatch<SetStateAction<boolean>>;
-	onCustomDateHandler: (
-		dateTimeRange: DateTimeRangeType,
-		lexicalContext?: LexicalContext,
-	) => void;
+	onCustomDateHandler: (dateTimeRange: DateTimeRangeType) => void;
 	onSelectHandler: (label: string, value: string) => void;
 	handleGoLive: () => void;
 	selectedTime: string;
@@ -38,12 +36,35 @@ function CustomTimePickerPopoverContent({
 	handleGoLive,
 	selectedTime,
 }: CustomTimePickerPopoverContentProps): JSX.Element {
+	const { RangePicker } = DatePicker;
 	const { pathname } = useLocation();
 
+	const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(
+		(state) => state.globalTime,
+	);
+
 	const isLogsExplorerPage = useMemo(() => pathname === ROUTES.LOGS_EXPLORER, [
 		pathname,
 	]);
 
+	const disabledDate = (current: Dayjs): boolean => {
+		const currentDay = dayjs(current);
+		return currentDay.isAfter(dayjs());
+	};
+
+	const onPopoverClose = (visible: boolean): void => {
+		if (!visible) {
+			setCustomDTPickerVisible(false);
+		}
+		setIsOpen(visible);
+	};
+
+	const onModalOkHandler = (date_time: any): void => {
+		if (date_time?.[1]) {
+			onPopoverClose(false);
+		}
+		onCustomDateHandler(date_time);
+	};
 	function getTimeChips(options: Option[]): JSX.Element {
 		return (
 			<div className="relative-date-time-section">
@@ -80,32 +101,26 @@ function CustomTimePickerPopoverContent({
 						}}
 						className={cx(
 							'date-time-options-btn',
-							customDateTimeVisible
-								? option.value === 'custom' && 'active'
-								: selectedTime === option.value && 'active',
+							selectedTime === option.value && 'active',
 						)}
 					>
 						{option.label}
 					</Button>
 				))}
 			</div>
-			<div
-				className={cx(
-					'relative-date-time',
-					selectedTime === 'custom' || customDateTimeVisible
-						? 'date-picker'
-						: 'relative-times',
-				)}
-			>
+			<div className="relative-date-time">
 				{selectedTime === 'custom' || customDateTimeVisible ? (
-					<RangePickerModal
-						setCustomDTPickerVisible={setCustomDTPickerVisible}
-						setIsOpen={setIsOpen}
-						onCustomDateHandler={onCustomDateHandler}
-						selectedTime={selectedTime}
+					<RangePicker
+						disabledDate={disabledDate}
+						allowClear
+						onCalendarChange={onModalOkHandler}
+						// eslint-disable-next-line react/jsx-props-no-spreading
+						{...(selectedTime === 'custom' && {
+							defaultValue: [dayjs(minTime / 1000000), dayjs(maxTime / 1000000)],
+						})}
 					/>
 				) : (
-					<div className="relative-times-container">
+					<div>
 						<div className="time-heading">RELATIVE TIMES</div>
 						<div>{getTimeChips(RelativeDurationSuggestionOptions)}</div>
 					</div>