fix: use middleware from common middleware package

### Summary

- support for docker compose plugin
- check for occupied port when installing SigNoz for the first time
- remove unused code

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

conf/defaults.yaml

@@ -1,32 +0,0 @@
-##################### SigNoz Configuration Defaults #####################
-# 
-# Do not modify this file
-#
-
-##################### Web #####################
-web:
-  # The prefix to serve web on
-  prefix: /
-  # The directory containing the static build files.
-  directory: /etc/signoz/web
-
-##################### Cache #####################
-cache:
-  # specifies the caching provider to use.
-  provider: memory
-  # memory: Uses in-memory caching.
-  memory:
-    # Time-to-live for cache entries in memory. Specify the duration in ns
-    ttl: 60000000000
-    # The interval at which the cache will be cleaned up
-    cleanupInterval: 
-  # redis: Uses Redis as the caching backend.
-  redis:
-    # The hostname or IP address of the Redis server.
-    host: localhost
-    # The port on which the Redis server is running. Default is usually 6379.
-    port: 6379
-    # The password for authenticating with the Redis server, if required.
-    password: 
-    # The Redis database number to use
-    db: 0

conf/example.yaml

@@ -0,0 +1,70 @@
+##################### SigNoz Configuration Example #####################
+# 
+# Do not modify this file
+#
+
+##################### Instrumentation #####################
+instrumentation:
+  logs:
+    level: info
+    enabled: false
+    processors:
+      batch:
+        exporter:
+          otlp:
+            endpoint: localhost:4317
+  traces:
+    enabled: false
+    processors:
+      batch:
+        exporter:
+          otlp:
+            endpoint: localhost:4317
+  metrics:
+    enabled: true
+    readers:
+      pull:
+        exporter:
+          prometheus:
+            host: "0.0.0.0"
+            port: 9090
+
+##################### Web #####################
+web:
+  # Whether to enable the web frontend
+  enabled: true
+  # The prefix to serve web on
+  prefix: /
+  # The directory containing the static build files.
+  directory: /etc/signoz/web
+
+##################### Cache #####################
+cache:
+  # specifies the caching provider to use.
+  provider: memory
+  # memory: Uses in-memory caching.
+  memory:
+    # Time-to-live for cache entries in memory. Specify the duration in ns
+    ttl: 60000000000
+    # The interval at which the cache will be cleaned up
+    cleanupInterval: 1m
+  # redis: Uses Redis as the caching backend.
+  redis:
+    # The hostname or IP address of the Redis server.
+    host: localhost
+    # The port on which the Redis server is running. Default is usually 6379.
+    port: 6379
+    # The password for authenticating with the Redis server, if required.
+    password: 
+    # The Redis database number to use
+    db: 0
+
+##################### SQLStore #####################
+sqlstore:
+  # specifies the SQLStore provider to use.
+  provider: sqlite
+  # The maximum number of open connections to the database.
+  max_open_conns: 100
+  sqlite:
+    # The path to the SQLite database file.
+    path: /var/lib/signoz/signoz.db

deploy/install.sh

@@ -32,6 +32,11 @@ has_cmd() {
     command -v "$1" > /dev/null 2>&1
 }
 
+# Check if docker compose plugin is present
+has_docker_compose_plugin() {
+    docker compose version > /dev/null 2>&1
+}
+
 is_mac() {
     [[ $OSTYPE == darwin* ]]
 }
@@ -183,9 +188,7 @@ install_docker() {
         $sudo_cmd yum-config-manager --add-repo https://download.docker.com/linux/$os/docker-ce.repo
         echo "Installing docker"
         $yum_cmd install docker-ce docker-ce-cli containerd.io
-
     fi
-
 }
 
 compose_version () {
@@ -227,12 +230,6 @@ start_docker() {
             echo "Starting docker service"
             $sudo_cmd systemctl start docker.service
         fi
-        # if [[ -z $sudo_cmd ]]; then
-        #     docker ps > /dev/null && true
-        #     if [[ $? -ne 0 ]]; then
-        #         request_sudo
-        #     fi
-        # fi
         if [[ -z $sudo_cmd ]]; then
             if ! docker ps > /dev/null && true; then
                 request_sudo
@@ -265,7 +262,7 @@ bye() {  # Prints a friendly good bye message and exits the script.
 
         echo "🔴 The containers didn't seem to start correctly. Please run the following command to check containers that may have errored out:"
         echo ""
-        echo -e "$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml ps -a"
+        echo -e "$sudo_cmd $docker_compose_cmd -f ./docker/clickhouse-setup/docker-compose.yaml ps -a"
 
         echo "Please read our troubleshooting guide https://signoz.io/docs/install/troubleshooting/"
         echo "or reach us for support in #help channel in our Slack Community https://signoz.io/slack"
@@ -296,11 +293,6 @@ request_sudo() {
         if (( $EUID != 0 )); then
             sudo_cmd="sudo"
             echo -e "Please enter your sudo password, if prompted."
-            # $sudo_cmd -l | grep -e "NOPASSWD: ALL" > /dev/null
-            # if [[ $? -ne 0 ]] && ! $sudo_cmd -v; then
-            #     echo "Need sudo privileges to proceed with the installation."
-            #     exit 1;
-            # fi
             if ! $sudo_cmd -l | grep -e "NOPASSWD: ALL" > /dev/null && ! $sudo_cmd -v; then
                 echo "Need sudo privileges to proceed with the installation."
                 exit 1;
@@ -317,6 +309,7 @@ echo -e "👋 Thank you for trying out SigNoz! "
 echo ""
 
 sudo_cmd=""
+docker_compose_cmd=""
 
 # Check sudo permissions
 if (( $EUID != 0 )); then
@@ -362,28 +355,8 @@ else
     SIGNOZ_INSTALLATION_ID=$(echo "$sysinfo" | $digest_cmd | grep -E -o '[a-zA-Z0-9]{64}')
 fi
 
-# echo ""
-
-# echo -e "👉 ${RED}Two ways to go forward\n"  
-# echo -e "${RED}1) ClickHouse as database (default)\n"  
-# read -p "⚙️  Enter your preference (1/2):" choice_setup 
-
-# while [[ $choice_setup != "1"   &&  $choice_setup != "2" && $choice_setup != "" ]]
-# do
-#     # echo $choice_setup
-#     echo -e "\n❌ ${CYAN}Please enter either 1 or 2"
-#     read -p "⚙️  Enter your preference (1/2):  " choice_setup 
-#     # echo $choice_setup
-# done
-
-# if [[ $choice_setup == "1" || $choice_setup == "" ]];then
-#     setup_type='clickhouse'
-# fi
-
 setup_type='clickhouse'
 
-# echo -e "\n✅ ${CYAN}You have chosen: ${setup_type} setup\n"
-
 # Run bye if failure happens
 trap bye EXIT
 
@@ -455,8 +428,6 @@ if [[ $desired_os -eq 0 ]]; then
     send_event "os_not_supported"
 fi
 
-# check_ports_occupied
-
 # Check is Docker daemon is installed and available. If not, the install & start Docker for Linux machines. We cannot automatically install Docker Desktop on Mac OS
 if ! is_command_present docker; then
 
@@ -486,27 +457,39 @@ if ! is_command_present docker; then
     fi
 fi
 
+if has_docker_compose_plugin; then
+    echo "docker compose plugin is present, using it"
+    docker_compose_cmd="docker compose"
 # Install docker-compose
-if ! is_command_present docker-compose; then
-    request_sudo
-    install_docker_compose
+else
+    docker_compose_cmd="docker-compose"
+    if ! is_command_present docker-compose; then
+        request_sudo
+        install_docker_compose
+    fi
 fi
 
 start_docker
 
-# $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml up -d --remove-orphans || true
-
+# check for open ports, if signoz is not installed
+if is_command_present docker-compose; then
+    if $sudo_cmd $docker_compose_cmd -f ./docker/clickhouse-setup/docker-compose.yaml ps | grep "signoz-query-service" | grep -q "healthy" > /dev/null 2>&1; then
+        echo "SigNoz already installed, skipping the occupied ports check"
+    else
+        check_ports_occupied
+    fi
+fi
 
 echo ""
 echo -e "\n🟡 Pulling the latest container images for SigNoz.\n"
-$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml pull
+$sudo_cmd $docker_compose_cmd -f ./docker/clickhouse-setup/docker-compose.yaml pull
 
 echo ""
 echo "🟡 Starting the SigNoz containers. It may take a few minutes ..."
 echo
-# The docker-compose command does some nasty stuff for the `--detach` functionality. So we add a `|| true` so that the
+# The $docker_compose_cmd command does some nasty stuff for the `--detach` functionality. So we add a `|| true` so that the
 # script doesn't exit because this command looks like it failed to do it's thing.
-$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml up --detach --remove-orphans || true
+$sudo_cmd $docker_compose_cmd -f ./docker/clickhouse-setup/docker-compose.yaml up --detach --remove-orphans || true
 
 wait_for_containers_start 60
 echo ""
@@ -516,7 +499,7 @@ if [[ $status_code -ne 200 ]]; then
     echo "🔴 The containers didn't seem to start correctly. Please run the following command to check containers that may have errored out:"
     echo ""
 
-    echo -e "$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml ps -a"
+    echo -e "$sudo_cmd $docker_compose_cmd -f ./docker/clickhouse-setup/docker-compose.yaml ps -a"
 
     echo "Please read our troubleshooting guide https://signoz.io/docs/install/troubleshooting/"
     echo "or reach us on SigNoz for support https://signoz.io/slack"
@@ -537,7 +520,7 @@ else
     echo "ℹ️  By default, retention period is set to 15 days for logs and traces, and 30 days for metrics." 
     echo -e "To change this, navigate to the General tab on the Settings page of SigNoz UI. For more details, refer to https://signoz.io/docs/userguide/retention-period \n"
 
-    echo "ℹ️  To bring down SigNoz and clean volumes : $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml down -v"
+    echo "ℹ️  To bring down SigNoz and clean volumes : $sudo_cmd $docker_compose_cmd -f ./docker/clickhouse-setup/docker-compose.yaml down -v"
 
     echo ""
     echo "+++++++++++++++++++++++++++++++++++++++++++++++++"

ee/query-service/app/server.go

@@ -1,22 +1,16 @@
 package app
 
 import (
-	"bufio"
-	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"net"
 	"net/http"
 	_ "net/http/pprof" // http profiler
 	"os"
-	"regexp"
 	"time"
 
 	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
 	"github.com/jmoiron/sqlx"
 
 	"github.com/rs/cors"
@@ -29,15 +23,13 @@ import (
 	"go.signoz.io/signoz/ee/query-service/integrations/gateway"
 	"go.signoz.io/signoz/ee/query-service/interfaces"
 	"go.signoz.io/signoz/ee/query-service/rules"
-	baseauth "go.signoz.io/signoz/pkg/query-service/auth"
-	"go.signoz.io/signoz/pkg/query-service/migrate"
-	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
 	"go.signoz.io/signoz/pkg/signoz"
 	"go.signoz.io/signoz/pkg/web"
 
 	licensepkg "go.signoz.io/signoz/ee/query-service/license"
 	"go.signoz.io/signoz/ee/query-service/usage"
 
+	"go.signoz.io/signoz/pkg/http/middleware"
 	"go.signoz.io/signoz/pkg/query-service/agentConf"
 	baseapp "go.signoz.io/signoz/pkg/query-service/app"
 	"go.signoz.io/signoz/pkg/query-service/app/cloudintegrations"
@@ -201,13 +193,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
 		return nil, err
 	}
 
-	go func() {
-		err = migrate.ClickHouseMigrate(reader.GetConn(), serverOptions.Cluster)
-		if err != nil {
-			zap.L().Error("error while running clickhouse migrations", zap.Error(err))
-		}
-	}()
-
 	// initiate opamp
 	_, err = opAmpModel.InitDB(localDB)
 	if err != nil {
@@ -327,10 +312,17 @@ func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server,
 
 	r := baseapp.NewRouter()
 
-	r.Use(setTimeoutMiddleware)
-	r.Use(s.analyticsMiddleware)
-	r.Use(loggingMiddlewarePrivate)
-	r.Use(baseapp.LogCommentEnricher)
+	timeoutMiddleware := middleware.NewTimeout(zap.L(), baseconst.TimeoutExcludedRoutes, 60*time.Second, 600*time.Second)
+	r.Use(timeoutMiddleware.Wrap)
+
+	analyticsMiddleware := middleware.NewAnalytics(zap.L())
+	r.Use(analyticsMiddleware.Wrap)
+
+	loggingMiddleware := middleware.NewLogging(zap.L())
+	r.Use(loggingMiddleware.Wrap)
+
+	logCommentMiddleware := middleware.NewLogComment(zap.L())
+	r.Use(logCommentMiddleware.Wrap)
 
 	apiHandler.RegisterPrivateRoutes(r)
 
@@ -370,10 +362,17 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler, web web.Web) (*h
 	}
 	am := baseapp.NewAuthMiddleware(getUserFromRequest)
 
-	r.Use(setTimeoutMiddleware)
-	r.Use(s.analyticsMiddleware)
-	r.Use(loggingMiddleware)
-	r.Use(baseapp.LogCommentEnricher)
+	timeoutMiddleware := middleware.NewTimeout(zap.L(), baseconst.TimeoutExcludedRoutes, 60*time.Second, 600*time.Second)
+	r.Use(timeoutMiddleware.Wrap)
+
+	analyticsMiddleware := middleware.NewAnalytics(zap.L())
+	r.Use(analyticsMiddleware.Wrap)
+
+	loggingMiddleware := middleware.NewLogging(zap.L())
+	r.Use(loggingMiddleware.Wrap)
+
+	logCommentMiddleware := middleware.NewLogComment(zap.L())
+	r.Use(logCommentMiddleware.Wrap)
 
 	apiHandler.RegisterRoutes(r, am)
 	apiHandler.RegisterLogsRoutes(r, am)
@@ -405,216 +404,6 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler, web web.Web) (*h
 	}, nil
 }
 
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-// loggingMiddleware is used for logging public api calls
-func loggingMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		route := mux.CurrentRoute(r)
-		path, _ := route.GetPathTemplate()
-		startTime := time.Now()
-		next.ServeHTTP(w, r)
-		zap.L().Info(path, zap.Duration("timeTaken", time.Since(startTime)), zap.String("path", path))
-	})
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-// loggingMiddlewarePrivate is used for logging private api calls
-// from internal services like alert manager
-func loggingMiddlewarePrivate(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		route := mux.CurrentRoute(r)
-		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))
-	})
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-type loggingResponseWriter struct {
-	http.ResponseWriter
-	statusCode int
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-func NewLoggingResponseWriter(w http.ResponseWriter) *loggingResponseWriter {
-	// WriteHeader(int) is not called if our response implicitly returns 200 OK, so
-	// we default to that status code.
-	return &loggingResponseWriter{w, http.StatusOK}
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-func (lrw *loggingResponseWriter) WriteHeader(code int) {
-	lrw.statusCode = code
-	lrw.ResponseWriter.WriteHeader(code)
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-// Flush implements the http.Flush interface.
-func (lrw *loggingResponseWriter) Flush() {
-	lrw.ResponseWriter.(http.Flusher).Flush()
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-// Support websockets
-func (lrw *loggingResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	h, ok := lrw.ResponseWriter.(http.Hijacker)
-	if !ok {
-		return nil, nil, errors.New("hijack not supported")
-	}
-	return h.Hijack()
-}
-
-func extractQueryRangeData(path string, r *http.Request) (map[string]interface{}, bool) {
-	pathToExtractBodyFromV3 := "/api/v3/query_range"
-	pathToExtractBodyFromV4 := "/api/v4/query_range"
-
-	data := map[string]interface{}{}
-	var postData *v3.QueryRangeParamsV3
-
-	if (r.Method == "POST") && ((path == pathToExtractBodyFromV3) || (path == pathToExtractBodyFromV4)) {
-		if r.Body != nil {
-			bodyBytes, err := io.ReadAll(r.Body)
-			if err != nil {
-				return nil, false
-			}
-			r.Body.Close() //  must close
-			r.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
-			json.Unmarshal(bodyBytes, &postData)
-
-		} else {
-			return nil, false
-		}
-
-	} else {
-		return nil, false
-	}
-
-	referrer := r.Header.Get("Referer")
-
-	dashboardMatched, err := regexp.MatchString(`/dashboard/[a-zA-Z0-9\-]+/(new|edit)(?:\?.*)?$`, referrer)
-	if err != nil {
-		zap.L().Error("error while matching the referrer", zap.Error(err))
-	}
-	alertMatched, err := regexp.MatchString(`/alerts/(new|edit)(?:\?.*)?$`, referrer)
-	if err != nil {
-		zap.L().Error("error while matching the alert: ", zap.Error(err))
-	}
-	logsExplorerMatched, err := regexp.MatchString(`/logs/logs-explorer(?:\?.*)?$`, referrer)
-	if err != nil {
-		zap.L().Error("error while matching the logs explorer: ", zap.Error(err))
-	}
-	traceExplorerMatched, err := regexp.MatchString(`/traces-explorer(?:\?.*)?$`, referrer)
-	if err != nil {
-		zap.L().Error("error while matching the trace explorer: ", zap.Error(err))
-	}
-
-	queryInfoResult := telemetry.GetInstance().CheckQueryInfo(postData)
-
-	if (queryInfoResult.MetricsUsed || queryInfoResult.LogsUsed || queryInfoResult.TracesUsed) && (queryInfoResult.FilterApplied) {
-		if queryInfoResult.MetricsUsed {
-			telemetry.GetInstance().AddActiveMetricsUser()
-		}
-		if queryInfoResult.LogsUsed {
-			telemetry.GetInstance().AddActiveLogsUser()
-		}
-		if queryInfoResult.TracesUsed {
-			telemetry.GetInstance().AddActiveTracesUser()
-		}
-		data["metricsUsed"] = queryInfoResult.MetricsUsed
-		data["logsUsed"] = queryInfoResult.LogsUsed
-		data["tracesUsed"] = queryInfoResult.TracesUsed
-		data["filterApplied"] = queryInfoResult.FilterApplied
-		data["groupByApplied"] = queryInfoResult.GroupByApplied
-		data["aggregateOperator"] = queryInfoResult.AggregateOperator
-		data["aggregateAttributeKey"] = queryInfoResult.AggregateAttributeKey
-		data["numberOfQueries"] = queryInfoResult.NumberOfQueries
-		data["queryType"] = queryInfoResult.QueryType
-		data["panelType"] = queryInfoResult.PanelType
-
-		userEmail, err := baseauth.GetEmailFromJwt(r.Context())
-		if err == nil {
-			// switch case to set data["screen"] based on the referrer
-			switch {
-			case dashboardMatched:
-				data["screen"] = "panel"
-			case alertMatched:
-				data["screen"] = "alert"
-			case logsExplorerMatched:
-				data["screen"] = "logs-explorer"
-			case traceExplorerMatched:
-				data["screen"] = "traces-explorer"
-			default:
-				data["screen"] = "unknown"
-				return data, true
-			}
-			telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_QUERY_RANGE_API, data, userEmail, true, false)
-		}
-	}
-	return data, true
-}
-
-func getActiveLogs(path string, r *http.Request) {
-	// if path == "/api/v1/dashboards/{uuid}" {
-	// 	telemetry.GetInstance().AddActiveMetricsUser()
-	// }
-	if path == "/api/v1/logs" {
-		hasFilters := len(r.URL.Query().Get("q"))
-		if hasFilters > 0 {
-			telemetry.GetInstance().AddActiveLogsUser()
-		}
-
-	}
-
-}
-
-func (s *Server) analyticsMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx := baseauth.AttachJwtToContext(r.Context(), r)
-		r = r.WithContext(ctx)
-		route := mux.CurrentRoute(r)
-		path, _ := route.GetPathTemplate()
-
-		queryRangeData, metadataExists := extractQueryRangeData(path, r)
-		getActiveLogs(path, r)
-
-		lrw := NewLoggingResponseWriter(w)
-		next.ServeHTTP(lrw, r)
-
-		data := map[string]interface{}{"path": path, "statusCode": lrw.statusCode}
-		if metadataExists {
-			for key, value := range queryRangeData {
-				data[key] = value
-			}
-		}
-
-		if _, ok := telemetry.EnabledPaths()[path]; ok {
-			userEmail, err := baseauth.GetEmailFromJwt(r.Context())
-			if err == nil {
-				telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_PATH, data, userEmail, true, false)
-			}
-		}
-
-	})
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/timeout.go
-func setTimeoutMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx := r.Context()
-		var cancel context.CancelFunc
-		// check if route is not excluded
-		url := r.URL.Path
-		if _, ok := baseconst.TimeoutExcludedRoutes[url]; !ok {
-			ctx, cancel = context.WithTimeout(r.Context(), baseconst.ContextTimeout)
-			defer cancel()
-		}
-
-		r = r.WithContext(ctx)
-		next.ServeHTTP(w, r)
-	})
-}
-
 // initListeners initialises listeners of the server
 func (s *Server) initListeners() error {
 	// listen on public port

ee/query-service/main.go

@@ -13,21 +13,14 @@ import (
 	"go.opentelemetry.io/otel/sdk/resource"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 	"go.signoz.io/signoz/ee/query-service/app"
-	"go.signoz.io/signoz/pkg/cache/memorycache"
-	"go.signoz.io/signoz/pkg/cache/rediscache"
 	"go.signoz.io/signoz/pkg/config"
 	"go.signoz.io/signoz/pkg/config/envprovider"
 	"go.signoz.io/signoz/pkg/config/fileprovider"
-	"go.signoz.io/signoz/pkg/factory"
 	"go.signoz.io/signoz/pkg/query-service/auth"
 	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"
 	"go.signoz.io/signoz/pkg/signoz"
-	"go.signoz.io/signoz/pkg/sqlmigration"
-	"go.signoz.io/signoz/pkg/sqlstore/sqlitesqlstore"
-	"go.signoz.io/signoz/pkg/web/noopweb"
-	"go.signoz.io/signoz/pkg/web/routerweb"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
@@ -152,29 +145,7 @@ func main() {
 		zap.L().Fatal("Failed to create config", zap.Error(err))
 	}
 
-	signoz, err := signoz.New(context.Background(), config, signoz.ProviderConfig{
-		CacheProviderFactories: factory.MustNewNamedMap(
-			memorycache.NewFactory(),
-			rediscache.NewFactory(),
-		),
-		WebProviderFactories: factory.MustNewNamedMap(
-			routerweb.NewFactory(),
-			noopweb.NewFactory(),
-		),
-		SQLStoreProviderFactories: factory.MustNewNamedMap(
-			sqlitesqlstore.NewFactory(),
-		),
-		SQLMigrationProviderFactories: factory.MustNewNamedMap(
-			sqlmigration.NewAddDataMigrationsFactory(),
-			sqlmigration.NewAddOrganizationFactory(),
-			sqlmigration.NewAddPreferencesFactory(),
-			sqlmigration.NewAddDashboardsFactory(),
-			sqlmigration.NewAddSavedViewsFactory(),
-			sqlmigration.NewAddAgentsFactory(),
-			sqlmigration.NewAddPipelinesFactory(),
-			sqlmigration.NewAddIntegrationsFactory(),
-		),
-	})
+	signoz, err := signoz.New(context.Background(), config, signoz.NewProviderConfig())
 	if err != nil {
 		zap.L().Fatal("Failed to create signoz struct", zap.Error(err))
 	}

frontend/src/api/infraMonitoring/getK8sNodesList.ts

@@ -1,4 +1,4 @@
-import { ApiBaseInstance } from 'api';
+import axios from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError } from 'axios';
 import { ErrorResponse, SuccessResponse } from 'types/api';
@@ -47,7 +47,7 @@ export const getK8sNodesList = async (
 	headers?: Record<string, string>,
 ): Promise<SuccessResponse<K8sNodesListResponse> | ErrorResponse> => {
 	try {
-		const response = await ApiBaseInstance.post('/nodes/list', props, {
+		const response = await axios.post('/nodes/list', props, {
 			signal,
 			headers,
 		});

frontend/src/api/infraMonitoring/getK8sPodsList.ts

@@ -1,4 +1,4 @@
-import { ApiBaseInstance } from 'api';
+import axios from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError } from 'axios';
 import { ErrorResponse, SuccessResponse } from 'types/api';
@@ -75,7 +75,7 @@ export const getK8sPodsList = async (
 	headers?: Record<string, string>,
 ): Promise<SuccessResponse<K8sPodsListResponse> | ErrorResponse> => {
 	try {
-		const response = await ApiBaseInstance.post('/pods/list', props, {
+		const response = await axios.post('/pods/list', props, {
 			signal,
 			headers,
 		});

frontend/src/components/Logs/ListLogView/index.tsx

@@ -219,12 +219,14 @@ function ListLogView({
 					<LogStateIndicator type={logType} fontSize={fontSize} />
 					<div>
 						<LogContainer fontSize={fontSize}>
-							<LogGeneralField
-								fieldKey="Log"
-								fieldValue={flattenLogData.body}
-								linesPerRow={linesPerRow}
-								fontSize={fontSize}
-							/>
+							{updatedSelecedFields.some((field) => field.name === 'body') && (
+								<LogGeneralField
+									fieldKey="Log"
+									fieldValue={flattenLogData.body}
+									linesPerRow={linesPerRow}
+									fontSize={fontSize}
+								/>
+							)}
 							{flattenLogData.stream && (
 								<LogGeneralField
 									fieldKey="Stream"
@@ -232,23 +234,27 @@ function ListLogView({
 									fontSize={fontSize}
 								/>
 							)}
-							<LogGeneralField
-								fieldKey="Timestamp"
-								fieldValue={timestampValue}
-								fontSize={fontSize}
-							/>
-
-							{updatedSelecedFields.map((field) =>
-								isValidLogField(flattenLogData[field.name] as never) ? (
-									<LogSelectedField
-										key={field.name}
-										fieldKey={field.name}
-										fieldValue={flattenLogData[field.name] as never}
-										onAddToQuery={onAddToQuery}
-										fontSize={fontSize}
-									/>
-								) : null,
+							{updatedSelecedFields.some((field) => field.name === 'timestamp') && (
+								<LogGeneralField
+									fieldKey="Timestamp"
+									fieldValue={timestampValue}
+									fontSize={fontSize}
+								/>
 							)}
+
+							{updatedSelecedFields
+								.filter((field) => !['timestamp', 'body'].includes(field.name))
+								.map((field) =>
+									isValidLogField(flattenLogData[field.name] as never) ? (
+										<LogSelectedField
+											key={field.name}
+											fieldKey={field.name}
+											fieldValue={flattenLogData[field.name] as never}
+											onAddToQuery={onAddToQuery}
+											fontSize={fontSize}
+										/>
+									) : null,
+								)}
 						</LogContainer>
 					</div>
 				</div>

frontend/src/components/Logs/RawLogView/index.tsx

@@ -73,6 +73,7 @@ function RawLogView({
 	);
 
 	const attributesValues = updatedSelecedFields
+		.filter((field) => !['timestamp', 'body'].includes(field.name))
 		.map((field) => flattenLogData[field.name])
 		.filter((attribute) => {
 			// loadash isEmpty doesnot work with numbers
@@ -92,19 +93,40 @@ function RawLogView({
 	const { formatTimezoneAdjustedTimestamp } = useTimezone();
 
 	const text = useMemo(() => {
-		const date =
-			typeof data.timestamp === 'string'
-				? formatTimezoneAdjustedTimestamp(data.timestamp, 'YYYY-MM-DD HH:mm:ss.SSS')
-				: formatTimezoneAdjustedTimestamp(
-						data.timestamp / 1e6,
-						'YYYY-MM-DD HH:mm:ss.SSS',
-				  );
+		const parts = [];
 
-		return `${date} | ${attributesText} ${data.body}`;
+		// Check if timestamp is selected
+		const showTimestamp = selectedFields.some(
+			(field) => field.name === 'timestamp',
+		);
+		if (showTimestamp) {
+			const date =
+				typeof data.timestamp === 'string'
+					? formatTimezoneAdjustedTimestamp(
+							data.timestamp,
+							'YYYY-MM-DD HH:mm:ss.SSS',
+					  )
+					: formatTimezoneAdjustedTimestamp(
+							data.timestamp / 1e6,
+							'YYYY-MM-DD HH:mm:ss.SSS',
+					  );
+			parts.push(date);
+		}
+
+		// Check if body is selected
+		const showBody = selectedFields.some((field) => field.name === 'body');
+		if (showBody) {
+			parts.push(`${attributesText} ${data.body}`);
+		} else {
+			parts.push(attributesText);
+		}
+
+		return parts.join(' | ');
 	}, [
+		selectedFields,
+		attributesText,
 		data.timestamp,
 		data.body,
-		attributesText,
 		formatTimezoneAdjustedTimestamp,
 	]);
 

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

@@ -48,7 +48,7 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {
 
 	const columns: ColumnsType<Record<string, unknown>> = useMemo(() => {
 		const fieldColumns: ColumnsType<Record<string, unknown>> = fields
-			.filter((e) => e.name !== 'id')
+			.filter((e) => !['id', 'body', 'timestamp'].includes(e.name))
 			.map(({ name }) => ({
 				title: name,
 				dataIndex: name,
@@ -91,55 +91,67 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {
 					),
 				}),
 			},
-			{
-				title: 'timestamp',
-				dataIndex: 'timestamp',
-				key: 'timestamp',
-				// https://github.com/ant-design/ant-design/discussions/36886
-				render: (field): ColumnTypeRender<Record<string, unknown>> => {
-					const date =
-						typeof field === 'string'
-							? formatTimezoneAdjustedTimestamp(field, 'YYYY-MM-DD HH:mm:ss.SSS')
-							: formatTimezoneAdjustedTimestamp(
-									field / 1e6,
-									'YYYY-MM-DD HH:mm:ss.SSS',
-							  );
-					return {
-						children: (
-							<div className="table-timestamp">
-								<Typography.Paragraph ellipsis className={cx('text', fontSize)}>
-									{date}
-								</Typography.Paragraph>
-							</div>
-						),
-					};
-				},
-			},
+			...(fields.some((field) => field.name === 'timestamp')
+				? [
+						{
+							title: 'timestamp',
+							dataIndex: 'timestamp',
+							key: 'timestamp',
+							// https://github.com/ant-design/ant-design/discussions/36886
+							render: (
+								field: string | number,
+							): ColumnTypeRender<Record<string, unknown>> => {
+								const date =
+									typeof field === 'string'
+										? formatTimezoneAdjustedTimestamp(field, 'YYYY-MM-DD HH:mm:ss.SSS')
+										: formatTimezoneAdjustedTimestamp(
+												field / 1e6,
+												'YYYY-MM-DD HH:mm:ss.SSS',
+										  );
+								return {
+									children: (
+										<div className="table-timestamp">
+											<Typography.Paragraph ellipsis className={cx('text', fontSize)}>
+												{date}
+											</Typography.Paragraph>
+										</div>
+									),
+								};
+							},
+						},
+				  ]
+				: []),
 			...(appendTo === 'center' ? fieldColumns : []),
-			{
-				title: 'body',
-				dataIndex: 'body',
-				key: 'body',
-				render: (field): ColumnTypeRender<Record<string, unknown>> => ({
-					props: {
-						style: defaultTableStyle,
-					},
-					children: (
-						<TableBodyContent
-							dangerouslySetInnerHTML={{
-								__html: convert.toHtml(
-									dompurify.sanitize(unescapeString(field), {
-										FORBID_TAGS: [...FORBID_DOM_PURIFY_TAGS],
-									}),
+			...(fields.some((field) => field.name === 'body')
+				? [
+						{
+							title: 'body',
+							dataIndex: 'body',
+							key: 'body',
+							render: (
+								field: string | number,
+							): ColumnTypeRender<Record<string, unknown>> => ({
+								props: {
+									style: defaultTableStyle,
+								},
+								children: (
+									<TableBodyContent
+										dangerouslySetInnerHTML={{
+											__html: convert.toHtml(
+												dompurify.sanitize(unescapeString(field as string), {
+													FORBID_TAGS: [...FORBID_DOM_PURIFY_TAGS],
+												}),
+											),
+										}}
+										fontSize={fontSize}
+										linesPerRow={linesPerRow}
+										isDarkMode={isDarkMode}
+									/>
 								),
-							}}
-							fontSize={fontSize}
-							linesPerRow={linesPerRow}
-							isDarkMode={isDarkMode}
-						/>
-					),
-				}),
-			},
+							}),
+						},
+				  ]
+				: []),
 			...(appendTo === 'end' ? fieldColumns : []),
 		];
 	}, [

frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.tsx

@@ -1,8 +1,7 @@
 import 'uplot/dist/uPlot.min.css';
 import './AnomalyAlertEvaluationView.styles.scss';
 
-import { Checkbox, Typography } from 'antd';
-import Search from 'antd/es/input/Search';
+import { Checkbox, Input, Typography } from 'antd';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import useDebouncedFn from 'hooks/useDebouncedFunction';
 import { useResizeObserver } from 'hooks/useDimensions';
@@ -16,6 +15,8 @@ import uPlot from 'uplot';
 
 import tooltipPlugin from './tooltipPlugin';
 
+const { Search } = Input;
+
 function UplotChart({
 	data,
 	options,

frontend/src/container/CreateAlertRule/AlertRuleDocumentationRedirection.test.tsx

@@ -0,0 +1,146 @@
+import ROUTES from 'constants/routes';
+import CreateAlertPage from 'pages/CreateAlert';
+import { MemoryRouter, Route } from 'react-router-dom';
+import { act, fireEvent, render } from 'tests/test-utils';
+import { AlertTypes } from 'types/api/alerts/alertTypes';
+
+import { ALERT_TYPE_TO_TITLE, ALERT_TYPE_URL_MAP } from './constants';
+
+jest.mock('react-router-dom', () => ({
+	...jest.requireActual('react-router-dom'),
+	useLocation: (): { pathname: string } => ({
+		pathname: `${process.env.FRONTEND_API_ENDPOINT}${ROUTES.ALERTS_NEW}`,
+	}),
+}));
+
+jest.mock('uplot', () => {
+	const paths = {
+		spline: jest.fn(),
+		bars: jest.fn(),
+	};
+	const uplotMock = jest.fn(() => ({
+		paths,
+	}));
+	return {
+		paths,
+		default: uplotMock,
+	};
+});
+
+let mockWindowOpen: jest.Mock;
+
+window.ResizeObserver =
+	window.ResizeObserver ||
+	jest.fn().mockImplementation(() => ({
+		disconnect: jest.fn(),
+		observe: jest.fn(),
+		unobserve: jest.fn(),
+	}));
+
+function findLinkForAlertType(
+	links: HTMLElement[],
+	alertType: AlertTypes,
+): HTMLElement {
+	const link = links.find(
+		(el) =>
+			el.closest('[data-testid]')?.getAttribute('data-testid') ===
+			`alert-type-card-${alertType}`,
+	);
+	expect(link).toBeTruthy();
+	return link as HTMLElement;
+}
+
+function clickLinkAndVerifyRedirect(
+	link: HTMLElement,
+	expectedUrl: string,
+): void {
+	fireEvent.click(link);
+	expect(mockWindowOpen).toHaveBeenCalledWith(expectedUrl, '_blank');
+}
+describe('Alert rule documentation redirection', () => {
+	let renderResult: ReturnType<typeof render>;
+
+	beforeAll(() => {
+		mockWindowOpen = jest.fn();
+		window.open = mockWindowOpen;
+	});
+
+	beforeEach(() => {
+		act(() => {
+			renderResult = render(
+				<MemoryRouter initialEntries={['/alerts/new']}>
+					<Route path={ROUTES.ALERTS_NEW}>
+						<CreateAlertPage />
+					</Route>
+				</MemoryRouter>,
+			);
+		});
+	});
+
+	it('should render alert type cards', () => {
+		const { getByText, getAllByText } = renderResult;
+
+		// Check for the heading
+		expect(getByText('choose_alert_type')).toBeInTheDocument();
+
+		// Check for alert type titles and descriptions
+		Object.values(AlertTypes).forEach((alertType) => {
+			const title = ALERT_TYPE_TO_TITLE[alertType];
+			expect(getByText(title)).toBeInTheDocument();
+			expect(getByText(`${title}_desc`)).toBeInTheDocument();
+		});
+
+		const clickHereLinks = getAllByText(
+			'Click here to see how to create a sample alert.',
+		);
+
+		expect(clickHereLinks).toHaveLength(5);
+	});
+
+	it('should redirect to correct documentation for each alert type', () => {
+		const { getAllByText } = renderResult;
+
+		const clickHereLinks = getAllByText(
+			'Click here to see how to create a sample alert.',
+		);
+		const alertTypeCount = Object.keys(AlertTypes).length;
+
+		expect(clickHereLinks).toHaveLength(alertTypeCount);
+
+		Object.values(AlertTypes).forEach((alertType) => {
+			const linkForAlertType = findLinkForAlertType(clickHereLinks, alertType);
+			const expectedUrl = ALERT_TYPE_URL_MAP[alertType];
+
+			clickLinkAndVerifyRedirect(linkForAlertType, expectedUrl.selection);
+		});
+
+		expect(mockWindowOpen).toHaveBeenCalledTimes(alertTypeCount);
+	});
+
+	Object.values(AlertTypes)
+		.filter((type) => type !== AlertTypes.ANOMALY_BASED_ALERT)
+		.forEach((alertType) => {
+			it(`should redirect to create alert page for ${alertType} and "Check an example alert" should redirect to the correct documentation`, () => {
+				const { getByTestId, getByRole } = renderResult;
+
+				const alertTypeLink = getByTestId(`alert-type-card-${alertType}`);
+
+				act(() => {
+					fireEvent.click(alertTypeLink);
+				});
+
+				act(() => {
+					fireEvent.click(
+						getByRole('button', {
+							name: /alert setup guide/i,
+						}),
+					);
+				});
+
+				expect(mockWindowOpen).toHaveBeenCalledWith(
+					ALERT_TYPE_URL_MAP[alertType].creation,
+					'_blank',
+				);
+			});
+		});
+});

frontend/src/container/CreateAlertRule/AnomalyAlertDocumentationRedirection.test.tsx

@@ -0,0 +1,71 @@
+import ROUTES from 'constants/routes';
+import CreateAlertPage from 'pages/CreateAlert';
+import { MemoryRouter, Route } from 'react-router-dom';
+import { act, fireEvent, render } from 'tests/test-utils';
+import { AlertTypes } from 'types/api/alerts/alertTypes';
+
+import { ALERT_TYPE_URL_MAP } from './constants';
+
+jest.mock('react-router-dom', () => ({
+	...jest.requireActual('react-router-dom'),
+	useLocation: (): { pathname: string; search: string } => ({
+		pathname: `${process.env.FRONTEND_API_ENDPOINT}${ROUTES.ALERTS_NEW}`,
+		search: 'ruleType=anomaly_rule',
+	}),
+}));
+
+jest.mock('uplot', () => {
+	const paths = {
+		spline: jest.fn(),
+		bars: jest.fn(),
+	};
+	const uplotMock = jest.fn(() => ({
+		paths,
+	}));
+	return {
+		paths,
+		default: uplotMock,
+	};
+});
+
+window.ResizeObserver =
+	window.ResizeObserver ||
+	jest.fn().mockImplementation(() => ({
+		disconnect: jest.fn(),
+		observe: jest.fn(),
+		unobserve: jest.fn(),
+	}));
+
+describe('Anomaly Alert Documentation Redirection', () => {
+	let mockWindowOpen: jest.Mock;
+
+	beforeAll(() => {
+		mockWindowOpen = jest.fn();
+		window.open = mockWindowOpen;
+	});
+
+	it('should handle anomaly alert documentation redirection correctly', () => {
+		const { getByRole } = render(
+			<MemoryRouter initialEntries={['/alerts/new']}>
+				<Route path={ROUTES.ALERTS_NEW}>
+					<CreateAlertPage />
+				</Route>
+			</MemoryRouter>,
+		);
+
+		const alertType = AlertTypes.ANOMALY_BASED_ALERT;
+
+		act(() => {
+			fireEvent.click(
+				getByRole('button', {
+					name: /alert setup guide/i,
+				}),
+			);
+		});
+
+		expect(mockWindowOpen).toHaveBeenCalledWith(
+			ALERT_TYPE_URL_MAP[alertType].creation,
+			'_blank',
+		);
+	});
+});

frontend/src/container/CreateAlertRule/constants.ts

@@ -0,0 +1,47 @@
+import { AlertTypes } from 'types/api/alerts/alertTypes';
+
+// since we don't have a card in alert creation for anomaly based alert
+
+export const ALERT_TYPE_URL_MAP: Record<
+	AlertTypes,
+	{ selection: string; creation: string }
+> = {
+	[AlertTypes.METRICS_BASED_ALERT]: {
+		selection:
+			'https://signoz.io/docs/alerts-management/metrics-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples',
+		creation:
+			'https://signoz.io/docs/alerts-management/metrics-based-alerts/?utm_source=product&utm_medium=alert-creation-page',
+	},
+	[AlertTypes.LOGS_BASED_ALERT]: {
+		selection:
+			'https://signoz.io/docs/alerts-management/log-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples',
+		creation:
+			'https://signoz.io/docs/alerts-management/log-based-alerts/?utm_source=product&utm_medium=alert-creation-page',
+	},
+	[AlertTypes.TRACES_BASED_ALERT]: {
+		selection:
+			'https://signoz.io/docs/alerts-management/trace-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples',
+		creation:
+			'https://signoz.io/docs/alerts-management/trace-based-alerts/?utm_source=product&utm_medium=alert-creation-page',
+	},
+	[AlertTypes.EXCEPTIONS_BASED_ALERT]: {
+		selection:
+			'https://signoz.io/docs/alerts-management/exceptions-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples',
+		creation:
+			'https://signoz.io/docs/alerts-management/exceptions-based-alerts/?utm_source=product&utm_medium=alert-creation-page',
+	},
+	[AlertTypes.ANOMALY_BASED_ALERT]: {
+		selection:
+			'https://signoz.io/docs/alerts-management/anomaly-based-alerts/?utm_source=product&utm_medium=alert-source-selection-page#examples',
+		creation:
+			'https://signoz.io/docs/alerts-management/anomaly-based-alerts/?utm_source=product&utm_medium=alert-creation-page',
+	},
+};
+
+export const ALERT_TYPE_TO_TITLE: Record<AlertTypes, string> = {
+	[AlertTypes.METRICS_BASED_ALERT]: 'metric_based_alert',
+	[AlertTypes.LOGS_BASED_ALERT]: 'log_based_alert',
+	[AlertTypes.TRACES_BASED_ALERT]: 'traces_based_alert',
+	[AlertTypes.EXCEPTIONS_BASED_ALERT]: 'exceptions_based_alert',
+	[AlertTypes.ANOMALY_BASED_ALERT]: 'anomaly_based_alert',
+};

frontend/src/container/InfraMonitoringK8s/InfraMonitoringK8s.styles.scss

@@ -39,10 +39,6 @@
 		.ant-collapse-header {
 			border-bottom: 1px solid var(--bg-slate-400);
 			padding: 12px 8px;
-
-			&[aria-expanded='true'] {
-				background: var(--bg-ink-400);
-			}
 		}
 
 		.ant-collapse-content-box {
@@ -271,8 +267,6 @@
 
 				.group-by-label {
 					min-width: max-content;
-
-					color: var(--bg-vanilla-100, #c0c1c3);
 					font-size: 13px;
 					font-style: normal;
 					font-weight: 400;
@@ -282,7 +276,6 @@
 					border-radius: 2px 0px 0px 2px;
 					border: 1px solid var(--bg-slate-400, #1d212d);
 					border-right: none;
-					background: var(--bg-ink-100, #16181d);
 					border-top-right-radius: 0px;
 					border-bottom-right-radius: 0px;
 
@@ -488,7 +481,7 @@
 		.expanded-table-container {
 			border: 1px solid var(--bg-ink-400);
 			overflow-x: auto;
-			padding-left: 16px;
+			padding-left: 48px;
 
 			&::-webkit-scrollbar {
 				width: 0.1rem;
@@ -710,8 +703,34 @@
 }
 
 .ant-table-cell {
-	min-width: 170px !important;
-	max-width: 170px !important;
+	min-width: 140px !important;
+	max-width: 140px !important;
+}
+
+.ant-table-cell {
+	&:has(.pod-name-header) {
+		min-width: 250px !important;
+		max-width: 250px !important;
+	}
+}
+
+.ant-table-cell {
+	&:has(.med-col) {
+		min-width: 180px !important;
+		max-width: 180px !important;
+	}
+}
+
+.expanded-k8s-list-table {
+	.ant-table-cell {
+		min-width: 180px !important;
+		max-width: 180px !important;
+	}
+
+	.ant-table-row-expand-icon-cell {
+		min-width: 30px !important;
+		max-width: 30px !important;
+	}
 }
 
 .ant-table-row-expand-icon-cell {
@@ -808,6 +827,24 @@
 }
 
 .lightMode {
+	.infra-monitoring-container {
+		.k8s-list-table {
+			.ant-table-expanded-row {
+				&:hover {
+					background: var(--bg-vanilla-100) !important;
+				}
+
+				.ant-table-cell {
+					background: var(--bg-vanilla-100) !important;
+				}
+
+				.ant-table .ant-table-thead > tr > th {
+					padding: 4px 16px !important;
+				}
+			}
+		}
+	}
+
 	.event-content-container {
 		.ant-table {
 			background: var(--bg-vanilla-100);
@@ -831,4 +868,11 @@
 			}
 		}
 	}
+
+	.entity-group-header {
+		.ant-tag {
+			background-color: var(--bg-vanilla-300) !important;
+			color: var(--bg-slate-400) !important;
+		}
+	}
 }

frontend/src/container/InfraMonitoringK8s/InfraMonitoringK8s.tsx

@@ -9,7 +9,7 @@ import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
 import { Container, Workflow } from 'lucide-react';
 import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';
-import { useCallback, useState } from 'react';
+import { useState } from 'react';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 
 import {
@@ -24,6 +24,7 @@ export default function InfraMonitoringK8s(): JSX.Element {
 	const [showFilters, setShowFilters] = useState(true);
 
 	const [selectedCategory, setSelectedCategory] = useState(K8sCategories.PODS);
+	const [quickFiltersLastUpdated, setQuickFiltersLastUpdated] = useState(-1);
 
 	const { currentQuery } = useQueryBuilder();
 
@@ -37,14 +38,12 @@ export default function InfraMonitoringK8s(): JSX.Element {
 		entityVersion: '',
 	});
 
-	const handleFilterChange = useCallback(
-		(query: Query): void => {
-			// update the current query with the new filters
-			// in infra monitoring k8s, we are using only one query, hence updating the 0th index of queryData
-			handleChangeQueryData('filters', query.builder.queryData[0].filters);
-		},
-		[handleChangeQueryData],
-	);
+	const handleFilterChange = (query: Query): void => {
+		// update the current query with the new filters
+		// in infra monitoring k8s, we are using only one query, hence updating the 0th index of queryData
+		handleChangeQueryData('filters', query.builder.queryData[0].filters);
+		setQuickFiltersLastUpdated(Date.now());
+	};
 
 	const items: CollapseProps['items'] = [
 		{
@@ -262,6 +261,8 @@ export default function InfraMonitoringK8s(): JSX.Element {
 	const handleCategoryChange = (key: string | string[]): void => {
 		if (Array.isArray(key) && key.length > 0) {
 			setSelectedCategory(key[0] as string);
+			// Reset filters
+			handleChangeQueryData('filters', { items: [], op: 'and' });
 		}
 	};
 
@@ -302,6 +303,7 @@ export default function InfraMonitoringK8s(): JSX.Element {
 							<K8sPodLists
 								isFiltersVisible={showFilters}
 								handleFilterVisibilityChange={handleFilterVisibilityChange}
+								quickFiltersLastUpdated={quickFiltersLastUpdated}
 							/>
 						)}
 
@@ -309,6 +311,7 @@ export default function InfraMonitoringK8s(): JSX.Element {
 							<K8sNodesList
 								isFiltersVisible={showFilters}
 								handleFilterVisibilityChange={handleFilterVisibilityChange}
+								quickFiltersLastUpdated={quickFiltersLastUpdated}
 							/>
 						)}
 					</div>

frontend/src/container/InfraMonitoringK8s/K8sFiltersSidePanel/K8sFiltersSidePanel.tsx

@@ -7,7 +7,7 @@ import { Button, Input } from 'antd';
 import { GripVertical, TableColumnsSplit, X } from 'lucide-react';
 import { useEffect, useRef, useState } from 'react';
 
-import { IPodColumn } from '../utils';
+import { IEntityColumn } from '../utils';
 
 function K8sFiltersSidePanel({
 	defaultAddedColumns,
@@ -17,12 +17,12 @@ function K8sFiltersSidePanel({
 	onAddColumn = () => {},
 	onRemoveColumn = () => {},
 }: {
-	defaultAddedColumns: IPodColumn[];
+	defaultAddedColumns: IEntityColumn[];
 	onClose: () => void;
-	addedColumns?: IPodColumn[];
-	availableColumns?: IPodColumn[];
-	onAddColumn?: (column: IPodColumn) => void;
-	onRemoveColumn?: (column: IPodColumn) => void;
+	addedColumns?: IEntityColumn[];
+	availableColumns?: IEntityColumn[];
+	onAddColumn?: (column: IEntityColumn) => void;
+	onRemoveColumn?: (column: IEntityColumn) => void;
 }): JSX.Element {
 	const [searchValue, setSearchValue] = useState('');
 	const sidePanelRef = useRef<HTMLDivElement>(null);

frontend/src/container/InfraMonitoringK8s/K8sHeader.tsx

@@ -12,7 +12,7 @@ import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 import { K8sCategory } from './constants';
 import K8sFiltersSidePanel from './K8sFiltersSidePanel/K8sFiltersSidePanel';
-import { IPodColumn } from './utils';
+import { IEntityColumn } from './utils';
 
 interface K8sHeaderProps {
 	selectedGroupBy: BaseAutocompleteData[];
@@ -20,11 +20,11 @@ interface K8sHeaderProps {
 	isLoadingGroupByFilters: boolean;
 	handleFiltersChange: (value: IBuilderQuery['filters']) => void;
 	handleGroupByChange: (value: IBuilderQuery['groupBy']) => void;
-	defaultAddedColumns: IPodColumn[];
-	addedColumns?: IPodColumn[];
-	availableColumns?: IPodColumn[];
-	onAddColumn?: (column: IPodColumn) => void;
-	onRemoveColumn?: (column: IPodColumn) => void;
+	defaultAddedColumns: IEntityColumn[];
+	addedColumns?: IEntityColumn[];
+	availableColumns?: IEntityColumn[];
+	onAddColumn?: (column: IEntityColumn) => void;
+	onRemoveColumn?: (column: IEntityColumn) => void;
 	handleFilterVisibilityChange: () => void;
 	isFiltersVisible: boolean;
 	entity: K8sCategory;

frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.tsx

@@ -45,9 +45,11 @@ import {
 function K8sNodesList({
 	isFiltersVisible,
 	handleFilterVisibilityChange,
+	quickFiltersLastUpdated,
 }: {
 	isFiltersVisible: boolean;
 	handleFilterVisibilityChange: () => void;
+	quickFiltersLastUpdated: number;
 }): JSX.Element {
 	const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(
 		(state) => state.globalTime,
@@ -60,7 +62,7 @@ function K8sNodesList({
 	const [orderBy, setOrderBy] = useState<{
 		columnName: string;
 		order: 'asc' | 'desc';
-	} | null>(null);
+	} | null>({ columnName: 'cpu', order: 'desc' });
 
 	const [selectedNodeUID, setselectedNodeUID] = useState<string | null>(null);
 
@@ -76,12 +78,28 @@ function K8sNodesList({
 		{ value: string; label: string }[]
 	>([]);
 
+	const { currentQuery } = useQueryBuilder();
+
+	const queryFilters = useMemo(
+		() =>
+			currentQuery?.builder?.queryData[0]?.filters || {
+				items: [],
+				op: 'and',
+			},
+		[currentQuery?.builder?.queryData],
+	);
+
+	// Reset pagination every time quick filters are changed
+	useEffect(() => {
+		setCurrentPage(1);
+	}, [quickFiltersLastUpdated]);
+
 	const createFiltersForSelectedRowData = (
 		selectedRowData: K8sNodesRowData,
 		groupBy: IBuilderQuery['groupBy'],
 	): IBuilderQuery['filters'] => {
 		const baseFilters: IBuilderQuery['filters'] = {
-			items: [],
+			items: [...queryFilters.items],
 			op: 'and',
 		};
 
@@ -120,6 +138,7 @@ function K8sNodesList({
 			end: Math.floor(maxTime / 1000000),
 			orderBy,
 		};
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [minTime, maxTime, orderBy, selectedRowData, groupBy]);
 
 	const {
@@ -133,8 +152,6 @@ function K8sNodesList({
 		enabled: !!fetchGroupedByRowDataQuery && !!selectedRowData,
 	});
 
-	const { currentQuery } = useQueryBuilder();
-
 	const {
 		data: groupByFiltersData,
 		isLoading: isLoadingGroupByFilters,
@@ -153,15 +170,6 @@ function K8sNodesList({
 		K8sCategory.NODES,
 	);
 
-	const queryFilters = useMemo(
-		() =>
-			currentQuery?.builder?.queryData[0]?.filters || {
-				items: [],
-				op: 'and',
-			},
-		[currentQuery?.builder?.queryData],
-	);
-
 	const query = useMemo(() => {
 		const baseQuery = getK8sNodesListQuery();
 		const queryPayload = {
@@ -308,6 +316,7 @@ function K8sNodesList({
 			) : (
 				<div className="expanded-table">
 					<Table
+						className="expanded-table-view"
 						columns={nestedColumns as ColumnType<K8sNodesRowData>[]}
 						dataSource={formattedGroupedByNodesData}
 						pagination={false}
@@ -382,18 +391,6 @@ function K8sNodesList({
 		setselectedNodeUID(null);
 	};
 
-	const showsNodesTable =
-		!isError &&
-		!isLoading &&
-		!isFetching &&
-		!(formattedNodesData.length === 0 && queryFilters.items.length > 0);
-
-	const showNoFilteredNodesMessage =
-		!isFetching &&
-		!isLoading &&
-		formattedNodesData.length === 0 &&
-		queryFilters.items.length > 0;
-
 	const handleGroupByChange = useCallback(
 		(value: IBuilderQuery['groupBy']) => {
 			const groupBy = [];
@@ -442,54 +439,53 @@ function K8sNodesList({
 			/>
 			{isError && <Typography>{data?.error || 'Something went wrong'}</Typography>}
 
-			{showNoFilteredNodesMessage && (
-				<div className="no-filtered-hosts-message-container">
-					<div className="no-filtered-hosts-message-content">
-						<img
-							src="/Icons/emptyState.svg"
-							alt="thinking-emoji"
-							className="empty-state-svg"
-						/>
+			<Table
+				className="k8s-list-table nodes-list-table"
+				dataSource={isFetching || isLoading ? [] : formattedNodesData}
+				columns={columns}
+				pagination={{
+					current: currentPage,
+					pageSize,
+					total: totalCount,
+					showSizeChanger: false,
+					hideOnSinglePage: true,
+				}}
+				scroll={{ x: true }}
+				loading={{
+					spinning: isFetching || isLoading,
+					indicator: <Spin indicator={<LoadingOutlined size={14} spin />} />,
+				}}
+				locale={{
+					emptyText:
+						isFetching || isLoading ? null : (
+							<div className="no-filtered-hosts-message-container">
+								<div className="no-filtered-hosts-message-content">
+									<img
+										src="/Icons/emptyState.svg"
+										alt="thinking-emoji"
+										className="empty-state-svg"
+									/>
 
-						<Typography.Text className="no-filtered-hosts-message">
-							This query had no results. Edit your query and try again!
-						</Typography.Text>
-					</div>
-				</div>
-			)}
+									<Typography.Text className="no-filtered-hosts-message">
+										This query had no results. Edit your query and try again!
+									</Typography.Text>
+								</div>
+							</div>
+						),
+				}}
+				tableLayout="fixed"
+				onChange={handleTableChange}
+				onRow={(record): { onClick: () => void; className: string } => ({
+					onClick: (): void => handleRowClick(record),
+					className: 'clickable-row',
+				})}
+				expandable={{
+					expandedRowRender: isGroupedByAttribute ? expandedRowRender : undefined,
+					expandIcon: expandRowIconRenderer,
+					expandedRowKeys,
+				}}
+			/>
 
-			{(isFetching || isLoading) && <LoadingContainer />}
-
-			{showsNodesTable && (
-				<Table
-					className="k8s-list-table nodes-list-table"
-					dataSource={isFetching || isLoading ? [] : formattedNodesData}
-					columns={columns}
-					pagination={{
-						current: currentPage,
-						pageSize,
-						total: totalCount,
-						showSizeChanger: false,
-						hideOnSinglePage: true,
-					}}
-					scroll={{ x: true }}
-					loading={{
-						spinning: isFetching || isLoading,
-						indicator: <Spin indicator={<LoadingOutlined size={14} spin />} />,
-					}}
-					tableLayout="fixed"
-					onChange={handleTableChange}
-					onRow={(record): { onClick: () => void; className: string } => ({
-						onClick: (): void => handleRowClick(record),
-						className: 'clickable-row',
-					})}
-					expandable={{
-						expandedRowRender: isGroupedByAttribute ? expandedRowRender : undefined,
-						expandIcon: expandRowIconRenderer,
-						expandedRowKeys,
-					}}
-				/>
-			)}
 			<NodeDetails
 				node={selectedNodeData}
 				isModalTimeSelection

frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/Events/NodeEvents.tsx

@@ -155,6 +155,7 @@ export default function Events({
 					id: event.data.id,
 					key: event.data.id,
 					resources_string: event.data.resources_string,
+					attributes_string: event.data.attributes_string,
 				}),
 			);
 
@@ -174,7 +175,9 @@ export default function Events({
 	}, [eventsData]);
 
 	const handleExpandRow = (record: EventDataType): JSX.Element => (
-		<EventContents data={record.resources_string} />
+		<EventContents
+			data={{ ...record.attributes_string, ...record.resources_string }}
+		/>
 	);
 
 	const handlePrev = (): void => {

frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/NodeDetails.tsx

@@ -12,6 +12,7 @@ import {
 	initialQueryState,
 } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
+import { filterDuplicateFilters } from 'container/InfraMonitoringK8s/entityDetailUtils';
 import {
 	CustomTimeType,
 	Time,
@@ -97,22 +98,9 @@ function NodeDetails({
 					op: '=',
 					value: node?.meta.k8s_node_name || '',
 				},
-				{
-					id: uuidv4(),
-					key: {
-						key: QUERY_KEYS.K8S_CLUSTER_NAME,
-						dataType: DataTypes.String,
-						type: 'resource',
-						isColumn: false,
-						isJSON: false,
-						id: 'k8s_node_name--string--resource--false',
-					},
-					op: '=',
-					value: node?.meta.k8s_cluster_name || '',
-				},
 			],
 		}),
-		[node?.meta.k8s_node_name, node?.meta.k8s_cluster_name],
+		[node?.meta.k8s_node_name],
 	);
 
 	const initialEventsFilters = useMemo(
@@ -239,11 +227,13 @@ function NodeDetails({
 
 				return {
 					op: 'AND',
-					items: [
-						...primaryFilters,
-						...newFilters,
-						...(paginationFilter ? [paginationFilter] : []),
-					].filter((item): item is TagFilterItem => item !== undefined),
+					items: filterDuplicateFilters(
+						[
+							...primaryFilters,
+							...newFilters,
+							...(paginationFilter ? [paginationFilter] : []),
+						].filter((item): item is TagFilterItem => item !== undefined),
+					),
 				};
 			});
 		},
@@ -266,12 +256,14 @@ function NodeDetails({
 
 				return {
 					op: 'AND',
-					items: [
-						...primaryFilters,
-						...value.items.filter(
-							(item) => item.key?.key !== QUERY_KEYS.K8S_NODE_NAME,
-						),
-					].filter((item): item is TagFilterItem => item !== undefined),
+					items: filterDuplicateFilters(
+						[
+							...primaryFilters,
+							...value.items.filter(
+								(item) => item.key?.key !== QUERY_KEYS.K8S_NODE_NAME,
+							),
+						].filter((item): item is TagFilterItem => item !== undefined),
+					),
 				};
 			});
 		},

frontend/src/container/InfraMonitoringK8s/Nodes/utils.tsx

@@ -64,7 +64,7 @@ export interface K8sNodesRowData {
 
 const nodeGroupColumnConfig = {
 	title: (
-		<div className="column-header node-group-header">
+		<div className="column-header entity-group-header">
 			<Group size={14} /> NODE GROUP
 		</div>
 	),
@@ -74,6 +74,7 @@ const nodeGroupColumnConfig = {
 	width: 150,
 	align: 'left',
 	sorter: false,
+	className: 'column entity-group-header',
 };
 
 export const getK8sNodesListQuery = (): K8sNodesListPayload => ({
@@ -86,7 +87,7 @@ export const getK8sNodesListQuery = (): K8sNodesListPayload => ({
 
 const columnsConfig = [
 	{
-		title: <div className="column-header-left">Node Name</div>,
+		title: <div className="column-header-left name-header">Node Name</div>,
 		dataIndex: 'nodeName',
 		key: 'nodeName',
 		ellipsis: true,
@@ -95,7 +96,7 @@ const columnsConfig = [
 		align: 'left',
 	},
 	{
-		title: <div className="column-header-left">Cluster Name</div>,
+		title: <div className="column-header-left name-header">Cluster Name</div>,
 		dataIndex: 'clusterName',
 		key: 'clusterName',
 		ellipsis: true,

frontend/src/container/InfraMonitoringK8s/Pods/K8sPodLists.tsx

@@ -15,6 +15,7 @@ import get from 'api/browser/localstorage/get';
 import set from 'api/browser/localstorage/set';
 import logEvent from 'api/common/logEvent';
 import { K8sPodsListPayload } from 'api/infraMonitoring/getK8sPodsList';
+import classNames from 'classnames';
 import { useGetK8sPodsList } from 'hooks/infraMonitoring/useGetK8sPodsList';
 import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -38,7 +39,7 @@ import {
 	formatDataForTable,
 	getK8sPodsListColumns,
 	getK8sPodsListQuery,
-	IPodColumn,
+	IEntityColumn,
 	K8sPodsRowData,
 } from '../utils';
 import PodDetails from './PodDetails/PodDetails';
@@ -47,9 +48,11 @@ import PodDetails from './PodDetails/PodDetails';
 function K8sPodsList({
 	isFiltersVisible,
 	handleFilterVisibilityChange,
+	quickFiltersLastUpdated,
 }: {
 	isFiltersVisible: boolean;
 	handleFilterVisibilityChange: () => void;
+	quickFiltersLastUpdated: number;
 }): JSX.Element {
 	const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(
 		(state) => state.globalTime,
@@ -57,9 +60,9 @@ function K8sPodsList({
 
 	const [currentPage, setCurrentPage] = useState(1);
 
-	const [addedColumns, setAddedColumns] = useState<IPodColumn[]>([]);
+	const [addedColumns, setAddedColumns] = useState<IEntityColumn[]>([]);
 
-	const [availableColumns, setAvailableColumns] = useState<IPodColumn[]>(
+	const [availableColumns, setAvailableColumns] = useState<IEntityColumn[]>(
 		defaultAvailableColumns,
 	);
 
@@ -104,6 +107,11 @@ function K8sPodsList({
 		K8sCategory.PODS, // infraMonitoringEntity
 	);
 
+	// Reset pagination every time quick filters are changed
+	useEffect(() => {
+		setCurrentPage(1);
+	}, [quickFiltersLastUpdated]);
+
 	useEffect(() => {
 		const addedColumns = JSON.parse(get('k8sPodsAddedColumns') ?? '[]');
 
@@ -124,7 +132,7 @@ function K8sPodsList({
 	const [orderBy, setOrderBy] = useState<{
 		columnName: string;
 		order: 'asc' | 'desc';
-	} | null>(null);
+	} | null>({ columnName: 'cpu', order: 'desc' });
 
 	const [selectedPodUID, setSelectedPodUID] = useState<string | null>(null);
 
@@ -162,7 +170,7 @@ function K8sPodsList({
 		selectedRowData: K8sPodsRowData,
 	): IBuilderQuery['filters'] => {
 		const baseFilters: IBuilderQuery['filters'] = {
-			items: [],
+			items: [...query.filters.items],
 			op: 'and',
 		};
 
@@ -201,6 +209,7 @@ function K8sPodsList({
 			end: Math.floor(maxTime / 1000000),
 			orderBy,
 		};
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [minTime, maxTime, orderBy, selectedRowData]);
 
 	const {
@@ -338,20 +347,8 @@ function K8sPodsList({
 		setSelectedPodUID(null);
 	};
 
-	const showPodsTable =
-		!isError &&
-		!isLoading &&
-		!isFetching &&
-		!(formattedPodsData.length === 0 && queryFilters.items.length > 0);
-
-	const showNoFilteredPodsMessage =
-		!isFetching &&
-		!isLoading &&
-		formattedPodsData.length === 0 &&
-		queryFilters.items.length > 0;
-
 	const handleAddColumn = useCallback(
-		(column: IPodColumn): void => {
+		(column: IEntityColumn): void => {
 			setAddedColumns((prev) => [...prev, column]);
 
 			setAvailableColumns((prev) => prev.filter((c) => c.value !== column.value));
@@ -378,7 +375,7 @@ function K8sPodsList({
 	}, [groupByFiltersData]);
 
 	const handleRemoveColumn = useCallback(
-		(column: IPodColumn): void => {
+		(column: IEntityColumn): void => {
 			setAddedColumns((prev) => prev.filter((c) => c.value !== column.value));
 
 			setAvailableColumns((prev) => [...prev, column]);
@@ -505,54 +502,54 @@ function K8sPodsList({
 			/>
 			{isError && <Typography>{data?.error || 'Something went wrong'}</Typography>}
 
-			{showNoFilteredPodsMessage && (
-				<div className="no-filtered-hosts-message-container">
-					<div className="no-filtered-hosts-message-content">
-						<img
-							src="/Icons/emptyState.svg"
-							alt="thinking-emoji"
-							className="empty-state-svg"
-						/>
+			<Table
+				className={classNames('k8s-list-table', {
+					'expanded-k8s-list-table': isGroupedByAttribute,
+				})}
+				dataSource={isFetching || isLoading ? [] : formattedPodsData}
+				columns={columns}
+				pagination={{
+					current: currentPage,
+					pageSize,
+					total: totalCount,
+					showSizeChanger: false,
+					hideOnSinglePage: true,
+				}}
+				loading={{
+					spinning: isFetching || isLoading,
+					indicator: <Spin indicator={<LoadingOutlined size={14} spin />} />,
+				}}
+				locale={{
+					emptyText:
+						isFetching || isLoading ? null : (
+							<div className="no-filtered-hosts-message-container">
+								<div className="no-filtered-hosts-message-content">
+									<img
+										src="/Icons/emptyState.svg"
+										alt="thinking-emoji"
+										className="empty-state-svg"
+									/>
 
-						<Typography.Text className="no-filtered-hosts-message">
-							This query had no results. Edit your query and try again!
-						</Typography.Text>
-					</div>
-				</div>
-			)}
-
-			{(isFetching || isLoading) && <LoadingContainer />}
-
-			{showPodsTable && (
-				<Table
-					className="k8s-list-table"
-					dataSource={isFetching || isLoading ? [] : formattedPodsData}
-					columns={columns}
-					pagination={{
-						current: currentPage,
-						pageSize,
-						total: totalCount,
-						showSizeChanger: false,
-						hideOnSinglePage: true,
-					}}
-					loading={{
-						spinning: isFetching || isLoading,
-						indicator: <Spin indicator={<LoadingOutlined size={14} spin />} />,
-					}}
-					scroll={{ x: true }}
-					tableLayout="fixed"
-					onChange={handleTableChange}
-					onRow={(record): { onClick: () => void; className: string } => ({
-						onClick: (): void => handleRowClick(record),
-						className: 'clickable-row',
-					})}
-					expandable={{
-						expandedRowRender: isGroupedByAttribute ? expandedRowRender : undefined,
-						expandIcon: expandRowIconRenderer,
-						expandedRowKeys,
-					}}
-				/>
-			)}
+									<Typography.Text className="no-filtered-hosts-message">
+										This query had no results. Edit your query and try again!
+									</Typography.Text>
+								</div>
+							</div>
+						),
+				}}
+				scroll={{ x: true }}
+				tableLayout="fixed"
+				onChange={handleTableChange}
+				onRow={(record): { onClick: () => void; className: string } => ({
+					onClick: (): void => handleRowClick(record),
+					className: 'clickable-row',
+				})}
+				expandable={{
+					expandedRowRender: isGroupedByAttribute ? expandedRowRender : undefined,
+					expandIcon: expandRowIconRenderer,
+					expandedRowKeys,
+				}}
+			/>
 
 			{selectedPodData && (
 				<PodDetails

frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/Events/Events.tsx

@@ -155,6 +155,7 @@ export default function Events({
 					id: event.data.id,
 					key: event.data.id,
 					resources_string: event.data.resources_string,
+					attributes_string: event.data.attributes_string,
 				}),
 			);
 
@@ -174,7 +175,9 @@ export default function Events({
 	}, [eventsData]);
 
 	const handleExpandRow = (record: EventDataType): JSX.Element => (
-		<EventContents data={record.resources_string} />
+		<EventContents
+			data={{ ...record.attributes_string, ...record.resources_string }}
+		/>
 	);
 
 	const handlePrev = (): void => {

frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodDetails.tsx

@@ -13,6 +13,7 @@ import {
 	initialQueryState,
 } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
+import { filterDuplicateFilters } from 'container/InfraMonitoringK8s/entityDetailUtils';
 import {
 	CustomTimeType,
 	Time,
@@ -50,7 +51,7 @@ import { PodDetailProps } from './PodDetail.interfaces';
 import PodLogsDetailedView from './PodLogs/PodLogsDetailedView';
 import PodTraces from './PodTraces/PodTraces';
 
-const TimeRangeOffset = 1000000;
+const TimeRangeOffset = 1000000000;
 
 // eslint-disable-next-line sonarjs/cognitive-complexity
 function PodDetails({
@@ -101,19 +102,6 @@ function PodDetails({
 					op: '=',
 					value: pod?.meta.k8s_pod_name || '',
 				},
-				{
-					id: uuidv4(),
-					key: {
-						key: QUERY_KEYS.K8S_CLUSTER_NAME,
-						dataType: DataTypes.String,
-						type: 'resource',
-						isColumn: false,
-						isJSON: false,
-						id: 'k8s_pod_name--string--resource--false',
-					},
-					op: '=',
-					value: pod?.meta.k8s_cluster_name || '',
-				},
 				{
 					id: uuidv4(),
 					key: {
@@ -129,11 +117,7 @@ function PodDetails({
 				},
 			],
 		}),
-		[
-			pod?.meta.k8s_cluster_name,
-			pod?.meta.k8s_namespace_name,
-			pod?.meta.k8s_pod_name,
-		],
+		[pod?.meta.k8s_namespace_name, pod?.meta.k8s_pod_name],
 	);
 
 	const initialEventsFilters = useMemo(
@@ -262,11 +246,13 @@ function PodDetails({
 
 				return {
 					op: 'AND',
-					items: [
-						...primaryFilters,
-						...newFilters,
-						...(paginationFilter ? [paginationFilter] : []),
-					].filter((item): item is TagFilterItem => item !== undefined),
+					items: filterDuplicateFilters(
+						[
+							...primaryFilters,
+							...newFilters,
+							...(paginationFilter ? [paginationFilter] : []),
+						].filter((item): item is TagFilterItem => item !== undefined),
+					),
 				};
 			});
 		},
@@ -291,12 +277,14 @@ function PodDetails({
 
 				return {
 					op: 'AND',
-					items: [
-						...primaryFilters,
-						...value.items.filter(
-							(item) => item.key?.key !== QUERY_KEYS.K8S_POD_NAME,
-						),
-					].filter((item): item is TagFilterItem => item !== undefined),
+					items: filterDuplicateFilters(
+						[
+							...primaryFilters,
+							...value.items.filter(
+								(item) => item.key?.key !== QUERY_KEYS.K8S_POD_NAME,
+							),
+						].filter((item): item is TagFilterItem => item !== undefined),
+					),
 				};
 			});
 		},

frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodTraces/PodTraces.tsx

@@ -78,8 +78,6 @@ function PodTraces({
 		[currentQuery],
 	);
 
-	console.log({ updatedCurrentQuery });
-
 	const query = updatedCurrentQuery?.builder?.queryData[0] || null;
 
 	const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(

frontend/src/container/InfraMonitoringK8s/commonUtils.tsx

@@ -100,7 +100,13 @@ export function getStrokeColorForLimitUtilization(value: number): string {
 export const getProgressBarText = (percent: number): React.ReactNode =>
 	`${percent}%`;
 
-export function EntityProgressBar({ value }: { value: number }): JSX.Element {
+export function EntityProgressBar({
+	value,
+	type,
+}: {
+	value: number;
+	type: 'request' | 'limit';
+}): JSX.Element {
 	const percentage = Number((value * 100).toFixed(1));
 
 	return (
@@ -110,7 +116,11 @@ export function EntityProgressBar({ value }: { value: number }): JSX.Element {
 				strokeLinecap="butt"
 				size="small"
 				status="normal"
-				strokeColor={getStrokeColorForLimitUtilization(value)}
+				strokeColor={
+					type === 'limit'
+						? getStrokeColorForLimitUtilization(value)
+						: getStrokeColorForRequestUtilization(value)
+				}
 				className="progress-bar"
 				showInfo={false}
 			/>

frontend/src/container/InfraMonitoringK8s/constants.ts

@@ -150,6 +150,8 @@ export const PodsQuickFiltersConfig: IQuickFiltersConfig[] = [
 			isColumn: false,
 			isJSON: false,
 		},
+		aggregateOperator: 'noop',
+		aggregateAttribute: 'k8s_pod_cpu_utilization',
 		dataSource: DataSource.METRICS,
 		defaultOpen: false,
 	},

frontend/src/container/InfraMonitoringK8s/entityDetailUtils.ts

@@ -0,0 +1,18 @@
+import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
+
+export const filterDuplicateFilters = (
+	filters: TagFilterItem[],
+): TagFilterItem[] => {
+	const uniqueFilters = [];
+	const seenIds = new Set();
+
+	// eslint-disable-next-line no-restricted-syntax
+	for (const filter of filters) {
+		if (!seenIds.has(filter.id)) {
+			seenIds.add(filter.id);
+			uniqueFilters.push(filter);
+		}
+	}
+
+	return uniqueFilters;
+};

frontend/src/container/InfraMonitoringK8s/utils.tsx

@@ -26,16 +26,9 @@ export interface IEntityColumn {
 	canRemove: boolean;
 }
 
-export interface IPodColumn {
-	label: string;
-	value: string;
-	id: string;
-	canRemove: boolean;
-}
-
 const columnProgressBarClassName = 'column-progress-bar';
 
-export const defaultAddedColumns: IPodColumn[] = [
+export const defaultAddedColumns: IEntityColumn[] = [
 	{
 		label: 'Pod name',
 		value: 'podName',
@@ -78,12 +71,13 @@ export const defaultAddedColumns: IPodColumn[] = [
 		id: 'memory',
 		canRemove: false,
 	},
-	{
-		label: 'Restarts',
-		value: 'restarts',
-		id: 'restarts',
-		canRemove: false,
-	},
+	// TODO - Re-enable the column once backend issue is fixed
+	// {
+	// 	label: 'Restarts',
+	// 	value: 'restarts',
+	// 	id: 'restarts',
+	// 	canRemove: false,
+	// },
 ];
 
 export const defaultAvailableColumns = [
@@ -131,7 +125,7 @@ export const getK8sPodsListQuery = (): K8sPodsListPayload => ({
 
 const podGroupColumnConfig = {
 	title: (
-		<div className="column-header pod-group-header">
+		<div className="column-header entity-group-header">
 			<Group size={14} /> POD GROUP
 		</div>
 	),
@@ -140,7 +134,7 @@ const podGroupColumnConfig = {
 	ellipsis: true,
 	width: 180,
 	sorter: false,
-	className: 'column column-pod-group',
+	className: 'column entity-group-header',
 };
 
 export const dummyColumnConfig = {
@@ -160,11 +154,11 @@ const columnsConfig = [
 		key: 'podName',
 		width: 180,
 		ellipsis: true,
-		sorter: true,
+		sorter: false,
 		className: 'column column-pod-name',
 	},
 	{
-		title: <div className="column-header">CPU Req Usage (%)</div>,
+		title: <div className="column-header med-col">CPU Req Usage (%)</div>,
 		dataIndex: 'cpu_request',
 		key: 'cpu_request',
 		width: 180,
@@ -174,7 +168,7 @@ const columnsConfig = [
 		className: `column ${columnProgressBarClassName}`,
 	},
 	{
-		title: <div className="column-header">CPU Limit Usage (%)</div>,
+		title: <div className="column-header med-col">CPU Limit Usage (%)</div>,
 		dataIndex: 'cpu_limit',
 		key: 'cpu_limit',
 		width: 120,
@@ -192,7 +186,7 @@ const columnsConfig = [
 		className: `column ${columnProgressBarClassName}`,
 	},
 	{
-		title: <div className="column-header">Mem Req Usage (%)</div>,
+		title: <div className="column-heade med-col">Mem Req Usage (%)</div>,
 		dataIndex: 'memory_request',
 		key: 'memory_request',
 		width: 120,
@@ -201,7 +195,7 @@ const columnsConfig = [
 		className: `column ${columnProgressBarClassName}`,
 	},
 	{
-		title: <div className="column-header">Mem Limit Usage (%)</div>,
+		title: <div className="column-header med-col">Mem Limit Usage (%)</div>,
 		dataIndex: 'memory_limit',
 		key: 'memory_limit',
 		width: 120,
@@ -219,20 +213,21 @@ const columnsConfig = [
 		align: 'left',
 		className: `column ${columnProgressBarClassName}`,
 	},
-	{
-		title: (
-			<div className="column-header">
-				<Tooltip title="Container Restarts">Restarts</Tooltip>
-			</div>
-		),
-		dataIndex: 'restarts',
-		key: 'restarts',
-		width: 40,
-		ellipsis: true,
-		sorter: true,
-		align: 'left',
-		className: `column ${columnProgressBarClassName}`,
-	},
+	// TODO - Re-enable the column once backend issue is fixed
+	// {
+	// 	title: (
+	// 		<div className="column-header">
+	// 			<Tooltip title="Container Restarts">Restarts</Tooltip>
+	// 		</div>
+	// 	),
+	// 	dataIndex: 'restarts',
+	// 	key: 'restarts',
+	// 	width: 40,
+	// 	ellipsis: true,
+	// 	sorter: true,
+	// 	align: 'left',
+	// 	className: `column ${columnProgressBarClassName}`,
+	// },
 ];
 
 export const namespaceColumnConfig = {
@@ -251,7 +246,7 @@ export const nodeColumnConfig = {
 	dataIndex: 'node',
 	key: 'node',
 	width: 100,
-	sorter: true,
+	sorter: false,
 	ellipsis: true,
 	align: 'left',
 	className: 'column column-node',
@@ -262,7 +257,7 @@ export const clusterColumnConfig = {
 	dataIndex: 'cluster',
 	key: 'cluster',
 	width: 100,
-	sorter: true,
+	sorter: false,
 	ellipsis: true,
 	align: 'left',
 	className: 'column column-cluster',
@@ -275,7 +270,7 @@ export const columnConfigMap = {
 };
 
 export const getK8sPodsListColumns = (
-	addedColumns: IPodColumn[],
+	addedColumns: IEntityColumn[],
 	groupBy: IBuilderQuery['groupBy'],
 ): ColumnType<K8sPodsRowData>[] => {
 	const updatedColumnsConfig = [...columnsConfig];
@@ -341,7 +336,7 @@ export const formatDataForTable = (
 				attribute="CPU Request"
 			>
 				<div className="progress-container">
-					<EntityProgressBar value={pod.podCPURequest} />
+					<EntityProgressBar value={pod.podCPURequest} type="request" />
 				</div>
 			</ValidateColumnValueWrapper>
 		),
@@ -352,7 +347,7 @@ export const formatDataForTable = (
 				attribute="CPU Limit"
 			>
 				<div className="progress-container">
-					<EntityProgressBar value={pod.podCPULimit} />
+					<EntityProgressBar value={pod.podCPULimit} type="limit" />
 				</div>
 			</ValidateColumnValueWrapper>
 		),
@@ -368,7 +363,7 @@ export const formatDataForTable = (
 				attribute="Memory Request"
 			>
 				<div className="progress-container">
-					<EntityProgressBar value={pod.podMemoryRequest} />
+					<EntityProgressBar value={pod.podMemoryRequest} type="request" />
 				</div>
 			</ValidateColumnValueWrapper>
 		),
@@ -379,7 +374,7 @@ export const formatDataForTable = (
 				attribute="Memory Limit"
 			>
 				<div className="progress-container">
-					<EntityProgressBar value={pod.podMemoryLimit} />
+					<EntityProgressBar value={pod.podMemoryLimit} type="limit" />
 				</div>
 			</ValidateColumnValueWrapper>
 		),

frontend/src/container/LogsExplorerList/InfinityTableView/index.tsx

@@ -121,23 +121,25 @@ const InfinityTable = forwardRef<TableVirtuosoHandle, InfinityTableProps>(
 		const tableHeader = useCallback(
 			() => (
 				<tr>
-					{tableColumns.map((column) => {
-						const isDragColumn = column.key !== 'expand';
+					{tableColumns
+						.filter((column) => column.key)
+						.map((column) => {
+							const isDragColumn = column.key !== 'expand';
 
-						return (
-							<TableHeaderCellStyled
-								$isLogIndicator={column.key === 'state-indicator'}
-								$isDarkMode={isDarkMode}
-								$isDragColumn={isDragColumn}
-								key={column.key}
-								fontSize={tableViewProps?.fontSize}
-								// eslint-disable-next-line react/jsx-props-no-spreading
-								{...(isDragColumn && { className: 'dragHandler' })}
-							>
-								{(column.title as string).replace(/^\w/, (c) => c.toUpperCase())}
-							</TableHeaderCellStyled>
-						);
-					})}
+							return (
+								<TableHeaderCellStyled
+									$isLogIndicator={column.key === 'state-indicator'}
+									$isDarkMode={isDarkMode}
+									$isDragColumn={isDragColumn}
+									key={column.key}
+									fontSize={tableViewProps?.fontSize}
+									// eslint-disable-next-line react/jsx-props-no-spreading
+									{...(isDragColumn && { className: 'dragHandler' })}
+								>
+									{(column.title as string).replace(/^\w/, (c) => c.toUpperCase())}
+								</TableHeaderCellStyled>
+							);
+						})}
 				</tr>
 			),
 			[tableColumns, isDarkMode, tableViewProps?.fontSize],

frontend/src/container/LogsExplorerList/InfinityTableView/styles.ts

@@ -29,7 +29,7 @@ export const TableCellStyled = styled.td<TableHeaderCellStyledProps>`
 		props.$isDarkMode ? 'inherit' : themeColors.whiteCream};
 
 	${({ $isLogIndicator }): string =>
-		$isLogIndicator ? 'padding: 0 0 0 8px;' : ''}
+		$isLogIndicator ? 'padding: 0 0 0 8px;width: 15px;' : ''}
 	color: ${(props): string =>
 		props.$isDarkMode ? themeColors.white : themeColors.bckgGrey};
 `;

frontend/src/container/OptionsMenu/constants.ts

@@ -5,7 +5,26 @@ import { FontSize, OptionsQuery } from './types';
 export const URL_OPTIONS = 'options';
 
 export const defaultOptionsQuery: OptionsQuery = {
-	selectColumns: [],
+	selectColumns: [
+		{
+			key: 'timestamp',
+			dataType: DataTypes.String,
+			type: 'tag',
+			isColumn: true,
+			isJSON: false,
+			id: 'timestamp--string--tag--true',
+			isIndexed: false,
+		},
+		{
+			key: 'body',
+			dataType: DataTypes.String,
+			type: 'tag',
+			isColumn: true,
+			isJSON: false,
+			id: 'body--string--tag--true',
+			isIndexed: false,
+		},
+	],
 	maxLines: 2,
 	format: 'raw',
 	fontSize: FontSize.SMALL,

frontend/src/container/OptionsMenu/useOptionsMenu.ts

@@ -169,6 +169,15 @@ const useOptionsMenu = ({
 
 	const searchedAttributeKeys = useMemo(() => {
 		if (searchedAttributesData?.payload?.attributeKeys?.length) {
+			if (dataSource === DataSource.LOGS) {
+				// add timestamp and body to the list of attributes
+				return [
+					...defaultOptionsQuery.selectColumns,
+					...searchedAttributesData.payload.attributeKeys.filter(
+						(attribute) => attribute.key !== 'body',
+					),
+				];
+			}
 			return searchedAttributesData.payload.attributeKeys;
 		}
 		if (dataSource === DataSource.TRACES) {
@@ -198,12 +207,17 @@ const useOptionsMenu = ({
 	);
 
 	const optionsFromAttributeKeys = useMemo(() => {
-		const filteredAttributeKeys = searchedAttributeKeys.filter(
-			(item) => item.key !== 'body',
-		);
+		const filteredAttributeKeys = searchedAttributeKeys.filter((item) => {
+			// For other data sources, only filter out 'body' if it exists
+			if (dataSource !== DataSource.LOGS) {
+				return item.key !== 'body';
+			}
+			// For LOGS, keep all keys
+			return true;
+		});
 
 		return getOptionsFromKeys(filteredAttributeKeys, selectedColumnKeys);
-	}, [searchedAttributeKeys, selectedColumnKeys]);
+	}, [dataSource, searchedAttributeKeys, selectedColumnKeys]);
 
 	const handleRedirectWithOptionsData = useCallback(
 		(newQueryData: OptionsQuery) => {

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

@@ -95,6 +95,7 @@ function QueryBuilderSearch({
 		isMulti,
 		isFetching,
 		setSearchKey,
+		setSearchValue,
 		searchKey,
 		key,
 		exampleQueries,
@@ -145,7 +146,11 @@ function QueryBuilderSearch({
 
 		const tagEditHandler = (value: string): void => {
 			updateTag(value);
-			handleSearch(value);
+			if (isInfraMonitoring) {
+				setSearchValue(value);
+			} else {
+				handleSearch(value);
+			}
 		};
 
 		const isDisabled = !!searchValue;

frontend/src/hooks/queryBuilder/useAutoComplete.ts

@@ -153,6 +153,7 @@ export const useAutoComplete = (
 		isMulti,
 		isFetching,
 		setSearchKey,
+		setSearchValue,
 		searchKey,
 		key,
 		exampleQueries,
@@ -172,6 +173,7 @@ interface IAutoComplete {
 	isMulti: boolean;
 	isFetching: boolean;
 	setSearchKey: (value: string) => void;
+	setSearchValue: (value: string) => void;
 	searchKey: string;
 	key: string;
 	exampleQueries: TagFilter[];

frontend/src/pages/InfrastructureMonitoring/InfrastructureMonitoringPage.tsx

@@ -5,12 +5,12 @@ import { TabRoutes } from 'components/RouteTab/types';
 import history from 'lib/history';
 import { useLocation } from 'react-use';
 
-import { Hosts } from './constants';
+import { Hosts, Kubernetes } from './constants';
 
 export default function InfrastructureMonitoringPage(): JSX.Element {
 	const { pathname } = useLocation();
 
-	const routes: TabRoutes[] = [Hosts];
+	const routes: TabRoutes[] = [Hosts, Kubernetes];
 
 	return (
 		<div className="infra-monitoring-module-container">

pkg/cache/memorycache/provider.go

@@ -16,7 +16,7 @@ type provider struct {
 }
 
 func NewFactory() factory.ProviderFactory[cache.Cache, cache.Config] {
-	return factory.NewProviderFactory(factory.MustNewName("memorycache"), New)
+	return factory.NewProviderFactory(factory.MustNewName("memory"), New)
 }
 
 func New(ctx context.Context, settings factory.ProviderSettings, config cache.Config) (cache.Cache, error) {

pkg/cache/memorycache/provider_test.go

@@ -8,17 +8,17 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	_cache "go.signoz.io/signoz/pkg/cache"
+	"go.signoz.io/signoz/pkg/cache"
 	"go.signoz.io/signoz/pkg/factory/providertest"
 )
 
 // TestNew tests the New function
 func TestNew(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	assert.NotNil(t, c)
 	assert.NotNil(t, c.(*provider).cc)
@@ -56,11 +56,11 @@ func (dce DCacheableEntity) UnmarshalBinary(data []byte) error {
 // TestStore tests the Store function
 // this should fail because of nil pointer error
 func TestStoreWithNilPointer(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	var storeCacheableEntity *CacheableEntity
 	assert.Error(t, c.Store(context.Background(), "key", storeCacheableEntity, 10*time.Second))
@@ -68,22 +68,22 @@ func TestStoreWithNilPointer(t *testing.T) {
 
 // this should fail because of no pointer error
 func TestStoreWithStruct(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	var storeCacheableEntity CacheableEntity
 	assert.Error(t, c.Store(context.Background(), "key", storeCacheableEntity, 10*time.Second))
 }
 
 func TestStoreWithNonNilPointer(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -95,11 +95,11 @@ func TestStoreWithNonNilPointer(t *testing.T) {
 
 // TestRetrieve tests the Retrieve function
 func TestRetrieveWithNilPointer(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -112,15 +112,15 @@ func TestRetrieveWithNilPointer(t *testing.T) {
 
 	retrieveStatus, err := c.Retrieve(context.Background(), "key", retrieveCacheableEntity, false)
 	assert.Error(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusError)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusError)
 }
 
 func TestRetrieveWitNonPointer(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -133,15 +133,15 @@ func TestRetrieveWitNonPointer(t *testing.T) {
 
 	retrieveStatus, err := c.Retrieve(context.Background(), "key", retrieveCacheableEntity, false)
 	assert.Error(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusError)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusError)
 }
 
 func TestRetrieveWithDifferentTypes(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -153,15 +153,15 @@ func TestRetrieveWithDifferentTypes(t *testing.T) {
 	retrieveCacheableEntity := new(DCacheableEntity)
 	retrieveStatus, err := c.Retrieve(context.Background(), "key", retrieveCacheableEntity, false)
 	assert.Error(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusError)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusError)
 }
 
 func TestRetrieveWithSameTypes(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -173,13 +173,13 @@ func TestRetrieveWithSameTypes(t *testing.T) {
 	retrieveCacheableEntity := new(CacheableEntity)
 	retrieveStatus, err := c.Retrieve(context.Background(), "key", retrieveCacheableEntity, false)
 	assert.NoError(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusHit)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusHit)
 	assert.Equal(t, storeCacheableEntity, retrieveCacheableEntity)
 }
 
 // TestSetTTL tests the SetTTL function
 func TestSetTTL(t *testing.T) {
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: _cache.Memory{TTL: 10 * time.Second, CleanupInterval: 1 * time.Second}})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: cache.Memory{TTL: 10 * time.Second, CleanupInterval: 1 * time.Second}})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -191,7 +191,7 @@ func TestSetTTL(t *testing.T) {
 	time.Sleep(3 * time.Second)
 	retrieveStatus, err := c.Retrieve(context.Background(), "key", retrieveCacheableEntity, false)
 	assert.NoError(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusKeyMiss)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusKeyMiss)
 	assert.Equal(t, new(CacheableEntity), retrieveCacheableEntity)
 
 	assert.NoError(t, c.Store(context.Background(), "key", storeCacheableEntity, 2*time.Second))
@@ -199,17 +199,17 @@ func TestSetTTL(t *testing.T) {
 	time.Sleep(3 * time.Second)
 	retrieveStatus, err = c.Retrieve(context.Background(), "key", retrieveCacheableEntity, false)
 	assert.NoError(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusHit)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusHit)
 	assert.Equal(t, retrieveCacheableEntity, storeCacheableEntity)
 }
 
 // TestRemove tests the Remove function
 func TestRemove(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -222,17 +222,17 @@ func TestRemove(t *testing.T) {
 
 	retrieveStatus, err := c.Retrieve(context.Background(), "key", retrieveCacheableEntity, false)
 	assert.NoError(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusKeyMiss)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusKeyMiss)
 	assert.Equal(t, new(CacheableEntity), retrieveCacheableEntity)
 }
 
 // TestBulkRemove tests the BulkRemove function
 func TestBulkRemove(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -246,22 +246,22 @@ func TestBulkRemove(t *testing.T) {
 
 	retrieveStatus, err := c.Retrieve(context.Background(), "key1", retrieveCacheableEntity, false)
 	assert.NoError(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusKeyMiss)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusKeyMiss)
 	assert.Equal(t, new(CacheableEntity), retrieveCacheableEntity)
 
 	retrieveStatus, err = c.Retrieve(context.Background(), "key2", retrieveCacheableEntity, false)
 	assert.NoError(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusKeyMiss)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusKeyMiss)
 	assert.Equal(t, new(CacheableEntity), retrieveCacheableEntity)
 }
 
 // TestCache tests the cache
 func TestCache(t *testing.T) {
-	opts := _cache.Memory{
+	opts := cache.Memory{
 		TTL:             10 * time.Second,
 		CleanupInterval: 10 * time.Second,
 	}
-	c, err := New(context.Background(), providertest.NewSettings(), _cache.Config{Provider: "memory", Memory: opts})
+	c, err := New(context.Background(), providertest.NewSettings(), cache.Config{Provider: "memory", Memory: opts})
 	require.NoError(t, err)
 	storeCacheableEntity := &CacheableEntity{
 		Key:    "some-random-key",
@@ -272,7 +272,7 @@ func TestCache(t *testing.T) {
 	assert.NoError(t, c.Store(context.Background(), "key", storeCacheableEntity, 10*time.Second))
 	retrieveStatus, err := c.Retrieve(context.Background(), "key", retrieveCacheableEntity, false)
 	assert.NoError(t, err)
-	assert.Equal(t, retrieveStatus, _cache.RetrieveStatusHit)
+	assert.Equal(t, retrieveStatus, cache.RetrieveStatusHit)
 	assert.Equal(t, storeCacheableEntity, retrieveCacheableEntity)
 	c.Remove(context.Background(), "key")
 }

pkg/cache/rediscache/provider.go

@@ -18,7 +18,7 @@ type provider struct {
 }
 
 func NewFactory() factory.ProviderFactory[cache.Cache, cache.Config] {
-	return factory.NewProviderFactory(factory.MustNewName("rediscache"), New)
+	return factory.NewProviderFactory(factory.MustNewName("redis"), New)
 }
 
 func New(ctx context.Context, settings factory.ProviderSettings, config cache.Config) (cache.Cache, error) {

pkg/config/envprovider/provider_test.go

@@ -30,6 +30,18 @@ func TestGetWithStrings(t *testing.T) {
 	assert.Equal(t, expected, actual.All())
 }
 
+func TestGetWithNoPrefix(t *testing.T) {
+	t.Setenv("K1_K2", "string")
+	t.Setenv("K3_K4", "string")
+	expected := map[string]any{}
+
+	provider := New(config.ProviderConfig{})
+	actual, err := provider.Get(context.Background(), config.MustNewUri("env:"))
+	require.NoError(t, err)
+
+	assert.Equal(t, expected, actual.All())
+}
+
 func TestGetWithGoTypes(t *testing.T) {
 	t.Setenv("SIGNOZ_BOOL", "true")
 	t.Setenv("SIGNOZ_STRING", "string")

pkg/confmap/config.go

@@ -1,9 +0,0 @@
-package confmap
-
-// Config is an interface that defines methods for creating and validating configurations.
-type Config interface {
-	// New creates a new instance of the configuration with default values.
-	NewWithDefaults() Config
-	// Validate the configuration and returns an error if invalid.
-	Validate() error
-}

pkg/confmap/doc.go

@@ -1,3 +0,0 @@
-// Package confmap is a wrapper on top of the confmap defined here:
-// https://github.com/open-telemetry/opentelemetry-collector/blob/main/otelcol/configprovider.go/
-package confmap

pkg/confmap/provider/signozenvprovider/provider.go

@@ -1,94 +0,0 @@
-package signozenvprovider
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"regexp"
-	"sort"
-	"strings"
-
-	"go.opentelemetry.io/collector/confmap"
-	"go.uber.org/zap"
-	"gopkg.in/yaml.v3"
-)
-
-const (
-	schemeName                string = "signozenv"
-	envPrefix                 string = "signoz"
-	separator                 string = "__"
-	envPrefixWithOneSeparator string = "signoz_"
-	envRegexString            string = `^[a-zA-Z][a-zA-Z0-9_]*$`
-)
-
-var (
-	envRegex = regexp.MustCompile(envRegexString)
-)
-
-type provider struct {
-	logger *zap.Logger
-}
-
-// NewFactory returns a factory for a confmap.Provider that reads the configuration from the environment.
-// All variables starting with `SIGNOZ__` are read from the environment.
-// The separator is `__` (2 underscores) in order to incorporate env variables having keys with a single `_`
-func NewFactory() confmap.ProviderFactory {
-	return confmap.NewProviderFactory(newProvider)
-}
-
-func newProvider(settings confmap.ProviderSettings) confmap.Provider {
-	return &provider{
-		logger: settings.Logger,
-	}
-}
-
-func (provider *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) {
-	if !strings.HasPrefix(uri, schemeName+":") {
-		return nil, fmt.Errorf("%q uri is not supported by %q provider", uri, schemeName)
-	}
-
-	// Read and Sort environment variables for consistent output
-	envvars := os.Environ()
-	sort.Strings(envvars)
-
-	// Create a map m containing key value pairs
-	m := make(map[string]any)
-	for _, envvar := range envvars {
-		parts := strings.SplitN(envvar, "=", 2)
-		if len(parts) != 2 {
-			continue
-		}
-		key := strings.ToLower(parts[0])
-		val := parts[1]
-
-		if strings.HasPrefix(key, envPrefixWithOneSeparator) {
-			// Remove the envPrefix from the key
-			key = strings.Replace(key, envPrefix+separator, "", 1)
-
-			// Check whether the resulting key matches with the regex
-			if !envRegex.MatchString(key) {
-				provider.logger.Warn("Configuration references invalid environment variable key", zap.String("key", key))
-				continue
-			}
-
-			// Convert key into yaml format
-			key = strings.ToLower(strings.ReplaceAll(key, separator, confmap.KeyDelimiter))
-			m[key] = val
-		}
-	}
-
-	out, err := yaml.Marshal(m)
-	if err != nil {
-		return nil, err
-	}
-
-	return confmap.NewRetrievedFromYAML(out)
-}
-
-func (*provider) Scheme() string {
-	return schemeName
-}
-
-func (*provider) Shutdown(context.Context) error {
-	return nil
-}

pkg/confmap/provider/signozenvprovider/provider_test.go

@@ -1,40 +0,0 @@
-package signozenvprovider
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/confmap"
-	"go.opentelemetry.io/collector/confmap/confmaptest"
-)
-
-func createProvider() confmap.Provider {
-	return NewFactory().Create(confmaptest.NewNopProviderSettings())
-}
-
-func TestValidateProviderScheme(t *testing.T) {
-	assert.NoError(t, confmaptest.ValidateProviderScheme(createProvider()))
-}
-
-func TestRetrieve(t *testing.T) {
-	t.Setenv("SIGNOZ__STORAGE__DSN", "localhost:9000")
-	t.Setenv("SIGNOZ__SIGNOZ_ENABLED", "true")
-	t.Setenv("SIGNOZ__INSTRUMENTATION__LOGS__ENABLED", "true")
-	expected := confmap.NewFromStringMap(map[string]any{
-		"storage::dsn":                   "localhost:9000",
-		"signoz_enabled":                 "true",
-		"instrumentation::logs::enabled": "true",
-	})
-
-	signoz := createProvider()
-	retrieved, err := signoz.Retrieve(context.Background(), schemeName+":", nil)
-	require.NoError(t, err)
-
-	actual, err := retrieved.AsConf()
-	require.NoError(t, err)
-
-	assert.Equal(t, expected.ToStringMap(), actual.ToStringMap())
-	assert.NoError(t, signoz.Shutdown(context.Background()))
-}

pkg/factory/provider.go

@@ -1,6 +1,8 @@
 package factory
 
-import "context"
+import (
+	"context"
+)
 
 type Provider = any
 
@@ -21,8 +23,14 @@ func (factory *providerFactory[P, C]) Name() Name {
 	return factory.name
 }
 
-func (factory *providerFactory[P, C]) New(ctx context.Context, settings ProviderSettings, config C) (P, error) {
-	return factory.newProviderFunc(ctx, settings, config)
+func (factory *providerFactory[P, C]) New(ctx context.Context, settings ProviderSettings, config C) (p P, err error) {
+	provider, err := factory.newProviderFunc(ctx, settings, config)
+	if err != nil {
+		return
+	}
+
+	p = provider
+	return
 }
 
 // NewProviderFactory creates a new provider factory.

pkg/http/middleware/analytics.go

@@ -0,0 +1,198 @@
+package middleware
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"errors"
+	"io"
+	"net"
+	"net/http"
+	"regexp"
+
+	"github.com/gorilla/mux"
+	"go.signoz.io/signoz/pkg/query-service/auth"
+	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+	"go.signoz.io/signoz/pkg/query-service/telemetry"
+	"go.uber.org/zap"
+)
+
+type Analytics struct {
+	logger *zap.Logger
+}
+
+func NewAnalytics(logger *zap.Logger) *Analytics {
+	if logger == nil {
+		panic("cannot build analytics, logger is empty")
+	}
+
+	return &Analytics{
+		logger: logger.Named(pkgname),
+	}
+}
+
+func (middleware *Analytics) Wrap(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		ctx := auth.AttachJwtToContext(r.Context(), r)
+		r = r.WithContext(ctx)
+		route := mux.CurrentRoute(r)
+		path, _ := route.GetPathTemplate()
+
+		queryRangeData, metadataExists := extractQueryRangeData(path, r)
+		getActiveLogs(path, r)
+
+		lrw := NewLoggingResponseWriter(w)
+		next.ServeHTTP(lrw, r)
+
+		data := map[string]interface{}{"path": path, "statusCode": lrw.statusCode}
+		if metadataExists {
+			for key, value := range queryRangeData {
+				data[key] = value
+			}
+		}
+
+		if _, ok := telemetry.EnabledPaths()[path]; ok {
+			userEmail, err := auth.GetEmailFromJwt(r.Context())
+			if err == nil {
+				telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_PATH, data, userEmail, true, false)
+			}
+		}
+
+	})
+}
+
+type loggingResponseWriter struct {
+	http.ResponseWriter
+	statusCode int
+}
+
+func NewLoggingResponseWriter(w http.ResponseWriter) *loggingResponseWriter {
+	// WriteHeader(int) is not called if our response implicitly returns 200 OK, so
+	// we default to that status code.
+	return &loggingResponseWriter{w, http.StatusOK}
+}
+
+// TODO(remove): Implemented at pkg/http/middleware/logging.go
+func (lrw *loggingResponseWriter) WriteHeader(code int) {
+	lrw.statusCode = code
+	lrw.ResponseWriter.WriteHeader(code)
+}
+
+// TODO(remove): Implemented at pkg/http/middleware/logging.go
+// Flush implements the http.Flush interface.
+func (lrw *loggingResponseWriter) Flush() {
+	lrw.ResponseWriter.(http.Flusher).Flush()
+}
+
+// TODO(remove): Implemented at pkg/http/middleware/logging.go
+// Support websockets
+func (lrw *loggingResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+	h, ok := lrw.ResponseWriter.(http.Hijacker)
+	if !ok {
+		return nil, nil, errors.New("hijack not supported")
+	}
+	return h.Hijack()
+}
+
+func getActiveLogs(path string, r *http.Request) {
+	// if path == "/api/v1/dashboards/{uuid}" {
+	// 	telemetry.GetInstance().AddActiveMetricsUser()
+	// }
+	if path == "/api/v1/logs" {
+		hasFilters := len(r.URL.Query().Get("q"))
+		if hasFilters > 0 {
+			telemetry.GetInstance().AddActiveLogsUser()
+		}
+
+	}
+
+}
+
+func extractQueryRangeData(path string, r *http.Request) (map[string]interface{}, bool) {
+	pathToExtractBodyFromV3 := "/api/v3/query_range"
+	pathToExtractBodyFromV4 := "/api/v4/query_range"
+
+	data := map[string]interface{}{}
+	var postData *v3.QueryRangeParamsV3
+
+	if (r.Method == "POST") && ((path == pathToExtractBodyFromV3) || (path == pathToExtractBodyFromV4)) {
+		if r.Body != nil {
+			bodyBytes, err := io.ReadAll(r.Body)
+			if err != nil {
+				return nil, false
+			}
+			r.Body.Close() //  must close
+			r.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
+			json.Unmarshal(bodyBytes, &postData)
+
+		} else {
+			return nil, false
+		}
+
+	} else {
+		return nil, false
+	}
+
+	referrer := r.Header.Get("Referer")
+
+	dashboardMatched, err := regexp.MatchString(`/dashboard/[a-zA-Z0-9\-]+/(new|edit)(?:\?.*)?$`, referrer)
+	if err != nil {
+		zap.L().Error("error while matching the referrer", zap.Error(err))
+	}
+	alertMatched, err := regexp.MatchString(`/alerts/(new|edit)(?:\?.*)?$`, referrer)
+	if err != nil {
+		zap.L().Error("error while matching the alert: ", zap.Error(err))
+	}
+	logsExplorerMatched, err := regexp.MatchString(`/logs/logs-explorer(?:\?.*)?$`, referrer)
+	if err != nil {
+		zap.L().Error("error while matching the logs explorer: ", zap.Error(err))
+	}
+	traceExplorerMatched, err := regexp.MatchString(`/traces-explorer(?:\?.*)?$`, referrer)
+	if err != nil {
+		zap.L().Error("error while matching the trace explorer: ", zap.Error(err))
+	}
+
+	queryInfoResult := telemetry.GetInstance().CheckQueryInfo(postData)
+
+	if (queryInfoResult.MetricsUsed || queryInfoResult.LogsUsed || queryInfoResult.TracesUsed) && (queryInfoResult.FilterApplied) {
+		if queryInfoResult.MetricsUsed {
+			telemetry.GetInstance().AddActiveMetricsUser()
+		}
+		if queryInfoResult.LogsUsed {
+			telemetry.GetInstance().AddActiveLogsUser()
+		}
+		if queryInfoResult.TracesUsed {
+			telemetry.GetInstance().AddActiveTracesUser()
+		}
+		data["metricsUsed"] = queryInfoResult.MetricsUsed
+		data["logsUsed"] = queryInfoResult.LogsUsed
+		data["tracesUsed"] = queryInfoResult.TracesUsed
+		data["filterApplied"] = queryInfoResult.FilterApplied
+		data["groupByApplied"] = queryInfoResult.GroupByApplied
+		data["aggregateOperator"] = queryInfoResult.AggregateOperator
+		data["aggregateAttributeKey"] = queryInfoResult.AggregateAttributeKey
+		data["numberOfQueries"] = queryInfoResult.NumberOfQueries
+		data["queryType"] = queryInfoResult.QueryType
+		data["panelType"] = queryInfoResult.PanelType
+
+		userEmail, err := auth.GetEmailFromJwt(r.Context())
+		if err == nil {
+			// switch case to set data["screen"] based on the referrer
+			switch {
+			case dashboardMatched:
+				data["screen"] = "panel"
+			case alertMatched:
+				data["screen"] = "alert"
+			case logsExplorerMatched:
+				data["screen"] = "logs-explorer"
+			case traceExplorerMatched:
+				data["screen"] = "traces-explorer"
+			default:
+				data["screen"] = "unknown"
+				return data, true
+			}
+			telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_QUERY_RANGE_API, data, userEmail, true, false)
+		}
+	}
+	return data, true
+}

pkg/http/middleware/log_comment.go

@@ -0,0 +1,88 @@
+package middleware
+
+import (
+	"context"
+	"net/http"
+	"net/url"
+	"strings"
+
+	"go.signoz.io/signoz/pkg/query-service/auth"
+	"go.signoz.io/signoz/pkg/query-service/common"
+	"go.uber.org/zap"
+)
+
+type LogComment struct {
+	logger *zap.Logger
+}
+
+func NewLogComment(logger *zap.Logger) *LogComment {
+	if logger == nil {
+		panic("cannot build log enrichment, logger is empty")
+	}
+
+	return &LogComment{
+		logger: logger.Named(pkgname),
+	}
+}
+
+func (middleware *LogComment) Wrap(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		referrer := r.Header.Get("Referer")
+
+		var path, dashboardID, alertID, page, client, viewName, tab string
+
+		if referrer != "" {
+			referrerURL, _ := url.Parse(referrer)
+			client = "browser"
+			path = referrerURL.Path
+
+			if strings.Contains(path, "/dashboard") {
+				// Split the path into segments
+				pathSegments := strings.Split(referrerURL.Path, "/")
+				// The dashboard ID should be the segment after "/dashboard/"
+				// Loop through pathSegments to find "dashboard" and then take the next segment as the ID
+				for i, segment := range pathSegments {
+					if segment == "dashboard" && i < len(pathSegments)-1 {
+						// Return the next segment, which should be the dashboard ID
+						dashboardID = pathSegments[i+1]
+					}
+				}
+				page = "dashboards"
+			} else if strings.Contains(path, "/alerts") {
+				urlParams := referrerURL.Query()
+				alertID = urlParams.Get("ruleId")
+				page = "alerts"
+			} else if strings.Contains(path, "logs") && strings.Contains(path, "explorer") {
+				page = "logs-explorer"
+				viewName = referrerURL.Query().Get("viewName")
+			} else if strings.Contains(path, "/trace") || strings.Contains(path, "traces-explorer") {
+				page = "traces-explorer"
+				viewName = referrerURL.Query().Get("viewName")
+			} else if strings.Contains(path, "/services") {
+				page = "services"
+				tab = referrerURL.Query().Get("tab")
+				if tab == "" {
+					tab = "OVER_METRICS"
+				}
+			}
+		} else {
+			client = "api"
+		}
+
+		email, _ := auth.GetEmailFromJwt(r.Context())
+
+		kvs := map[string]string{
+			"path":        path,
+			"dashboardID": dashboardID,
+			"alertID":     alertID,
+			"source":      page,
+			"client":      client,
+			"viewName":    viewName,
+			"servicesTab": tab,
+			"email":       email,
+		}
+
+		r = r.WithContext(context.WithValue(r.Context(), common.LogCommentKey, kvs))
+		next.ServeHTTP(w, r)
+	})
+}

pkg/http/server/config.go

@@ -1,12 +1,5 @@
 package server
 
-import (
-	"go.signoz.io/signoz/pkg/confmap"
-)
-
-// Config satisfies the confmap.Config interface
-var _ confmap.Config = (*Config)(nil)
-
 // Config holds the configuration for http.
 type Config struct {
 	//Address specifies the TCP address for the server to listen on, in the form "host:port".
@@ -14,14 +7,3 @@ type Config struct {
 	// See net.Dial for details of the address format.
 	Address string `mapstructure:"address"`
 }
-
-func (c *Config) NewWithDefaults() confmap.Config {
-	return &Config{
-		Address: "0.0.0.0:8080",
-	}
-
-}
-
-func (c *Config) Validate() error {
-	return nil
-}

pkg/http/server/server.go

@@ -6,21 +6,20 @@ import (
 	"net/http"
 	"time"
 
-	"go.signoz.io/signoz/pkg/registry"
+	"go.signoz.io/signoz/pkg/factory"
 	"go.uber.org/zap"
 )
 
-var _ registry.NamedService = (*Server)(nil)
+var _ factory.Service = (*Server)(nil)
 
 type Server struct {
 	srv     *http.Server
 	logger  *zap.Logger
 	handler http.Handler
 	cfg     Config
-	name    string
 }
 
-func New(logger *zap.Logger, name string, cfg Config, handler http.Handler) (*Server, error) {
+func New(logger *zap.Logger, cfg Config, handler http.Handler) (*Server, error) {
 	if handler == nil {
 		return nil, fmt.Errorf("cannot build http server, handler is required")
 	}
@@ -29,10 +28,6 @@ func New(logger *zap.Logger, name string, cfg Config, handler http.Handler) (*Se
 		return nil, fmt.Errorf("cannot build http server, logger is required")
 	}
 
-	if name == "" {
-		return nil, fmt.Errorf("cannot build http server, name is required")
-	}
-
 	srv := &http.Server{
 		Addr:           cfg.Address,
 		Handler:        handler,
@@ -46,14 +41,9 @@ func New(logger *zap.Logger, name string, cfg Config, handler http.Handler) (*Se
 		logger:  logger.Named("go.signoz.io/pkg/http/server"),
 		handler: handler,
 		cfg:     cfg,
-		name:    name,
 	}, nil
 }
 
-func (server *Server) Name() string {
-	return server.name
-}
-
 func (server *Server) Start(ctx context.Context) error {
 	server.logger.Info("starting http server", zap.String("address", server.srv.Addr))
 	if err := server.srv.ListenAndServe(); err != nil {

pkg/query-service/app/inframetrics/clusters.go

@@ -338,5 +338,7 @@ func (p *ClustersRepo) GetClusterList(ctx context.Context, req model.ClusterList
 	resp.Total = len(allClusterGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }

pkg/query-service/app/inframetrics/daemonsets.go

@@ -440,5 +440,7 @@ func (d *DaemonSetsRepo) GetDaemonSetList(ctx context.Context, req model.DaemonS
 	resp.Total = len(allDaemonSetGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }

pkg/query-service/app/inframetrics/deployments.go

@@ -440,5 +440,7 @@ func (d *DeploymentsRepo) GetDeploymentList(ctx context.Context, req model.Deplo
 	resp.Total = len(allDeploymentGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }

pkg/query-service/app/inframetrics/jobs.go

@@ -494,5 +494,7 @@ func (d *JobsRepo) GetJobList(ctx context.Context, req model.JobListRequest) (mo
 	resp.Total = len(allJobGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }

pkg/query-service/app/inframetrics/namespaces.go

@@ -341,5 +341,7 @@ func (p *NamespacesRepo) GetNamespaceList(ctx context.Context, req model.Namespa
 	resp.Total = len(allNamespaceGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }

pkg/query-service/app/inframetrics/nodes.go

@@ -19,7 +19,7 @@ var (
 
 	nodeAttrsToEnrich = []string{"k8s_node_name", "k8s_node_uid", "k8s_cluster_name"}
 
-	k8sNodeUIDAttrKey = "k8s_node_uid"
+	k8sNodeGroupAttrKey = "k8s_node_name"
 
 	queryNamesForNodes = map[string][]string{
 		"cpu":                {"A"},
@@ -125,7 +125,7 @@ func (p *NodesRepo) getMetadataAttributes(ctx context.Context, req model.NodeLis
 			}
 		}
 
-		nodeUID := stringData[k8sNodeUIDAttrKey]
+		nodeUID := stringData[k8sNodeGroupAttrKey]
 		if _, ok := nodeAttrs[nodeUID]; !ok {
 			nodeAttrs[nodeUID] = map[string]string{}
 		}
@@ -220,7 +220,7 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)
 	}
 
 	if req.GroupBy == nil {
-		req.GroupBy = []v3.AttributeKey{{Key: k8sNodeUIDAttrKey}}
+		req.GroupBy = []v3.AttributeKey{{Key: k8sNodeGroupAttrKey}}
 		resp.Type = model.ResponseTypeList
 	} else {
 		resp.Type = model.ResponseTypeGroupedList
@@ -306,7 +306,7 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)
 				NodeMemoryAllocatable: -1,
 			}
 
-			if nodeUID, ok := row.Data[k8sNodeUIDAttrKey].(string); ok {
+			if nodeUID, ok := row.Data[k8sNodeGroupAttrKey].(string); ok {
 				record.NodeUID = nodeUID
 			}
 
@@ -354,5 +354,6 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest)
 	resp.Total = len(allNodeGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
 	return resp, nil
 }

pkg/query-service/app/inframetrics/nodes_query.go

@@ -20,7 +20,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -46,7 +46,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -72,7 +72,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -98,7 +98,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -132,7 +132,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},
@@ -166,7 +166,7 @@ var NodesTableListQuery = v3.QueryRangeParamsV3{
 				},
 				GroupBy: []v3.AttributeKey{
 					{
-						Key:      k8sNodeUIDAttrKey,
+						Key:      k8sNodeGroupAttrKey,
 						DataType: v3.AttributeKeyDataTypeString,
 						Type:     v3.AttributeKeyTypeResource,
 					},

pkg/query-service/app/inframetrics/pods.go

@@ -404,5 +404,7 @@ func (p *PodsRepo) GetPodList(ctx context.Context, req model.PodListRequest) (mo
 	resp.Total = len(allPodGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }

pkg/query-service/app/inframetrics/pvcs.go

@@ -374,5 +374,7 @@ func (p *PvcsRepo) GetPvcList(ctx context.Context, req model.VolumeListRequest)
 	resp.Total = len(allVolumeGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }

pkg/query-service/app/inframetrics/statefulsets.go

@@ -440,5 +440,7 @@ func (d *StatefulSetsRepo) GetStatefulSetList(ctx context.Context, req model.Sta
 	resp.Total = len(allStatefulSetGroups)
 	resp.Records = records
 
+	resp.SortBy(req.OrderBy)
+
 	return resp, nil
 }

pkg/query-service/app/logs/v3/enrich_query.go

@@ -167,6 +167,22 @@ func jsonFilterEnrich(filter v3.FilterItem) v3.FilterItem {
 	// check if the value is a int, float, string, bool
 	valueType := ""
 	switch filter.Value.(type) {
+	// even the filter value is an array the actual type of the value is string.
+	case []interface{}:
+		// check first value type in array and use that
+		if len(filter.Value.([]interface{})) > 0 {
+			firstVal := filter.Value.([]interface{})[0]
+			switch firstVal.(type) {
+			case uint8, uint16, uint32, uint64, int, int8, int16, int32, int64:
+				valueType = "int64"
+			case float32, float64:
+				valueType = "float64"
+			case bool:
+				valueType = "bool"
+			default:
+				valueType = "string"
+			}
+		}
 	case uint8, uint16, uint32, uint64, int, int8, int16, int32, int64:
 		valueType = "int64"
 	case float32, float64:

pkg/query-service/app/logs/v3/enrich_query_test.go

@@ -563,6 +563,50 @@ var testJSONFilterEnrichData = []struct {
 			Value:    10.0,
 		},
 	},
+	{
+		Name: "check IN",
+		Filter: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.attr",
+				DataType: v3.AttributeKeyDataTypeUnspecified,
+				Type:     v3.AttributeKeyTypeUnspecified,
+			},
+			Operator: "IN",
+			Value:    []interface{}{"hello", "world"},
+		},
+		Result: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.attr",
+				DataType: v3.AttributeKeyDataTypeString,
+				Type:     v3.AttributeKeyTypeUnspecified,
+				IsJSON:   true,
+			},
+			Operator: "IN",
+			Value:    []interface{}{"hello", "world"},
+		},
+	},
+	{
+		Name: "check NOT_IN",
+		Filter: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.attr",
+				DataType: v3.AttributeKeyDataTypeUnspecified,
+				Type:     v3.AttributeKeyTypeUnspecified,
+			},
+			Operator: "NOT_IN",
+			Value:    []interface{}{10, 20},
+		},
+		Result: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.attr",
+				DataType: v3.AttributeKeyDataTypeInt64,
+				Type:     v3.AttributeKeyTypeUnspecified,
+				IsJSON:   true,
+			},
+			Operator: "NOT_IN",
+			Value:    []interface{}{10, 20},
+		},
+	},
 }
 
 func TestJsonEnrich(t *testing.T) {

pkg/query-service/app/logs/v4/json_filter_test.go

@@ -183,6 +183,71 @@ var testGetJSONFilterData = []struct {
 		},
 		Filter: "lower(body) like lower('%message%') AND JSON_EXISTS(body, '$.\"message\"')",
 	},
+	{
+		Name: "test json in array string",
+		FilterItem: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.name",
+				DataType: "string",
+				IsJSON:   true,
+			},
+			Operator: "in",
+			Value:    []interface{}{"hello", "world"},
+		},
+		Filter: "lower(body) like lower('%name%') AND JSON_EXISTS(body, '$.\"name\"') AND JSON_VALUE(body, '$.\"name\"') IN ['hello','world']",
+	},
+	{
+		Name: "test json in array number",
+		FilterItem: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.value",
+				DataType: "int64",
+				IsJSON:   true,
+			},
+			Operator: "in",
+			Value:    []interface{}{10, 11},
+		},
+		Filter: "lower(body) like lower('%value%') AND JSON_EXISTS(body, '$.\"value\"') AND JSONExtract(JSON_VALUE(body, '$.\"value\"'), 'Int64') IN [10,11]",
+	},
+	{
+		Name: "test json in array mixed data- allow",
+		FilterItem: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.value",
+				DataType: "int64",
+				IsJSON:   true,
+			},
+			Operator: "in",
+			Value:    []interface{}{11, "11"},
+		},
+		Filter: "lower(body) like lower('%value%') AND JSON_EXISTS(body, '$.\"value\"') AND JSONExtract(JSON_VALUE(body, '$.\"value\"'), 'Int64') IN [11,11]",
+	},
+	{
+		Name: "test json in array mixed data- fail",
+		FilterItem: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.value",
+				DataType: "int64",
+				IsJSON:   true,
+			},
+			Operator: "in",
+			Value:    []interface{}{11, "11", "hello"},
+		},
+		Error: true,
+	},
+	{
+		Name: "test json in array mixed data- allow",
+		FilterItem: v3.FilterItem{
+			Key: v3.AttributeKey{
+				Key:      "body.value",
+				DataType: "string",
+				IsJSON:   true,
+			},
+			Operator: "in",
+			Value:    []interface{}{"hello", 11},
+		},
+		Filter: "lower(body) like lower('%value%') AND JSON_EXISTS(body, '$.\"value\"') AND JSON_VALUE(body, '$.\"value\"') IN ['hello','11']",
+	},
 }
 
 func TestGetJSONFilter(t *testing.T) {

pkg/query-service/app/server.go

@@ -1,28 +1,21 @@
 package app
 
 import (
-	"bufio"
-	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"net"
 	"net/http"
 	_ "net/http/pprof" // http profiler
-	"net/url"
 	"os"
-	"regexp"
-	"strings"
 	"time"
 
 	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
 	"github.com/jmoiron/sqlx"
 
 	"github.com/rs/cors"
 	"github.com/soheilhy/cmux"
+	"go.signoz.io/signoz/pkg/http/middleware"
 	"go.signoz.io/signoz/pkg/query-service/agentConf"
 	"go.signoz.io/signoz/pkg/query-service/app/clickhouseReader"
 	"go.signoz.io/signoz/pkg/query-service/app/cloudintegrations"
@@ -32,9 +25,8 @@ import (
 	"go.signoz.io/signoz/pkg/query-service/app/opamp"
 	opAmpModel "go.signoz.io/signoz/pkg/query-service/app/opamp/model"
 	"go.signoz.io/signoz/pkg/query-service/app/preferences"
-	"go.signoz.io/signoz/pkg/query-service/common"
-	"go.signoz.io/signoz/pkg/query-service/migrate"
-	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
+	"go.signoz.io/signoz/pkg/signoz"
+	"go.signoz.io/signoz/pkg/web"
 
 	"go.signoz.io/signoz/pkg/query-service/app/explorer"
 	"go.signoz.io/signoz/pkg/query-service/auth"
@@ -70,6 +62,7 @@ type ServerOptions struct {
 	Cluster           string
 	UseLogsNewSchema  bool
 	UseTraceNewSchema bool
+	SigNoz            *signoz.SigNoz
 }
 
 // Server runs HTTP, Mux and a grpc server
@@ -166,13 +159,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
 		return nil, err
 	}
 
-	go func() {
-		err = migrate.ClickHouseMigrate(reader.GetConn(), serverOptions.Cluster)
-		if err != nil {
-			zap.L().Error("error while running clickhouse migrations", zap.Error(err))
-		}
-	}()
-
 	fluxInterval, err := time.ParseDuration(serverOptions.FluxInterval)
 	if err != nil {
 		return nil, err
@@ -226,7 +212,7 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
 		unavailableChannel: make(chan healthcheck.Status),
 	}
 
-	httpServer, err := s.createPublicServer(apiHandler)
+	httpServer, err := s.createPublicServer(apiHandler, serverOptions.SigNoz.Web)
 
 	if err != nil {
 		return nil, err
@@ -268,9 +254,17 @@ func (s *Server) createPrivateServer(api *APIHandler) (*http.Server, error) {
 
 	r := NewRouter()
 
-	r.Use(setTimeoutMiddleware)
-	r.Use(s.analyticsMiddleware)
-	r.Use(loggingMiddlewarePrivate)
+	timeoutMiddleware := middleware.NewTimeout(zap.L(), constants.TimeoutExcludedRoutes, 60*time.Second, 600*time.Second)
+	r.Use(timeoutMiddleware.Wrap)
+
+	analyticsMiddleware := middleware.NewAnalytics(zap.L())
+	r.Use(analyticsMiddleware.Wrap)
+
+	loggingMiddleware := middleware.NewLogging(zap.L())
+	r.Use(loggingMiddleware.Wrap)
+
+	logCommentMiddleware := middleware.NewLogComment(zap.L())
+	r.Use(logCommentMiddleware.Wrap)
 
 	api.RegisterPrivateRoutes(r)
 
@@ -290,14 +284,21 @@ func (s *Server) createPrivateServer(api *APIHandler) (*http.Server, error) {
 	}, nil
 }
 
-func (s *Server) createPublicServer(api *APIHandler) (*http.Server, error) {
+func (s *Server) createPublicServer(api *APIHandler, web web.Web) (*http.Server, error) {
 
 	r := NewRouter()
 
-	r.Use(setTimeoutMiddleware)
-	r.Use(s.analyticsMiddleware)
-	r.Use(loggingMiddleware)
-	r.Use(LogCommentEnricher)
+	timeoutMiddleware := middleware.NewTimeout(zap.L(), constants.TimeoutExcludedRoutes, 60*time.Second, 600*time.Second)
+	r.Use(timeoutMiddleware.Wrap)
+
+	analyticsMiddleware := middleware.NewAnalytics(zap.L())
+	r.Use(analyticsMiddleware.Wrap)
+
+	loggingMiddleware := middleware.NewLogging(zap.L())
+	r.Use(loggingMiddleware.Wrap)
+
+	logCommentMiddleware := middleware.NewLogComment(zap.L())
+	r.Use(logCommentMiddleware.Wrap)
 
 	// add auth middleware
 	getUserFromRequest := func(r *http.Request) (*model.UserPayload, error) {
@@ -335,302 +336,16 @@ func (s *Server) createPublicServer(api *APIHandler) (*http.Server, error) {
 
 	handler = handlers.CompressHandler(handler)
 
+	err := web.AddToRouter(r)
+	if err != nil {
+		return nil, err
+	}
+
 	return &http.Server{
 		Handler: handler,
 	}, nil
 }
 
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-// loggingMiddleware is used for logging public api calls
-func loggingMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		route := mux.CurrentRoute(r)
-		path, _ := route.GetPathTemplate()
-		startTime := time.Now()
-		next.ServeHTTP(w, r)
-		zap.L().Info(path, zap.Duration("timeTaken", time.Since(startTime)), zap.String("path", path))
-	})
-}
-
-func LogCommentEnricher(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		referrer := r.Header.Get("Referer")
-
-		var path, dashboardID, alertID, page, client, viewName, tab string
-
-		if referrer != "" {
-			referrerURL, _ := url.Parse(referrer)
-			client = "browser"
-			path = referrerURL.Path
-
-			if strings.Contains(path, "/dashboard") {
-				// Split the path into segments
-				pathSegments := strings.Split(referrerURL.Path, "/")
-				// The dashboard ID should be the segment after "/dashboard/"
-				// Loop through pathSegments to find "dashboard" and then take the next segment as the ID
-				for i, segment := range pathSegments {
-					if segment == "dashboard" && i < len(pathSegments)-1 {
-						// Return the next segment, which should be the dashboard ID
-						dashboardID = pathSegments[i+1]
-					}
-				}
-				page = "dashboards"
-			} else if strings.Contains(path, "/alerts") {
-				urlParams := referrerURL.Query()
-				alertID = urlParams.Get("ruleId")
-				page = "alerts"
-			} else if strings.Contains(path, "logs") && strings.Contains(path, "explorer") {
-				page = "logs-explorer"
-				viewName = referrerURL.Query().Get("viewName")
-			} else if strings.Contains(path, "/trace") || strings.Contains(path, "traces-explorer") {
-				page = "traces-explorer"
-				viewName = referrerURL.Query().Get("viewName")
-			} else if strings.Contains(path, "/services") {
-				page = "services"
-				tab = referrerURL.Query().Get("tab")
-				if tab == "" {
-					tab = "OVER_METRICS"
-				}
-			}
-		} else {
-			client = "api"
-		}
-
-		email, _ := auth.GetEmailFromJwt(r.Context())
-
-		kvs := map[string]string{
-			"path":        path,
-			"dashboardID": dashboardID,
-			"alertID":     alertID,
-			"source":      page,
-			"client":      client,
-			"viewName":    viewName,
-			"servicesTab": tab,
-			"email":       email,
-		}
-
-		r = r.WithContext(context.WithValue(r.Context(), common.LogCommentKey, kvs))
-		next.ServeHTTP(w, r)
-	})
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-// loggingMiddlewarePrivate is used for logging private api calls
-// from internal services like alert manager
-func loggingMiddlewarePrivate(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		route := mux.CurrentRoute(r)
-		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("privatePort", true))
-	})
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-type loggingResponseWriter struct {
-	http.ResponseWriter
-	statusCode int
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-func NewLoggingResponseWriter(w http.ResponseWriter) *loggingResponseWriter {
-	// WriteHeader(int) is not called if our response implicitly returns 200 OK, so
-	// we default to that status code.
-	return &loggingResponseWriter{w, http.StatusOK}
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-func (lrw *loggingResponseWriter) WriteHeader(code int) {
-	lrw.statusCode = code
-	lrw.ResponseWriter.WriteHeader(code)
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-// Flush implements the http.Flush interface.
-func (lrw *loggingResponseWriter) Flush() {
-	lrw.ResponseWriter.(http.Flusher).Flush()
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/logging.go
-// Support websockets
-func (lrw *loggingResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	h, ok := lrw.ResponseWriter.(http.Hijacker)
-	if !ok {
-		return nil, nil, errors.New("hijack not supported")
-	}
-	return h.Hijack()
-}
-
-func extractQueryRangeV3Data(path string, r *http.Request) (map[string]interface{}, bool) {
-	pathToExtractBodyFromV3 := "/api/v3/query_range"
-	pathToExtractBodyFromV4 := "/api/v4/query_range"
-
-	data := map[string]interface{}{}
-	var postData *v3.QueryRangeParamsV3
-
-	if (r.Method == "POST") && ((path == pathToExtractBodyFromV3) || (path == pathToExtractBodyFromV4)) {
-		if r.Body != nil {
-			bodyBytes, err := io.ReadAll(r.Body)
-			if err != nil {
-				return nil, false
-			}
-			r.Body.Close() //  must close
-			r.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
-			json.Unmarshal(bodyBytes, &postData)
-
-		} else {
-			return nil, false
-		}
-
-	} else {
-		return nil, false
-	}
-
-	referrer := r.Header.Get("Referer")
-
-	dashboardMatched, err := regexp.MatchString(`/dashboard/[a-zA-Z0-9\-]+/(new|edit)(?:\?.*)?$`, referrer)
-	if err != nil {
-		zap.L().Error("error while matching the referrer", zap.Error(err))
-	}
-	alertMatched, err := regexp.MatchString(`/alerts/(new|edit)(?:\?.*)?$`, referrer)
-	if err != nil {
-		zap.L().Error("error while matching the alert: ", zap.Error(err))
-	}
-	logsExplorerMatched, err := regexp.MatchString(`/logs/logs-explorer(?:\?.*)?$`, referrer)
-	if err != nil {
-		zap.L().Error("error while matching the logs explorer: ", zap.Error(err))
-	}
-	traceExplorerMatched, err := regexp.MatchString(`/traces-explorer(?:\?.*)?$`, referrer)
-	if err != nil {
-		zap.L().Error("error while matching the trace explorer: ", zap.Error(err))
-	}
-
-	queryInfoResult := telemetry.GetInstance().CheckQueryInfo(postData)
-
-	if (queryInfoResult.MetricsUsed || queryInfoResult.LogsUsed || queryInfoResult.TracesUsed) && (queryInfoResult.FilterApplied) {
-		if queryInfoResult.MetricsUsed {
-			telemetry.GetInstance().AddActiveMetricsUser()
-		}
-		if queryInfoResult.LogsUsed {
-			telemetry.GetInstance().AddActiveLogsUser()
-		}
-		if queryInfoResult.TracesUsed {
-			telemetry.GetInstance().AddActiveTracesUser()
-		}
-		data["metricsUsed"] = queryInfoResult.MetricsUsed
-		data["logsUsed"] = queryInfoResult.LogsUsed
-		data["tracesUsed"] = queryInfoResult.TracesUsed
-		data["filterApplied"] = queryInfoResult.FilterApplied
-		data["groupByApplied"] = queryInfoResult.GroupByApplied
-		data["aggregateOperator"] = queryInfoResult.AggregateOperator
-		data["aggregateAttributeKey"] = queryInfoResult.AggregateAttributeKey
-		data["numberOfQueries"] = queryInfoResult.NumberOfQueries
-		data["queryType"] = queryInfoResult.QueryType
-		data["panelType"] = queryInfoResult.PanelType
-
-		userEmail, err := auth.GetEmailFromJwt(r.Context())
-		if err == nil {
-			// switch case to set data["screen"] based on the referrer
-			switch {
-			case dashboardMatched:
-				data["screen"] = "panel"
-			case alertMatched:
-				data["screen"] = "alert"
-			case logsExplorerMatched:
-				data["screen"] = "logs-explorer"
-			case traceExplorerMatched:
-				data["screen"] = "traces-explorer"
-			default:
-				data["screen"] = "unknown"
-				return data, true
-			}
-			telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_QUERY_RANGE_API, data, userEmail, true, false)
-		}
-	}
-	return data, true
-}
-
-func getActiveLogs(path string, r *http.Request) {
-	// if path == "/api/v1/dashboards/{uuid}" {
-	// 	telemetry.GetInstance().AddActiveMetricsUser()
-	// }
-	if path == "/api/v1/logs" {
-		hasFilters := len(r.URL.Query().Get("q"))
-		if hasFilters > 0 {
-			telemetry.GetInstance().AddActiveLogsUser()
-		}
-
-	}
-
-}
-
-func (s *Server) analyticsMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx := auth.AttachJwtToContext(r.Context(), r)
-		r = r.WithContext(ctx)
-		route := mux.CurrentRoute(r)
-		path, _ := route.GetPathTemplate()
-
-		queryRangeV3data, metadataExists := extractQueryRangeV3Data(path, r)
-		getActiveLogs(path, r)
-
-		lrw := NewLoggingResponseWriter(w)
-		next.ServeHTTP(lrw, r)
-
-		data := map[string]interface{}{"path": path, "statusCode": lrw.statusCode}
-		if metadataExists {
-			for key, value := range queryRangeV3data {
-				data[key] = value
-			}
-		}
-
-		// if telemetry.GetInstance().IsSampled() {
-		if _, ok := telemetry.EnabledPaths()[path]; ok {
-			userEmail, err := auth.GetEmailFromJwt(r.Context())
-			if err == nil {
-				telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_PATH, data, userEmail, true, false)
-			}
-		}
-		// }
-
-	})
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/timeout.go
-func getRouteContextTimeout(overrideTimeout string) time.Duration {
-	var timeout time.Duration
-	var err error
-	if overrideTimeout != "" {
-		timeout, err = time.ParseDuration(overrideTimeout + "s")
-		if err != nil {
-			timeout = constants.ContextTimeout
-		}
-		if timeout > constants.ContextTimeoutMaxAllowed {
-			timeout = constants.ContextTimeoutMaxAllowed
-		}
-		return timeout
-	}
-	return constants.ContextTimeout
-}
-
-// TODO(remove): Implemented at pkg/http/middleware/timeout.go
-func setTimeoutMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx := r.Context()
-		var cancel context.CancelFunc
-		// check if route is not excluded
-		url := r.URL.Path
-		if _, ok := constants.TimeoutExcludedRoutes[url]; !ok {
-			ctx, cancel = context.WithTimeout(r.Context(), getRouteContextTimeout(r.Header.Get("timeout")))
-			defer cancel()
-		}
-
-		r = r.WithContext(ctx)
-		next.ServeHTTP(w, r)
-	})
-}
-
 // initListeners initialises listeners of the server
 func (s *Server) initListeners() error {
 	// listen on public port

pkg/query-service/app/server_test.go

@@ -1,42 +0,0 @@
-package app
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// TODO(remove): Implemented at pkg/http/middleware/timeout_test.go
-func TestGetRouteContextTimeout(t *testing.T) {
-	var testGetRouteContextTimeoutData = []struct {
-		Name          string
-		OverrideValue string
-		timeout       time.Duration
-	}{
-		{
-			Name:          "default",
-			OverrideValue: "",
-			timeout:       60 * time.Second,
-		},
-		{
-			Name:          "override",
-			OverrideValue: "180",
-			timeout:       180 * time.Second,
-		},
-		{
-			Name:          "override more than max",
-			OverrideValue: "610",
-			timeout:       600 * time.Second,
-		},
-	}
-
-	t.Parallel()
-
-	for _, test := range testGetRouteContextTimeoutData {
-		t.Run(test.Name, func(t *testing.T) {
-			res := getRouteContextTimeout(test.OverrideValue)
-			assert.Equal(t, test.timeout, res)
-		})
-	}
-}

pkg/query-service/app/traces/v4/query_builder.go

@@ -93,8 +93,8 @@ func buildTracesFilterQuery(fs *v3.FilterSet) (string, error) {
 	if fs != nil && len(fs.Items) != 0 {
 		for _, item := range fs.Items {
 
-			// skip if it's a resource attribute
-			if item.Key.Type == v3.AttributeKeyTypeResource {
+			// skip if it's a resource attribute or Span search scope attribute
+			if item.Key.Type == v3.AttributeKeyTypeResource || item.Key.Type == v3.AttributeKeyTypeSpanSearchScope {
 				continue
 			}
 
@@ -213,6 +213,31 @@ func orderByAttributeKeyTags(panelType v3.PanelType, items []v3.OrderBy, tags []
 	return str
 }
 
+func buildSpanScopeQuery(fs *v3.FilterSet) (string, error) {
+	var query string
+	if fs == nil || len(fs.Items) == 0 {
+		return "", nil
+	}
+	for _, item := range fs.Items {
+		// skip anything other than Span Search scope attribute
+		if item.Key.Type != v3.AttributeKeyTypeSpanSearchScope {
+			continue
+		}
+		keyName := strings.ToLower(item.Key.Key)
+
+		if keyName == constants.SpanSearchScopeRoot {
+			query = "parent_span_id = '' "
+			return query, nil
+		} else if keyName == constants.SpanSearchScopeEntryPoint {
+			query = "((name, `resource_string_service$$name`) IN ( SELECT DISTINCT name, serviceName from " + constants.SIGNOZ_TRACE_DBNAME + "." + constants.SIGNOZ_TOP_LEVEL_OPERATIONS_TABLENAME + " )) "
+			return query, nil
+		} else {
+			return "", fmt.Errorf("invalid scope item type: %s", item.Key.Type)
+		}
+	}
+	return "", nil
+}
+
 func buildTracesQuery(start, end, step int64, mq *v3.BuilderQuery, panelType v3.PanelType, options v3.QBOptions) (string, error) {
 	tracesStart := utils.GetEpochNanoSecs(start)
 	tracesEnd := utils.GetEpochNanoSecs(end)
@@ -248,6 +273,11 @@ func buildTracesQuery(start, end, step int64, mq *v3.BuilderQuery, panelType v3.
 		filterSubQuery = filterSubQuery + " AND (resource_fingerprint GLOBAL IN " + resourceSubQuery + ")"
 	}
 
+	spanScopeSubQuery, err := buildSpanScopeQuery(mq.Filters)
+	if spanScopeSubQuery != "" {
+		filterSubQuery = filterSubQuery + " AND " + spanScopeSubQuery
+	}
+
 	// timerange will be sent in epoch millisecond
 	selectLabels := getSelectLabels(mq.GroupBy)
 	if selectLabels != "" {
@@ -274,8 +304,8 @@ func buildTracesQuery(start, end, step int64, mq *v3.BuilderQuery, panelType v3.
 			if len(mq.SelectColumns) == 0 {
 				return "", fmt.Errorf("select columns cannot be empty for panelType %s", panelType)
 			}
-			// add it to the select labels
 			selectLabels = getSelectLabels(mq.SelectColumns)
+			// add it to the select labels
 			queryNoOpTmpl := fmt.Sprintf("SELECT timestamp as timestamp_datetime, spanID, traceID,%s ", selectLabels) + "from " + constants.SIGNOZ_TRACE_DBNAME + "." + constants.SIGNOZ_SPAN_INDEX_V3 + " where %s %s" + "%s"
 			query = fmt.Sprintf(queryNoOpTmpl, timeFilter, filterSubQuery, orderBy)
 		} else {

pkg/query-service/app/traces/v4/query_builder_test.go

@@ -552,6 +552,70 @@ func Test_buildTracesQuery(t *testing.T) {
 			want: "SELECT timestamp as timestamp_datetime, spanID, traceID, name as `name` from signoz_traces.distributed_signoz_index_v3 where (timestamp >= '1680066360726210000' AND timestamp <= '1680066458000000000') " +
 				"AND (ts_bucket_start >= 1680064560 AND ts_bucket_start <= 1680066458)  order by timestamp ASC",
 		},
+		{
+			name: "test noop list view with entry_point_spans",
+			args: args{
+				panelType: v3.PanelTypeList,
+				start:     1680066360726210000,
+				end:       1680066458000000000,
+				mq: &v3.BuilderQuery{
+					AggregateOperator: v3.AggregateOperatorNoOp,
+					Filters:           &v3.FilterSet{Operator: "AND", Items: []v3.FilterItem{{Key: v3.AttributeKey{Key: "isEntryPoint", Type: v3.AttributeKeyTypeSpanSearchScope, IsColumn: false}, Value: true, Operator: v3.FilterOperatorEqual}}},
+					SelectColumns:     []v3.AttributeKey{{Key: "name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, IsColumn: true}},
+					OrderBy:           []v3.OrderBy{{ColumnName: "timestamp", Order: "ASC"}},
+				},
+			},
+			want: "SELECT timestamp as timestamp_datetime, spanID, traceID, name as `name` from signoz_traces.distributed_signoz_index_v3 where (timestamp >= '1680066360726210000' AND timestamp <= '1680066458000000000') " +
+				"AND (ts_bucket_start >= 1680064560 AND ts_bucket_start <= 1680066458)  AND ((name, `resource_string_service$$name`) IN ( SELECT DISTINCT name, serviceName from signoz_traces.distributed_top_level_operations ))  order by timestamp ASC",
+		},
+		{
+			name: "test noop list view with root_spans",
+			args: args{
+				panelType: v3.PanelTypeList,
+				start:     1680066360726210000,
+				end:       1680066458000000000,
+				mq: &v3.BuilderQuery{
+					AggregateOperator: v3.AggregateOperatorNoOp,
+					Filters:           &v3.FilterSet{Operator: "AND", Items: []v3.FilterItem{{Key: v3.AttributeKey{Key: "isRoot", Type: v3.AttributeKeyTypeSpanSearchScope, IsColumn: false}, Value: true, Operator: v3.FilterOperatorEqual}}},
+					SelectColumns:     []v3.AttributeKey{{Key: "name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, IsColumn: true}},
+					OrderBy:           []v3.OrderBy{{ColumnName: "timestamp", Order: "ASC"}},
+				},
+			},
+			want: "SELECT timestamp as timestamp_datetime, spanID, traceID, name as `name` from signoz_traces.distributed_signoz_index_v3 where (timestamp >= '1680066360726210000' AND timestamp <= '1680066458000000000') " +
+				"AND (ts_bucket_start >= 1680064560 AND ts_bucket_start <= 1680066458)  AND parent_span_id = ''  order by timestamp ASC",
+		},
+		{
+			name: "test noop list view with root_spans and entry_point_spans both existing",
+			args: args{
+				panelType: v3.PanelTypeList,
+				start:     1680066360726210000,
+				end:       1680066458000000000,
+				mq: &v3.BuilderQuery{
+					AggregateOperator: v3.AggregateOperatorNoOp,
+					Filters:           &v3.FilterSet{Operator: "AND", Items: []v3.FilterItem{{Key: v3.AttributeKey{Key: "isRoot", Type: v3.AttributeKeyTypeSpanSearchScope, IsColumn: false}, Value: true, Operator: v3.FilterOperatorEqual}, {Key: v3.AttributeKey{Key: "isEntryPoint", Type: v3.AttributeKeyTypeSpanSearchScope, IsColumn: false}, Value: true, Operator: v3.FilterOperatorEqual}}},
+					SelectColumns:     []v3.AttributeKey{{Key: "name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, IsColumn: true}},
+					OrderBy:           []v3.OrderBy{{ColumnName: "timestamp", Order: "ASC"}},
+				},
+			},
+			want: "SELECT timestamp as timestamp_datetime, spanID, traceID, name as `name` from signoz_traces.distributed_signoz_index_v3 where (timestamp >= '1680066360726210000' AND timestamp <= '1680066458000000000') " +
+				"AND (ts_bucket_start >= 1680064560 AND ts_bucket_start <= 1680066458)  AND parent_span_id = ''  order by timestamp ASC",
+		},
+		{
+			name: "test noop list view with root_spans with other attributes",
+			args: args{
+				panelType: v3.PanelTypeList,
+				start:     1680066360726210000,
+				end:       1680066458000000000,
+				mq: &v3.BuilderQuery{
+					AggregateOperator: v3.AggregateOperatorNoOp,
+					Filters:           &v3.FilterSet{Operator: "AND", Items: []v3.FilterItem{{Key: v3.AttributeKey{Key: "isRoot", Type: v3.AttributeKeyTypeSpanSearchScope, IsColumn: false}, Value: true, Operator: v3.FilterOperatorEqual}, {Key: v3.AttributeKey{Key: "service.name", Type: v3.AttributeKeyTypeResource, IsColumn: true, DataType: v3.AttributeKeyDataTypeString}, Value: "cartservice", Operator: v3.FilterOperatorEqual}}},
+					SelectColumns:     []v3.AttributeKey{{Key: "name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, IsColumn: true}},
+					OrderBy:           []v3.OrderBy{{ColumnName: "timestamp", Order: "ASC"}},
+				},
+			},
+			want: "SELECT timestamp as timestamp_datetime, spanID, traceID, name as `name` from signoz_traces.distributed_signoz_index_v3 where (timestamp >= '1680066360726210000' AND timestamp <= '1680066458000000000') " +
+				"AND (ts_bucket_start >= 1680064560 AND ts_bucket_start <= 1680066458)  AND (resource_fingerprint GLOBAL IN (SELECT fingerprint FROM signoz_traces.distributed_traces_v3_resource WHERE (seen_at_ts_bucket_start >= 1680064560) AND (seen_at_ts_bucket_start <= 1680066458) AND simpleJSONExtractString(labels, 'service.name') = 'cartservice' AND labels like '%service.name%cartservice%')) AND parent_span_id = ''  order by timestamp ASC",
+		},
 		{
 			name: "test noop list view-without ts",
 			args: args{

pkg/query-service/constants/constants.go

@@ -54,6 +54,9 @@ const DurationSort = "DurationSort"
 const TimestampSort = "TimestampSort"
 const PreferRPM = "PreferRPM"
 
+const SpanSearchScopeRoot = "isroot"
+const SpanSearchScopeEntryPoint = "isentrypoint"
+
 func GetAlertManagerApiPrefix() string {
 	if os.Getenv("ALERTMANAGER_API_PREFIX") != "" {
 		return os.Getenv("ALERTMANAGER_API_PREFIX")
@@ -248,11 +251,12 @@ const (
 	SIGNOZ_TIMESERIES_v4_1DAY_LOCAL_TABLENAME  = "time_series_v4_1day"
 	SIGNOZ_TIMESERIES_v4_1WEEK_LOCAL_TABLENAME = "time_series_v4_1week"
 	SIGNOZ_TIMESERIES_v4_1DAY_TABLENAME        = "distributed_time_series_v4_1day"
+	SIGNOZ_TOP_LEVEL_OPERATIONS_TABLENAME      = "distributed_top_level_operations"
 )
 
-var TimeoutExcludedRoutes = map[string]bool{
-	"/api/v1/logs/tail":     true,
-	"/api/v3/logs/livetail": true,
+var TimeoutExcludedRoutes = map[string]struct{}{
+	"/api/v1/logs/tail":     {},
+	"/api/v3/logs/livetail": {},
 }
 
 // alert related constants

pkg/query-service/main.go

@@ -9,11 +9,15 @@ import (
 	"time"
 
 	prommodel "github.com/prometheus/common/model"
+	"go.signoz.io/signoz/pkg/config"
+	"go.signoz.io/signoz/pkg/config/envprovider"
+	"go.signoz.io/signoz/pkg/config/fileprovider"
 	"go.signoz.io/signoz/pkg/query-service/app"
 	"go.signoz.io/signoz/pkg/query-service/auth"
 	"go.signoz.io/signoz/pkg/query-service/constants"
 	"go.signoz.io/signoz/pkg/query-service/migrate"
 	"go.signoz.io/signoz/pkg/query-service/version"
+	"go.signoz.io/signoz/pkg/signoz"
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -74,6 +78,22 @@ func main() {
 	logger := loggerMgr.Sugar()
 	version.PrintVersion()
 
+	config, err := signoz.NewConfig(context.Background(), config.ResolverConfig{
+		Uris: []string{"env:"},
+		ProviderFactories: []config.ProviderFactory{
+			envprovider.NewFactory(),
+			fileprovider.NewFactory(),
+		},
+	})
+	if err != nil {
+		zap.L().Fatal("Failed to create config", zap.Error(err))
+	}
+
+	signoz, err := signoz.New(context.Background(), config, signoz.NewProviderConfig())
+	if err != nil {
+		zap.L().Fatal("Failed to create signoz struct", zap.Error(err))
+	}
+
 	serverOptions := &app.ServerOptions{
 		HTTPHostPort:      constants.HTTPHostPort,
 		PromConfigPath:    promConfigPath,
@@ -90,6 +110,7 @@ func main() {
 		Cluster:           cluster,
 		UseLogsNewSchema:  useLogsNewSchema,
 		UseTraceNewSchema: useTraceNewSchema,
+		SigNoz:            signoz,
 	}
 
 	// Read the jwt secret key

pkg/query-service/migrate/migate.go

@@ -1,11 +1,8 @@
 package migrate
 
 import (
-	"context"
 	"database/sql"
-	"fmt"
 
-	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	"github.com/jmoiron/sqlx"
 )
 
@@ -55,90 +52,3 @@ func Migrate(dsn string) error {
 
 	return nil
 }
-
-func ClickHouseMigrate(conn driver.Conn, cluster string) error {
-
-	database := "CREATE DATABASE IF NOT EXISTS signoz_analytics ON CLUSTER %s"
-
-	localTable := `CREATE TABLE IF NOT EXISTS signoz_analytics.rule_state_history_v0 ON CLUSTER %s
-(
-	_retention_days UInt32 DEFAULT 180,
-    rule_id LowCardinality(String),
-    rule_name LowCardinality(String),
-    overall_state LowCardinality(String),
-    overall_state_changed Bool,
-    state LowCardinality(String),
-    state_changed Bool,
-    unix_milli Int64 CODEC(Delta(8), ZSTD(1)),
-    fingerprint UInt64 CODEC(ZSTD(1)),
-    value Float64 CODEC(Gorilla, ZSTD(1)),
-    labels String CODEC(ZSTD(5)),
-)
-ENGINE = MergeTree
-PARTITION BY toDate(unix_milli / 1000)
-ORDER BY (rule_id, unix_milli)
-TTL toDateTime(unix_milli / 1000) + toIntervalDay(_retention_days)
-SETTINGS ttl_only_drop_parts = 1, index_granularity = 8192`
-
-	distributedTable := `CREATE TABLE IF NOT EXISTS signoz_analytics.distributed_rule_state_history_v0 ON CLUSTER %s
-(
-    rule_id LowCardinality(String),
-    rule_name LowCardinality(String),
-    overall_state LowCardinality(String),
-    overall_state_changed Bool,
-    state LowCardinality(String),
-    state_changed Bool,
-    unix_milli Int64 CODEC(Delta(8), ZSTD(1)),
-    fingerprint UInt64 CODEC(ZSTD(1)),
-    value Float64 CODEC(Gorilla, ZSTD(1)),
-    labels String CODEC(ZSTD(5)),
-)
-ENGINE = Distributed(%s, signoz_analytics, rule_state_history_v0, cityHash64(rule_id, rule_name, fingerprint))`
-
-	// check if db exists
-	dbExists := `SELECT count(*) FROM system.databases WHERE name = 'signoz_analytics'`
-	var count uint64
-	err := conn.QueryRow(context.Background(), dbExists).Scan(&count)
-	if err != nil {
-		return err
-	}
-
-	if count == 0 {
-		err = conn.Exec(context.Background(), fmt.Sprintf(database, cluster))
-		if err != nil {
-			return err
-		}
-	}
-
-	// check if table exists
-	tableExists := `SELECT count(*) FROM system.tables WHERE name = 'rule_state_history_v0' AND database = 'signoz_analytics'`
-	var tableCount uint64
-	err = conn.QueryRow(context.Background(), tableExists).Scan(&tableCount)
-	if err != nil {
-		return err
-	}
-
-	if tableCount == 0 {
-		err = conn.Exec(context.Background(), fmt.Sprintf(localTable, cluster))
-		if err != nil {
-			return err
-		}
-	}
-
-	// check if distributed table exists
-	distributedTableExists := `SELECT count(*) FROM system.tables WHERE name = 'distributed_rule_state_history_v0' AND database = 'signoz_analytics'`
-	var distributedTableCount uint64
-	err = conn.QueryRow(context.Background(), distributedTableExists).Scan(&distributedTableCount)
-	if err != nil {
-		return err
-	}
-
-	if distributedTableCount == 0 {
-		err = conn.Exec(context.Background(), fmt.Sprintf(distributedTable, cluster, cluster))
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

pkg/query-service/model/infra.go

@@ -114,6 +114,47 @@ type PodListResponse struct {
 	Total   int             `json:"total"`
 }
 
+func (r *PodListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "cpu":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].PodCPU > r.Records[j].PodCPU
+		})
+	case "cpu_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].PodCPURequest > r.Records[j].PodCPURequest
+		})
+	case "cpu_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].PodCPULimit > r.Records[j].PodCPULimit
+		})
+	case "memory":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].PodMemory > r.Records[j].PodMemory
+		})
+	case "memory_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].PodMemoryRequest > r.Records[j].PodMemoryRequest
+		})
+	case "memory_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].PodMemoryLimit > r.Records[j].PodMemoryLimit
+		})
+	case "restarts":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].RestartCount > r.Records[j].RestartCount
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type PodListRecord struct {
 	PodUID           string            `json:"podUID,omitempty"`
 	PodCPU           float64           `json:"podCPU"`
@@ -151,6 +192,35 @@ type NodeListResponse struct {
 	Total   int              `json:"total"`
 }
 
+func (r *NodeListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "cpu":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].NodeCPUUsage > r.Records[j].NodeCPUUsage
+		})
+	case "cpu_allocatable":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].NodeCPUAllocatable > r.Records[j].NodeCPUAllocatable
+		})
+	case "memory":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].NodeMemoryUsage > r.Records[j].NodeMemoryUsage
+		})
+	case "memory_allocatable":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].NodeMemoryAllocatable > r.Records[j].NodeMemoryAllocatable
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type NodeCountByCondition struct {
 	Ready    int `json:"ready"`
 	NotReady int `json:"notReady"`
@@ -183,6 +253,31 @@ type NamespaceListResponse struct {
 	Total   int                   `json:"total"`
 }
 
+func (r *NamespaceListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "cpu":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPUUsage > r.Records[j].CPUUsage
+		})
+	case "memory":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryUsage > r.Records[j].MemoryUsage
+		})
+	case "pod_phase":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CountByPhase.Pending > r.Records[j].CountByPhase.Pending
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type NamespaceListRecord struct {
 	NamespaceName string            `json:"namespaceName"`
 	CPUUsage      float64           `json:"cpuUsage"`
@@ -207,6 +302,35 @@ type ClusterListResponse struct {
 	Total   int                 `json:"total"`
 }
 
+func (r *ClusterListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "cpu":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPUUsage > r.Records[j].CPUUsage
+		})
+	case "cpu_allocatable":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPUAllocatable > r.Records[j].CPUAllocatable
+		})
+	case "memory":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryUsage > r.Records[j].MemoryUsage
+		})
+	case "memory_allocatable":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryAllocatable > r.Records[j].MemoryAllocatable
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type ClusterListRecord struct {
 	ClusterUID        string            `json:"clusterUID"`
 	CPUUsage          float64           `json:"cpuUsage"`
@@ -232,6 +356,55 @@ type DeploymentListResponse struct {
 	Total   int                    `json:"total"`
 }
 
+func (r *DeploymentListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "cpu":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPUUsage > r.Records[j].CPUUsage
+		})
+	case "cpu_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPURequest > r.Records[j].CPURequest
+		})
+	case "cpu_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPULimit > r.Records[j].CPULimit
+		})
+	case "memory":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryUsage > r.Records[j].MemoryUsage
+		})
+	case "memory_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryRequest > r.Records[j].MemoryRequest
+		})
+	case "memory_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryLimit > r.Records[j].MemoryLimit
+		})
+	case "desired_pods":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].DesiredPods > r.Records[j].DesiredPods
+		})
+	case "available_pods":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].AvailablePods > r.Records[j].AvailablePods
+		})
+	case "restarts":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].Restarts > r.Records[j].Restarts
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type DeploymentListRecord struct {
 	DeploymentName string            `json:"deploymentName"`
 	CPUUsage       float64           `json:"cpuUsage"`
@@ -262,6 +435,55 @@ type DaemonSetListResponse struct {
 	Total   int                   `json:"total"`
 }
 
+func (r *DaemonSetListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "cpu":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPUUsage > r.Records[j].CPUUsage
+		})
+	case "cpu_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPURequest > r.Records[j].CPURequest
+		})
+	case "cpu_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPULimit > r.Records[j].CPULimit
+		})
+	case "memory":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryUsage > r.Records[j].MemoryUsage
+		})
+	case "memory_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryRequest > r.Records[j].MemoryRequest
+		})
+	case "memory_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryLimit > r.Records[j].MemoryLimit
+		})
+	case "restarts":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].Restarts > r.Records[j].Restarts
+		})
+	case "desired_nodes":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].DesiredNodes > r.Records[j].DesiredNodes
+		})
+	case "available_nodes":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].AvailableNodes > r.Records[j].AvailableNodes
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type DaemonSetListRecord struct {
 	DaemonSetName  string            `json:"daemonSetName"`
 	CPUUsage       float64           `json:"cpuUsage"`
@@ -292,6 +514,55 @@ type StatefulSetListResponse struct {
 	Total   int                     `json:"total"`
 }
 
+func (r *StatefulSetListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "cpu":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPUUsage > r.Records[j].CPUUsage
+		})
+	case "cpu_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPURequest > r.Records[j].CPURequest
+		})
+	case "cpu_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPULimit > r.Records[j].CPULimit
+		})
+	case "memory":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryUsage > r.Records[j].MemoryUsage
+		})
+	case "memory_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryRequest > r.Records[j].MemoryRequest
+		})
+	case "memory_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryLimit > r.Records[j].MemoryLimit
+		})
+	case "restarts":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].Restarts > r.Records[j].Restarts
+		})
+	case "desired_pods":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].DesiredPods > r.Records[j].DesiredPods
+		})
+	case "available_pods":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].AvailablePods > r.Records[j].AvailablePods
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type StatefulSetListRecord struct {
 	StatefulSetName string            `json:"statefulSetName"`
 	CPUUsage        float64           `json:"cpuUsage"`
@@ -322,6 +593,63 @@ type JobListResponse struct {
 	Total   int             `json:"total"`
 }
 
+func (r *JobListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "cpu":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPUUsage > r.Records[j].CPUUsage
+		})
+	case "cpu_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPURequest > r.Records[j].CPURequest
+		})
+	case "cpu_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].CPULimit > r.Records[j].CPULimit
+		})
+	case "memory":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryUsage > r.Records[j].MemoryUsage
+		})
+	case "memory_request":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryRequest > r.Records[j].MemoryRequest
+		})
+	case "memory_limit":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].MemoryLimit > r.Records[j].MemoryLimit
+		})
+	case "restarts":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].Restarts > r.Records[j].Restarts
+		})
+	case "desired_pods":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].DesiredSuccessfulPods > r.Records[j].DesiredSuccessfulPods
+		})
+	case "active_pods":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].ActivePods > r.Records[j].ActivePods
+		})
+	case "failed_pods":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].FailedPods > r.Records[j].FailedPods
+		})
+	case "successful_pods":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].SuccessfulPods > r.Records[j].SuccessfulPods
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type JobListRecord struct {
 	JobName               string            `json:"jobName"`
 	CPUUsage              float64           `json:"cpuUsage"`
@@ -354,6 +682,43 @@ type VolumeListResponse struct {
 	Total   int                `json:"total"`
 }
 
+func (r *VolumeListResponse) SortBy(orderBy *v3.OrderBy) {
+	switch orderBy.ColumnName {
+	case "available":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].VolumeAvailable > r.Records[j].VolumeAvailable
+		})
+	case "capacity":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].VolumeCapacity > r.Records[j].VolumeCapacity
+		})
+	case "usage":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].VolumeUsage > r.Records[j].VolumeUsage
+		})
+	case "inodes":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].VolumeInodes > r.Records[j].VolumeInodes
+		})
+	case "inodes_free":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].VolumeInodesFree > r.Records[j].VolumeInodesFree
+		})
+	case "inodes_used":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].VolumeInodesUsed > r.Records[j].VolumeInodesUsed
+		})
+	}
+
+	// the default is descending
+	if orderBy.Order == v3.DirectionAsc {
+		// reverse the list
+		for i, j := 0, len(r.Records)-1; i < j; i, j = i+1, j-1 {
+			r.Records[i], r.Records[j] = r.Records[j], r.Records[i]
+		}
+	}
+}
+
 type VolumeListRecord struct {
 	PersistentVolumeClaimName string            `json:"persistentVolumeClaimName"`
 	VolumeAvailable           float64           `json:"volumeAvailable"`

pkg/query-service/model/v3/v3.go

@@ -322,6 +322,7 @@ const (
 	AttributeKeyTypeTag                  AttributeKeyType = "tag"
 	AttributeKeyTypeResource             AttributeKeyType = "resource"
 	AttributeKeyTypeInstrumentationScope AttributeKeyType = "scope"
+	AttributeKeyTypeSpanSearchScope      AttributeKeyType = "spanSearchScope"
 )
 
 func (t AttributeKeyType) String() string {

pkg/registry/registry.go

@@ -8,18 +8,19 @@ import (
 	"os/signal"
 	"syscall"
 
+	"go.signoz.io/signoz/pkg/factory"
 	"go.uber.org/zap"
 )
 
 type Registry struct {
-	services []NamedService
+	services []factory.Service
 	logger   *zap.Logger
 	startCh  chan error
 	stopCh   chan error
 }
 
 // New creates a new registry of services. It needs at least one service in the input.
-func New(logger *zap.Logger, services ...NamedService) (*Registry, error) {
+func New(logger *zap.Logger, services ...factory.Service) (*Registry, error) {
 	if logger == nil {
 		return nil, fmt.Errorf("cannot build registry, logger is required")
 	}
@@ -38,7 +39,7 @@ func New(logger *zap.Logger, services ...NamedService) (*Registry, error) {
 
 func (r *Registry) Start(ctx context.Context) error {
 	for _, s := range r.services {
-		go func(s Service) {
+		go func(s factory.Service) {
 			err := s.Start(ctx)
 			r.startCh <- err
 		}(s)
@@ -66,7 +67,7 @@ func (r *Registry) Wait(ctx context.Context) error {
 
 func (r *Registry) Stop(ctx context.Context) error {
 	for _, s := range r.services {
-		go func(s Service) {
+		go func(s factory.Service) {
 			err := s.Stop(ctx)
 			r.stopCh <- err
 		}(s)

pkg/registry/registry_test.go

@@ -6,14 +6,15 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"go.signoz.io/signoz/pkg/factory/servicetest"
 	"go.uber.org/zap"
 )
 
 func TestRegistryWith2HttpServers(t *testing.T) {
-	http1, err := newHttpService("http1")
+	http1, err := servicetest.NewHttpService("http1")
 	require.NoError(t, err)
 
-	http2, err := newHttpService("http2")
+	http2, err := servicetest.NewHttpService("http2")
 	require.NoError(t, err)
 
 	registry, err := New(zap.NewNop(), http1, http2)
@@ -34,10 +35,10 @@ func TestRegistryWith2HttpServers(t *testing.T) {
 }
 
 func TestRegistryWith2HttpServersWithoutWait(t *testing.T) {
-	http1, err := newHttpService("http1")
+	http1, err := servicetest.NewHttpService("http1")
 	require.NoError(t, err)
 
-	http2, err := newHttpService("http2")
+	http2, err := servicetest.NewHttpService("http2")
 	require.NoError(t, err)
 
 	registry, err := New(zap.NewNop(), http1, http2)

pkg/registry/service.go

@@ -1,16 +0,0 @@
-package registry
-
-import "context"
-
-type Service interface {
-	// Starts a service. The service should return an error if it cannot be started.
-	Start(context.Context) error
-	// Stops a service.
-	Stop(context.Context) error
-}
-
-type NamedService interface {
-	// Identifier of a service. It should be unique across all services.
-	Name() string
-	Service
-}

pkg/registry/service_test.go

@@ -1,49 +0,0 @@
-package registry
-
-import (
-	"context"
-	"net"
-	"net/http"
-)
-
-var _ NamedService = (*httpService)(nil)
-
-type httpService struct {
-	Listener net.Listener
-	Server   *http.Server
-	name     string
-}
-
-func newHttpService(name string) (*httpService, error) {
-	return &httpService{
-		name:   name,
-		Server: &http.Server{},
-	}, nil
-}
-
-func (service *httpService) Name() string {
-	return service.name
-}
-
-func (service *httpService) Start(ctx context.Context) error {
-	listener, err := net.Listen("tcp", "localhost:0")
-	if err != nil {
-		return err
-	}
-	service.Listener = listener
-
-	if err := service.Server.Serve(service.Listener); err != nil {
-		if err != http.ErrServerClosed {
-			return err
-		}
-	}
-	return nil
-}
-
-func (service *httpService) Stop(ctx context.Context) error {
-	if err := service.Server.Shutdown(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/signoz/config.go

@@ -7,33 +7,27 @@ import (
 	"go.signoz.io/signoz/pkg/config"
 	"go.signoz.io/signoz/pkg/factory"
 	"go.signoz.io/signoz/pkg/instrumentation"
-	"go.signoz.io/signoz/pkg/sqlmigration"
 	"go.signoz.io/signoz/pkg/sqlmigrator"
 	"go.signoz.io/signoz/pkg/sqlstore"
 	"go.signoz.io/signoz/pkg/web"
 )
 
-type ProviderConfig struct {
-	// Map of all cache provider factories
-	CacheProviderFactories factory.NamedMap[factory.ProviderFactory[cache.Cache, cache.Config]]
-
-	// Map of all web provider factories
-	WebProviderFactories factory.NamedMap[factory.ProviderFactory[web.Web, web.Config]]
-
-	// Map of all sqlstore provider factories
-	SQLStoreProviderFactories factory.NamedMap[factory.ProviderFactory[sqlstore.SQLStore, sqlstore.Config]]
-
-	// Map of all sql migration provider factories
-	SQLMigrationProviderFactories factory.NamedMap[factory.ProviderFactory[sqlmigration.SQLMigration, sqlmigration.Config]]
-}
-
 // Config defines the entire input configuration of signoz.
 type Config struct {
+	// Instrumentation config
 	Instrumentation instrumentation.Config `mapstructure:"instrumentation"`
-	Web             web.Config             `mapstructure:"web"`
-	Cache           cache.Config           `mapstructure:"cache"`
-	SQLStore        sqlstore.Config        `mapstructure:"sqlstore"`
-	SQLMigrator     sqlmigrator.Config     `mapstructure:"sqlmigrator"`
+
+	// Web config
+	Web web.Config `mapstructure:"web"`
+
+	// Cache config
+	Cache cache.Config `mapstructure:"cache"`
+
+	// SQLStore config
+	SQLStore sqlstore.Config `mapstructure:"sqlstore"`
+
+	// SQLMigrator config
+	SQLMigrator sqlmigrator.Config `mapstructure:"sqlmigrator"`
 }
 
 func NewConfig(ctx context.Context, resolverConfig config.ResolverConfig) (Config, error) {

pkg/signoz/provider.go

@@ -0,0 +1,54 @@
+package signoz
+
+import (
+	"go.signoz.io/signoz/pkg/cache"
+	"go.signoz.io/signoz/pkg/cache/memorycache"
+	"go.signoz.io/signoz/pkg/cache/rediscache"
+	"go.signoz.io/signoz/pkg/factory"
+	"go.signoz.io/signoz/pkg/sqlmigration"
+	"go.signoz.io/signoz/pkg/sqlstore"
+	"go.signoz.io/signoz/pkg/sqlstore/sqlitesqlstore"
+	"go.signoz.io/signoz/pkg/web"
+	"go.signoz.io/signoz/pkg/web/noopweb"
+	"go.signoz.io/signoz/pkg/web/routerweb"
+)
+
+type ProviderConfig struct {
+	// Map of all cache provider factories
+	CacheProviderFactories factory.NamedMap[factory.ProviderFactory[cache.Cache, cache.Config]]
+
+	// Map of all web provider factories
+	WebProviderFactories factory.NamedMap[factory.ProviderFactory[web.Web, web.Config]]
+
+	// Map of all sqlstore provider factories
+	SQLStoreProviderFactories factory.NamedMap[factory.ProviderFactory[sqlstore.SQLStore, sqlstore.Config]]
+
+	// Map of all sql migration provider factories
+	SQLMigrationProviderFactories factory.NamedMap[factory.ProviderFactory[sqlmigration.SQLMigration, sqlmigration.Config]]
+}
+
+func NewProviderConfig() ProviderConfig {
+	return ProviderConfig{
+		CacheProviderFactories: factory.MustNewNamedMap(
+			memorycache.NewFactory(),
+			rediscache.NewFactory(),
+		),
+		WebProviderFactories: factory.MustNewNamedMap(
+			routerweb.NewFactory(),
+			noopweb.NewFactory(),
+		),
+		SQLStoreProviderFactories: factory.MustNewNamedMap(
+			sqlitesqlstore.NewFactory(),
+		),
+		SQLMigrationProviderFactories: factory.MustNewNamedMap(
+			sqlmigration.NewAddDataMigrationsFactory(),
+			sqlmigration.NewAddOrganizationFactory(),
+			sqlmigration.NewAddPreferencesFactory(),
+			sqlmigration.NewAddDashboardsFactory(),
+			sqlmigration.NewAddSavedViewsFactory(),
+			sqlmigration.NewAddAgentsFactory(),
+			sqlmigration.NewAddPipelinesFactory(),
+			sqlmigration.NewAddIntegrationsFactory(),
+		),
+	}
+}

pkg/signoz/provider_test.go

@@ -0,0 +1,16 @@
+package signoz
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewProviderConfig(t *testing.T) {
+	// This is a test to ensure that provider factories can be created without panicking since
+	// we are using the factory.MustNewNamedMap function to initialize the provider factories.
+	// It also helps us catch these errors during testing instead of runtime.
+	assert.NotPanics(t, func() {
+		NewProviderConfig()
+	})
+}

pkg/web/noopweb/provider.go

@@ -12,7 +12,7 @@ import (
 type provider struct{}
 
 func NewFactory() factory.ProviderFactory[web.Web, web.Config] {
-	return factory.NewProviderFactory(factory.MustNewName("noopweb"), New)
+	return factory.NewProviderFactory(factory.MustNewName("noop"), New)
 }
 
 func New(ctx context.Context, settings factory.ProviderSettings, config web.Config) (web.Web, error) {

pkg/web/routerweb/provider.go

@@ -23,7 +23,7 @@ type provider struct {
 }
 
 func NewFactory() factory.ProviderFactory[web.Web, web.Config] {
-	return factory.NewProviderFactory(factory.MustNewName("routerweb"), New)
+	return factory.NewProviderFactory(factory.MustNewName("router"), New)
 }
 
 func New(ctx context.Context, settings factory.ProviderSettings, config web.Config) (web.Web, error) {