Merge branch 'develop' into release/v0.47.x

Signed-off-by: Prashant Shahi <prashant@signoz.io>

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

@@ -146,7 +146,7 @@ services:
         condition: on-failure
 
   query-service:
-    image: signoz/query-service:0.46.0
+    image: signoz/query-service:0.47.0
     command:
       [
         "-config=/root/config/prometheus.yml",
@@ -186,7 +186,7 @@ services:
     <<: *db-depend
 
   frontend:
-    image: signoz/frontend:0.46.0
+    image: signoz/frontend:0.47.0
     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.24
+    image: signoz/signoz-otel-collector:0.88.26
     command:
       [
         "--config=/etc/otel-collector-config.yaml",
@@ -237,7 +237,7 @@ services:
       - query-service
 
   otel-collector-migrator:
-      image: signoz/signoz-schema-migrator:0.88.24
+      image: signoz/signoz-schema-migrator:0.88.26
       deploy:
         restart_policy:
           condition: on-failure

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

@@ -77,16 +77,7 @@ processors:
       # This is added to ensure the uniqueness of the timeseries
       # Otherwise, identical timeseries produced by multiple replicas of
       # collectors result in incorrect APM metrics
-      - name: signoz.collector.id
-      - name: service.version
-      - name: browser.platform
-      - name: browser.mobile
-      - name: k8s.cluster.name
-      - name: k8s.node.name
-      - name: k8s.namespace.name
-      - name: host.name
-      - name: host.type
-      - name: container.name
+      - name: 'signoz.collector.id'
   # memory_limiter:
   #   # 80% of maximum memory up to 2G
   #   limit_mib: 1500
@@ -117,15 +108,6 @@ processors:
       # Otherwise, identical timeseries produced by multiple replicas of
       # collectors result in incorrect APM metrics
       - name: signoz.collector.id
-      - name: service.version
-      - name: browser.platform
-      - name: browser.mobile
-      - name: k8s.cluster.name
-      - name: k8s.node.name
-      - name: k8s.namespace.name
-      - name: host.name
-      - name: host.type
-      - name: container.name
 
 exporters:
   clickhousetraces:

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

@@ -66,7 +66,7 @@ services:
       - --storage.path=/data
 
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.24}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.26}
     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.24
+    image: signoz/signoz-otel-collector:0.88.26
     command:
       [
         "--config=/etc/otel-collector-config.yaml",

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

@@ -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.46.0}
+    image: signoz/query-service:${DOCKER_TAG:-0.47.0}
     container_name: signoz-query-service
     command:
       [
@@ -204,7 +204,7 @@ services:
     <<: *db-depend
 
   frontend:
-    image: signoz/frontend:${DOCKER_TAG:-0.46.0}
+    image: signoz/frontend:${DOCKER_TAG:-0.47.0}
     container_name: signoz-frontend
     restart: on-failure
     depends_on:
@@ -216,7 +216,7 @@ services:
       - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
   otel-collector-migrator:
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.24}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.26}
     container_name: otel-migrator
     command:
       - "--dsn=tcp://clickhouse:9000"
@@ -230,7 +230,7 @@ services:
 
 
   otel-collector:
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.24}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.26}
     container_name: signoz-otel-collector
     command:
       [

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

@@ -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.46.0}
+    image: signoz/query-service:${DOCKER_TAG:-0.47.0}
     container_name: signoz-query-service
     command:
       [
@@ -203,7 +203,7 @@ services:
     <<: *db-depend
 
   frontend:
-    image: signoz/frontend:${DOCKER_TAG:-0.46.0}
+    image: signoz/frontend:${DOCKER_TAG:-0.47.0}
     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.24}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.26}
     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.24}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.26}
     container_name: signoz-otel-collector
     command:
       [

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

@@ -75,16 +75,7 @@ processors:
       # This is added to ensure the uniqueness of the timeseries
       # Otherwise, identical timeseries produced by multiple replicas of
       # collectors result in incorrect APM metrics
-      - name: signoz.collector.id
-      - name: service.version
-      - name: browser.platform
-      - name: browser.mobile
-      - name: k8s.cluster.name
-      - name: k8s.node.name
-      - name: k8s.namespace.name
-      - name: host.name
-      - name: host.type
-      - name: container.name
+      - name: 'signoz.collector.id'
   # memory_limiter:
   #   # 80% of maximum memory up to 2G
   #   limit_mib: 1500
@@ -120,15 +111,6 @@ processors:
       # Otherwise, identical timeseries produced by multiple replicas of
       # collectors result in incorrect APM metrics
       - name: signoz.collector.id
-      - name: service.version
-      - name: browser.platform
-      - name: browser.mobile
-      - name: k8s.cluster.name
-      - name: k8s.node.name
-      - name: k8s.namespace.name
-      - name: host.name
-      - name: host.type
-      - name: container.name
 
 extensions:
   health_check:

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

@@ -14,6 +14,7 @@ import (
 
 	"go.signoz.io/signoz/ee/query-service/constants"
 	"go.signoz.io/signoz/ee/query-service/model"
+	"go.signoz.io/signoz/pkg/query-service/auth"
 	baseauth "go.signoz.io/signoz/pkg/query-service/auth"
 	basemodel "go.signoz.io/signoz/pkg/query-service/model"
 )
@@ -35,14 +36,14 @@ func (ah *APIHandler) loginUser(w http.ResponseWriter, r *http.Request) {
 	req := basemodel.LoginRequest{}
 	err := parseRequest(r, &req)
 	if err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
 	ctx := context.Background()
 
 	if req.Email != "" && ah.CheckFeature(model.SSO) {
-		var apierr *basemodel.ApiError
+		var apierr basemodel.BaseApiError
 		_, apierr = ah.AppDao().CanUsePassword(ctx, req.Email)
 		if apierr != nil && !apierr.IsNil() {
 			RespondError(w, apierr, nil)
@@ -50,7 +51,7 @@ func (ah *APIHandler) loginUser(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// if all looks good, call auth
-	resp, err := baseauth.Login(ctx, &req)
+	resp, err := auth.Login(ctx, &req)
 	if ah.HandleError(w, err, http.StatusUnauthorized) {
 		return
 	}
@@ -74,7 +75,7 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 	requestBody, err := io.ReadAll(r.Body)
 	if err != nil {
 		zap.L().Error("received no input in api", zap.Error(err))
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
@@ -82,7 +83,7 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 
 	if err != nil {
 		zap.L().Error("received invalid user registration request", zap.Error(err))
-		RespondError(w, basemodel.BadRequest(fmt.Errorf("failed to register user")), nil)
+		RespondError(w, model.BadRequest(fmt.Errorf("failed to register user")), nil)
 		return
 	}
 
@@ -90,13 +91,13 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 	invite, err := baseauth.ValidateInvite(ctx, req)
 	if err != nil {
 		zap.L().Error("failed to validate invite token", zap.Error(err))
-		RespondError(w, basemodel.BadRequest(err), nil)
+		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))
-		RespondError(w, basemodel.BadRequest(basemodel.ErrSignupFailed{}), nil)
+		RespondError(w, model.BadRequest(basemodel.ErrSignupFailed{}), nil)
 		return
 	}
 
@@ -104,7 +105,7 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 	domain, apierr := ah.AppDao().GetDomainByEmail(ctx, invite.Email)
 	if apierr != nil {
 		zap.L().Error("failed to get domain from email", zap.Error(apierr))
-		RespondError(w, basemodel.InternalError(basemodel.ErrSignupFailed{}), nil)
+		RespondError(w, model.InternalError(basemodel.ErrSignupFailed{}), nil)
 	}
 
 	precheckResp := &basemodel.PrecheckResponse{
@@ -120,7 +121,7 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		var precheckError *basemodel.ApiError
+		var precheckError basemodel.BaseApiError
 
 		precheckResp, precheckError = ah.AppDao().PrecheckLogin(ctx, user.Email, req.SourceUrl)
 		if precheckError != nil {
@@ -129,8 +130,8 @@ func (ah *APIHandler) registerUser(w http.ResponseWriter, r *http.Request) {
 
 	} else {
 		// no-sso, validate password
-		if err := baseauth.ValidatePassword(req.Password); err != nil {
-			RespondError(w, basemodel.InternalError(fmt.Errorf("password is not in a valid format")), nil)
+		if err := auth.ValidatePassword(req.Password); err != nil {
+			RespondError(w, model.InternalError(fmt.Errorf("password is not in a valid format")), nil)
 			return
 		}
 
@@ -155,7 +156,7 @@ func (ah *APIHandler) getInvite(w http.ResponseWriter, r *http.Request) {
 
 	inviteObject, err := baseauth.GetInvite(context.Background(), token)
 	if err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
@@ -240,11 +241,6 @@ func (ah *APIHandler) receiveGoogleAuth(w http.ResponseWriter, r *http.Request)
 	// prepare google callback handler using parsedState -
 	// which contains redirect URL (front-end endpoint)
 	callbackHandler, err := domain.PrepareGoogleOAuthProvider(parsedState)
-	if err != nil {
-		zap.L().Error("[receiveGoogleAuth] failed to prepare google oauth provider", zap.String("domain", domain.String()), zap.Error(err))
-		handleSsoError(w, r, redirectUri)
-		return
-	}
 
 	identity, err := callbackHandler.HandleCallback(r)
 	if err != nil {

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

@@ -9,7 +9,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"go.signoz.io/signoz/ee/query-service/model"
-	basemodel "go.signoz.io/signoz/pkg/query-service/model"
 )
 
 func (ah *APIHandler) listDomainsByOrg(w http.ResponseWriter, r *http.Request) {
@@ -28,12 +27,12 @@ func (ah *APIHandler) postDomain(w http.ResponseWriter, r *http.Request) {
 	req := model.OrgDomain{}
 
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
 	if err := req.ValidNew(); err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
@@ -51,18 +50,18 @@ func (ah *APIHandler) putDomain(w http.ResponseWriter, r *http.Request) {
 	domainIdStr := mux.Vars(r)["id"]
 	domainId, err := uuid.Parse(domainIdStr)
 	if err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
 	req := model.OrgDomain{Id: domainId}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 	req.Id = domainId
 	if err := req.Valid(nil); err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 	}
 
 	if apierr := ah.AppDao().UpdateDomain(ctx, &req); apierr != nil {
@@ -78,7 +77,7 @@ func (ah *APIHandler) deleteDomain(w http.ResponseWriter, r *http.Request) {
 
 	domainId, err := uuid.Parse(domainIdStr)
 	if err != nil {
-		RespondError(w, basemodel.BadRequest(fmt.Errorf("invalid domain id")), nil)
+		RespondError(w, model.BadRequest(fmt.Errorf("invalid domain id")), nil)
 		return
 	}
 

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

@@ -9,7 +9,6 @@ import (
 
 	"go.signoz.io/signoz/ee/query-service/constants"
 	"go.signoz.io/signoz/ee/query-service/model"
-	basemodel "go.signoz.io/signoz/pkg/query-service/model"
 	"go.uber.org/zap"
 )
 
@@ -72,12 +71,12 @@ func (ah *APIHandler) applyLicense(w http.ResponseWriter, r *http.Request) {
 	var l model.License
 
 	if err := json.NewDecoder(r.Body).Decode(&l); err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
 	if l.Key == "" {
-		RespondError(w, basemodel.BadRequest(fmt.Errorf("license key is required")), nil)
+		RespondError(w, model.BadRequest(fmt.Errorf("license key is required")), nil)
 		return
 	}
 	license, apiError := ah.LM().Activate(r.Context(), l.Key)
@@ -101,20 +100,20 @@ func (ah *APIHandler) checkout(w http.ResponseWriter, r *http.Request) {
 	hClient := &http.Client{}
 	req, err := http.NewRequest("POST", constants.LicenseSignozIo+"/checkout", r.Body)
 	if err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 	req.Header.Add("X-SigNoz-SecretKey", constants.LicenseAPIKey)
 	licenseResp, err := hClient.Do(req)
 	if err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 
 	// decode response body
 	var resp checkoutResponse
 	if err := json.NewDecoder(licenseResp.Body).Decode(&resp); err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 
@@ -125,7 +124,7 @@ func (ah *APIHandler) getBilling(w http.ResponseWriter, r *http.Request) {
 	licenseKey := r.URL.Query().Get("licenseKey")
 
 	if licenseKey == "" {
-		RespondError(w, basemodel.BadRequest(fmt.Errorf("license key is required")), nil)
+		RespondError(w, model.BadRequest(fmt.Errorf("license key is required")), nil)
 		return
 	}
 
@@ -134,20 +133,20 @@ func (ah *APIHandler) getBilling(w http.ResponseWriter, r *http.Request) {
 	hClient := &http.Client{}
 	req, err := http.NewRequest("GET", billingURL, nil)
 	if err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 	req.Header.Add("X-SigNoz-SecretKey", constants.LicenseAPIKey)
 	billingResp, err := hClient.Do(req)
 	if err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 
 	// decode response body
 	var billingResponse billingDetails
 	if err := json.NewDecoder(billingResp.Body).Decode(&billingResponse); err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 
@@ -252,20 +251,20 @@ func (ah *APIHandler) portalSession(w http.ResponseWriter, r *http.Request) {
 	hClient := &http.Client{}
 	req, err := http.NewRequest("POST", constants.LicenseSignozIo+"/portal", r.Body)
 	if err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 	req.Header.Add("X-SigNoz-SecretKey", constants.LicenseAPIKey)
 	licenseResp, err := hClient.Do(req)
 	if err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 
 	// decode response body
 	var resp checkoutResponse
 	if err := json.NewDecoder(licenseResp.Body).Decode(&resp); err != nil {
-		RespondError(w, basemodel.InternalError(err), nil)
+		RespondError(w, model.InternalError(err), nil)
 		return
 	}
 

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

@@ -31,13 +31,13 @@ func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) {
 
 	req := model.CreatePATRequestBody{}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 	user, err := auth.GetUserFromRequest(r)
 	if err != nil {
-		RespondError(w, &basemodel.ApiError{
-			Typ: basemodel.ErrorUnauthorized,
+		RespondError(w, &model.ApiError{
+			Typ: model.ErrorUnauthorized,
 			Err: err,
 		}, nil)
 		return
@@ -49,7 +49,7 @@ func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) {
 	}
 	err = validatePATRequest(pat)
 	if err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
@@ -66,7 +66,7 @@ func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) {
 	}
 
 	zap.L().Info("Got Create PAT request", zap.Any("pat", pat))
-	var apierr *basemodel.ApiError
+	var apierr basemodel.BaseApiError
 	if pat, apierr = ah.AppDao().CreatePAT(ctx, pat); apierr != nil {
 		RespondError(w, apierr, nil)
 		return
@@ -93,14 +93,14 @@ func (ah *APIHandler) updatePAT(w http.ResponseWriter, r *http.Request) {
 
 	req := model.PAT{}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
 	user, err := auth.GetUserFromRequest(r)
 	if err != nil {
-		RespondError(w, &basemodel.ApiError{
-			Typ: basemodel.ErrorUnauthorized,
+		RespondError(w, &model.ApiError{
+			Typ: model.ErrorUnauthorized,
 			Err: err,
 		}, nil)
 		return
@@ -108,7 +108,7 @@ func (ah *APIHandler) updatePAT(w http.ResponseWriter, r *http.Request) {
 
 	err = validatePATRequest(req)
 	if err != nil {
-		RespondError(w, basemodel.BadRequest(err), nil)
+		RespondError(w, model.BadRequest(err), nil)
 		return
 	}
 
@@ -116,7 +116,7 @@ func (ah *APIHandler) updatePAT(w http.ResponseWriter, r *http.Request) {
 	id := mux.Vars(r)["id"]
 	req.UpdatedAt = time.Now().Unix()
 	zap.L().Info("Got Update PAT request", zap.Any("pat", req))
-	var apierr *basemodel.ApiError
+	var apierr basemodel.BaseApiError
 	if apierr = ah.AppDao().UpdatePAT(ctx, req, id); apierr != nil {
 		RespondError(w, apierr, nil)
 		return
@@ -129,8 +129,8 @@ func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) {
 	ctx := context.Background()
 	user, err := auth.GetUserFromRequest(r)
 	if err != nil {
-		RespondError(w, &basemodel.ApiError{
-			Typ: basemodel.ErrorUnauthorized,
+		RespondError(w, &model.ApiError{
+			Typ: model.ErrorUnauthorized,
 			Err: err,
 		}, nil)
 		return
@@ -149,8 +149,8 @@ func (ah *APIHandler) revokePAT(w http.ResponseWriter, r *http.Request) {
 	id := mux.Vars(r)["id"]
 	user, err := auth.GetUserFromRequest(r)
 	if err != nil {
-		RespondError(w, &basemodel.ApiError{
-			Typ: basemodel.ErrorUnauthorized,
+		RespondError(w, &model.ApiError{
+			Typ: model.ErrorUnauthorized,
 			Err: err,
 		}, nil)
 		return

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

@@ -7,6 +7,6 @@ import (
 	basemodel "go.signoz.io/signoz/pkg/query-service/model"
 )
 
-func RespondError(w http.ResponseWriter, apiErr *basemodel.ApiError, data interface{}) {
-	baseapp.RespondError(w, apiErr)
+func RespondError(w http.ResponseWriter, apiErr basemodel.BaseApiError, data interface{}) {
+	baseapp.RespondError(w, apiErr, data)
 }

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

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"go.signoz.io/signoz/ee/query-service/app/db"
+	"go.signoz.io/signoz/ee/query-service/model"
 	baseapp "go.signoz.io/signoz/pkg/query-service/app"
 	basemodel "go.signoz.io/signoz/pkg/query-service/model"
 	"go.uber.org/zap"
@@ -18,7 +19,7 @@ func (ah *APIHandler) searchTraces(w http.ResponseWriter, r *http.Request) {
 	}
 	searchTracesParams, err := baseapp.ParseSearchTracesParams(r)
 	if err != nil {
-		RespondError(w, &basemodel.ApiError{Typ: basemodel.ErrorBadData, Err: err}, "Error reading params")
+		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, "Error reading params")
 		return
 	}
 

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

@@ -26,10 +26,10 @@ func (r *ClickhouseReader) GetMetricResultEE(ctx context.Context, query string)
 
 	var hash string
 	// If getSubTreeSpans function is used in the clickhouse query
-	if strings.Contains(query, "getSubTreeSpans(") {
+	if strings.Index(query, "getSubTreeSpans(") != -1 {
 		var err error
 		query, hash, err = r.getSubTreeSpansCustomFunction(ctx, query, hash)
-		if err == fmt.Errorf("no spans found for the given query") {
+		if err == fmt.Errorf("No spans found for the given query") {
 			return nil, "", nil
 		}
 		if err != nil {
@@ -183,7 +183,7 @@ func (r *ClickhouseReader) getSubTreeSpansCustomFunction(ctx context.Context, qu
 
 	if err != nil {
 		zap.L().Error("Error in processing sql query", zap.Error(err))
-		return query, hash, fmt.Errorf("error in processing sql query")
+		return query, hash, fmt.Errorf("Error in processing sql query")
 	}
 
 	var searchScanResponses []basemodel.SearchSpanDBResponseItem
@@ -193,14 +193,14 @@ func (r *ClickhouseReader) getSubTreeSpansCustomFunction(ctx context.Context, qu
 	modelQuery := fmt.Sprintf("SELECT timestamp, traceID, model FROM %s.%s WHERE traceID=$1", r.TraceDB, r.SpansTable)
 
 	if len(getSpansSubQueryDBResponses) == 0 {
-		return query, hash, fmt.Errorf("no spans found for the given query")
+		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))
 	err = r.conn.Select(ctx, &searchScanResponses, modelQuery, getSpansSubQueryDBResponses[0].TraceID)
 
 	if err != nil {
 		zap.L().Error("Error in processing sql query", zap.Error(err))
-		return query, hash, fmt.Errorf("error in processing sql query")
+		return query, hash, fmt.Errorf("Error in processing sql query")
 	}
 
 	// Process model to fetch the spans
@@ -263,7 +263,6 @@ func (r *ClickhouseReader) getSubTreeSpansCustomFunction(ctx context.Context, qu
 	return query, hash, nil
 }
 
-//lint:ignore SA4009 return hash is feeded to the query
 func processQuery(query string, hash string) (string, string, string) {
 	re3 := regexp.MustCompile(`getSubTreeSpans`)
 

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

@@ -61,7 +61,7 @@ func SmartTraceAlgorithm(payload []basemodel.SearchSpanResponseItem, targetSpanI
 
 	// If the target span is not found, return span not found error
 	if targetSpan == nil {
-		return nil, errors.New("span not found")
+		return nil, errors.New("Span not found")
 	}
 
 	// Build the final result
@@ -118,8 +118,8 @@ func SmartTraceAlgorithm(payload []basemodel.SearchSpanResponseItem, targetSpanI
 	}
 
 	searchSpansResult := []basemodel.SearchSpansResult{{
-		Columns:   []string{"__time", "SpanId", "TraceId", "ServiceName", "Name", "Kind", "DurationNano", "TagsKeys", "TagsValues", "References", "Events", "HasError"},
-		Events:    make([][]interface{}, len(resultSpansSet)),
+		Columns: []string{"__time", "SpanId", "TraceId", "ServiceName", "Name", "Kind", "DurationNano", "TagsKeys", "TagsValues", "References", "Events", "HasError"},
+		Events:  make([][]interface{}, len(resultSpansSet)),
 		IsSubTree: true,
 	},
 	}
@@ -219,7 +219,7 @@ func breadthFirstSearch(spansPtr *model.SpanForTraceDetails, targetId string) (*
 		}
 
 		for _, child := range current.Children {
-			if ok := visited[child.SpanID]; !ok {
+			if ok, _ := visited[child.SpanID]; !ok {
 				queue = append(queue, child)
 			}
 		}

ee/query-service/app/server.go

@@ -28,6 +28,7 @@ import (
 	"go.signoz.io/signoz/ee/query-service/integrations/gateway"
 	"go.signoz.io/signoz/ee/query-service/interfaces"
 	baseauth "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"
 
 	licensepkg "go.signoz.io/signoz/ee/query-service/license"
@@ -78,7 +79,9 @@ type ServerOptions struct {
 // Server runs HTTP api service
 type Server struct {
 	serverOptions *ServerOptions
+	conn          net.Listener
 	ruleManager   *rules.Manager
+	separatePorts bool
 
 	// public http router
 	httpConn   net.Listener
@@ -88,6 +91,9 @@ type Server struct {
 	privateConn net.Listener
 	privateHTTP *http.Server
 
+	// feature flags
+	featureLookup baseint.FeatureLookup
+
 	// Usage manager
 	usageManager *usage.Manager
 
@@ -311,7 +317,7 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
 
 func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server, error) {
 
-	r := baseapp.NewRouter()
+	r := mux.NewRouter()
 
 	r.Use(baseapp.LogCommentEnricher)
 	r.Use(setTimeoutMiddleware)
@@ -338,7 +344,7 @@ func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server,
 
 func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, error) {
 
-	r := baseapp.NewRouter()
+	r := mux.NewRouter()
 
 	// add auth middleware
 	getUserFromRequest := func(r *http.Request) (*basemodel.UserPayload, error) {
@@ -379,7 +385,7 @@ func loggingMiddleware(next http.Handler) http.Handler {
 		path, _ := route.GetPathTemplate()
 		startTime := time.Now()
 		next.ServeHTTP(w, r)
-		zap.L().Info(path, zap.Duration("timeTaken", time.Since(startTime)), zap.String("path", path))
+		zap.L().Info(path+"\ttimeTaken:"+time.Now().Sub(startTime).String(), zap.Duration("timeTaken", time.Now().Sub(startTime)), zap.String("path", path))
 	})
 }
 
@@ -391,7 +397,7 @@ func loggingMiddlewarePrivate(next http.Handler) http.Handler {
 		path, _ := route.GetPathTemplate()
 		startTime := time.Now()
 		next.ServeHTTP(w, r)
-		zap.L().Info(path, zap.Duration("timeTaken", time.Since(startTime)), zap.String("path", path), zap.Bool("tprivatePort", true))
+		zap.L().Info(path+"\tprivatePort: true \ttimeTaken"+time.Now().Sub(startTime).String(), zap.Duration("timeTaken", time.Now().Sub(startTime)), zap.String("path", path), zap.Bool("tprivatePort", true))
 	})
 }
 
@@ -705,7 +711,7 @@ func makeRulesManager(
 	db *sqlx.DB,
 	ch baseint.Reader,
 	disableRules bool,
-	fm baseint.FeatureLookup) (*rules.Manager, error) {
+	fm baseInterface.FeatureLookup) (*rules.Manager, error) {
 
 	// create engine
 	pqle, err := pqle.FromConfigPath(promConfigPath)

ee/query-service/dao/interface.go

@@ -21,24 +21,24 @@ type ModelDao interface {
 	DB() *sqlx.DB
 
 	// auth methods
-	CanUsePassword(ctx context.Context, email string) (bool, *basemodel.ApiError)
-	PrepareSsoRedirect(ctx context.Context, redirectUri, email string) (redirectURL string, apierr *basemodel.ApiError)
+	CanUsePassword(ctx context.Context, email string) (bool, basemodel.BaseApiError)
+	PrepareSsoRedirect(ctx context.Context, redirectUri, email string) (redirectURL string, apierr basemodel.BaseApiError)
 	GetDomainFromSsoResponse(ctx context.Context, relayState *url.URL) (*model.OrgDomain, error)
 
 	// org domain (auth domains) CRUD ops
-	ListDomains(ctx context.Context, orgId string) ([]model.OrgDomain, *basemodel.ApiError)
-	GetDomain(ctx context.Context, id uuid.UUID) (*model.OrgDomain, *basemodel.ApiError)
-	CreateDomain(ctx context.Context, d *model.OrgDomain) *basemodel.ApiError
-	UpdateDomain(ctx context.Context, domain *model.OrgDomain) *basemodel.ApiError
-	DeleteDomain(ctx context.Context, id uuid.UUID) *basemodel.ApiError
-	GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, *basemodel.ApiError)
+	ListDomains(ctx context.Context, orgId string) ([]model.OrgDomain, basemodel.BaseApiError)
+	GetDomain(ctx context.Context, id uuid.UUID) (*model.OrgDomain, basemodel.BaseApiError)
+	CreateDomain(ctx context.Context, d *model.OrgDomain) basemodel.BaseApiError
+	UpdateDomain(ctx context.Context, domain *model.OrgDomain) basemodel.BaseApiError
+	DeleteDomain(ctx context.Context, id uuid.UUID) basemodel.BaseApiError
+	GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, basemodel.BaseApiError)
 
-	CreatePAT(ctx context.Context, p model.PAT) (model.PAT, *basemodel.ApiError)
-	UpdatePAT(ctx context.Context, p model.PAT, id string) *basemodel.ApiError
-	GetPAT(ctx context.Context, pat string) (*model.PAT, *basemodel.ApiError)
-	UpdatePATLastUsed(ctx context.Context, pat string, lastUsed int64) *basemodel.ApiError
-	GetPATByID(ctx context.Context, id string) (*model.PAT, *basemodel.ApiError)
-	GetUserByPAT(ctx context.Context, token string) (*basemodel.UserPayload, *basemodel.ApiError)
-	ListPATs(ctx context.Context) ([]model.PAT, *basemodel.ApiError)
-	RevokePAT(ctx context.Context, id string, userID string) *basemodel.ApiError
+	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
 }

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

@@ -17,19 +17,19 @@ import (
 	"go.uber.org/zap"
 )
 
-func (m *modelDao) createUserForSAMLRequest(ctx context.Context, email string) (*basemodel.User, *basemodel.ApiError) {
+func (m *modelDao) createUserForSAMLRequest(ctx context.Context, email string) (*basemodel.User, basemodel.BaseApiError) {
 	// get auth domain from email domain
 	domain, apierr := m.GetDomainByEmail(ctx, email)
 
 	if apierr != nil {
 		zap.L().Error("failed to get domain from email", zap.Error(apierr))
-		return nil, basemodel.InternalError(fmt.Errorf("failed to get domain from email"))
+		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))
-		return nil, basemodel.InternalError(fmt.Errorf("failed to generate password hash"))
+		return nil, model.InternalErrorStr("failed to generate password hash")
 	}
 
 	group, apiErr := m.GetGroupByName(ctx, baseconst.ViewerGroup)
@@ -61,12 +61,12 @@ func (m *modelDao) createUserForSAMLRequest(ctx context.Context, email string) (
 
 // PrepareSsoRedirect prepares redirect page link after SSO response
 // is successfully parsed (i.e. valid email is available)
-func (m *modelDao) PrepareSsoRedirect(ctx context.Context, redirectUri, email string) (redirectURL string, apierr *basemodel.ApiError) {
+func (m *modelDao) PrepareSsoRedirect(ctx context.Context, redirectUri, email string) (redirectURL string, apierr basemodel.BaseApiError) {
 
 	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()))
-		return "", basemodel.BadRequest(fmt.Errorf("invalid user email received from the auth provider"))
+		return "", model.BadRequestStr("invalid user email received from the auth provider")
 	}
 
 	user := &basemodel.User{}
@@ -85,7 +85,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))
-		return "", basemodel.InternalError(fmt.Errorf("failed to generate token for the user"))
+		return "", model.InternalErrorStr("failed to generate token for the user")
 	}
 
 	return fmt.Sprintf("%s?jwt=%s&usr=%s&refreshjwt=%s",
@@ -95,7 +95,7 @@ func (m *modelDao) PrepareSsoRedirect(ctx context.Context, redirectUri, email st
 		tokenStore.RefreshJwt), nil
 }
 
-func (m *modelDao) CanUsePassword(ctx context.Context, email string) (bool, *basemodel.ApiError) {
+func (m *modelDao) CanUsePassword(ctx context.Context, email string) (bool, basemodel.BaseApiError) {
 	domain, apierr := m.GetDomainByEmail(ctx, email)
 	if apierr != nil {
 		return false, apierr
@@ -110,7 +110,7 @@ func (m *modelDao) CanUsePassword(ctx context.Context, email string) (bool, *bas
 		}
 
 		if userPayload.Role != baseconst.AdminGroup {
-			return false, basemodel.BadRequest(fmt.Errorf("auth method not supported"))
+			return false, model.BadRequest(fmt.Errorf("auth method not supported"))
 		}
 
 	}
@@ -120,7 +120,7 @@ func (m *modelDao) CanUsePassword(ctx context.Context, email string) (bool, *bas
 
 // PrecheckLogin is called when the login or signup page is loaded
 // to check sso login is to be prompted
-func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (*basemodel.PrecheckResponse, *basemodel.ApiError) {
+func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (*basemodel.PrecheckResponse, basemodel.BaseApiError) {
 
 	// assume user is valid unless proven otherwise
 	resp := &basemodel.PrecheckResponse{IsUser: true, CanSelfRegister: false}
@@ -144,7 +144,7 @@ func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (
 			ssoAvailable = false
 		default:
 			zap.L().Error("feature check failed", zap.String("featureKey", model.SSO), zap.Error(err))
-			return resp, &basemodel.ApiError{Err: err, Typ: basemodel.ErrorBadData}
+			return resp, model.BadRequestStr(err.Error())
 		}
 	}
 
@@ -177,7 +177,7 @@ func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (
 			siteUrl, err := url.Parse(escapedUrl)
 			if err != nil {
 				zap.L().Error("failed to parse referer", zap.Error(err))
-				return resp, basemodel.InternalError(fmt.Errorf("failed to generate login request"))
+				return resp, model.InternalError(fmt.Errorf("failed to generate login request"))
 			}
 
 			// build Idp URL that will authenticat the user
@@ -186,7 +186,7 @@ func (m *modelDao) PrecheckLogin(ctx context.Context, email, sourceUrl string) (
 
 			if err != nil {
 				zap.L().Error("failed to prepare saml request for domain", zap.String("domain", orgDomain.Name), zap.Error(err))
-				return resp, basemodel.InternalError(err)
+				return resp, model.InternalError(err)
 			}
 
 			// set SSO to true, as the url is generated correctly

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

@@ -76,47 +76,47 @@ func (m *modelDao) GetDomainFromSsoResponse(ctx context.Context, relayState *url
 }
 
 // GetDomainByName returns org domain for a given domain name
-func (m *modelDao) GetDomainByName(ctx context.Context, name string) (*model.OrgDomain, *basemodel.ApiError) {
+func (m *modelDao) GetDomainByName(ctx context.Context, name string) (*model.OrgDomain, basemodel.BaseApiError) {
 
 	stored := StoredDomain{}
 	err := m.DB().Get(&stored, `SELECT * FROM org_domains WHERE name=$1 LIMIT 1`, name)
 
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return nil, basemodel.BadRequest(fmt.Errorf("invalid domain name"))
+			return nil, model.BadRequest(fmt.Errorf("invalid domain name"))
 		}
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 
 	domain := &model.OrgDomain{Id: stored.Id, Name: stored.Name, OrgId: stored.OrgId}
 	if err := domain.LoadConfig(stored.Data); err != nil {
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 	return domain, nil
 }
 
 // GetDomain returns org domain for a given domain id
-func (m *modelDao) GetDomain(ctx context.Context, id uuid.UUID) (*model.OrgDomain, *basemodel.ApiError) {
+func (m *modelDao) GetDomain(ctx context.Context, id uuid.UUID) (*model.OrgDomain, basemodel.BaseApiError) {
 
 	stored := StoredDomain{}
 	err := m.DB().Get(&stored, `SELECT * FROM org_domains WHERE id=$1 LIMIT 1`, id)
 
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return nil, basemodel.BadRequest(fmt.Errorf("invalid domain id"))
+			return nil, model.BadRequest(fmt.Errorf("invalid domain id"))
 		}
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 
 	domain := &model.OrgDomain{Id: stored.Id, Name: stored.Name, OrgId: stored.OrgId}
 	if err := domain.LoadConfig(stored.Data); err != nil {
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 	return domain, nil
 }
 
 // ListDomains gets the list of auth domains by org id
-func (m *modelDao) ListDomains(ctx context.Context, orgId string) ([]model.OrgDomain, *basemodel.ApiError) {
+func (m *modelDao) ListDomains(ctx context.Context, orgId string) ([]model.OrgDomain, basemodel.BaseApiError) {
 	domains := []model.OrgDomain{}
 
 	stored := []StoredDomain{}
@@ -126,7 +126,7 @@ func (m *modelDao) ListDomains(ctx context.Context, orgId string) ([]model.OrgDo
 		if err == sql.ErrNoRows {
 			return []model.OrgDomain{}, nil
 		}
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 
 	for _, s := range stored {
@@ -141,20 +141,20 @@ func (m *modelDao) ListDomains(ctx context.Context, orgId string) ([]model.OrgDo
 }
 
 // CreateDomain creates  a new auth domain
-func (m *modelDao) CreateDomain(ctx context.Context, domain *model.OrgDomain) *basemodel.ApiError {
+func (m *modelDao) CreateDomain(ctx context.Context, domain *model.OrgDomain) basemodel.BaseApiError {
 
 	if domain.Id == uuid.Nil {
 		domain.Id = uuid.New()
 	}
 
 	if domain.OrgId == "" || domain.Name == "" {
-		return basemodel.BadRequest(fmt.Errorf("domain creation failed, missing fields: OrgId, Name "))
+		return model.BadRequest(fmt.Errorf("domain creation failed, missing fields: OrgId, Name "))
 	}
 
 	configJson, err := json.Marshal(domain)
 	if err != nil {
 		zap.L().Error("failed to unmarshal domain config", zap.Error(err))
-		return basemodel.InternalError(fmt.Errorf("domain creation failed"))
+		return model.InternalError(fmt.Errorf("domain creation failed"))
 	}
 
 	_, err = m.DB().ExecContext(ctx,
@@ -168,24 +168,24 @@ func (m *modelDao) CreateDomain(ctx context.Context, domain *model.OrgDomain) *b
 
 	if err != nil {
 		zap.L().Error("failed to insert domain in db", zap.Error(err))
-		return basemodel.InternalError(fmt.Errorf("domain creation failed"))
+		return model.InternalError(fmt.Errorf("domain creation failed"))
 	}
 
 	return nil
 }
 
 // UpdateDomain updates stored config params for a domain
-func (m *modelDao) UpdateDomain(ctx context.Context, domain *model.OrgDomain) *basemodel.ApiError {
+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")))
-		return basemodel.InternalError(fmt.Errorf("domain update failed"))
+		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))
-		return basemodel.InternalError(fmt.Errorf("domain update failed"))
+		return model.InternalError(fmt.Errorf("domain update failed"))
 	}
 
 	_, err = m.DB().ExecContext(ctx,
@@ -196,18 +196,18 @@ func (m *modelDao) UpdateDomain(ctx context.Context, domain *model.OrgDomain) *b
 
 	if err != nil {
 		zap.L().Error("domain update failed", zap.Error(err))
-		return basemodel.InternalError(fmt.Errorf("domain update failed"))
+		return model.InternalError(fmt.Errorf("domain update failed"))
 	}
 
 	return nil
 }
 
 // DeleteDomain deletes an org domain
-func (m *modelDao) DeleteDomain(ctx context.Context, id uuid.UUID) *basemodel.ApiError {
+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")))
-		return basemodel.InternalError(fmt.Errorf("domain delete failed"))
+		return model.InternalError(fmt.Errorf("domain delete failed"))
 	}
 
 	_, err := m.DB().ExecContext(ctx,
@@ -216,21 +216,21 @@ func (m *modelDao) DeleteDomain(ctx context.Context, id uuid.UUID) *basemodel.Ap
 
 	if err != nil {
 		zap.L().Error("domain delete failed", zap.Error(err))
-		return basemodel.InternalError(fmt.Errorf("domain delete failed"))
+		return model.InternalError(fmt.Errorf("domain delete failed"))
 	}
 
 	return nil
 }
 
-func (m *modelDao) GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, *basemodel.ApiError) {
+func (m *modelDao) GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, basemodel.BaseApiError) {
 
 	if email == "" {
-		return nil, basemodel.BadRequest(fmt.Errorf("could not find auth domain, missing fields: email "))
+		return nil, model.BadRequest(fmt.Errorf("could not find auth domain, missing fields: email "))
 	}
 
 	components := strings.Split(email, "@")
 	if len(components) < 2 {
-		return nil, basemodel.BadRequest(fmt.Errorf("invalid email address"))
+		return nil, model.BadRequest(fmt.Errorf("invalid email address"))
 	}
 
 	parsedDomain := components[1]
@@ -242,12 +242,12 @@ func (m *modelDao) GetDomainByEmail(ctx context.Context, email string) (*model.O
 		if err == sql.ErrNoRows {
 			return nil, nil
 		}
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 
 	domain := &model.OrgDomain{Id: stored.Id, Name: stored.Name, OrgId: stored.OrgId}
 	if err := domain.LoadConfig(stored.Data); err != nil {
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 	return domain, nil
 }

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

@@ -11,7 +11,7 @@ import (
 	"go.uber.org/zap"
 )
 
-func (m *modelDao) CreatePAT(ctx context.Context, p model.PAT) (model.PAT, *basemodel.ApiError) {
+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)",
 		p.UserID,
@@ -27,12 +27,12 @@ func (m *modelDao) CreatePAT(ctx context.Context, p model.PAT) (model.PAT, *base
 	)
 	if err != nil {
 		zap.L().Error("Failed to insert PAT in db, err: %v", zap.Error(err))
-		return model.PAT{}, basemodel.InternalError(fmt.Errorf("PAT insertion failed"))
+		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))
-		return model.PAT{}, basemodel.InternalError(fmt.Errorf("PAT insertion failed"))
+		return model.PAT{}, model.InternalError(fmt.Errorf("PAT insertion failed"))
 	}
 	p.Id = strconv.Itoa(int(id))
 	createdByUser, _ := m.GetUser(ctx, p.UserID)
@@ -53,7 +53,7 @@ func (m *modelDao) CreatePAT(ctx context.Context, p model.PAT) (model.PAT, *base
 	return p, nil
 }
 
-func (m *modelDao) UpdatePAT(ctx context.Context, p model.PAT, id string) *basemodel.ApiError {
+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,
@@ -63,29 +63,29 @@ func (m *modelDao) UpdatePAT(ctx context.Context, p model.PAT, id string) *basem
 		id)
 	if err != nil {
 		zap.L().Error("Failed to update PAT in db, err: %v", zap.Error(err))
-		return basemodel.InternalError(fmt.Errorf("PAT update failed"))
+		return model.InternalError(fmt.Errorf("PAT update failed"))
 	}
 	return nil
 }
 
-func (m *modelDao) UpdatePATLastUsed(ctx context.Context, token string, lastUsed int64) *basemodel.ApiError {
+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 basemodel.InternalError(fmt.Errorf("PAT last used update failed"))
+		return model.InternalError(fmt.Errorf("PAT last used update failed"))
 	}
 	return nil
 }
 
-func (m *modelDao) ListPATs(ctx context.Context) ([]model.PAT, *basemodel.ApiError) {
+func (m *modelDao) ListPATs(ctx context.Context) ([]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))
-		return nil, basemodel.InternalError(fmt.Errorf("failed to fetch PATs"))
+		return nil, model.InternalError(fmt.Errorf("failed to fetch PATs"))
 	}
 	for i := range pats {
 		createdByUser, _ := m.GetUser(ctx, pats[i].UserID)
@@ -123,28 +123,28 @@ func (m *modelDao) ListPATs(ctx context.Context) ([]model.PAT, *basemodel.ApiErr
 	return pats, nil
 }
 
-func (m *modelDao) RevokePAT(ctx context.Context, id string, userID string) *basemodel.ApiError {
+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)
 	if err != nil {
 		zap.L().Error("Failed to revoke PAT in db, err: %v", zap.Error(err))
-		return basemodel.InternalError(fmt.Errorf("PAT revoke failed"))
+		return model.InternalError(fmt.Errorf("PAT revoke failed"))
 	}
 	return nil
 }
 
-func (m *modelDao) GetPAT(ctx context.Context, token string) (*model.PAT, *basemodel.ApiError) {
+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 {
-		return nil, basemodel.InternalError(fmt.Errorf("failed to fetch PAT"))
+		return nil, model.InternalError(fmt.Errorf("failed to fetch PAT"))
 	}
 
 	if len(pats) != 1 {
-		return nil, &basemodel.ApiError{
-			Typ: basemodel.ErrorInternal,
+		return nil, &model.ApiError{
+			Typ: model.ErrorInternal,
 			Err: fmt.Errorf("found zero or multiple PATs with same token, %s", token),
 		}
 	}
@@ -152,16 +152,16 @@ func (m *modelDao) GetPAT(ctx context.Context, token string) (*model.PAT, *basem
 	return &pats[0], nil
 }
 
-func (m *modelDao) GetPATByID(ctx context.Context, id string) (*model.PAT, *basemodel.ApiError) {
+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 {
-		return nil, basemodel.InternalError(fmt.Errorf("failed to fetch PAT"))
+		return nil, model.InternalError(fmt.Errorf("failed to fetch PAT"))
 	}
 
 	if len(pats) != 1 {
-		return nil, &basemodel.ApiError{
-			Typ: basemodel.ErrorInternal,
+		return nil, &model.ApiError{
+			Typ: model.ErrorInternal,
 			Err: fmt.Errorf("found zero or multiple PATs with same token"),
 		}
 	}
@@ -170,7 +170,7 @@ func (m *modelDao) GetPATByID(ctx context.Context, id string) (*model.PAT, *base
 }
 
 // deprecated
-func (m *modelDao) GetUserByPAT(ctx context.Context, token string) (*basemodel.UserPayload, *basemodel.ApiError) {
+func (m *modelDao) GetUserByPAT(ctx context.Context, token string) (*basemodel.UserPayload, basemodel.BaseApiError) {
 	users := []basemodel.UserPayload{}
 
 	query := `SELECT
@@ -186,12 +186,12 @@ func (m *modelDao) GetUserByPAT(ctx context.Context, token string) (*basemodel.U
 			  WHERE u.id = p.user_id and p.token=? and p.expires_at >= strftime('%s', 'now');`
 
 	if err := m.DB().Select(&users, query, token); err != nil {
-		return nil, basemodel.InternalError(fmt.Errorf("failed to fetch user from PAT, err: %v", err))
+		return nil, model.InternalError(fmt.Errorf("failed to fetch user from PAT, err: %v", err))
 	}
 
 	if len(users) != 1 {
-		return nil, &basemodel.ApiError{
-			Typ: basemodel.ErrorInternal,
+		return nil, &model.ApiError{
+			Typ: model.ErrorInternal,
 			Err: fmt.Errorf("found zero or multiple users with same PAT token"),
 		}
 	}

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

@@ -2,6 +2,11 @@ package signozio
 
 type status string
 
+const (
+	statusSuccess status = "success"
+	statusError   status = "error"
+)
+
 type ActivationResult struct {
 	Status    status              `json:"status"`
 	Data      *ActivationResponse `json:"data,omitempty"`

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

@@ -13,7 +13,6 @@ import (
 
 	"go.signoz.io/signoz/ee/query-service/constants"
 	"go.signoz.io/signoz/ee/query-service/model"
-	basemodel "go.signoz.io/signoz/pkg/query-service/model"
 )
 
 var C *Client
@@ -38,7 +37,7 @@ func init() {
 }
 
 // ActivateLicense sends key to license.signoz.io and gets activation data
-func ActivateLicense(key, siteId string) (*ActivationResponse, *basemodel.ApiError) {
+func ActivateLicense(key, siteId string) (*ActivationResponse, *model.ApiError) {
 	licenseReq := map[string]string{
 		"key":    key,
 		"siteId": siteId,
@@ -49,13 +48,13 @@ func ActivateLicense(key, siteId string) (*ActivationResponse, *basemodel.ApiErr
 
 	if err != nil {
 		zap.L().Error("failed to connect to license.signoz.io", zap.Error(err))
-		return nil, basemodel.BadRequest(fmt.Errorf("unable to connect with license.signoz.io, please check your network connection"))
+		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))
-		return nil, basemodel.BadRequest(fmt.Errorf("failed to read activation response from license.signoz.io"))
+		return nil, model.BadRequest(fmt.Errorf("failed to read activation response from license.signoz.io"))
 	}
 
 	defer httpResponse.Body.Close()
@@ -65,22 +64,22 @@ func ActivateLicense(key, siteId string) (*ActivationResponse, *basemodel.ApiErr
 	err = json.Unmarshal(httpBody, &result)
 	if err != nil {
 		zap.L().Error("failed to marshal activation response from license.signoz.io", zap.Error(err))
-		return nil, basemodel.InternalError(errors.Wrap(err, "failed to marshal license activation response"))
+		return nil, model.InternalError(errors.Wrap(err, "failed to marshal license activation response"))
 	}
 
 	switch httpResponse.StatusCode {
 	case 200, 201:
 		return result.Data, nil
 	case 400, 401:
-		return nil, basemodel.BadRequest(fmt.Errorf(fmt.Sprintf("failed to activate: %s", result.Error)))
+		return nil, model.BadRequest(fmt.Errorf(fmt.Sprintf("failed to activate: %s", result.Error)))
 	default:
-		return nil, basemodel.InternalError(fmt.Errorf(fmt.Sprintf("failed to activate: %s", result.Error)))
+		return nil, model.InternalError(fmt.Errorf(fmt.Sprintf("failed to activate: %s", result.Error)))
 	}
 
 }
 
 // ValidateLicense validates the license key
-func ValidateLicense(activationId string) (*ActivationResponse, *basemodel.ApiError) {
+func ValidateLicense(activationId string) (*ActivationResponse, *model.ApiError) {
 	validReq := map[string]string{
 		"activationId": activationId,
 	}
@@ -89,12 +88,12 @@ func ValidateLicense(activationId string) (*ActivationResponse, *basemodel.ApiEr
 	response, err := http.Post(C.Prefix+"/licenses/validate", APPLICATION_JSON, bytes.NewBuffer(reqString))
 
 	if err != nil {
-		return nil, basemodel.BadRequest(errors.Wrap(err, "unable to connect with license.signoz.io, please check your network connection"))
+		return nil, model.BadRequest(errors.Wrap(err, "unable to connect with license.signoz.io, please check your network connection"))
 	}
 
 	body, err := io.ReadAll(response.Body)
 	if err != nil {
-		return nil, basemodel.BadRequest(errors.Wrap(err, "failed to read validation response from license.signoz.io"))
+		return nil, model.BadRequest(errors.Wrap(err, "failed to read validation response from license.signoz.io"))
 	}
 
 	defer response.Body.Close()
@@ -104,14 +103,14 @@ func ValidateLicense(activationId string) (*ActivationResponse, *basemodel.ApiEr
 		a := ActivationResult{}
 		err = json.Unmarshal(body, &a)
 		if err != nil {
-			return nil, basemodel.BadRequest(errors.Wrap(err, "failed to marshal license validation response"))
+			return nil, model.BadRequest(errors.Wrap(err, "failed to marshal license validation response"))
 		}
 		return a.Data, nil
 	case 400, 401:
-		return nil, basemodel.BadRequest(errors.Wrap(fmt.Errorf(string(body)),
+		return nil, model.BadRequest(errors.Wrap(fmt.Errorf(string(body)),
 			"bad request error received from license.signoz.io"))
 	default:
-		return nil, basemodel.InternalError(errors.Wrap(fmt.Errorf(string(body)),
+		return nil, model.InternalError(errors.Wrap(fmt.Errorf(string(body)),
 			"internal error received from license.signoz.io"))
 	}
 
@@ -128,21 +127,21 @@ func NewPostRequestWithCtx(ctx context.Context, url string, contentType string,
 }
 
 // SendUsage reports the usage of signoz to license server
-func SendUsage(ctx context.Context, usage model.UsagePayload) *basemodel.ApiError {
+func SendUsage(ctx context.Context, usage model.UsagePayload) *model.ApiError {
 	reqString, _ := json.Marshal(usage)
 	req, err := NewPostRequestWithCtx(ctx, C.Prefix+"/usage", APPLICATION_JSON, bytes.NewBuffer(reqString))
 	if err != nil {
-		return basemodel.BadRequest(errors.Wrap(err, "unable to create http request"))
+		return model.BadRequest(errors.Wrap(err, "unable to create http request"))
 	}
 
 	res, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return basemodel.BadRequest(errors.Wrap(err, "unable to connect with license.signoz.io, please check your network connection"))
+		return model.BadRequest(errors.Wrap(err, "unable to connect with license.signoz.io, please check your network connection"))
 	}
 
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
-		return basemodel.BadRequest(errors.Wrap(err, "failed to read usage response from license.signoz.io"))
+		return model.BadRequest(errors.Wrap(err, "failed to read usage response from license.signoz.io"))
 	}
 
 	defer res.Body.Close()
@@ -151,10 +150,10 @@ func SendUsage(ctx context.Context, usage model.UsagePayload) *basemodel.ApiErro
 	case 200, 201:
 		return nil
 	case 400, 401:
-		return basemodel.BadRequest(errors.Wrap(fmt.Errorf(string(body)),
+		return model.BadRequest(errors.Wrap(fmt.Errorf(string(body)),
 			"bad request error received from license.signoz.io"))
 	default:
-		return basemodel.InternalError(errors.Wrap(fmt.Errorf(string(body)),
+		return model.InternalError(errors.Wrap(fmt.Errorf(string(body)),
 			"internal error received from license.signoz.io"))
 	}
 }

ee/query-service/license/db.go

@@ -111,7 +111,7 @@ func (r *Repo) UpdatePlanDetails(ctx context.Context,
 	planDetails string) error {
 
 	if key == "" {
-		return fmt.Errorf("update plan details failed: license key is required")
+		return fmt.Errorf("Update Plan Details failed: license key is required")
 	}
 
 	query := `UPDATE licenses 

ee/query-service/license/manager.go

@@ -137,11 +137,11 @@ func (lm *Manager) LoadActiveLicense(features ...basemodel.Feature) error {
 	return nil
 }
 
-func (lm *Manager) GetLicenses(ctx context.Context) (response []model.License, apiError *basemodel.ApiError) {
+func (lm *Manager) GetLicenses(ctx context.Context) (response []model.License, apiError *model.ApiError) {
 
 	licenses, err := lm.repo.GetLicenses(ctx)
 	if err != nil {
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 
 	for _, l := range licenses {
@@ -212,8 +212,8 @@ 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.Any("apiError", apiError))
-		return apiError
+		zap.L().Error("failed to validate license", zap.Error(apiError.Err))
+		return apiError.Err
 	}
 
 	if response.PlanDetails == lm.activeLicense.PlanDetails {
@@ -255,7 +255,7 @@ func (lm *Manager) Validate(ctx context.Context) (reterr error) {
 }
 
 // Activate activates a license key with signoz server
-func (lm *Manager) Activate(ctx context.Context, key string) (licenseResponse *model.License, errResponse *basemodel.ApiError) {
+func (lm *Manager) Activate(ctx context.Context, key string) (licenseResponse *model.License, errResponse *model.ApiError) {
 	defer func() {
 		if errResponse != nil {
 			userEmail, err := auth.GetEmailFromJwt(ctx)
@@ -268,7 +268,7 @@ func (lm *Manager) Activate(ctx context.Context, key string) (licenseResponse *m
 
 	response, apiError := validate.ActivateLicense(key, "")
 	if apiError != nil {
-		zap.L().Error("failed to activate license", zap.Any("apiError", apiError))
+		zap.L().Error("failed to activate license", zap.Error(apiError.Err))
 		return nil, apiError
 	}
 
@@ -283,14 +283,14 @@ func (lm *Manager) Activate(ctx context.Context, key string) (licenseResponse *m
 
 	if err != nil {
 		zap.L().Error("failed to activate license", zap.Error(err))
-		return nil, basemodel.InternalError(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))
-		return nil, basemodel.InternalError(err)
+		return nil, model.InternalError(err)
 	}
 
 	// license is valid, activate it

ee/query-service/license/sqlite/init.go

@@ -32,7 +32,7 @@ func InitDB(db *sqlx.DB) error {
 
 	_, err = db.Exec(table_schema)
 	if err != nil {
-		return fmt.Errorf("error in creating licenses table: %s", err.Error())
+		return fmt.Errorf("Error in creating licenses table: %s", err.Error())
 	}
 
 	table_schema = `CREATE TABLE IF NOT EXISTS feature_status (
@@ -45,7 +45,7 @@ func InitDB(db *sqlx.DB) error {
 
 	_, err = db.Exec(table_schema)
 	if err != nil {
-		return fmt.Errorf("error in creating feature_status table: %s", err.Error())
+		return fmt.Errorf("Error in creating feature_status table: %s", err.Error())
 	}
 
 	return nil

ee/query-service/main.go

@@ -14,6 +14,7 @@ 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/migrate"
 	"go.signoz.io/signoz/pkg/query-service/version"
@@ -51,8 +52,7 @@ func initZapLog(enableQueryServiceLogOTLPExport bool) *zap.Logger {
 	)
 
 	if enableQueryServiceLogOTLPExport {
-		ctx, cancel := context.WithTimeout(ctx, time.Second*30)
-		defer cancel()
+		ctx, _ := context.WithTimeout(ctx, time.Second*30)
 		conn, err := grpc.DialContext(ctx, baseconst.OTLPTarget, grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 		if err != nil {
 			log.Fatalf("failed to establish connection: %v", err)
@@ -148,7 +148,7 @@ func main() {
 		zap.L().Info("JWT secret key set successfully.")
 	}
 
-	if err := migrate.Migrate(baseconst.RELATIONAL_DATASOURCE_PATH); err != nil {
+	if err := migrate.Migrate(constants.RELATIONAL_DATASOURCE_PATH); err != nil {
 		zap.L().Error("Failed to migrate", zap.Error(err))
 	} else {
 		zap.L().Info("Migration successful")

ee/query-service/model/domain.go

@@ -104,7 +104,7 @@ func (od *OrgDomain) GetSAMLCert() string {
 // 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 OAUTH is not setup correctly for this domain")
+		return nil, fmt.Errorf("Google auth is not setup correctly for this domain")
 	}
 
 	return od.GoogleAuthConfig.GetProvider(od.Name, siteUrl)

ee/query-service/model/errors.go

@@ -1,5 +1,107 @@
 package model
 
+import (
+	"fmt"
+
+	basemodel "go.signoz.io/signoz/pkg/query-service/model"
+)
+
+type ApiError struct {
+	Typ basemodel.ErrorType
+	Err error
+}
+
+func (a *ApiError) Type() basemodel.ErrorType {
+	return a.Typ
+}
+
+func (a *ApiError) ToError() error {
+	if a != nil {
+		return a.Err
+	}
+	return a.Err
+}
+
+func (a *ApiError) Error() string {
+	return a.Err.Error()
+}
+
+func (a *ApiError) IsNil() bool {
+	return a == nil || a.Err == nil
+}
+
+// NewApiError returns a ApiError object of given type
+func NewApiError(typ basemodel.ErrorType, err error) *ApiError {
+	return &ApiError{
+		Typ: typ,
+		Err: err,
+	}
+}
+
+// BadRequest returns a ApiError object of bad request
+func BadRequest(err error) *ApiError {
+	return &ApiError{
+		Typ: basemodel.ErrorBadData,
+		Err: err,
+	}
+}
+
+// BadRequestStr returns a ApiError object of bad request for string input
+func BadRequestStr(s string) *ApiError {
+	return &ApiError{
+		Typ: basemodel.ErrorBadData,
+		Err: fmt.Errorf(s),
+	}
+}
+
+// InternalError returns a ApiError object of internal type
+func InternalError(err error) *ApiError {
+	return &ApiError{
+		Typ: basemodel.ErrorInternal,
+		Err: err,
+	}
+}
+
+// InternalErrorStr returns a ApiError object of internal type for string input
+func InternalErrorStr(s string) *ApiError {
+	return &ApiError{
+		Typ: basemodel.ErrorInternal,
+		Err: fmt.Errorf(s),
+	}
+}
+
+var (
+	ErrorNone                  basemodel.ErrorType = ""
+	ErrorTimeout               basemodel.ErrorType = "timeout"
+	ErrorCanceled              basemodel.ErrorType = "canceled"
+	ErrorExec                  basemodel.ErrorType = "execution"
+	ErrorBadData               basemodel.ErrorType = "bad_data"
+	ErrorInternal              basemodel.ErrorType = "internal"
+	ErrorUnavailable           basemodel.ErrorType = "unavailable"
+	ErrorNotFound              basemodel.ErrorType = "not_found"
+	ErrorNotImplemented        basemodel.ErrorType = "not_implemented"
+	ErrorUnauthorized          basemodel.ErrorType = "unauthorized"
+	ErrorForbidden             basemodel.ErrorType = "forbidden"
+	ErrorConflict              basemodel.ErrorType = "conflict"
+	ErrorStreamingNotSupported basemodel.ErrorType = "streaming is not supported"
+)
+
+func init() {
+	ErrorNone = basemodel.ErrorNone
+	ErrorTimeout = basemodel.ErrorTimeout
+	ErrorCanceled = basemodel.ErrorCanceled
+	ErrorExec = basemodel.ErrorExec
+	ErrorBadData = basemodel.ErrorBadData
+	ErrorInternal = basemodel.ErrorInternal
+	ErrorUnavailable = basemodel.ErrorUnavailable
+	ErrorNotFound = basemodel.ErrorNotFound
+	ErrorNotImplemented = basemodel.ErrorNotImplemented
+	ErrorUnauthorized = basemodel.ErrorUnauthorized
+	ErrorForbidden = basemodel.ErrorForbidden
+	ErrorConflict = basemodel.ErrorConflict
+	ErrorStreamingNotSupported = basemodel.ErrorStreamingNotSupported
+}
+
 type ErrUnsupportedAuth struct{}
 
 func (errUnsupportedAuth ErrUnsupportedAuth) Error() string {

ee/query-service/usage/manager.go

@@ -53,7 +53,7 @@ func New(dbType string, modelDao dao.ModelDao, licenseRepo *license.Repo, clickh
 	tenantID := ""
 	if len(hostNameRegexMatches) == 2 {
 		tenantID = hostNameRegexMatches[1]
-		tenantID = strings.TrimSuffix(tenantID, "-clickhouse")
+		tenantID = strings.TrimRight(tenantID, "-clickhouse")
 	}
 
 	m := &Manager{
@@ -190,7 +190,7 @@ func (lm *Manager) UploadUsageWithExponentalBackOff(ctx context.Context, payload
 		} 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.Any("apiErr", apiErr))
+			zap.L().Error("failed to upload snapshot retrying after %v secs : %v", zap.Duration("sleepDuration", sleepDuration), zap.Error(apiErr.Err))
 			time.Sleep(sleepDuration)
 		} else {
 			break

frontend/public/Icons/alert_emoji.svg

@@ -1,10 +0,0 @@
-<svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.99715 27.2944C4.70156 27.2944 4.74156 27.6477 4.74156 28.3143C4.74156 28.981 4.70156 29.3543 5.05493 29.3543C5.40831 29.3543 27.7778 29.3143 28.0134 29.2965C28.2489 29.2765 28.1889 28.4143 28.1889 28.081C28.1889 27.6699 28.2467 27.3166 27.9156 27.2966C27.5822 27.2766 5.11494 27.2944 4.99715 27.2944Z" fill="#ED6D30"/>
-<path d="M5.07275 21.8602L5.09498 27.3132L27.7956 27.291L27.8467 21.7135L27.3466 21.1536L5.255 21.1158L5.07275 21.8602Z" fill="#F78A51"/>
-<path d="M5.53728 21.4707L5.07278 21.8596L5.07056 22.724C5.07056 22.724 5.22169 22.8306 5.37282 22.7551C5.52395 22.6795 5.73508 22.5329 5.92177 22.5173C6.21959 22.4951 6.19514 22.7795 6.48184 22.7795C6.76855 22.7795 7.02858 22.4929 7.27083 22.4929C7.51308 22.4929 7.62421 22.7995 7.88202 22.784C8.13983 22.7684 8.28429 22.5084 8.60655 22.5173C8.86436 22.524 8.90881 22.784 9.22663 22.784C9.54445 22.784 9.70669 22.4818 9.97784 22.4818C10.249 22.4818 10.3379 22.8018 10.6401 22.8018C10.9424 22.8018 11.0246 22.4818 11.3713 22.4818C11.7181 22.4818 11.6892 22.784 11.9759 22.7529C12.2626 22.7218 12.2915 22.4729 12.6382 22.4573C12.9849 22.4418 13.0204 22.784 13.3227 22.784C13.625 22.784 13.6161 22.5373 13.8739 22.5373C14.1317 22.5373 18.9145 22.5262 19.0968 22.5262C19.279 22.5262 19.559 22.8462 19.8613 22.8462C20.1636 22.8462 20.0791 22.504 20.4103 22.4951C20.6081 22.4907 20.9925 22.824 21.2192 22.824C21.4459 22.824 21.5282 22.4818 21.7838 22.4662C22.0393 22.4507 22.4194 22.844 22.7217 22.8129C23.0239 22.7818 22.8728 22.4796 23.0995 22.4507C23.3262 22.4196 23.7796 22.784 24.0818 22.7973C24.3841 22.8129 24.1885 22.404 24.5041 22.404C24.8197 22.404 25.0642 22.7507 25.3953 22.7662C25.7265 22.7818 25.502 22.4196 25.8332 22.3884C26.1643 22.3573 26.4066 22.8418 26.7244 22.8106C27.0422 22.7795 26.9066 22.4329 27.1778 22.4173C27.4489 22.4018 27.8267 22.644 27.8267 22.644L27.8401 21.7063L14.7807 17.582L5.53728 21.4707Z" fill="#ED6D30"/>
-<path d="M13.8049 29.3267C13.8049 29.3267 13.8605 22.7804 13.8516 22.6204C13.8405 22.4271 14.0116 22.3804 14.1494 22.3804C14.2871 22.3804 18.8558 22.3804 18.9935 22.3804C19.1313 22.3804 19.2113 22.4827 19.2224 22.6093C19.2335 22.736 19.2002 29.3156 19.2002 29.3156L13.8049 29.3267Z" fill="#51362F"/>
-<path d="M4.15465 18.7244C4.15465 18.7244 3.23898 20.7487 3.24787 20.902C3.25676 21.0553 3.51234 21.9864 3.92128 22.0109C4.48135 22.0442 4.58359 21.5531 4.67693 21.5531C4.77028 21.5531 4.89474 22.0331 5.21478 22.0797C5.58816 22.1331 5.85708 21.5331 6.00154 21.5331C6.14601 21.5331 6.21713 22.0553 6.55495 22.0553C6.89277 22.0553 7.25281 21.4909 7.38616 21.502C7.51951 21.5131 7.64842 22.102 7.92401 22.102C8.20182 22.102 8.47296 21.5998 8.71299 21.5753C8.83745 21.5642 8.95525 22.1375 9.18194 22.1464C9.40864 22.1575 9.79535 21.5531 9.99093 21.5531C10.1865 21.5531 10.3399 22.1775 10.6377 22.1486C10.9355 22.1197 11.3378 21.5642 11.48 21.5642C11.6222 21.5642 11.7778 22.1264 12.0112 22.1375C12.2223 22.1464 12.5713 21.6087 12.7135 21.5998C12.8557 21.5909 13.0269 22.1486 13.2625 22.1486C13.498 22.1486 13.7536 21.5442 13.9492 21.5331C14.1448 21.522 14.227 22.102 14.4626 22.102C14.6982 22.102 15.0471 21.5175 15.2627 21.5087C15.4783 21.4975 15.5961 22.0686 15.8117 22.0686C16.0272 22.0686 16.2673 21.4887 16.4206 21.482C16.6584 21.4731 16.8096 22.0464 17.1385 22.0575C17.4674 22.0686 17.6008 21.5042 17.8564 21.5042C18.1119 21.5042 18.1853 22.0375 18.472 22.0486C18.7587 22.0597 18.9943 21.4953 19.2099 21.5042C19.4254 21.5153 19.5677 22.0264 19.8055 22.0264C20.0433 22.0264 20.2767 21.5042 20.4522 21.5131C20.6256 21.5242 20.8634 22.0464 21.099 22.0464C21.3346 22.0464 21.5302 21.5064 21.6435 21.502C21.8613 21.4953 22.0836 22.0664 22.3102 22.0464C22.5369 22.0264 22.7992 21.4642 22.9948 21.4731C23.1904 21.4842 23.4904 22.1108 23.726 22.0909C23.9616 22.0709 24.1616 21.4753 24.3772 21.4842C24.5928 21.4931 24.7661 22.0331 25.0395 22.0331C25.2906 22.0331 25.4306 21.5175 25.6573 21.5064C25.884 21.4953 26.0952 21.9997 26.3308 21.9753C26.5663 21.9509 26.6619 21.482 26.8686 21.4731C27.0731 21.462 27.3753 22.0042 27.6731 21.9931C27.971 21.982 28.1243 21.562 28.2888 21.5531C28.4532 21.5442 28.5955 22.0109 28.9955 22.0042C29.3556 21.9997 29.8267 21.3264 29.7334 20.8554C29.6401 20.3843 28.3599 18.5066 28.3599 18.5066L4.15465 18.7244Z" fill="#6C4D43"/>
-<path d="M6.09496 13.357C6.09496 13.357 4.90148 15.0328 4.1925 16.5641C3.48352 18.0954 3.21016 19.0022 3.16571 19.8956C3.12126 20.7691 3.24794 20.9024 3.24794 20.9024L4.54366 19.4867C4.54366 19.4867 4.55699 20.8247 4.65256 20.838C4.74813 20.8513 5.74603 19.4578 5.8127 19.4445C5.8816 19.4311 5.8816 20.8513 5.97717 20.8513C6.07274 20.8513 7.09731 19.4178 7.16621 19.4178C7.2351 19.4178 7.26177 20.838 7.34401 20.838C7.42624 20.838 8.35524 19.3911 8.42414 19.4045C8.49304 19.4178 8.73751 20.9202 8.81975 20.9202C8.90198 20.9202 9.76209 19.3911 9.85765 19.3911C9.95322 19.3911 10.0621 20.9758 10.171 20.9758C10.2799 20.9758 11.1267 19.4467 11.1956 19.4467C11.2645 19.4467 11.5379 20.9625 11.6468 20.9491C11.7557 20.9358 12.5069 19.4467 12.5758 19.4734C12.6447 19.5 12.8225 20.9358 12.9447 20.9358C13.0669 20.9358 13.7226 19.4334 13.8315 19.4334C13.9404 19.4334 14.216 20.8913 14.2982 20.8913C14.3804 20.8913 15.0627 19.4289 15.145 19.4156C15.2272 19.4023 15.665 21.0269 15.8006 21.0269C15.9362 21.0269 16.3474 19.5245 16.4429 19.5378C16.5385 19.5512 17.1808 20.9713 17.2341 20.9713C17.2875 20.9713 17.7675 19.4823 17.8209 19.4823C17.8742 19.4823 18.5165 20.8335 18.6121 20.8491C18.7076 20.8624 19.0632 19.4978 19.1321 19.5245C19.201 19.5512 19.8567 20.958 19.9389 20.9713C20.0211 20.9847 20.3078 19.4956 20.3901 19.4956C20.4723 19.4956 21.3724 21.1336 21.4413 21.1202C21.5102 21.1069 21.5925 19.4667 21.6725 19.4534C21.7547 19.44 22.8326 21.0647 22.9148 21.0513C22.9971 21.038 22.9548 19.3978 23.0104 19.3978C23.066 19.3978 23.9527 20.9269 24.075 20.9136C24.1972 20.9002 24.3061 19.48 24.3884 19.48C24.4706 19.48 25.4529 21.1469 25.5774 21.1336C25.7019 21.1202 25.6041 19.5756 25.6596 19.5623C25.7152 19.5489 26.8198 20.9558 26.8753 20.9424C26.9309 20.9291 26.9153 19.4267 27.0109 19.4134C27.1065 19.4 28.131 20.8758 28.2266 20.8469C28.3222 20.8202 28.3355 19.3445 28.3911 19.3311C28.4466 19.3178 29.7268 20.8535 29.7268 20.8535C29.7268 20.8535 29.9757 19.5178 29.5357 18.2377C29.0956 16.9575 28.0266 15.1595 27.5087 14.395C26.9931 13.6304 26.6909 13.277 26.6909 13.277L14.0648 11.6591L6.09496 13.357Z" fill="#A37F69"/>
-<path d="M10.4736 8.22084C10.4736 8.22084 8.78668 9.88105 7.98214 10.8412C7.17759 11.8013 6.09301 13.3548 6.09301 13.3548C6.09301 13.3548 5.69963 15.1728 5.8152 15.1862C5.93299 15.1995 7.08647 13.4615 7.19093 13.4726C7.29539 13.4859 7.02202 15.2239 7.12648 15.2506C7.23093 15.2773 8.51554 13.4482 8.57999 13.4348C8.64444 13.4215 8.3733 15.2373 8.4622 15.2639C8.5511 15.2906 9.85126 13.4482 9.92905 13.4482C10.0068 13.4482 10.1113 15.1484 10.2135 15.1484C10.3158 15.1484 11.1736 13.4237 11.2514 13.4348C11.3292 13.4482 11.5115 15.2128 11.6404 15.2373C11.7693 15.2639 12.3671 13.4082 12.4716 13.3948C12.576 13.3815 12.8339 15.3417 12.9516 15.3417C13.0694 15.3417 13.6917 13.4215 13.7695 13.4215C13.8473 13.4215 14.0429 15.3417 14.1718 15.3417C14.3007 15.3417 14.8852 13.3837 14.963 13.3837C15.0408 13.3837 15.5986 15.2639 15.6898 15.2395C15.7809 15.2128 16.2743 13.3593 16.3654 13.3704C16.4565 13.3837 16.8833 15.1862 17.041 15.2128C17.1966 15.2395 17.6122 13.4615 17.7411 13.4615C17.87 13.4615 18.2079 15.4329 18.3634 15.4329C18.519 15.4329 18.8702 13.4615 18.948 13.4615C19.0257 13.4615 19.7392 15.4084 19.857 15.4195C19.9747 15.4329 20.1037 13.5637 20.2459 13.5504C20.3881 13.5371 21.1549 15.4195 21.2327 15.4062C21.3105 15.3929 21.3749 13.5637 21.4527 13.5504C21.5305 13.5371 22.3995 15.2639 22.5417 15.2639C22.684 15.2639 22.5929 13.4726 22.724 13.4859C22.8529 13.4993 24.1508 15.3662 24.2686 15.3662C24.3864 15.3662 23.9308 13.4193 24.0353 13.3948C24.1397 13.3682 25.5021 15.4706 25.6443 15.4306C25.7866 15.3906 25.2821 13.5237 25.371 13.4971C25.4621 13.4704 26.8756 15.3262 27.0067 15.2751C27.1356 15.2239 26.7 13.277 26.7 13.277C26.7 13.277 25.3976 11.5768 24.7242 10.7478C24.0486 9.91661 22.9862 8.81425 22.9862 8.81425L17.7478 6.19836L10.4736 8.22084Z" fill="#BD9177"/>
-<path d="M10.4734 8.2202C10.4734 8.2202 9.83556 9.42236 9.96447 9.49791C10.0934 9.57346 11.6736 8.05576 11.8269 8.09354C11.9803 8.13131 11.3157 9.70012 11.5336 9.75123C11.7514 9.80234 12.7959 8.0291 12.9248 8.05354C13.0515 8.07798 12.6559 9.77567 12.8604 9.84011C13.0649 9.90455 13.945 7.9891 14.085 8.01576C14.225 8.04021 14.1872 9.929 14.3139 9.94233C14.4406 9.95566 15.0918 8.10465 15.1807 8.10465C15.2696 8.10465 15.5252 10.0579 15.6785 10.069C15.8319 10.0823 16.2897 8.03576 16.3919 8.03576C16.4942 8.03576 17.0053 9.96677 17.172 9.96677C17.3387 9.96677 17.4387 8.01799 17.5276 7.98021C17.6165 7.94244 18.3633 9.85122 18.5767 9.85122C18.7611 9.85122 18.4478 7.95132 18.5633 7.92466C18.6789 7.90021 19.7368 9.889 19.9546 9.87789C20.1724 9.86456 19.7946 8.02243 19.8968 8.02243C19.9991 8.02243 21.1681 9.86456 21.3592 9.86456C21.5504 9.86456 20.9592 7.99132 21.0747 7.96466C21.1903 7.94021 22.9305 9.60679 23.0328 9.58013C23.135 9.55568 22.9817 8.81128 22.9817 8.81128C22.9817 8.81128 18.7833 4.49595 16.4342 4.48484C14.0339 4.47151 10.4734 8.2202 10.4734 8.2202Z" fill="#D2A590"/>
-</svg>

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

@@ -108,7 +108,7 @@
 	"user_tooltip_more_help": "More details on how to create alerts",
 	"choose_alert_type": "Choose a type for the alert",
 	"metric_based_alert": "Metric based Alert",
-	"metric_based_alert_desc": "Send a notification when a condition occurs in the metric data.",
+	"metric_based_alert_desc": "Send a notification when a condition occurs in the metric data",
 	"log_based_alert": "Log-based Alert",
 	"log_based_alert_desc": "Send a notification when a condition occurs in the logs data.",
 	"traces_based_alert": "Trace-based Alert",

frontend/public/locales/en/alerts.json

@@ -108,7 +108,7 @@
 	"user_tooltip_more_help": "More details on how to create alerts",
 	"choose_alert_type": "Choose a type for the alert",
 	"metric_based_alert": "Metric based Alert",
-	"metric_based_alert_desc": "Send a notification when a condition occurs in the metric data.",
+	"metric_based_alert_desc": "Send a notification when a condition occurs in the metric data",
 	"log_based_alert": "Log-based Alert",
 	"log_based_alert_desc": "Send a notification when a condition occurs in the logs data.",
 	"traces_based_alert": "Trace-based Alert",

frontend/src/AppRoutes/index.tsx

@@ -178,25 +178,23 @@ function App(): JSX.Element {
 	}, [pathname]);
 
 	useEffect(() => {
-		if (user && user?.email && user?.userId && user?.name) {
-			try {
-				const isThemeAnalyticsSent = getLocalStorageApi(
-					LOCALSTORAGE.THEME_ANALYTICS_V1,
-				);
-				if (!isThemeAnalyticsSent) {
-					trackEvent('Theme Analytics', {
-						theme: isDarkMode ? THEME_MODE.DARK : THEME_MODE.LIGHT,
-						user: pick(user, ['email', 'userId', 'name']),
-						org,
-					});
-					setLocalStorageApi(LOCALSTORAGE.THEME_ANALYTICS_V1, 'true');
-				}
-			} catch {
-				console.error('Failed to parse local storage theme analytics event');
+		try {
+			const isThemeAnalyticsSent = getLocalStorageApi(
+				LOCALSTORAGE.THEME_ANALYTICS,
+			);
+			if (!isThemeAnalyticsSent) {
+				trackEvent('Theme Analytics', {
+					theme: isDarkMode ? THEME_MODE.DARK : THEME_MODE.LIGHT,
+					user: pick(user, ['email', 'userId', 'name']),
+					org,
+				});
+				setLocalStorageApi(LOCALSTORAGE.THEME_ANALYTICS, 'true');
 			}
+		} catch {
+			console.error('Failed to parse local storage theme analytics event');
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [user]);
+	}, []);
 
 	return (
 		<ConfigProvider theme={themeConfig}>

frontend/src/AppRoutes/pageComponents.ts

@@ -11,13 +11,6 @@ export const ServiceMetricsPage = Loadable(
 		),
 );
 
-export const ServiceTopLevelOperationsPage = Loadable(
-	() =>
-		import(
-			/* webpackChunkName: "ServiceMetricsPage" */ 'pages/ServiceTopLevelOperations'
-		),
-);
-
 export const ServiceMapPage = Loadable(
 	() => import(/* webpackChunkName: "ServiceMapPage" */ 'modules/Servicemap'),
 );

frontend/src/AppRoutes/routes.ts

@@ -33,7 +33,6 @@ import {
 	ServiceMapPage,
 	ServiceMetricsPage,
 	ServicesTablePage,
-	ServiceTopLevelOperationsPage,
 	SettingsPage,
 	ShortcutsPage,
 	SignupPage,
@@ -85,13 +84,6 @@ const routes: AppRoutes[] = [
 		isPrivate: true,
 		key: 'SERVICE_METRICS',
 	},
-	{
-		path: ROUTES.SERVICE_TOP_LEVEL_OPERATIONS,
-		exact: true,
-		component: ServiceTopLevelOperationsPage,
-		isPrivate: true,
-		key: 'SERVICE_TOP_LEVEL_OPERATIONS',
-	},
 	{
 		path: ROUTES.SERVICE_MAP,
 		component: ServiceMapPage,

frontend/src/components/facingIssueBtn/FacingIssueBtn.style.scss

@@ -2,24 +2,12 @@
 	color: var(--bg-amber-500);
 	border-color: var(--bg-amber-500);
 
-	> .ant-btn:hover {
+	.ant-btn:hover {
 		color: var(--bg-amber-400) !important;
 		border-color: var(--bg-amber-300) !important;
 	}
 }
 
-.lightMode {
-	.facing-issue-button {
-		color: var(--bg-vanilla-500);
-		border-color: var(--bg-vanilla-300);
-
-		> .ant-btn:hover {
-			color: var(--bg-vanilla-500) !important;
-			border-color: var(--bg-vanilla-300) !important;
-		}
-	}
-}
-
 .tooltip-overlay {
 	text-wrap: nowrap;
 	.ant-tooltip-inner {

frontend/src/constants/localStorage.ts

@@ -18,5 +18,5 @@ export enum LOCALSTORAGE {
 	DASHBOARD_VARIABLES = 'DASHBOARD_VARIABLES',
 	SHOW_EXPLORER_TOOLBAR = 'SHOW_EXPLORER_TOOLBAR',
 	PINNED_ATTRIBUTES = 'PINNED_ATTRIBUTES',
-	THEME_ANALYTICS_V1 = 'THEME_ANALYTICS_V1',
+	THEME_ANALYTICS = 'THEME_ANALYTICS',
 }

frontend/src/constants/queryBuilder.ts

@@ -174,8 +174,8 @@ export const initialQueryBuilderFormValues: IBuilderQuery = {
 		sourceNames: alphabet,
 	}),
 	disabled: false,
-	stepInterval: 60,
 	having: [],
+	stepInterval: 60,
 	limit: null,
 	orderBy: [],
 	groupBy: [],

frontend/src/constants/routes.ts

@@ -2,7 +2,6 @@ const ROUTES = {
 	SIGN_UP: '/signup',
 	LOGIN: '/login',
 	SERVICE_METRICS: '/services/:servicename',
-	SERVICE_TOP_LEVEL_OPERATIONS: '/services/:servicename/top-level-operations',
 	SERVICE_MAP: '/service-map',
 	TRACE: '/trace',
 	TRACE_DETAIL: '/trace/:id',

frontend/src/constants/theme.ts

@@ -78,82 +78,6 @@ const themeColors = {
 		mediumVioletRed: '#C71585',
 		paleGreen: '#98FB98',
 	},
-	lightModeColor: {
-		robin: '#3F5ECC',
-		dodgerBlueDark: '#0C6EED',
-		steelgrey: '#2f4b7c',
-		steelpurple: '#665191',
-		steelindigo: '#a05195',
-		steelpink: '#d45087',
-		steelcoral: '#f95d6a',
-		steelorange: '#ff7c43',
-		steelgold: '#ffa600',
-		steelrust: '#de425b',
-		steelgreen: '#41967e',
-		mediumOrchidDark: '#C326FD',
-		seaBuckthornDark: '#E66E05',
-		seaGreen: '#219653',
-		turquoiseBlueDark: '#0099CC',
-		silverDark: '#757575',
-		outrageousOrangeDark: '#F9521A',
-		roseBudDark: '#EB6437',
-		deepSkyBlueDark: '#0595BD',
-		royalBlue: '#3366E6',
-		avocadoDark: '#8E8E29',
-		mintGreenDark: '#00C700',
-		chestnut: '#B34D4D',
-		limaDark: '#6E9900',
-		olive: '#809900',
-		beautyBushDark: '#E25555',
-		danube: '#6680B3',
-		oliveDrab: '#66991A',
-		lavenderRoseDark: '#F024BD',
-		electricLimeDark: '#84A800',
-		radicalRed: '#FF1A66',
-		harleyOrange: '#E6331A',
-		gladeGreen: '#66994D',
-		hemlock: '#66664D',
-		vidaLoca: '#4D8000',
-		rust: '#B33300',
-		red: '#FF0000', // Adding more colors, we need to get better colors from design team
-		blue: '#0000FF',
-		green: '#00FF00',
-		purple: '#800080',
-		magentaDark: '#EB00EB',
-		pinkDark: '#FF3D5E',
-		brown: '#A52A2A',
-		teal: '#008080',
-		limeDark: '#07A207',
-		maroon: '#800000',
-		navy: '#000080',
-		gray: '#808080',
-		skyBlueDark: '#0CA7E4',
-		indigo: '#4B0082',
-		slateGray: '#708090',
-		chocolate: '#D2691E',
-		tomato: '#FF6347',
-		steelBlue: '#4682B4',
-		peruDark: '#D16E0A',
-		darkOliveGreen: '#556B2F',
-		indianRed: '#CD5C5C',
-		mediumSlateBlue: '#7B68EE',
-		rosyBrownDark: '#CB4848',
-		darkSlateGray: '#2F4F4F',
-		fuchsia: '#FF0AFF',
-		salmonDark: '#FF432E',
-		darkSalmonDark: '#D26541',
-		paleVioletRedDark: '#E83089',
-		mediumPurple: '#9370DB',
-		darkOrchid: '#9932CC',
-		mediumSeaGreenDark: '#109E50',
-		lightCoralDark: '#F85959',
-		darkSeaGreenDark: '#509F50',
-		sandyBrownDark: '#D97117',
-		darkKhakiDark: '#99900A',
-		cornflowerBlueDark: '#3371E6',
-		mediumVioletRed: '#C71585',
-		paleGreenDark: '#0D910D',
-	},
 	errorColor: '#d32f2f',
 	royalGrey: '#888888',
 	matterhornGrey: '#555555',

frontend/src/container/AllAlertChannels/index.tsx

@@ -1,5 +1,5 @@
 import { PlusOutlined } from '@ant-design/icons';
-import { Tooltip, Typography } from 'antd';
+import { Typography } from 'antd';
 import getAll from 'api/channels/getAll';
 import Spinner from 'components/Spinner';
 import TextToolTip from 'components/TextToolTip';
@@ -52,21 +52,11 @@ function AlertChannels(): JSX.Element {
 						url="https://signoz.io/docs/userguide/alerts-management/#setting-notification-channel"
 					/>
 
-					<Tooltip
-						title={
-							!addNewChannelPermission
-								? 'Ask an admin to create alert channel'
-								: undefined
-						}
-					>
-						<Button
-							onClick={onToggleHandler}
-							icon={<PlusOutlined />}
-							disabled={!addNewChannelPermission}
-						>
+					{addNewChannelPermission && (
+						<Button onClick={onToggleHandler} icon={<PlusOutlined />}>
 							{t('button_new_channel')}
 						</Button>
-					</Tooltip>
+					)}
 				</RightActionContainer>
 			</ButtonContainer>
 

frontend/src/container/BillingContainer/BillingContainer.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import './BillingContainer.styles.scss';
 
-import { CheckCircleOutlined, CloudDownloadOutlined } from '@ant-design/icons';
+import { CheckCircleOutlined } from '@ant-design/icons';
 import { Color } from '@signozhq/design-tokens';
 import {
 	Alert,
@@ -40,7 +40,6 @@ import { isCloudUser } from 'utils/app';
 import { getFormattedDate, getRemainingDays } from 'utils/timeUtils';
 
 import { BillingUsageGraph } from './BillingUsageGraph/BillingUsageGraph';
-import { prepareCsvData } from './BillingUsageGraph/utils';
 
 interface DataType {
 	key: string;
@@ -372,37 +371,6 @@ export default function BillingContainer(): JSX.Element {
 		</Typography>
 	);
 
-	const handleCsvDownload = useCallback((): void => {
-		try {
-			const csv = prepareCsvData(apiResponse);
-
-			if (!csv.csvData || !csv.fileName) {
-				throw new Error('Invalid CSV data or file name.');
-			}
-
-			const csvBlob = new Blob([csv.csvData], { type: 'text/csv;charset=utf-8;' });
-			const csvUrl = URL.createObjectURL(csvBlob);
-			const downloadLink = document.createElement('a');
-
-			downloadLink.href = csvUrl;
-			downloadLink.download = csv.fileName;
-			document.body.appendChild(downloadLink); // Required for Firefox
-			downloadLink.click();
-
-			// Clean up
-			downloadLink.remove();
-			URL.revokeObjectURL(csvUrl); // Release the memory associated with the object URL
-			notifications.success({
-				message: 'Download successful',
-			});
-		} catch (error) {
-			console.error('Error downloading the CSV file:', error);
-			notifications.error({
-				message: SOMETHING_WENT_WRONG,
-			});
-		}
-	}, [apiResponse, notifications]);
-
 	return (
 		<div className="billing-container">
 			<Flex vertical style={{ marginBottom: 16 }}>
@@ -431,29 +399,17 @@ export default function BillingContainer(): JSX.Element {
 							</Typography.Text>
 						) : null}
 					</Flex>
-					<Flex gap={20}>
-						<Button
-							type="dashed"
-							size="middle"
-							loading={isLoadingBilling || isLoadingManageBilling}
-							disabled={isLoading || isFetchingBillingData}
-							onClick={handleCsvDownload}
-							icon={<CloudDownloadOutlined />}
-						>
-							Download CSV
-						</Button>
-						<Button
-							type="primary"
-							size="middle"
-							loading={isLoadingBilling || isLoadingManageBilling}
-							disabled={isLoading}
-							onClick={handleBilling}
-						>
-							{isFreeTrial && !licensesData?.payload?.trialConvertedToSubscription
-								? t('upgrade_plan')
-								: t('manage_billing')}
-						</Button>
-					</Flex>
+					<Button
+						type="primary"
+						size="middle"
+						loading={isLoadingBilling || isLoadingManageBilling}
+						disabled={isLoading}
+						onClick={handleBilling}
+					>
+						{isFreeTrial && !licensesData?.payload?.trialConvertedToSubscription
+							? t('upgrade_plan')
+							: t('manage_billing')}
+					</Button>
 				</Flex>
 
 				{licensesData?.payload?.onTrial &&

frontend/src/container/BillingContainer/BillingUsageGraph/BillingUsageGraph.tsx

@@ -166,7 +166,6 @@ export function BillingUsageGraph(props: BillingUsageGraphProps): JSX.Element {
 					),
 					yAxisUnit: '',
 					isBillingUsageGraphs: true,
-					isDarkMode,
 				}),
 			],
 		}),

frontend/src/container/BillingContainer/BillingUsageGraph/generateCsvData.ts

@@ -1,129 +0,0 @@
-import dayjs from 'dayjs';
-
-export interface QuantityData {
-	metric: string;
-	values: [number, number][];
-	queryName: string;
-	legend: string;
-	quantity: number[];
-	unit: string;
-}
-
-interface DataPoint {
-	date: string;
-	metric: {
-		total: number;
-		cost: number;
-	};
-	trace: {
-		total: number;
-		cost: number;
-	};
-	log: {
-		total: number;
-		cost: number;
-	};
-}
-
-interface CsvData {
-	Date: string;
-	'Metrics Vol (Mn samples)': number;
-	'Metrics Cost ($)': number;
-	'Traces Vol (GBs)': number;
-	'Traces Cost ($)': number;
-	'Logs Vol (GBs)': number;
-	'Logs Cost ($)': number;
-}
-
-const formatDate = (timestamp: number): string =>
-	dayjs.unix(timestamp).format('MM/DD/YYYY');
-
-const getQuantityData = (
-	data: QuantityData[],
-	metricName: string,
-): QuantityData => {
-	const defaultData: QuantityData = {
-		metric: metricName,
-		values: [],
-		queryName: metricName,
-		legend: metricName,
-		quantity: [],
-		unit: '',
-	};
-	return data.find((d) => d.metric === metricName) || defaultData;
-};
-
-const generateCsvData = (quantityData: QuantityData[]): any[] => {
-	const convertData = (data: QuantityData[]): DataPoint[] => {
-		const metricsData = getQuantityData(data, 'Metrics');
-		const tracesData = getQuantityData(data, 'Traces');
-		const logsData = getQuantityData(data, 'Logs');
-
-		const timestamps = metricsData.values.map((value) => value[0]);
-
-		return timestamps.map((timestamp, index) => {
-			const date = formatDate(timestamp);
-
-			return {
-				date,
-				metric: {
-					total: metricsData.quantity[index] ?? 0,
-					cost: metricsData.values[index]?.[1] ?? 0,
-				},
-				trace: {
-					total: tracesData.quantity[index] ?? 0,
-					cost: tracesData.values[index]?.[1] ?? 0,
-				},
-				log: {
-					total: logsData.quantity[index] ?? 0,
-					cost: logsData.values[index]?.[1] ?? 0,
-				},
-			};
-		});
-	};
-
-	const formattedData = convertData(quantityData);
-
-	// Calculate totals
-	const totals = formattedData.reduce(
-		(acc, dataPoint) => {
-			acc.metric.total += dataPoint.metric.total;
-			acc.metric.cost += dataPoint.metric.cost;
-			acc.trace.total += dataPoint.trace.total;
-			acc.trace.cost += dataPoint.trace.cost;
-			acc.log.total += dataPoint.log.total;
-			acc.log.cost += dataPoint.log.cost;
-			return acc;
-		},
-		{
-			metric: { total: 0, cost: 0 },
-			trace: { total: 0, cost: 0 },
-			log: { total: 0, cost: 0 },
-		},
-	);
-
-	const csvData: CsvData[] = formattedData.map((dataPoint) => ({
-		Date: dataPoint.date,
-		'Metrics Vol (Mn samples)': parseFloat(dataPoint.metric.total.toFixed(2)),
-		'Metrics Cost ($)': parseFloat(dataPoint.metric.cost.toFixed(2)),
-		'Traces Vol (GBs)': parseFloat(dataPoint.trace.total.toFixed(2)),
-		'Traces Cost ($)': parseFloat(dataPoint.trace.cost.toFixed(2)),
-		'Logs Vol (GBs)': parseFloat(dataPoint.log.total.toFixed(2)),
-		'Logs Cost ($)': parseFloat(dataPoint.log.cost.toFixed(2)),
-	}));
-
-	// Add totals row
-	csvData.push({
-		Date: 'Total',
-		'Metrics Vol (Mn samples)': parseFloat(totals.metric.total.toFixed(2)),
-		'Metrics Cost ($)': parseFloat(totals.metric.cost.toFixed(2)),
-		'Traces Vol (GBs)': parseFloat(totals.trace.total.toFixed(2)),
-		'Traces Cost ($)': parseFloat(totals.trace.cost.toFixed(2)),
-		'Logs Vol (GBs)': parseFloat(totals.log.total.toFixed(2)),
-		'Logs Cost ($)': parseFloat(totals.log.cost.toFixed(2)),
-	});
-
-	return csvData;
-};
-
-export default generateCsvData;

frontend/src/container/BillingContainer/BillingUsageGraph/utils.ts

@@ -1,12 +1,6 @@
-import { UsageResponsePayloadProps } from 'api/billing/getUsage';
-import dayjs from 'dayjs';
-import { getUPlotChartData } from 'lib/uPlotLib/utils/getUplotChartData';
 import { isEmpty, isNull } from 'lodash-es';
-import { unparse } from 'papaparse';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 
-import generateCsvData, { QuantityData } from './generateCsvData';
-
 export const convertDataToMetricRangePayload = (
 	data: any,
 ): MetricRangePayloadProps => {
@@ -64,7 +58,10 @@ export const convertDataToMetricRangePayload = (
 	};
 };
 
-export function quantityDataArr(data: any, timestampArray: number[]): any[] {
+export function fillMissingValuesForQuantities(
+	data: any,
+	timestampArray: number[],
+): MetricRangePayloadProps {
 	const { result } = data.data;
 
 	const transformedResultArr: any[] = [];
@@ -79,14 +76,6 @@ export function quantityDataArr(data: any, timestampArray: number[]): any[] {
 		);
 		transformedResultArr.push({ ...item, quantity: quantityArray });
 	});
-	return transformedResultArr;
-}
-
-export function fillMissingValuesForQuantities(
-	data: any,
-	timestampArray: number[],
-): MetricRangePayloadProps {
-	const transformedResultArr = quantityDataArr(data, timestampArray);
 
 	return {
 		data: {
@@ -96,36 +85,3 @@ export function fillMissingValuesForQuantities(
 		},
 	};
 }
-
-const formatDate = (timestamp: number): string =>
-	dayjs.unix(timestamp).format('MM/DD/YYYY');
-
-export function csvFileName(csvData: QuantityData[]): string {
-	if (!csvData.length) {
-		return `billing-usage.csv`;
-	}
-
-	const { values } = csvData[0];
-
-	const timestamps = values.map((item) => item[0]);
-	const startDate = formatDate(Math.min(...timestamps));
-	const endDate = formatDate(Math.max(...timestamps));
-
-	return `billing_usage_(${startDate}-${endDate}).csv`;
-}
-
-export function prepareCsvData(
-	data: Partial<UsageResponsePayloadProps>,
-): {
-	csvData: string;
-	fileName: string;
-} {
-	const graphCompatibleData = convertDataToMetricRangePayload(data);
-	const chartData = getUPlotChartData(graphCompatibleData);
-	const quantityMapArr = quantityDataArr(graphCompatibleData, chartData[0]);
-
-	return {
-		csvData: unparse(generateCsvData(quantityMapArr)),
-		fileName: csvFileName(quantityMapArr),
-	};
-}

frontend/src/container/CreateAlertRule/SelectAlertType/index.tsx

@@ -12,30 +12,6 @@ function SelectAlertType({ onSelect }: SelectAlertTypeProps): JSX.Element {
 
 	const optionList = getOptionList(t);
 
-	function handleRedirection(option: AlertTypes): void {
-		let url = '';
-		switch (option) {
-			case AlertTypes.METRICS_BASED_ALERT:
-				url =
-					'https://signoz.io/docs/alerts-management/metrics-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples';
-				break;
-			case AlertTypes.LOGS_BASED_ALERT:
-				url =
-					'https://signoz.io/docs/alerts-management/log-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples';
-				break;
-			case AlertTypes.TRACES_BASED_ALERT:
-				url =
-					'https://signoz.io/docs/alerts-management/trace-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples';
-				break;
-			case AlertTypes.EXCEPTIONS_BASED_ALERT:
-				url =
-					'https://signoz.io/docs/alerts-management/exceptions-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples';
-				break;
-			default:
-				break;
-		}
-		window.open(url, '_blank');
-	}
 	const renderOptions = useMemo(
 		() => (
 			<>
@@ -47,16 +23,7 @@ function SelectAlertType({ onSelect }: SelectAlertTypeProps): JSX.Element {
 							onSelect(option.selection);
 						}}
 					>
-						{option.description}{' '}
-						<Typography.Link
-							onClick={(e): void => {
-								e.preventDefault();
-								e.stopPropagation();
-								handleRedirection(option.selection);
-							}}
-						>
-							Click here to see how to create a sample alert.
-						</Typography.Link>{' '}
+						{option.description}
 					</AlertTypeCard>
 				))}
 			</>

frontend/src/container/CreateAlertRule/defaults.ts

@@ -130,7 +130,7 @@ export const exceptionAlertDefaults: AlertDef = {
 					disabled: false,
 				},
 			},
-			queryType: EQueryType.CLICKHOUSE,
+			queryType: EQueryType.QUERY_BUILDER,
 			panelType: PANEL_TYPES.TIME_SERIES,
 			unit: undefined,
 		},

frontend/src/container/ExplorerOptions/ExplorerOptions.styles.scss

@@ -1,27 +1,18 @@
-.explorer-options-container {
-	position: fixed;
-	bottom: 24px;
-	left: calc(50% + 240px);
-	transform: translate(calc(-50% - 120px), 0);
-	transition: left 0.2s linear;
-
-	display: flex;
-	gap: 16px;
-	background-color: transparent;
-}
-
 .hide-update {
 	left: calc(50% - 72px) !important;
 }
-
 .explorer-update {
-	display: inline-flex;
+	position: fixed;
+	bottom: 24px;
+	left: calc(50% - 352px);
+	display: flex;
 	align-items: center;
 	gap: 12px;
 	padding: 10px 12px;
 	border-radius: 50px;
 	border: 1px solid var(--bg-slate-400);
 	background: rgba(22, 24, 29, 0.6);
+	box-shadow: 4px 4px 16px 4px rgba(0, 0, 0, 0.25);
 	backdrop-filter: blur(20px);
 
 	.action-icon {
@@ -47,10 +38,16 @@
 }
 
 .explorer-options {
+	position: fixed;
+	bottom: 24px;
+	left: calc(50% + 240px);
 	padding: 10px 12px;
+	transform: translate(calc(-50% - 120px), 0);
+	transition: left 0.2s linear;
 	border: 1px solid var(--bg-slate-400);
 	border-radius: 50px;
 	background: rgba(22, 24, 29, 0.6);
+	box-shadow: 4px 4px 16px 4px rgba(0, 0, 0, 0.25);
 	backdrop-filter: blur(20px);
 
 	cursor: default;
@@ -127,7 +124,7 @@
 
 .app-content {
 	&.collapsed {
-		.explorer-options-container {
+		.explorer-options {
 			left: calc(50% + 72px);
 		}
 	}

frontend/src/container/ExplorerOptions/ExplorerOptions.tsx

@@ -289,7 +289,7 @@ function ExplorerOptions({
 	const isEditDeleteSupported = allowedRoles.includes(role as string);
 
 	return (
-		<div className="explorer-options-container">
+		<>
 			{isQueryUpdated && !isExplorerOptionHidden && (
 				<div
 					className={cx(
@@ -493,7 +493,7 @@ function ExplorerOptions({
 					onExport={onExport}
 				/>
 			</Modal>
-		</div>
+		</>
 	);
 }
 

frontend/src/container/FormAlertRules/BasicInfo.tsx

@@ -1,17 +1,7 @@
-import './FormAlertRules.styles.scss';
-
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Form, Select, Switch, Tooltip } from 'antd';
-import getChannels from 'api/channels/getAll';
-import ROUTES from 'constants/routes';
-import useComponentPermission from 'hooks/useComponentPermission';
-import useFetch from 'hooks/useFetch';
-import { useCallback, useEffect, useState } from 'react';
+import { Form, Select, Switch } from 'antd';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
-import { AppState } from 'store/reducers';
 import { AlertDef, Labels } from 'types/api/alerts/def';
-import AppReducer from 'types/reducer/app';
 import { requireErrorMessage } from 'utils/form/requireErrorMessage';
 import { popupContainer } from 'utils/selectPopupContainer';
 
@@ -41,13 +31,6 @@ function BasicInfo({
 }: BasicInfoProps): JSX.Element {
 	const { t } = useTranslation('alerts');
 
-	const channels = useFetch(getChannels);
-	const { role } = useSelector<AppState, AppReducer>((state) => state.app);
-	const [addNewChannelPermission] = useComponentPermission(
-		['add_new_channel'],
-		role,
-	);
-
 	const [
 		shouldBroadCastToAllChannels,
 		setShouldBroadCastToAllChannels,
@@ -71,11 +54,6 @@ function BasicInfo({
 		});
 	};
 
-	const noChannels = channels.payload?.length === 0;
-	const handleCreateNewChannels = useCallback(() => {
-		window.open(ROUTES.CHANNELS_NEW, '_blank');
-	}, []);
-
 	return (
 		<>
 			<StepHeading> {t('alert_form_step3')} </StepHeading>
@@ -159,74 +137,32 @@ function BasicInfo({
 					name="alert_all_configured_channels"
 					label="Alert all the configured channels"
 				>
-					<Tooltip
-						title={
-							noChannels
-								? 'No channels. Ask an admin to create a notification channel'
-								: undefined
-						}
-						placement="right"
-					>
-						<Switch
-							checked={shouldBroadCastToAllChannels}
-							onChange={handleBroadcastToAllChannels}
-							disabled={noChannels || !!channels.loading}
-						/>
-					</Tooltip>
+					<Switch
+						checked={shouldBroadCastToAllChannels}
+						onChange={handleBroadcastToAllChannels}
+					/>
 				</FormItemMedium>
 
 				{!shouldBroadCastToAllChannels && (
-					<Tooltip
-						title={
-							noChannels
-								? 'No channels. Ask an admin to create a notification channel'
-								: undefined
-						}
-						placement="right"
+					<FormItemMedium
+						label="Notification Channels"
+						name="notification_channels"
+						required
+						rules={[
+							{ required: true, message: requireErrorMessage(t('field_alert_name')) },
+						]}
 					>
-						<FormItemMedium
-							label="Notification Channels"
-							name="notification_channels"
-							required
-							rules={[
-								{ required: true, message: requireErrorMessage(t('field_alert_name')) },
-							]}
-						>
-							<ChannelSelect
-								disabled={
-									shouldBroadCastToAllChannels || noChannels || !!channels.loading
-								}
-								currentValue={alertDef.preferredChannels}
-								channels={channels}
-								onSelectChannels={(preferredChannels): void => {
-									setAlertDef({
-										...alertDef,
-										preferredChannels,
-									});
-								}}
-							/>
-						</FormItemMedium>
-					</Tooltip>
-				)}
-
-				{noChannels && (
-					<Tooltip
-						title={
-							!addNewChannelPermission
-								? 'Ask an admin to create a notification channel'
-								: undefined
-						}
-						placement="right"
-					>
-						<Button
-							onClick={handleCreateNewChannels}
-							icon={<PlusOutlined />}
-							className="create-notification-btn"
-							disabled={!addNewChannelPermission}
-						>
-							Create a notification channel
-						</Button>
-					</Tooltip>
+						<ChannelSelect
+							disabled={shouldBroadCastToAllChannels}
+							currentValue={alertDef.preferredChannels}
+							onSelectChannels={(preferredChannels): void => {
+								setAlertDef({
+									...alertDef,
+									preferredChannels,
+								});
+							}}
+						/>
+					</FormItemMedium>
 				)}
 			</FormContainer>
 		</>

frontend/src/container/FormAlertRules/ChannelSelect/index.tsx

@@ -1,9 +1,9 @@
 import { Select } from 'antd';
-import { State } from 'hooks/useFetch';
+import getChannels from 'api/channels/getAll';
+import useFetch from 'hooks/useFetch';
 import { useNotifications } from 'hooks/useNotifications';
 import { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PayloadProps } from 'types/api/channels/getAll';
 
 import { StyledSelect } from './styles';
 
@@ -11,42 +11,38 @@ export interface ChannelSelectProps {
 	disabled?: boolean;
 	currentValue?: string[];
 	onSelectChannels: (s: string[]) => void;
-	channels: State<PayloadProps | undefined>;
 }
 
 function ChannelSelect({
 	disabled,
 	currentValue,
 	onSelectChannels,
-	channels,
 }: ChannelSelectProps): JSX.Element | null {
 	// init namespace for translations
 	const { t } = useTranslation('alerts');
 
+	const { loading, payload, error, errorMessage } = useFetch(getChannels);
+
 	const { notifications } = useNotifications();
 
 	const handleChange = (value: string[]): void => {
 		onSelectChannels(value);
 	};
 
-	if (channels.error && channels.errorMessage !== '') {
+	if (error && errorMessage !== '') {
 		notifications.error({
 			message: 'Error',
-			description: channels.errorMessage,
+			description: errorMessage,
 		});
 	}
 	const renderOptions = (): ReactNode[] => {
 		const children: ReactNode[] = [];
 
-		if (
-			channels.loading ||
-			channels.payload === undefined ||
-			channels.payload.length === 0
-		) {
+		if (loading || payload === undefined || payload.length === 0) {
 			return children;
 		}
 
-		channels.payload.forEach((o) => {
+		payload.forEach((o) => {
 			children.push(
 				<Select.Option key={o.id} value={o.name}>
 					{o.name}
@@ -59,7 +55,7 @@ function ChannelSelect({
 	return (
 		<StyledSelect
 			disabled={disabled}
-			status={channels.error ? 'error' : ''}
+			status={error ? 'error' : ''}
 			mode="multiple"
 			style={{ width: '100%' }}
 			placeholder={t('placeholder_channel_select')}

frontend/src/container/FormAlertRules/FormAlertRules.styles.scss

@@ -21,22 +21,6 @@
 	}
 }
 
-.info-help-btns {
-	display: grid;
-	grid-template-columns: auto auto;
-	gap: 12px;
-	margin-top: 20px;
-
-	.doc-redirection-btn {
-		color: var(--bg-aqua-500) !important;
-		border-color: var(--bg-aqua-500) !important;
-	}
-
-	.facing-issue-btn {
-		width: 100% !important;
-	}
-}
-
 .lightMode {
 	.main-container {
 		.plot-tag {
@@ -63,15 +47,9 @@
 			}
 		}
 	}
-
-	.info-help-btns {
-		.doc-redirection-btn {
-			color: var(--bg-aqua-600) !important;
-			border-color: var(--bg-aqua-600) !important;
-		}
-	}
 }
 
-.create-notification-btn {
-	box-shadow: none;
+.facing-issue-btn {
+	margin-top: 20px;
+	width: 100%;
 }

frontend/src/container/FormAlertRules/index.tsx

@@ -2,7 +2,6 @@ import './FormAlertRules.styles.scss';
 
 import { ExclamationCircleOutlined, SaveOutlined } from '@ant-design/icons';
 import {
-	Button,
 	Col,
 	FormInstance,
 	Modal,
@@ -23,13 +22,13 @@ import PlotTag from 'container/NewWidget/LeftContainer/WidgetGraph/PlotTag';
 import { BuilderUnitsFilter } from 'container/QueryBuilder/filters';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
+import { updateStepInterval } from 'hooks/queryBuilder/useStepInterval';
 import { MESSAGE, useIsFeatureDisabled } from 'hooks/useFeatureFlag';
 import { useNotifications } from 'hooks/useNotifications';
 import useUrlQuery from 'hooks/useUrlQuery';
 import history from 'lib/history';
 import { mapQueryDataFromApi } from 'lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi';
 import { mapQueryDataToApi } from 'lib/newQueryBuilder/queryBuilderMappers/mapQueryDataToApi';
-import { isEqual } from 'lodash-es';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQueryClient } from 'react-query';
@@ -70,7 +69,7 @@ function FormAlertRules({
 	// init namespace for translations
 	const { t } = useTranslation('alerts');
 
-	const { selectedTime: globalSelectedInterval } = useSelector<
+	const { minTime, maxTime, selectedTime: globalSelectedInterval } = useSelector<
 		AppState,
 		GlobalReducer
 	>((state) => state.globalTime);
@@ -103,13 +102,6 @@ function FormAlertRules({
 	const [alertDef, setAlertDef] = useState<AlertDef>(initialValue);
 	const [yAxisUnit, setYAxisUnit] = useState<string>(currentQuery.unit || '');
 
-	useEffect(() => {
-		if (!isEqual(currentQuery.unit, yAxisUnit)) {
-			setYAxisUnit(currentQuery.unit || '');
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [currentQuery.unit]);
-
 	// initQuery contains initial query when component was mounted
 	const initQuery = useMemo(() => initialValue.condition.compositeQuery, [
 		initialValue,
@@ -191,9 +183,7 @@ function FormAlertRules({
 		}
 		const query: Query = { ...currentQuery, queryType: val };
 
-		// update step interval is removed from here as if the user enters
-		// any value we will use that rather than auto update
-		redirectWithQueryBuilderData(query);
+		redirectWithQueryBuilderData(updateStepInterval(query, maxTime, minTime));
 	};
 	const { notifications } = useNotifications();
 
@@ -255,7 +245,7 @@ function FormAlertRules({
 
 		if (
 			!currentQuery.builder.queryData ||
-			currentQuery.builder.queryData?.length === 0
+			currentQuery.builder.queryData.length === 0
 		) {
 			notifications.error({
 				message: 'Error',
@@ -512,31 +502,6 @@ function FormAlertRules({
 
 	const isRuleCreated = !ruleId || ruleId === 0;
 
-	function handleRedirection(option: AlertTypes): void {
-		let url = '';
-		switch (option) {
-			case AlertTypes.METRICS_BASED_ALERT:
-				url =
-					'https://signoz.io/docs/alerts-management/metrics-based-alerts/?utm_source=product&utm_medium=alert-creation-page#examples';
-				break;
-			case AlertTypes.LOGS_BASED_ALERT:
-				url =
-					'https://signoz.io/docs/alerts-management/log-based-alerts/?utm_source=product&utm_medium=alert-creation-page#examples';
-				break;
-			case AlertTypes.TRACES_BASED_ALERT:
-				url =
-					'https://signoz.io/docs/alerts-management/trace-based-alerts/?utm_source=product&utm_medium=alert-creation-page#examples';
-				break;
-			case AlertTypes.EXCEPTIONS_BASED_ALERT:
-				url =
-					'https://signoz.io/docs/alerts-management/exceptions-based-alerts/?utm_source=product&utm_medium=alert-creation-page#examples';
-				break;
-			default:
-				break;
-		}
-		window.open(url, '_blank');
-	}
-
 	return (
 		<>
 			{Element}
@@ -567,7 +532,7 @@ function FormAlertRules({
 							queryCategory={currentQuery.queryType}
 							setQueryCategory={onQueryCategoryChange}
 							alertType={alertType || AlertTypes.METRICS_BASED_ALERT}
-							runQuery={(): void => handleRunQuery(true)}
+							runQuery={handleRunQuery}
 							alertDef={alertDef}
 							panelType={panelType || PANEL_TYPES.TIME_SERIES}
 							key={currentQuery.queryType}
@@ -620,33 +585,22 @@ function FormAlertRules({
 				</StyledLeftContainer>
 				<Col flex="1 1 300px">
 					<UserGuide queryType={currentQuery.queryType} />
-					<div className="info-help-btns">
-						<Button
-							style={{ height: 32 }}
-							onClick={(): void =>
-								handleRedirection(alertDef?.alertType as AlertTypes)
-							}
-							className="doc-redirection-btn"
-						>
-							Check an example alert
-						</Button>
-						<FacingIssueBtn
-							attributes={{
-								alert: alertDef?.alert,
-								alertType: alertDef?.alertType,
-								id: ruleId,
-								ruleType: alertDef?.ruleType,
-								state: (alertDef as any)?.state,
-								panelType,
-								screen: isRuleCreated ? 'Edit Alert' : 'New Alert',
-							}}
-							className="facing-issue-btn"
-							eventName="Alert: Facing Issues in alert"
-							buttonText="Need help with this alert?"
-							message={alertHelpMessage(alertDef, ruleId)}
-							onHoverText="Click here to get help with this alert"
-						/>
-					</div>
+					<FacingIssueBtn
+						attributes={{
+							alert: alertDef?.alert,
+							alertType: alertDef?.alertType,
+							id: ruleId,
+							ruleType: alertDef?.ruleType,
+							state: (alertDef as any)?.state,
+							panelType,
+							screen: isRuleCreated ? 'Edit Alert' : 'New Alert',
+						}}
+						className="facing-issue-btn"
+						eventName="Alert: Facing Issues in alert"
+						buttonText="Need help with this alert?"
+						message={alertHelpMessage(alertDef, ruleId)}
+						onHoverText="Click here to get help with this alert"
+					/>
 				</Col>
 			</PanelContainer>
 		</>

frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx

@@ -15,6 +15,7 @@ import {
 } from 'container/NewWidget/RightContainer/timeItems';
 import PanelWrapper from 'container/PanelWrapper/PanelWrapper';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
+import { useStepInterval } from 'hooks/queryBuilder/useStepInterval';
 import { useChartMutable } from 'hooks/useChartMutable';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { getDashboardVariables } from 'lib/dashbaordVariables/getDashboardVariables';
@@ -70,7 +71,7 @@ function FullView({
 		enum: widget?.timePreferance || 'GLOBAL_TIME',
 	});
 
-	const updatedQuery = widget?.query;
+	const updatedQuery = useStepInterval(widget?.query);
 
 	const [requestData, setRequestData] = useState<GetQueryResultsProps>(() => {
 		if (widget.panelTypes !== PANEL_TYPES.LIST) {
@@ -203,7 +204,7 @@ function FullView({
 			<div
 				className={cx('graph-container', {
 					disabled: isDashboardLocked,
-					'height-widget': widget?.mergeAllActiveQueries || widget?.stackedBarChart,
+					'height-widget': widget?.mergeAllActiveQueries,
 					'list-graph-container': isListView,
 				})}
 				ref={fullViewRef}

frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.tsx

@@ -131,22 +131,15 @@ function WidgetGraphComponent({
 
 		const uuid = v4();
 
-		// this is added to make sure the cloned panel is of the same dimensions as the original one
-		const originalPanelLayout = selectedDashboard.data.layout?.find(
-			(l) => l.i === widget.id,
-		);
-
-		// added the cloned panel on the top as it is given most priority when arranging
-		// in the layout. React_grid_layout assigns priority from top, hence no random position for cloned panel
 		const layout = [
+			...(selectedDashboard.data.layout || []),
 			{
 				i: uuid,
-				w: originalPanelLayout?.w || 6,
+				w: 6,
 				x: 0,
-				h: originalPanelLayout?.h || 6,
+				h: 6,
 				y: 0,
 			},
-			...(selectedDashboard.data.layout || []),
 		];
 
 		updateDashboardMutation.mutateAsync(

frontend/src/container/GridCardLayout/GridCard/index.tsx

@@ -3,6 +3,7 @@ import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { CustomTimeType } from 'container/TopNav/DateTimeSelectionV2/config';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
+import { useStepInterval } from 'hooks/queryBuilder/useStepInterval';
 import { useIntersectionObserver } from 'hooks/useIntersectionObserver';
 import { getDashboardVariables } from 'lib/dashbaordVariables/getDashboardVariables';
 import { GetQueryResultsProps } from 'lib/dashboard/getQueryResults';
@@ -89,7 +90,7 @@ function GridCardGraph({
 		}
 	}, [toScrollWidgetId, setToScrollWidgetId, widget.id]);
 
-	const updatedQuery = widget?.query;
+	const updatedQuery = useStepInterval(widget?.query);
 
 	const isEmptyWidget =
 		widget?.id === PANEL_TYPES.EMPTY_WIDGET || isEmpty(widget);

frontend/src/container/ListAlertRules/AlertsEmptyState/AlertInfoCard.tsx

@@ -1,37 +0,0 @@
-/* eslint-disable jsx-a11y/no-static-element-interactions */
-/* eslint-disable jsx-a11y/click-events-have-key-events */
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-
-interface AlertInfoCardProps {
-	header: string;
-	subheader: string;
-	link: string;
-}
-
-function AlertInfoCard({
-	header,
-	subheader,
-	link,
-}: AlertInfoCardProps): JSX.Element {
-	return (
-		<div
-			className="alert-info-card"
-			onClick={(): void => {
-				window.open(link, '_blank');
-			}}
-		>
-			<div className="alert-card-text">
-				<Typography.Text className="alert-card-text-header">
-					{header}
-				</Typography.Text>
-				<Typography.Text className="alert-card-text-subheader">
-					{subheader}
-				</Typography.Text>
-			</div>
-			<ArrowRightOutlined />
-		</div>
-	);
-}
-
-export default AlertInfoCard;

frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.styles.scss

@@ -1,251 +0,0 @@
-.alert-list-container {
-	margin-top: 104px;
-	margin-bottom: 30px;
-	display: flex;
-	justify-content: center;
-	width: 100%;
-
-	.alert-list-view-content {
-		width: calc(100% - 30px);
-		max-width: 836px;
-
-		.alert-list-title-container {
-			.title {
-				color: var(--bg-vanilla-100);
-				font-size: var(--font-size-lg);
-				font-style: normal;
-				font-weight: var(--font-weight-normal);
-				line-height: 28px; /* 155.556% */
-				letter-spacing: -0.09px;
-			}
-
-			.subtitle {
-				color: var(--bg-vanilla-400);
-				font-size: var(--font-size-sm);
-				font-style: normal;
-				font-weight: var(--font-weight-normal);
-				line-height: 20px; /* 142.857% */
-				letter-spacing: -0.07px;
-			}
-		}
-
-		.empty-alert-info-container {
-			display: flex;
-			padding: 71px 193.5px;
-			justify-content: center;
-			align-items: center;
-			border-radius: 6px;
-			border: 1px dashed var(--bg-slate-500);
-			margin-top: 16px;
-
-			.alert-content {
-				display: flex;
-				flex-direction: column;
-				align-items: flex-start;
-				gap: 12px;
-
-				.heading {
-					display: flex;
-					flex-direction: column;
-					gap: 4px;
-
-					.icons {
-						color: white;
-					}
-
-					.empty-alert-action {
-						color: var(--bg-vanilla-400);
-						font-family: Inter;
-						font-size: 14px;
-						font-style: normal;
-						font-weight: 400;
-						line-height: 24px; /* 171.429% */
-						letter-spacing: -0.07px;
-					}
-
-					.empty-info {
-						color: var(--bg-vanilla-100);
-						font-family: Inter;
-						font-size: 14px;
-						font-style: normal;
-						font-weight: 500;
-						line-height: 24px;
-						letter-spacing: -0.07px;
-					}
-				}
-
-				.action-container {
-					display: flex;
-					gap: 24px;
-					align-items: center;
-					padding-top: 24px;
-					padding-bottom: 24px;
-					width: 100%;
-				}
-			}
-		}
-
-		.get-started-text {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			gap: 16px;
-			margin-top: 24px;
-			margin-bottom: 24px;
-			width: 100%;
-
-			.ant-divider::before,
-			.ant-divider::after {
-				border-bottom: 2px dotted var(--bg-slate-300);
-				border-top: 2px dotted var(--bg-slate-300);
-				height: 8px;
-			}
-
-			.ant-typography {
-				color: var(--bg-vanilla-400);
-				font-family: Inter;
-				font-size: 12px;
-				font-style: normal;
-				font-weight: 500;
-				line-height: 20px; /* 166.667% */
-				letter-spacing: 0.48px;
-				text-transform: uppercase;
-				padding-top: 8px;
-			}
-		}
-
-		.alert-info-card {
-			display: flex;
-			padding: 16px;
-			justify-content: space-between;
-			align-items: center;
-
-			border-radius: 6px;
-			border: 1px solid var(--bg-slate-500);
-			background: var(--bg-ink-400);
-			margin-bottom: 16px;
-
-			&:hover {
-				cursor: pointer;
-			}
-
-			.alert-card-text {
-				display: flex;
-				gap: 2px;
-				flex-direction: column;
-
-				.alert-card-text-header {
-					color: var(--bg-vanilla-100);
-					font-family: Inter;
-					font-size: 14px;
-					font-style: normal;
-					font-weight: 500;
-					line-height: 20px; /* 142.857% */
-					letter-spacing: -0.07px;
-				}
-
-				.alert-card-text-subheader {
-					color: var(--bg-vanilla-400);
-					font-family: Inter;
-					font-size: 12px;
-					font-style: normal;
-					font-weight: 400;
-					line-height: 18px; /* 150% */
-				}
-			}
-		}
-	}
-}
-
-.info-text {
-	color: var(--bg-robin-400) !important;
-	font-family: Inter;
-	font-size: 12px;
-	font-style: normal;
-	font-weight: 500;
-	line-height: 16px; /* 133.333% */
-	letter-spacing: -0.06px;
-}
-
-.info-link-container {
-	.anticon {
-		color: var(--bg-robin-400);
-	}
-
-	:hover {
-		cursor: pointer;
-	}
-}
-
-.lightMode {
-	.alert-list-container {
-		.alert-list-view-content {
-			.alert-list-title-container {
-				.title {
-					color: var(--bg-slate-400);
-				}
-
-				.subtitle {
-					color: var(--bg-slate-100);
-				}
-			}
-
-			.empty-alert-info-container {
-				border: 1px dashed var(--bg-vanilla-400);
-
-				.alert-content {
-					.heading {
-						.icons {
-							color: white;
-						}
-
-						.empty-alert-action {
-							color: var(--bg-slate-100);
-						}
-
-						.empty-info {
-							color: var(--bg-slate-400);
-						}
-					}
-				}
-			}
-
-			.get-started-text {
-				.ant-divider::before,
-				.ant-divider::after {
-					border-bottom: 2px dotted var(--bg-vanilla-400);
-					border-top: 2px dotted var(--bg-vanilla-400);
-				}
-
-				.ant-typography {
-					color: var(--bg-slate-100);
-				}
-			}
-
-			.alert-info-card {
-				border: 1px solid var(--bg-vanilla-200);
-				background: var(--bg-vanilla-100);
-
-				.alert-card-text {
-					.alert-card-text-header {
-						color: var(--bg-slate-400);
-					}
-
-					.alert-card-text-subheader {
-						color: var(--bg-slate-100);
-					}
-				}
-			}
-		}
-	}
-
-	.info-text {
-		color: var(--bg-robin-600) !important;
-	}
-
-	.info-link-container {
-		.anticon {
-			color: var(--bg-robin-400);
-		}
-	}
-}

frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.tsx

@@ -1,127 +0,0 @@
-import './AlertsEmptyState.styles.scss';
-
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Divider, Typography } from 'antd';
-import ROUTES from 'constants/routes';
-import useComponentPermission from 'hooks/useComponentPermission';
-import { useNotifications } from 'hooks/useNotifications';
-import history from 'lib/history';
-import { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
-import { AppState } from 'store/reducers';
-import AppReducer from 'types/reducer/app';
-
-import AlertInfoCard from './AlertInfoCard';
-import { ALERT_CARDS, ALERT_INFO_LINKS } from './alertLinks';
-import InfoLinkText from './InfoLinkText';
-
-export function AlertsEmptyState(): JSX.Element {
-	const { t } = useTranslation('common');
-	const { role, featureResponse } = useSelector<AppState, AppReducer>(
-		(state) => state.app,
-	);
-	const [addNewAlert] = useComponentPermission(
-		['add_new_alert', 'action'],
-		role,
-	);
-
-	const { notifications: notificationsApi } = useNotifications();
-
-	const handleError = useCallback((): void => {
-		notificationsApi.error({
-			message: t('something_went_wrong'),
-		});
-	}, [notificationsApi, t]);
-
-	const [loading, setLoading] = useState(false);
-
-	const onClickNewAlertHandler = useCallback(() => {
-		setLoading(true);
-		featureResponse
-			.refetch()
-			.then(() => {
-				setLoading(false);
-				history.push(ROUTES.ALERTS_NEW);
-			})
-			.catch(handleError)
-			.finally(() => setLoading(false));
-	}, [featureResponse, handleError]);
-
-	return (
-		<div className="alert-list-container">
-			<div className="alert-list-view-content">
-				<div className="alert-list-title-container">
-					<Typography.Title className="title">Alert Rules</Typography.Title>
-					<Typography.Text className="subtitle">
-						Create and manage alert rules for your resources.
-					</Typography.Text>
-				</div>
-				<section className="empty-alert-info-container">
-					<div className="alert-content">
-						<section className="heading">
-							<img
-								src="/Icons/alert_emoji.svg"
-								alt="alert-header"
-								style={{ height: '32px', width: '32px' }}
-							/>
-							<div>
-								<Typography.Text className="empty-info">
-									No Alert rules yet.{' '}
-								</Typography.Text>
-								<Typography.Text className="empty-alert-action">
-									Create an Alert Rule to get started
-								</Typography.Text>
-							</div>
-						</section>
-						<div className="action-container">
-							<Button
-								className="add-alert-btn"
-								onClick={onClickNewAlertHandler}
-								icon={<PlusOutlined />}
-								disabled={!addNewAlert}
-								loading={loading}
-								type="primary"
-								data-testid="add-alert"
-							>
-								New Alert Rule
-							</Button>
-							<InfoLinkText
-								infoText="Watch a tutorial on creating a sample alert"
-								link="https://youtu.be/xjxNIqiv4_M"
-								leftIconVisible
-								rightIconVisible
-							/>
-						</div>
-
-						{ALERT_INFO_LINKS.map((info) => (
-							<InfoLinkText
-								key={info.link}
-								infoText={info.infoText}
-								link={info.link}
-								leftIconVisible={info.leftIconVisible}
-								rightIconVisible={info.rightIconVisible}
-							/>
-						))}
-					</div>
-				</section>
-				<div className="get-started-text">
-					<Divider>
-						<Typography.Text className="get-started-text">
-							Or get started with these sample alerts
-						</Typography.Text>
-					</Divider>
-				</div>
-
-				{ALERT_CARDS.map((card) => (
-					<AlertInfoCard
-						key={card.link}
-						header={card.header}
-						subheader={card.subheader}
-						link={card.link}
-					/>
-				))}
-			</div>
-		</div>
-	);
-}

frontend/src/container/ListAlertRules/AlertsEmptyState/InfoLinkText.tsx

@@ -1,31 +0,0 @@
-import { ArrowRightOutlined, PlayCircleFilled } from '@ant-design/icons';
-import { Flex, Typography } from 'antd';
-
-interface InfoLinkTextProps {
-	infoText: string;
-	link: string;
-	leftIconVisible: boolean;
-	rightIconVisible: boolean;
-}
-
-function InfoLinkText({
-	infoText,
-	link,
-	leftIconVisible,
-	rightIconVisible,
-}: InfoLinkTextProps): JSX.Element {
-	return (
-		<Flex
-			onClick={(): void => {
-				window.open(link, '_blank');
-			}}
-			className="info-link-container"
-		>
-			{leftIconVisible && <PlayCircleFilled />}
-			<Typography.Text className="info-text">{infoText}</Typography.Text>
-			{rightIconVisible && <ArrowRightOutlined rotate={315} />}
-		</Flex>
-	);
-}
-
-export default InfoLinkText;

frontend/src/container/ListAlertRules/AlertsEmptyState/alertLinks.ts

@@ -1,50 +0,0 @@
-export const ALERT_INFO_LINKS = [
-	{
-		infoText: 'How to create Metrics-based alerts',
-		link:
-			'https://signoz.io/docs/alerts-management/metrics-based-alerts/?utm_source=product&utm_medium=alert-empty-page',
-		leftIconVisible: false,
-		rightIconVisible: true,
-	},
-	{
-		infoText: 'How to create Log-based alerts',
-		link:
-			'https://signoz.io/docs/alerts-management/log-based-alerts/?utm_source=product&utm_medium=alert-empty-page',
-		leftIconVisible: false,
-		rightIconVisible: true,
-	},
-	{
-		infoText: 'How to create Trace-based alerts',
-		link:
-			'https://signoz.io/docs/alerts-management/trace-based-alerts/?utm_source=product&utm_medium=alert-empty-page',
-		leftIconVisible: false,
-		rightIconVisible: true,
-	},
-];
-
-export const ALERT_CARDS = [
-	{
-		header: 'Alert on high memory usage',
-		subheader: "Monitor your host's memory usage",
-		link:
-			'https://signoz.io/docs/alerts-management/metrics-based-alerts/?utm_source=product&utm_medium=alert-empty-page#1-alert-when-memory-usage-for-host-goes-above-400-mb-or-any-fixed-memory',
-	},
-	{
-		header: 'Alert on slow external API calls',
-		subheader: 'Monitor your external API calls',
-		link:
-			'https://signoz.io/docs/alerts-management/trace-based-alerts/?utm_source=product&utm_medium=alert-empty-page#1-alert-when-external-api-latency-p90-is-over-1-second-for-last-5-mins',
-	},
-	{
-		header: 'Alert on high percentage of timeout errors in logs',
-		subheader: 'Monitor your logs for errors',
-		link:
-			'https://signoz.io/docs/alerts-management/log-based-alerts/?utm_source=product&utm_medium=alert-empty-page#1-alert-when-percentage-of-redis-timeout-error-logs-greater-than-7-in-last-5-mins',
-	},
-	{
-		header: 'Alert on high error percentage of an endpoint',
-		subheader: 'Monitor your API endpoint',
-		link:
-			'https://signoz.io/docs/alerts-management/metrics-based-alerts/?utm_source=product&utm_medium=alert-empty-page#3-alert-when-the-error-percentage-for-an-endpoint-exceeds-5',
-	},
-];

frontend/src/container/ListAlertRules/index.tsx

@@ -8,7 +8,6 @@ import { useTranslation } from 'react-i18next';
 import { useQuery } from 'react-query';
 import { useLocation } from 'react-router-dom';
 
-import { AlertsEmptyState } from './AlertsEmptyState/AlertsEmptyState';
 import ListAlert from './ListAlert';
 
 function ListAlertRules(): JSX.Element {
@@ -46,10 +45,6 @@ function ListAlertRules(): JSX.Element {
 		);
 	}
 
-	if (status === 'success' && !data.payload?.length) {
-		return <AlertsEmptyState />;
-	}
-
 	// in case of loading
 	if (isLoading || !data?.payload) {
 		return <Spinner height="75vh" tip="Loading Rules..." />;

frontend/src/container/ListOfDashboard/DashboardsList.tsx

@@ -53,7 +53,6 @@ import {
 	Search,
 } from 'lucide-react';
 import { handleContactSupport } from 'pages/Integrations/utils';
-import { useDashboard } from 'providers/Dashboard/Dashboard';
 import {
 	ChangeEvent,
 	Key,
@@ -92,11 +91,6 @@ function DashboardsList(): JSX.Element {
 
 	const { role } = useSelector<AppState, AppReducer>((state) => state.app);
 
-	const {
-		listSortOrder: sortOrder,
-		setListSortOrder: setSortOrder,
-	} = useDashboard();
-
 	const [action, createNewDashboard] = useComponentPermission(
 		['action', 'create_new_dashboards'],
 		role,
@@ -122,9 +116,18 @@ function DashboardsList(): JSX.Element {
 	);
 
 	const params = useUrlQuery();
+	const orderColumnParam = params.get('columnKey');
+	const orderQueryParam = params.get('order');
+	const paginationParam = params.get('page');
 	const searchParams = params.get('search');
 	const [searchString, setSearchString] = useState<string>(searchParams || '');
 
+	const [sortOrder, setSortOrder] = useState({
+		columnKey: orderColumnParam,
+		order: orderQueryParam,
+		pagination: paginationParam,
+	});
+
 	const getLocalStorageDynamicColumns = (): DashboardDynamicColumns => {
 		const dashboardDynamicColumnsString = localStorage.getItem('dashboard');
 		let dashboardDynamicColumns: DashboardDynamicColumns = {
@@ -195,6 +198,7 @@ function DashboardsList(): JSX.Element {
 	}, [sortOrder]);
 
 	const sortHandle = (key: string): void => {
+		console.log(dashboards);
 		if (!dashboards) return;
 		if (key === 'createdAt') {
 			sortDashboardsByCreatedAt(dashboards);
@@ -221,29 +225,13 @@ function DashboardsList(): JSX.Element {
 	}
 
 	useEffect(() => {
+		sortDashboardsByCreatedAt(dashboardListResponse);
 		const filteredDashboards = filterDashboard(
 			searchString,
 			dashboardListResponse,
 		);
-		if (sortOrder.columnKey === 'updatedAt') {
-			sortDashboardsByUpdatedAt(filteredDashboards || []);
-		} else if (sortOrder.columnKey === 'createdAt') {
-			sortDashboardsByCreatedAt(filteredDashboards || []);
-		} else if (sortOrder.columnKey === 'null') {
-			setSortOrder({
-				columnKey: 'updatedAt',
-				order: 'descend',
-				pagination: sortOrder.pagination || '1',
-			});
-			sortDashboardsByUpdatedAt(filteredDashboards || []);
-		}
-	}, [
-		dashboardListResponse,
-		searchString,
-		setSortOrder,
-		sortOrder.columnKey,
-		sortOrder.pagination,
-	]);
+		setDashboards(filteredDashboards || []);
+	}, [dashboardListResponse, searchString]);
 
 	const [newDashboardState, setNewDashboardState] = useState({
 		loading: false,
@@ -819,7 +807,6 @@ function DashboardsList(): JSX.Element {
 											showTotal: showPaginationItem,
 											showSizeChanger: false,
 											onChange: (page): void => handlePageSizeUpdate(page),
-											current: Number(sortOrder.pagination),
 											defaultCurrent: Number(sortOrder.pagination) || 1,
 										}
 									}

frontend/src/container/LiveLogs/constants.ts

@@ -30,8 +30,8 @@ export const constructCompositeQuery = ({
 }: GetDefaultCompositeQueryParams): Query => ({
 	...query,
 	builder: {
-		...query?.builder,
-		queryData: query?.builder?.queryData?.map((item) => ({
+		...query.builder,
+		queryData: query.builder.queryData.map((item) => ({
 			...initialQueryData,
 			...item,
 			...customQueryData,

frontend/src/container/LiveLogs/utils.ts

@@ -42,7 +42,7 @@ export const prepareQueryByFilter = (
 		...query,
 		builder: {
 			...query.builder,
-			queryData: query.builder.queryData?.map((item) => ({
+			queryData: query.builder.queryData.map((item) => ({
 				...item,
 				filters: value ? getFilter(item.filters, tagFilter, value) : item.filters,
 			})),
@@ -57,7 +57,7 @@ export const getQueryWithoutFilterId = (query: Query): Query => {
 		...query,
 		builder: {
 			...query.builder,
-			queryData: query.builder.queryData?.map((item) => ({
+			queryData: query.builder.queryData.map((item) => ({
 				...item,
 				filters: {
 					...item.filters,

frontend/src/container/LogDetailedView/JsonView.tsx

@@ -10,7 +10,7 @@ import { JSONViewProps } from './LogDetailedView.types';
 import { aggregateAttributesResourcesToString } from './utils';
 
 function JSONView({ logData }: JSONViewProps): JSX.Element {
-	const [isWrapWord, setIsWrapWord] = useState<boolean>(true);
+	const [isWrapWord, setIsWrapWord] = useState<boolean>(false);
 
 	const LogJsonData = useMemo(
 		() => aggregateAttributesResourcesToString(logData),
@@ -22,7 +22,7 @@ function JSONView({ logData }: JSONViewProps): JSX.Element {
 	const options: EditorProps['options'] = {
 		automaticLayout: true,
 		readOnly: true,
-		wordWrap: isWrapWord ? 'on' : 'off',
+		wordWrap: 'on',
 		minimap: {
 			enabled: false,
 		},
@@ -68,7 +68,7 @@ function JSONView({ logData }: JSONViewProps): JSX.Element {
 	return (
 		<div className="json-view-container">
 			<MEditor
-				value={LogJsonData}
+				value={isWrapWord ? JSON.stringify(LogJsonData) : LogJsonData}
 				language="json"
 				options={options}
 				onChange={(): void => {}}

frontend/src/container/LogDetailedView/Overview.tsx

@@ -35,7 +35,7 @@ function Overview({
 	onClickActionItem,
 	isListViewPanel = false,
 }: Props): JSX.Element {
-	const [isWrapWord, setIsWrapWord] = useState<boolean>(true);
+	const [isWrapWord, setIsWrapWord] = useState<boolean>(false);
 	const [isSearchVisible, setIsSearchVisible] = useState<boolean>(false);
 	const [isAttributesExpanded, setIsAttributesExpanded] = useState<boolean>(
 		true,
@@ -48,7 +48,7 @@ function Overview({
 		automaticLayout: true,
 		readOnly: true,
 		height: '40vh',
-		wordWrap: isWrapWord ? 'on' : 'off',
+		wordWrap: 'on',
 		minimap: {
 			enabled: false,
 		},
@@ -118,8 +118,8 @@ function Overview({
 						children: (
 							<div className="logs-body-content">
 								<MEditor
-									value={logData.body}
-									language="json"
+									value={isWrapWord ? JSON.stringify(logData.body) : logData.body}
+									language={isWrapWord ? 'placetext' : 'json'}
 									options={options}
 									onChange={(): void => {}}
 									height="20vh"
@@ -143,7 +143,7 @@ function Overview({
 								</div>
 							</div>
 						),
-						// extra: <Tag className="tag">JSON</Tag>,
+						extra: <Tag className="tag">{isWrapWord ? 'Raw' : 'JSON'}</Tag>,
 						className: 'collapse-content',
 					},
 				]}

frontend/src/container/LogExplorerQuerySection/index.tsx

@@ -47,7 +47,7 @@ function LogExplorerQuerySection({
 		const isTable = panelTypes === PANEL_TYPES.TABLE;
 		const isList = panelTypes === PANEL_TYPES.LIST;
 		const config: QueryBuilderProps['filterConfigs'] = {
-			stepInterval: { isHidden: isTable, isDisabled: false },
+			stepInterval: { isHidden: isTable, isDisabled: true },
 			having: { isHidden: isList, isDisabled: true },
 			filters: {
 				customKey: 'body',

frontend/src/container/LogsContextList/utils.ts

@@ -40,7 +40,7 @@ export const getRequestData = ({
 		...query,
 		builder: {
 			...query.builder,
-			queryData: query.builder.queryData?.map((item) => ({
+			queryData: query.builder.queryData.map((item) => ({
 				...item,
 				...paginateData,
 				pageSize,

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

@@ -27,7 +27,6 @@ import {
 	handleNonInQueryRange,
 	onGraphClickHandler,
 	onViewTracePopupClick,
-	useGetAPMToTracesQueries,
 } from './util';
 
 function DBCall(): JSX.Element {
@@ -97,11 +96,6 @@ function DBCall(): JSX.Element {
 		[servicename, tagFilterItems],
 	);
 
-	const apmToTraceQuery = useGetAPMToTracesQueries({
-		servicename,
-		isDBCall: true,
-	});
-
 	return (
 		<Row gutter={24}>
 			<Col span={12}>
@@ -113,7 +107,6 @@ function DBCall(): JSX.Element {
 						servicename,
 						selectedTraceTags,
 						timestamp: selectedTimeStamp,
-						apmToTraceQuery,
 					})}
 				>
 					View Traces
@@ -146,7 +139,6 @@ function DBCall(): JSX.Element {
 						servicename,
 						selectedTraceTags,
 						timestamp: selectedTimeStamp,
-						apmToTraceQuery,
 					})}
 				>
 					View Traces

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

@@ -27,7 +27,6 @@ import {
 	handleNonInQueryRange,
 	onGraphClickHandler,
 	onViewTracePopupClick,
-	useGetAPMToTracesQueries,
 } from './util';
 
 function External(): JSX.Element {
@@ -139,11 +138,6 @@ function External(): JSX.Element {
 		[servicename, tagFilterItems],
 	);
 
-	const apmToTraceQuery = useGetAPMToTracesQueries({
-		servicename,
-		isExternalCall: true,
-	});
-
 	return (
 		<>
 			<Row gutter={24}>
@@ -156,7 +150,7 @@ function External(): JSX.Element {
 							servicename,
 							selectedTraceTags,
 							timestamp: selectedTimeStamp,
-							apmToTraceQuery,
+							isExternalCall: true,
 						})}
 					>
 						View Traces
@@ -190,7 +184,7 @@ function External(): JSX.Element {
 							servicename,
 							selectedTraceTags,
 							timestamp: selectedTimeStamp,
-							apmToTraceQuery,
+							isExternalCall: true,
 						})}
 					>
 						View Traces
@@ -227,7 +221,7 @@ function External(): JSX.Element {
 							servicename,
 							selectedTraceTags,
 							timestamp: selectedTimeStamp,
-							apmToTraceQuery,
+							isExternalCall: true,
 						})}
 					>
 						View Traces
@@ -261,7 +255,7 @@ function External(): JSX.Element {
 							servicename,
 							selectedTraceTags,
 							timestamp: selectedTimeStamp,
-							apmToTraceQuery,
+							isExternalCall: true,
 						})}
 					>
 						View Traces

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

@@ -22,8 +22,6 @@ import { useQuery } from 'react-query';
 import { useDispatch } from 'react-redux';
 import { useLocation, useParams } from 'react-router-dom';
 import { UpdateTimeInterval } from 'store/actions';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { EQueryType } from 'types/common/dashboard';
 import { v4 as uuid } from 'uuid';
 
@@ -45,7 +43,6 @@ import {
 	handleNonInQueryRange,
 	onGraphClickHandler,
 	onViewTracePopupClick,
-	useGetAPMToTracesQueries,
 } from './util';
 
 function Application(): JSX.Element {
@@ -95,8 +92,6 @@ function Application(): JSX.Element {
 		convertRawQueriesToTraceSelectedTags(queries) || [],
 	);
 
-	const apmToTraceQuery = useGetAPMToTracesQueries({ servicename });
-
 	const tagFilterItems = useMemo(
 		() =>
 			handleNonInQueryRange(resourceAttributesToTagFilterItems(queries)) || [],
@@ -164,10 +159,7 @@ function Application(): JSX.Element {
 		[dispatch, pathname, urlQuery],
 	);
 
-	const onErrorTrackHandler = (
-		timestamp: number,
-		apmToTraceQuery: Query,
-	): (() => void) => (): void => {
+	const onErrorTrackHandler = (timestamp: number): (() => void) => (): void => {
 		const currentTime = timestamp;
 		const tPlusOne = timestamp + 60 * 1000;
 
@@ -178,38 +170,15 @@ function Application(): JSX.Element {
 		const avialableParams = routeConfig[ROUTES.TRACE];
 		const queryString = getQueryString(avialableParams, urlParams);
 
-		const JSONCompositeQuery = encodeURIComponent(
-			JSON.stringify(apmToTraceQuery),
+		history.replace(
+			`${
+				ROUTES.TRACE
+			}?selected={"serviceName":["${servicename}"],"status":["error"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&isFilterExclude={"serviceName":false,"status":false}&userSelectedFilter={"serviceName":["${servicename}"],"status":["error"]}&spanAggregateCurrentPage=1&${queryString.join(
+				'',
+			)}`,
 		);
-
-		const newTraceExplorerPath = `${
-			ROUTES.TRACES_EXPLORER
-		}?${urlParams.toString()}&selected={"serviceName":["${servicename}"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&${
-			QueryParams.compositeQuery
-		}=${JSONCompositeQuery}&${queryString.join('&')}`;
-
-		history.push(newTraceExplorerPath);
 	};
 
-	const errorTrackQuery = useGetAPMToTracesQueries({
-		servicename,
-		filters: [
-			{
-				id: uuid().slice(0, 8),
-				key: {
-					key: 'hasError',
-					dataType: DataTypes.bool,
-					type: 'tag',
-					isColumn: true,
-					isJSON: false,
-					id: 'hasError--bool--tag--true',
-				},
-				op: 'in',
-				value: ['true'],
-			},
-		],
-	});
-
 	return (
 		<>
 			<Row gutter={24}>
@@ -233,7 +202,6 @@ function Application(): JSX.Element {
 							servicename,
 							selectedTraceTags,
 							timestamp: selectedTimeStamp,
-							apmToTraceQuery,
 						})}
 					>
 						View Traces
@@ -261,7 +229,6 @@ function Application(): JSX.Element {
 								servicename,
 								selectedTraceTags,
 								timestamp: selectedTimeStamp,
-								apmToTraceQuery,
 							})}
 						>
 							View Traces
@@ -278,7 +245,7 @@ function Application(): JSX.Element {
 							type="default"
 							size="small"
 							id="Error_button"
-							onClick={onErrorTrackHandler(selectedTimeStamp, errorTrackQuery)}
+							onClick={onErrorTrackHandler(selectedTimeStamp)}
 						>
 							View Traces
 						</Button>

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

@@ -21,11 +21,7 @@ import { v4 as uuid } from 'uuid';
 
 import { Button } from '../styles';
 import { IServiceName } from '../types';
-import {
-	handleNonInQueryRange,
-	onViewTracePopupClick,
-	useGetAPMToTracesQueries,
-} from '../util';
+import { handleNonInQueryRange, onViewTracePopupClick } from '../util';
 
 function ServiceOverview({
 	onDragSelect,
@@ -73,8 +69,6 @@ function ServiceOverview({
 	const isQueryEnabled =
 		!topLevelOperationsIsLoading && topLevelOperationsRoute.length > 0;
 
-	const apmToTraceQuery = useGetAPMToTracesQueries({ servicename });
-
 	return (
 		<>
 			<Button
@@ -85,7 +79,6 @@ function ServiceOverview({
 					servicename,
 					selectedTraceTags,
 					timestamp: selectedTimeStamp,
-					apmToTraceQuery,
 				})}
 			>
 				View Traces

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

@@ -1,10 +1,6 @@
 import { Tooltip, Typography } from 'antd';
 import { navigateToTrace } from 'container/MetricsApplication/utils';
 import { RowData } from 'lib/query/createTableColumnsFromQuery';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { v4 as uuid } from 'uuid';
-
-import { useGetAPMToTracesQueries } from '../../util';
 
 function ColumnWithLink({
 	servicename,
@@ -15,25 +11,6 @@ function ColumnWithLink({
 }: LinkColumnProps): JSX.Element {
 	const text = record.toString();
 
-	const apmToTraceQuery = useGetAPMToTracesQueries({
-		servicename,
-		filters: [
-			{
-				id: uuid().slice(0, 8),
-				key: {
-					key: 'name',
-					dataType: DataTypes.String,
-					type: 'tag',
-					isColumn: true,
-					isJSON: false,
-					id: 'name--string--tag--true',
-				},
-				op: 'in',
-				value: [text],
-			},
-		],
-	});
-
 	const handleOnClick = (operation: string) => (): void => {
 		navigateToTrace({
 			servicename,
@@ -41,7 +18,6 @@ function ColumnWithLink({
 			minTime,
 			maxTime,
 			selectedTraceTags,
-			apmToTraceQuery,
 		});
 	};
 

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

@@ -1,20 +1,11 @@
 import { QueryParams } from 'constants/query';
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
 import { routeConfig } from 'container/SideNav/config';
 import { getQueryString } from 'container/SideNav/helper';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import history from 'lib/history';
-import { traceFilterKeys } from 'pages/TracesExplorer/Filter/filterUtils';
-import { Dispatch, SetStateAction, useMemo } from 'react';
-import {
-	BaseAutocompleteData,
-	DataTypes,
-} from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
+import { Dispatch, SetStateAction } from 'react';
+import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
 import { Tags } from 'types/reducer/trace';
-import { v4 as uuid } from 'uuid';
 
 export const dbSystemTags: Tags[] = [
 	{
@@ -30,13 +21,13 @@ interface OnViewTracePopupClickProps {
 	servicename: string | undefined;
 	selectedTraceTags: string;
 	timestamp: number;
-	apmToTraceQuery: Query;
+	isExternalCall?: boolean;
 }
 export function onViewTracePopupClick({
 	selectedTraceTags,
 	servicename,
 	timestamp,
-	apmToTraceQuery,
+	isExternalCall,
 }: OnViewTracePopupClickProps): VoidFunction {
 	return (): void => {
 		const currentTime = timestamp;
@@ -49,17 +40,13 @@ export function onViewTracePopupClick({
 		const avialableParams = routeConfig[ROUTES.TRACE];
 		const queryString = getQueryString(avialableParams, urlParams);
 
-		const JSONCompositeQuery = encodeURIComponent(
-			JSON.stringify(apmToTraceQuery),
+		history.replace(
+			`${
+				ROUTES.TRACE
+			}?${urlParams.toString()}&selected={"serviceName":["${servicename}"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&&isFilterExclude={"serviceName":false}&userSelectedFilter={"status":["error","ok"],"serviceName":["${servicename}"]}&spanAggregateCurrentPage=1${
+				isExternalCall ? '&spanKind=3' : ''
+			}&${queryString.join('&')}`,
 		);
-
-		const newTraceExplorerPath = `${
-			ROUTES.TRACES_EXPLORER
-		}?${urlParams.toString()}&selected={"serviceName":["${servicename}"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&${
-			QueryParams.compositeQuery
-		}=${JSONCompositeQuery}&${queryString.join('&')}`;
-
-		history.push(newTraceExplorerPath);
 	};
 }
 
@@ -100,104 +87,3 @@ export const handleNonInQueryRange = (tags: TagFilterItem[]): TagFilterItem[] =>
 		}
 		return tag;
 	});
-
-export function handleQueryChange(
-	query: Query,
-	attributeKeys: BaseAutocompleteData,
-	serviceAttribute: string,
-	filters?: TagFilterItem[],
-): Query {
-	const filterItem: TagFilterItem[] = [
-		{
-			id: uuid().slice(0, 8),
-			key: attributeKeys,
-			op: 'in',
-			value: serviceAttribute,
-		},
-	];
-	return {
-		...query,
-		builder: {
-			...query.builder,
-			queryData: query.builder.queryData?.map((item) => ({
-				...item,
-				filters: {
-					...item.filters,
-					items: [...item.filters.items, ...filterItem, ...(filters || [])],
-				},
-			})),
-		},
-	};
-}
-
-export function useGetAPMToTracesQueries({
-	servicename,
-	isExternalCall,
-	isDBCall,
-	filters,
-}: {
-	servicename: string;
-	isExternalCall?: boolean;
-	isDBCall?: boolean;
-	filters?: TagFilterItem[];
-}): Query {
-	const { updateAllQueriesOperators } = useQueryBuilder();
-
-	const finalFilters: TagFilterItem[] = [];
-	let spanKindFilter: TagFilterItem;
-	let dbCallFilter: TagFilterItem;
-
-	if (isExternalCall) {
-		spanKindFilter = {
-			id: uuid().slice(0, 8),
-			key: {
-				key: 'spanKind',
-				dataType: DataTypes.String,
-				type: 'tag',
-				isColumn: true,
-				isJSON: false,
-				id: 'spanKind--string--tag--true',
-			},
-			op: '=',
-			value: 'Client',
-		};
-		finalFilters.push(spanKindFilter);
-	}
-
-	if (isDBCall) {
-		dbCallFilter = {
-			id: uuid().slice(0, 8),
-			key: {
-				key: 'dbSystem',
-				dataType: DataTypes.String,
-				type: 'tag',
-				isColumn: true,
-				isJSON: false,
-				id: 'dbSystem--string--tag--true',
-			},
-			op: 'exists',
-			value: '',
-		};
-		finalFilters.push(dbCallFilter);
-	}
-
-	if (filters?.length) {
-		finalFilters.push(...filters);
-	}
-
-	return useMemo(() => {
-		const updatedQuery = updateAllQueriesOperators(
-			initialQueriesMap.traces,
-			PANEL_TYPES.TRACE,
-			DataSource.TRACES,
-		);
-
-		return handleQueryChange(
-			updatedQuery,
-			traceFilterKeys.serviceName,
-			servicename,
-			finalFilters,
-		);
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [servicename, updateAllQueriesOperators]);
-}

frontend/src/container/MetricsApplication/TopOperationsTable.tsx

@@ -12,13 +12,9 @@ import { useRef } from 'react';
 import { useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import { AppState } from 'store/reducers';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
 import { GlobalReducer } from 'types/reducer/globalTime';
-import { v4 as uuid } from 'uuid';
 
 import { IServiceName } from './Tabs/types';
-import { useGetAPMToTracesQueries } from './Tabs/util';
 import {
 	convertedTracesToDownloadData,
 	getErrorRate,
@@ -42,49 +38,18 @@ function TopOperationsTable({
 		convertRawQueriesToTraceSelectedTags(queries) || [],
 	);
 
-	const apmToTraceQuery = useGetAPMToTracesQueries({ servicename });
-
 	const params = useParams<{ servicename: string }>();
 
 	const handleOnClick = (operation: string): void => {
 		const { servicename: encodedServiceName } = params;
 		const servicename = decodeURIComponent(encodedServiceName);
 
-		const opFilter: TagFilterItem = {
-			id: uuid().slice(0, 8),
-			key: {
-				key: 'name',
-				dataType: DataTypes.String,
-				type: 'tag',
-				isColumn: true,
-				isJSON: false,
-				id: 'name--string--tag--true',
-			},
-			op: 'in',
-			value: [operation],
-		};
-
-		const preparedQuery: Query = {
-			...apmToTraceQuery,
-			builder: {
-				...apmToTraceQuery.builder,
-				queryData: apmToTraceQuery.builder.queryData?.map((item) => ({
-					...item,
-					filters: {
-						...item.filters,
-						items: [...item.filters.items, opFilter],
-					},
-				})),
-			},
-		};
-
 		navigateToTrace({
 			servicename,
 			operation,
 			minTime,
 			maxTime,
 			selectedTraceTags,
-			apmToTraceQuery: preparedQuery,
 		});
 	};
 

frontend/src/container/MetricsApplication/types.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { Widgets } from 'types/api/dashboard/getAll';
-import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
+import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
 
 import { IServiceName } from './Tabs/types';
 
@@ -19,7 +19,6 @@ export interface NavigateToTraceProps {
 	minTime: number;
 	maxTime: number;
 	selectedTraceTags: string;
-	apmToTraceQuery: Query;
 }
 
 export interface DatabaseCallsRPSProps extends DatabaseCallProps {

frontend/src/container/MetricsApplication/utils.ts

@@ -18,21 +18,15 @@ export const navigateToTrace = ({
 	minTime,
 	maxTime,
 	selectedTraceTags,
-	apmToTraceQuery,
 }: NavigateToTraceProps): void => {
 	const urlParams = new URLSearchParams();
 	urlParams.set(QueryParams.startTime, (minTime / 1000000).toString());
 	urlParams.set(QueryParams.endTime, (maxTime / 1000000).toString());
-
-	const JSONCompositeQuery = encodeURIComponent(JSON.stringify(apmToTraceQuery));
-
-	const newTraceExplorerPath = `${
-		ROUTES.TRACES_EXPLORER
-	}?${urlParams.toString()}&selected={"serviceName":["${servicename}"],"operation":["${operation}"]}&filterToFetchData=["duration","status","serviceName","operation"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&${
-		QueryParams.compositeQuery
-	}=${JSONCompositeQuery}`;
-
-	history.push(newTraceExplorerPath);
+	history.push(
+		`${
+			ROUTES.TRACE
+		}?${urlParams.toString()}&selected={"serviceName":["${servicename}"],"operation":["${operation}"]}&filterToFetchData=["duration","status","serviceName","operation"]&spanAggregateCurrentPage=1&selectedTags=${selectedTraceTags}&&isFilterExclude={"serviceName":false,"operation":false}&userSelectedFilter={"status":["error","ok"],"serviceName":["${servicename}"],"operation":["${operation}"]}&spanAggregateCurrentPage=1`,
+	);
 };
 
 export const getNearestHighestBucketValue = (

frontend/src/container/NewDashboard/DashboardDescription/Description.styles.scss

@@ -53,60 +53,54 @@
 		padding: 0px;
 	}
 
-	.dashboard-header {
+	.dashboard-breadcrumbs {
+		height: 48px;
+		padding: 16px;
 		border-bottom: 1px solid var(--bg-slate-400);
 		display: flex;
-		justify-content: space-between;
+		gap: 6px;
 		align-items: center;
 
-		.dashboard-breadcrumbs {
-			height: 48px;
-			padding: 16px;
+		.dashboard-btn {
 			display: flex;
-			gap: 6px;
 			align-items: center;
+			color: var(--bg-vanilla-400);
+			font-family: Inter;
+			font-size: 14px;
+			font-style: normal;
+			font-weight: 400;
+			line-height: 20px; /* 142.857% */
+			letter-spacing: -0.07px;
+			padding: 0px;
+			height: 20px;
+		}
 
-			.dashboard-btn {
-				display: flex;
-				align-items: center;
-				color: var(--bg-vanilla-400);
-				font-family: Inter;
-				font-size: 14px;
-				font-style: normal;
-				font-weight: 400;
-				line-height: 20px; /* 142.857% */
-				letter-spacing: -0.07px;
-				padding: 0px;
-				height: 20px;
-			}
+		.dashboard-btn:hover {
+			background-color: unset;
+		}
 
-			.dashboard-btn:hover {
-				background-color: unset;
-			}
+		.id-btn {
+			display: flex;
+			align-items: center;
+			padding: 0px 2px;
+			border-radius: 2px;
+			background: rgba(113, 144, 249, 0.1);
+			color: var(--bg-robin-400);
+			font-family: Inter;
+			font-size: 14px;
+			font-style: normal;
+			font-weight: 400;
+			line-height: 20px; /* 142.857% */
+			height: 20px;
 
-			.id-btn {
-				display: flex;
-				align-items: center;
-				padding: 0px 2px;
-				border-radius: 2px;
-				background: rgba(113, 144, 249, 0.1);
-				color: var(--bg-robin-400);
-				font-family: Inter;
-				font-size: 14px;
-				font-style: normal;
-				font-weight: 400;
-				line-height: 20px; /* 142.857% */
-				height: 20px;
-
-				.ant-btn-icon {
-					margin-inline-end: 4px;
-				}
-			}
-			.id-btn:hover {
-				background: rgba(113, 144, 249, 0.1);
-				color: var(--bg-robin-300);
+			.ant-btn-icon {
+				margin-inline-end: 4px;
 			}
 		}
+		.id-btn:hover {
+			background: rgba(113, 144, 249, 0.1);
+			color: var(--bg-robin-300);
+		}
 	}
 
 	.dashbord-details {
@@ -568,12 +562,11 @@
 	.dashboard-description-container {
 		color: var(--bg-ink-400);
 
-		.dashboard-header {
+		.dashboard-breadcrumbs {
 			border-bottom: 1px solid var(--bg-vanilla-300);
-			.dashboard-breadcrumbs {
-				.dashboard-btn {
-					color: var(--bg-ink-400);
-				}
+
+			.dashboard-btn {
+				color: var(--bg-ink-400);
 			}
 		}
 

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

@@ -1,11 +1,19 @@
 import './Description.styles.scss';
 
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, Card, Input, Modal, Popover, Tag, Typography } from 'antd';
+import {
+	Button,
+	Card,
+	Flex,
+	Input,
+	Modal,
+	Popover,
+	Tag,
+	Typography,
+} from 'antd';
 import FacingIssueBtn from 'components/facingIssueBtn/FacingIssueBtn';
 import { dashboardHelpMessage } from 'components/facingIssueBtn/util';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
-import { QueryParams } from 'constants/query';
 import { PANEL_GROUP_TYPES, PANEL_TYPES } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
 import { DeleteButton } from 'container/ListOfDashboard/TableComponents/DeleteButton';
@@ -13,7 +21,6 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import { useUpdateDashboard } from 'hooks/dashboard/useUpdateDashboard';
 import useComponentPermission from 'hooks/useComponentPermission';
 import { useNotifications } from 'hooks/useNotifications';
-import useUrlQuery from 'hooks/useUrlQuery';
 import history from 'lib/history';
 import { isEmpty } from 'lodash-es';
 import {
@@ -63,7 +70,6 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 		layouts,
 		setLayouts,
 		isDashboardLocked,
-		listSortOrder,
 		setSelectedDashboard,
 		handleToggleDashboardSlider,
 		handleDashboardLockToggle,
@@ -85,8 +91,6 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 
 	const updateDashboardMutation = useUpdateDashboard();
 
-	const urlQuery = useUrlQuery();
-
 	const { featureResponse, user, role } = useSelector<AppState, AppReducer>(
 		(state) => state.app,
 	);
@@ -255,25 +259,15 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 		});
 	}
 
-	function goToListPage(): void {
-		urlQuery.set('columnKey', listSortOrder.columnKey as string);
-		urlQuery.set('order', listSortOrder.order as string);
-		urlQuery.set('page', listSortOrder.pagination as string);
-		urlQuery.delete(QueryParams.relativeTime);
-
-		const generatedUrl = `${ROUTES.ALL_DASHBOARD}?${urlQuery.toString()}`;
-		history.replace(generatedUrl);
-	}
-
 	return (
 		<Card className="dashboard-description-container">
-			<div className="dashboard-header">
+			<Flex justify="space-between" align="center">
 				<section className="dashboard-breadcrumbs">
 					<Button
 						type="text"
 						icon={<LayoutGrid size={14} />}
 						className="dashboard-btn"
-						onClick={(): void => goToListPage()}
+						onClick={(): void => history.push(ROUTES.ALL_DASHBOARD)}
 					>
 						Dashboard /
 					</Button>
@@ -303,7 +297,7 @@ function DashboardDescription(props: DashboardDescriptionProps): JSX.Element {
 					buttonText="Facing issues with dashboards?"
 					onHoverText="Click here to get help with dashboard details"
 				/>
-			</div>
+			</Flex>
 			<section className="dashbord-details">
 				<div className="left-section">
 					<img

frontend/src/container/NewDashboard/DashboardSettings/General/index.tsx

@@ -71,24 +71,24 @@ function GeneralDashboardSettings(): JSX.Element {
 
 	useEffect(() => {
 		let numberOfUnsavedChanges = 0;
-		const initialValues = [title, description, tags, image];
-		const updatedValues = [
-			updatedTitle,
-			updatedDescription,
-			updatedTags,
-			updatedImage,
-		];
-		initialValues.forEach((val, index) => {
-			if (!isEqual(val, updatedValues[index])) {
-				numberOfUnsavedChanges += 1;
-			}
-		});
+		if (!isEqual(updatedTitle, selectedData?.title)) {
+			numberOfUnsavedChanges += 1;
+		}
+		if (!isEqual(updatedDescription, selectedData?.description)) {
+			numberOfUnsavedChanges += 1;
+		}
+		if (!isEqual(updatedTags, selectedData?.tags)) {
+			numberOfUnsavedChanges += 1;
+		}
+		if (!isEqual(updatedImage, selectedData?.image)) {
+			numberOfUnsavedChanges += 1;
+		}
 		setNumberOfUnsavedChanges(numberOfUnsavedChanges);
 	}, [
-		description,
-		image,
-		tags,
-		title,
+		selectedData?.description,
+		selectedData?.image,
+		selectedData?.tags,
+		selectedData?.title,
 		updatedDescription,
 		updatedImage,
 		updatedTags,
@@ -167,8 +167,7 @@ function GeneralDashboardSettings(): JSX.Element {
 					<div className="unsaved">
 						<div className="unsaved-dot" />
 						<Typography.Text className="unsaved-changes">
-							{numberOfUnsavedChanges} unsaved change
-							{numberOfUnsavedChanges > 1 && 's'}
+							{numberOfUnsavedChanges} Unsaved change
 						</Typography.Text>
 					</div>
 					<div className="footer-action-btns">

frontend/src/container/NewWidget/LeftContainer/QuerySection/index.tsx

@@ -12,6 +12,7 @@ import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interface
 import { useKeyboardHotkeys } from 'hooks/hotkeys/useKeyboardHotkeys';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
+import { updateStepInterval } from 'hooks/queryBuilder/useStepInterval';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { defaultTo } from 'lodash-es';
@@ -32,6 +33,7 @@ import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { EQueryType } from 'types/common/dashboard';
 import AppReducer from 'types/reducer/app';
+import { GlobalReducer } from 'types/reducer/globalTime';
 
 import ClickHouseQueryContainer from './QueryBuilder/clickHouse';
 import PromQLQueryContainer from './QueryBuilder/promQL';
@@ -44,6 +46,10 @@ function QuerySection({
 	const urlQuery = useUrlQuery();
 	const { registerShortcut, deregisterShortcut } = useKeyboardHotkeys();
 
+	const { minTime, maxTime } = useSelector<AppState, GlobalReducer>(
+		(state) => state.globalTime,
+	);
+
 	const { featureResponse } = useSelector<AppState, AppReducer>(
 		(state) => state.app,
 	);
@@ -74,6 +80,8 @@ function QuerySection({
 				return;
 			}
 
+			const updatedQuery = updateStepInterval(query, maxTime, minTime);
+
 			const selectedWidgetIndex = getSelectedWidgetIndex(
 				selectedDashboard,
 				selectedWidget.id,
@@ -94,16 +102,18 @@ function QuerySection({
 						...previousWidgets,
 						{
 							...selectedWidget,
-							query,
+							query: updatedQuery,
 						},
 						...nextWidgets,
 					],
 				},
 			});
-			redirectWithQueryBuilderData(query);
+			redirectWithQueryBuilderData(updatedQuery);
 		},
 		[
 			selectedDashboard,
+			maxTime,
+			minTime,
 			selectedWidget,
 			setSelectedDashboard,
 			redirectWithQueryBuilderData,
@@ -127,7 +137,7 @@ function QuerySection({
 
 	const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => {
 		const config: QueryBuilderProps['filterConfigs'] = {
-			stepInterval: { isHidden: false, isDisabled: false },
+			stepInterval: { isHidden: false, isDisabled: true },
 		};
 
 		return config;

frontend/src/container/NewWidget/RightContainer/ColumnUnitSelector/ColumnUnitSelector.tsx

@@ -4,7 +4,6 @@ import { Typography } from 'antd';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { Dispatch, SetStateAction } from 'react';
 import { ColumnUnit } from 'types/api/dashboard/getAll';
-import { EQueryType } from 'types/common/dashboard';
 
 import YAxisUnitSelector from '../YAxisUnitSelector';
 
@@ -19,13 +18,7 @@ export function ColumnUnitSelector(
 	const { currentQuery } = useQueryBuilder();
 
 	function getAggregateColumnsNamesAndLabels(): string[] {
-		if (currentQuery.queryType === EQueryType.QUERY_BUILDER) {
-			return currentQuery.builder.queryData.map((q) => q.queryName);
-		}
-		if (currentQuery.queryType === EQueryType.CLICKHOUSE) {
-			return currentQuery.clickhouse_sql.map((q) => q.name);
-		}
-		return currentQuery.promql.map((q) => q.name);
+		return currentQuery.builder.queryData.map((q) => q.queryName);
 	}
 
 	const { columnUnits, setColumnUnits } = props;

frontend/src/container/NewWidget/RightContainer/RightContainer.styles.scss

@@ -241,24 +241,6 @@
 			}
 		}
 
-		.stack-chart {
-			margin-top: 16px;
-			display: flex;
-			justify-content: space-between;
-			gap: 8px;
-
-			.label {
-				color: var(--bg-vanilla-400);
-				font-family: 'Space Mono';
-				font-size: 13px;
-				font-style: normal;
-				font-weight: 400;
-				line-height: 18px; /* 138.462% */
-				letter-spacing: 0.52px;
-				text-transform: uppercase;
-			}
-		}
-
 		.bucket-config {
 			margin-top: 16px;
 			display: flex;

frontend/src/container/NewWidget/RightContainer/constants.ts

@@ -132,17 +132,3 @@ export const panelTypeVsColumnUnitPreferences: {
 	[PANEL_TYPES.HISTOGRAM]: false,
 	[PANEL_TYPES.EMPTY_WIDGET]: false,
 } as const;
-
-export const panelTypeVsStackingChartPreferences: {
-	[key in PANEL_TYPES]: boolean;
-} = {
-	[PANEL_TYPES.TIME_SERIES]: false,
-	[PANEL_TYPES.VALUE]: false,
-	[PANEL_TYPES.TABLE]: false,
-	[PANEL_TYPES.LIST]: false,
-	[PANEL_TYPES.PIE]: false,
-	[PANEL_TYPES.BAR]: true,
-	[PANEL_TYPES.TRACE]: false,
-	[PANEL_TYPES.HISTOGRAM]: false,
-	[PANEL_TYPES.EMPTY_WIDGET]: false,
-} as const;

frontend/src/container/NewWidget/RightContainer/index.tsx

@@ -29,7 +29,6 @@ import {
 	panelTypeVsFillSpan,
 	panelTypeVsPanelTimePreferences,
 	panelTypeVsSoftMinMax,
-	panelTypeVsStackingChartPreferences,
 	panelTypeVsThreshold,
 	panelTypeVsYAxisUnit,
 } from './constants';
@@ -49,8 +48,6 @@ function RightContainer({
 	selectedGraph,
 	bucketCount,
 	bucketWidth,
-	stackedBarChart,
-	setStackedBarChart,
 	setBucketCount,
 	setBucketWidth,
 	setSelectedTime,
@@ -90,8 +87,6 @@ function RightContainer({
 	const allowYAxisUnit = panelTypeVsYAxisUnit[selectedGraph];
 	const allowCreateAlerts = panelTypeVsCreateAlert[selectedGraph];
 	const allowBucketConfig = panelTypeVsBucketConfig[selectedGraph];
-	const allowStackingBarChart =
-		panelTypeVsStackingChartPreferences[selectedGraph];
 	const allowPanelTimePreference =
 		panelTypeVsPanelTimePreferences[selectedGraph];
 
@@ -236,17 +231,6 @@ function RightContainer({
 					</section>
 				)}
 
-				{allowStackingBarChart && (
-					<section className="stack-chart">
-						<Typography.Text className="label">Stack series</Typography.Text>
-						<Switch
-							checked={stackedBarChart}
-							size="small"
-							onChange={(checked): void => setStackedBarChart(checked)}
-						/>
-					</section>
-				)}
-
 				{allowBucketConfig && (
 					<section className="bucket-config">
 						<Typography.Text className="label">Number of buckets</Typography.Text>
@@ -328,8 +312,6 @@ interface RightContainerProps {
 	setSelectedTime: Dispatch<SetStateAction<timePreferance>>;
 	selectedTime: timePreferance;
 	yAxisUnit: string;
-	stackedBarChart: boolean;
-	setStackedBarChart: Dispatch<SetStateAction<boolean>>;
 	bucketWidth: number;
 	bucketCount: number;
 	combineHistogram: boolean;

frontend/src/container/NewWidget/index.tsx

@@ -126,10 +126,6 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 	const [stacked, setStacked] = useState<boolean>(
 		selectedWidget?.isStacked || false,
 	);
-
-	const [stackedBarChart, setStackedBarChart] = useState<boolean>(
-		selectedWidget?.stackedBarChart || false,
-	);
 	const [opacity, setOpacity] = useState<string>(selectedWidget?.opacity || '1');
 	const [thresholds, setThresholds] = useState<ThresholdProps[]>(
 		selectedWidget?.thresholds || [],
@@ -199,7 +195,6 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 				fillSpans: isFillSpans,
 				columnUnits,
 				bucketCount,
-				stackedBarChart,
 				bucketWidth,
 				mergeAllActiveQueries: combineHistogram,
 				selectedLogFields,
@@ -224,7 +219,6 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 		bucketWidth,
 		bucketCount,
 		combineHistogram,
-		stackedBarChart,
 	]);
 
 	const closeModal = (): void => {
@@ -313,7 +307,6 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 								opacity: selectedWidget?.opacity || '1',
 								nullZeroValues: selectedWidget?.nullZeroValues || 'zero',
 								title: selectedWidget?.title,
-								stackedBarChart: selectedWidget?.stackedBarChart || false,
 								yAxisUnit: selectedWidget?.yAxisUnit,
 								panelTypes: graphType,
 								query: currentQuery,
@@ -339,7 +332,6 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 								opacity: selectedWidget?.opacity || '1',
 								nullZeroValues: selectedWidget?.nullZeroValues || 'zero',
 								title: selectedWidget?.title,
-								stackedBarChart: selectedWidget?.stackedBarChart || false,
 								yAxisUnit: selectedWidget?.yAxisUnit,
 								panelTypes: graphType,
 								query: currentQuery,
@@ -540,8 +532,6 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 						setDescription={setDescription}
 						stacked={stacked}
 						setStacked={setStacked}
-						stackedBarChart={stackedBarChart}
-						setStackedBarChart={setStackedBarChart}
 						opacity={opacity}
 						yAxisUnit={yAxisUnit}
 						columnUnits={columnUnits}

frontend/src/container/NewWidget/styles.ts

@@ -10,9 +10,10 @@ export const Container = styled.div`
 
 export const RightContainerWrapper = styled(Col)`
 	&&& {
+		min-width: 330px;
+		overflow-y: auto;
 		max-width: 400px;
 		width: 30%;
-		overflow-y: auto;
 	}
 	&::-webkit-scrollbar {
 		width: 0rem;
@@ -25,7 +26,7 @@ interface LeftContainerWrapperProps {
 
 export const LeftContainerWrapper = styled(Col)<LeftContainerWrapperProps>`
 	&&& {
-		width: 100%;
+		min-width: 70%;
 		overflow-y: auto;
 		border-right: ${({ isDarkMode }): string =>
 			isDarkMode

frontend/src/container/PanelWrapper/PiePanelWrapper.tsx

@@ -60,7 +60,7 @@ function PiePanelWrapper({
 						d.series?.length === 1
 							? getLabel(Object.values(s.labels)[0], widget.query, d.queryName)
 							: getLabel(Object.values(s.labels)[0], {} as Query, d.queryName, true),
-						isDarkMode ? themeColors.chartcolors : themeColors.lightModeColor,
+						themeColors.chartcolors,
 					),
 				})),
 			)

frontend/src/container/PanelWrapper/UplotPanelWrapper.styles.scss

@@ -1,4 +0,0 @@
-.info-text {
-	margin-top: 8px;
-	padding: 8px;
-}

frontend/src/container/PanelWrapper/UplotPanelWrapper.tsx

@@ -1,6 +1,3 @@
-import './UplotPanelWrapper.styles.scss';
-
-import { Alert } from 'antd';
 import { ToggleGraphProps } from 'components/Graph/types';
 import Uplot from 'components/Uplot';
 import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -11,7 +8,6 @@ import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useResizeObserver } from 'hooks/useDimensions';
 import { getUPlotChartOptions } from 'lib/uPlotLib/getUplotChartOptions';
 import { getUPlotChartData } from 'lib/uPlotLib/utils/getUplotChartData';
-import { cloneDeep, isEqual, isUndefined } from 'lodash-es';
 import _noop from 'lodash-es/noop';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
 import { useEffect, useMemo, useRef, useState } from 'react';
@@ -39,8 +35,6 @@ function UplotPanelWrapper({
 	const [maxTimeScale, setMaxTimeScale] = useState<number>();
 	const { currentQuery } = useQueryBuilder();
 
-	const [hiddenGraph, setHiddenGraph] = useState<{ [key: string]: boolean }>();
-
 	useEffect(() => {
 		if (toScrollWidgetId === widget.id) {
 			graphRef.current?.scrollIntoView({
@@ -84,26 +78,8 @@ function UplotPanelWrapper({
 	const chartData = getUPlotChartData(
 		queryResponse?.data?.payload,
 		widget.fillSpans,
-		widget?.stackedBarChart,
-		hiddenGraph,
 	);
 
-	useEffect(() => {
-		if (widget.panelTypes === PANEL_TYPES.BAR && widget?.stackedBarChart) {
-			const graphV = cloneDeep(graphVisibility)?.slice(1);
-			const isSomeSelectedLegend = graphV?.some((v) => v === false);
-			if (isSomeSelectedLegend) {
-				const hiddenIndex = graphV?.findIndex((v) => v === true);
-				if (!isUndefined(hiddenIndex) && hiddenIndex !== -1) {
-					const updatedHiddenGraph = { [hiddenIndex]: true };
-					if (!isEqual(hiddenGraph, updatedHiddenGraph)) {
-						setHiddenGraph(updatedHiddenGraph);
-					}
-				}
-			}
-		}
-	}, [graphVisibility, hiddenGraph, widget.panelTypes, widget?.stackedBarChart]);
-
 	const options = useMemo(
 		() =>
 			getUPlotChartOptions({
@@ -123,9 +99,6 @@ function UplotPanelWrapper({
 				setGraphsVisibilityStates: setGraphVisibility,
 				panelType: selectedGraph || widget.panelTypes,
 				currentQuery,
-				stackBarChart: widget?.stackedBarChart,
-				hiddenGraph,
-				setHiddenGraph,
 			}),
 		[
 			widget?.id,
@@ -134,7 +107,6 @@ function UplotPanelWrapper({
 			widget.softMax,
 			widget.softMin,
 			widget.panelTypes,
-			widget?.stackedBarChart,
 			queryResponse.data?.payload,
 			containerDimensions,
 			isDarkMode,
@@ -146,23 +118,15 @@ function UplotPanelWrapper({
 			setGraphVisibility,
 			selectedGraph,
 			currentQuery,
-			hiddenGraph,
 		],
 	);
 
 	return (
 		<div style={{ height: '100%', width: '100%' }} ref={graphRef}>
 			<Uplot options={options} data={chartData} ref={lineChartRef} />
-			{widget?.stackedBarChart && isFullViewMode && (
-				<Alert
-					message="Selecting multiple legends is currently not supported in case of stacked bar charts"
-					type="info"
-					className="info-text"
-				/>
-			)}
-			{isFullViewMode && setGraphVisibility && !widget?.stackedBarChart && (
+			{isFullViewMode && setGraphVisibility && (
 				<GraphManager
-					data={getUPlotChartData(queryResponse?.data?.payload, widget.fillSpans)}
+					data={chartData}
 					name={widget.id}
 					options={options}
 					yAxisUnit={widget.yAxisUnit}

frontend/src/container/PipelinePage/tests/PipelinesSearchSection.test.tsx

@@ -42,11 +42,9 @@ describe('PipelinePage container test', () => {
 		jest.advanceTimersByTime(299);
 		expect(setPipelineValue).not.toHaveBeenCalled();
 
-		// Fast-forward time by 1ms to reach the debounce delay
-		jest.advanceTimersByTime(1);
-
-		// Wait for the debounce delay to pass and expect the callback to be called
+		// Wait for the debounce delay to pass
 		await waitFor(() => {
+			// Expect the callback to be called after debounce delay
 			expect(setPipelineValue).toHaveBeenCalledWith('sample_pipeline');
 		});
 

frontend/src/container/ServiceApplication/Columns/GetColumnSearchProps.tsx

@@ -1,26 +1,13 @@
-import '../ServiceApplication.styles.scss';
-
 import { SearchOutlined } from '@ant-design/icons';
-import { Popconfirm, PopconfirmProps } from 'antd';
 import type { ColumnType } from 'antd/es/table';
 import ROUTES from 'constants/routes';
 import { routeConfig } from 'container/SideNav/config';
 import { getQueryString } from 'container/SideNav/helper';
-import history from 'lib/history';
-import { Info } from 'lucide-react';
 import { Link } from 'react-router-dom';
 import { ServicesList } from 'types/api/metrics/getService';
 
 import { filterDropdown } from '../Filter/FilterDropdown';
-
-const MAX_TOP_LEVEL_OPERATIONS = 2500;
-
-const highTopLevelOperationsPopoverDesc = (metrics: string): JSX.Element => (
-	<div className="popover-description">
-		The service `{metrics}` has too many top level operations. It makes the
-		dashboard slow to load.
-	</div>
-);
+import { Name } from '../styles';
 
 export const getColumnSearchProps = (
 	dataIndex: keyof ServicesList,
@@ -28,61 +15,24 @@ export const getColumnSearchProps = (
 ): ColumnType<ServicesList> => ({
 	filterDropdown,
 	filterIcon: <SearchOutlined />,
-	onFilter: (
-		value: string | number | boolean,
-		record: ServicesList,
-	): boolean => {
-		if (record[dataIndex]) {
-			record[dataIndex]
-				?.toString()
-				.toLowerCase()
-				.includes(value.toString().toLowerCase());
-		}
-
-		return false;
-	},
-	render: (metrics: string, record: ServicesList): JSX.Element => {
+	onFilter: (value: string | number | boolean, record: ServicesList): boolean =>
+		record[dataIndex]
+			.toString()
+			.toLowerCase()
+			.includes(value.toString().toLowerCase()),
+	render: (metrics: string): JSX.Element => {
 		const urlParams = new URLSearchParams(search);
 		const avialableParams = routeConfig[ROUTES.SERVICE_METRICS];
 		const queryString = getQueryString(avialableParams, urlParams);
-		const topLevelOperations = record?.dataWarning?.topLevelOps || [];
-
-		const handleShowTopLevelOperations: PopconfirmProps['onConfirm'] = () => {
-			history.push(
-				`${ROUTES.APPLICATION}/${encodeURIComponent(metrics)}/top-level-operations`,
-			);
-		};
-
-		const hasHighTopLevelOperations =
-			topLevelOperations &&
-			Array.isArray(topLevelOperations) &&
-			topLevelOperations.length > MAX_TOP_LEVEL_OPERATIONS;
 
 		return (
-			<div className={`serviceName ${hasHighTopLevelOperations ? 'error' : ''} `}>
-				{hasHighTopLevelOperations && (
-					<Popconfirm
-						title="Too Many Top Level Operations"
-						description={highTopLevelOperationsPopoverDesc(metrics)}
-						placement="right"
-						overlayClassName="service-high-top-level-operations"
-						onConfirm={handleShowTopLevelOperations}
-						trigger={['hover']}
-						showCancel={false}
-						okText="Show Top Level Operations"
-					>
-						<Info size={14} />
-					</Popconfirm>
-				)}
-
-				<Link
-					to={`${ROUTES.APPLICATION}/${encodeURIComponent(
-						metrics,
-					)}?${queryString.join('')}`}
-				>
-					{metrics}
-				</Link>
-			</div>
+			<Link
+				to={`${ROUTES.APPLICATION}/${encodeURIComponent(
+					metrics,
+				)}?${queryString.join('')}`}
+			>
+				<Name>{metrics}</Name>
+			</Link>
 		);
 	},
 });

frontend/src/container/ServiceApplication/ServiceApplication.styles.scss

@@ -1,25 +0,0 @@
-.serviceName {
-	color: #4e74f8;
-	font-weight: 600;
-	cursor: pointer;
-
-	display: flex;
-	align-items: center;
-	gap: 8px;
-}
-
-.error {
-	color: var(--bg-cherry-500);
-
-	a {
-		color: var(--bg-cherry-500);
-	}
-}
-
-.service-high-top-level-operations {
-	width: 300px;
-
-	.popover-description {
-		padding: 16px 0;
-	}
-}

frontend/src/container/ServiceTable/Columns/GetColumnSearchProps.tsx

@@ -15,19 +15,11 @@ export const getColumnSearchProps = (
 ): ColumnType<ServicesList> => ({
 	filterDropdown,
 	filterIcon: <SearchOutlined />,
-	onFilter: (
-		value: string | number | boolean,
-		record: ServicesList,
-	): boolean => {
-		if (record[dataIndex]) {
-			record[dataIndex]
-				?.toString()
-				.toLowerCase()
-				.includes(value.toString().toLowerCase());
-		}
-
-		return false;
-	},
+	onFilter: (value: string | number | boolean, record: ServicesList): boolean =>
+		record[dataIndex]
+			.toString()
+			.toLowerCase()
+			.includes(value.toString().toLowerCase()),
 	render: (metrics: string): JSX.Element => {
 		const urlParams = new URLSearchParams(search);
 		const avialableParams = routeConfig[ROUTES.SERVICE_METRICS];

frontend/src/container/SideNav/SideNav.tsx

@@ -209,9 +209,7 @@ function SideNav({
 				if (event && isCtrlMetaKey(event)) {
 					openInNewTab(`${key}?${queryString.join('&')}`);
 				} else {
-					history.push(`${key}?${queryString.join('&')}`, {
-						from: pathname,
-					});
+					history.push(`${key}?${queryString.join('&')}`);
 				}
 			}
 		},

frontend/src/container/TopNav/DateTimeSelectionV2/config.ts

@@ -202,7 +202,6 @@ export const routesToSkip = [
 	ROUTES.INTEGRATIONS,
 	ROUTES.DASHBOARD,
 	ROUTES.DASHBOARD_WIDGET,
-	ROUTES.SERVICE_TOP_LEVEL_OPERATIONS,
 ];
 
 export const routesToDisable = [ROUTES.LOGS_EXPLORER, ROUTES.LIVE_LOGS];

frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx

@@ -22,6 +22,7 @@ import { QueryHistoryState } from 'container/LiveLogs/types';
 import NewExplorerCTA from 'container/NewExplorerCTA';
 import dayjs, { Dayjs } from 'dayjs';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { updateStepInterval } from 'hooks/queryBuilder/useStepInterval';
 import useUrlQuery from 'hooks/useUrlQuery';
 import GetMinMax from 'lib/getMinMax';
 import getTimeString from 'lib/getTimeString';
@@ -314,6 +315,8 @@ function DateTimeSelection({
 			return;
 		}
 
+		const { maxTime, minTime } = GetMinMax(value, getTime());
+
 		if (!isLogsExplorerPage) {
 			urlQuery.delete('startTime');
 			urlQuery.delete('endTime');
@@ -330,8 +333,7 @@ function DateTimeSelection({
 			return;
 		}
 		// the second boolean param directs the qb about the time change so to merge the query and retain the current state
-		// we removed update step interval to stop auto updating the value on time change
-		initQueryBuilderData(stagedQuery, true);
+		initQueryBuilderData(updateStepInterval(stagedQuery, maxTime, minTime), true);
 	};
 
 	const onRefreshHandler = (): void => {
@@ -381,6 +383,8 @@ function DateTimeSelection({
 
 		setIsValidteRelativeTime(true);
 
+		const { maxTime, minTime } = GetMinMax(dateTimeStr, getTime());
+
 		if (!isLogsExplorerPage) {
 			urlQuery.delete('startTime');
 			urlQuery.delete('endTime');
@@ -396,8 +400,7 @@ function DateTimeSelection({
 		}
 
 		// the second boolean param directs the qb about the time change so to merge the query and retain the current state
-		// we removed update step interval to stop auto updating the value on time change
-		initQueryBuilderData(stagedQuery, true);
+		initQueryBuilderData(updateStepInterval(stagedQuery, maxTime, minTime), true);
 	};
 
 	const getCustomOrIntervalTime = (

frontend/src/container/TracesExplorer/QuerySection/index.tsx

@@ -19,7 +19,7 @@ function QuerySection(): JSX.Element {
 	const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => {
 		const isList = panelTypes === PANEL_TYPES.LIST;
 		const config: QueryBuilderProps['filterConfigs'] = {
-			stepInterval: { isHidden: false, isDisabled: false },
+			stepInterval: { isHidden: false, isDisabled: true },
 			limit: { isHidden: isList, isDisabled: true },
 			having: { isHidden: isList, isDisabled: true },
 		};
@@ -56,7 +56,7 @@ function QuerySection(): JSX.Element {
 				version="v3" // setting this to v3 as we this is rendered in logs explorer
 				actions={
 					<ButtonWrapper>
-						<Button onClick={(): void => handleRunQuery()} type="primary">
+						<Button onClick={handleRunQuery} type="primary">
 							Run Query
 						</Button>
 					</ButtonWrapper>

frontend/src/hooks/queryBuilder/useStepInterval.ts

@@ -8,7 +8,6 @@ export const updateStepInterval = (
 	query: Widgets['query'],
 	maxTime: number,
 	minTime: number,
-	shallUpdateStepInterval?: boolean,
 ): Widgets['query'] => {
 	const stepInterval = getStep({
 		start: minTime,
@@ -16,14 +15,6 @@ export const updateStepInterval = (
 		inputFormat: 'ns',
 	});
 
-	function getStepInterval(customInterval: number): number {
-		// if user enters some value then auto update should never come
-		if (shallUpdateStepInterval) {
-			return customInterval;
-		}
-		return stepInterval;
-	}
-
 	return {
 		...query,
 		builder: {
@@ -31,7 +22,7 @@ export const updateStepInterval = (
 			queryData:
 				query?.builder?.queryData?.map((item) => ({
 					...item,
-					stepInterval: getStepInterval(item.stepInterval),
+					stepInterval,
 				})) || [],
 		},
 	};

frontend/src/hooks/useDarkMode/index.tsx

@@ -30,7 +30,7 @@ export function ThemeProvider({ children }: ThemeProviderProps): JSX.Element {
 			setTheme(THEME_MODE.LIGHT);
 			set(LOCALSTORAGE.THEME, THEME_MODE.LIGHT);
 		}
-		set(LOCALSTORAGE.THEME_ANALYTICS_V1, '');
+		set(LOCALSTORAGE.THEME_ANALYTICS, '');
 	}, [theme]);
 
 	const value = useMemo(