From 8ccdc71eaf1247694780b2de415781ff78f84084 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 25 Jun 2024 10:10:33 +0530 Subject: [PATCH] chore: remove deprecated option (#5239) --- ee/query-service/app/api/api.go | 2 -- ee/query-service/app/server.go | 2 -- ee/query-service/main.go | 5 +---- pkg/query-service/app/http_handler.go | 3 --- pkg/query-service/app/server.go | 2 -- pkg/query-service/main.go | 5 +---- 6 files changed, 2 insertions(+), 17 deletions(-) diff --git a/ee/query-service/app/api/api.go b/ee/query-service/app/api/api.go index be0cf1ec36..66b462e167 100644 --- a/ee/query-service/app/api/api.go +++ b/ee/query-service/app/api/api.go @@ -24,7 +24,6 @@ import ( type APIHandlerOptions struct { DataConnector interfaces.DataConnector SkipConfig *basemodel.SkipConfig - PreferDelta bool PreferSpanMetrics bool MaxIdleConns int MaxOpenConns int @@ -53,7 +52,6 @@ func NewAPIHandler(opts APIHandlerOptions) (*APIHandler, error) { baseHandler, err := baseapp.NewAPIHandler(baseapp.APIHandlerOpts{ Reader: opts.DataConnector, SkipConfig: opts.SkipConfig, - PerferDelta: opts.PreferDelta, PreferSpanMetrics: opts.PreferSpanMetrics, MaxIdleConns: opts.MaxIdleConns, MaxOpenConns: opts.MaxOpenConns, diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index 75af1d7ebc..9a2c96734f 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -64,7 +64,6 @@ type ServerOptions struct { // alert specific params DisableRules bool RuleRepoURL string - PreferDelta bool PreferSpanMetrics bool MaxIdleConns int MaxOpenConns int @@ -256,7 +255,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) { apiOpts := api.APIHandlerOptions{ DataConnector: reader, SkipConfig: skipConfig, - PreferDelta: serverOptions.PreferDelta, PreferSpanMetrics: serverOptions.PreferSpanMetrics, MaxIdleConns: serverOptions.MaxIdleConns, MaxOpenConns: serverOptions.MaxOpenConns, diff --git a/ee/query-service/main.go b/ee/query-service/main.go index 4a8a12af6e..c5a03f4c0f 100644 --- a/ee/query-service/main.go +++ b/ee/query-service/main.go @@ -89,7 +89,6 @@ func main() { var cacheConfigPath, fluxInterval string var enableQueryServiceLogOTLPExport bool - var preferDelta bool var preferSpanMetrics bool var maxIdleConns int @@ -100,14 +99,13 @@ func main() { flag.StringVar(&promConfigPath, "config", "./config/prometheus.yml", "(prometheus config to read metrics)") flag.StringVar(&skipTopLvlOpsPath, "skip-top-level-ops", "", "(config file to skip top level operations)") flag.BoolVar(&disableRules, "rules.disable", false, "(disable rule evaluation)") - flag.BoolVar(&preferDelta, "prefer-delta", false, "(prefer delta over cumulative metrics)") flag.BoolVar(&preferSpanMetrics, "prefer-span-metrics", false, "(prefer span metrics for service level metrics)") flag.IntVar(&maxIdleConns, "max-idle-conns", 50, "(number of connections to maintain in the pool.)") flag.IntVar(&maxOpenConns, "max-open-conns", 100, "(max connections for use at any time.)") flag.DurationVar(&dialTimeout, "dial-timeout", 5*time.Second, "(the maximum time to establish a connection.)") flag.StringVar(&ruleRepoURL, "rules.repo-url", baseconst.AlertHelpPage, "(host address used to build rule link in alert messages)") flag.StringVar(&cacheConfigPath, "experimental.cache-config", "", "(cache config to use)") - flag.StringVar(&fluxInterval, "flux-interval", "5m", "(cache config to use)") + flag.StringVar(&fluxInterval, "flux-interval", "5m", "(the interval to exclude data from being cached to avoid incorrect cache for data in motion)") flag.BoolVar(&enableQueryServiceLogOTLPExport, "enable.query.service.log.otlp.export", false, "(enable query service log otlp export)") flag.StringVar(&cluster, "cluster", "cluster", "(cluster name - defaults to 'cluster')") flag.StringVar(&gatewayUrl, "gateway-url", "", "(url to the gateway)") @@ -125,7 +123,6 @@ func main() { HTTPHostPort: baseconst.HTTPHostPort, PromConfigPath: promConfigPath, SkipTopLvlOpsPath: skipTopLvlOpsPath, - PreferDelta: preferDelta, PreferSpanMetrics: preferSpanMetrics, PrivateHostPort: baseconst.PrivateHostPort, DisableRules: disableRules, diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index 1f0769bb08..70c8fd3dd3 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -76,7 +76,6 @@ type APIHandler struct { querier interfaces.Querier querierV2 interfaces.Querier queryBuilder *queryBuilder.QueryBuilder - preferDelta bool preferSpanMetrics bool // temporalityMap is a map of metric name to temporality @@ -106,7 +105,6 @@ type APIHandlerOpts struct { SkipConfig *model.SkipConfig - PerferDelta bool PreferSpanMetrics bool MaxIdleConns int @@ -166,7 +164,6 @@ func NewAPIHandler(opts APIHandlerOpts) (*APIHandler, error) { reader: opts.Reader, appDao: opts.AppDao, skipConfig: opts.SkipConfig, - preferDelta: opts.PerferDelta, preferSpanMetrics: opts.PreferSpanMetrics, temporalityMap: make(map[string]map[v3.Temporality]bool), maxIdleConns: opts.MaxIdleConns, diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index 92b879fcc9..2260045f4d 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -55,7 +55,6 @@ type ServerOptions struct { // alert specific params DisableRules bool RuleRepoURL string - PreferDelta bool PreferSpanMetrics bool MaxIdleConns int MaxOpenConns int @@ -172,7 +171,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) { apiHandler, err := NewAPIHandler(APIHandlerOpts{ Reader: reader, SkipConfig: skipConfig, - PerferDelta: serverOptions.PreferDelta, PreferSpanMetrics: serverOptions.PreferSpanMetrics, MaxIdleConns: serverOptions.MaxIdleConns, MaxOpenConns: serverOptions.MaxOpenConns, diff --git a/pkg/query-service/main.go b/pkg/query-service/main.go index 793ce25bf2..3063e07b12 100644 --- a/pkg/query-service/main.go +++ b/pkg/query-service/main.go @@ -37,7 +37,6 @@ func main() { var ruleRepoURL, cacheConfigPath, fluxInterval string var cluster string - var preferDelta bool var preferSpanMetrics bool var maxIdleConns int @@ -47,11 +46,10 @@ func main() { flag.StringVar(&promConfigPath, "config", "./config/prometheus.yml", "(prometheus config to read metrics)") flag.StringVar(&skipTopLvlOpsPath, "skip-top-level-ops", "", "(config file to skip top level operations)") flag.BoolVar(&disableRules, "rules.disable", false, "(disable rule evaluation)") - flag.BoolVar(&preferDelta, "prefer-delta", false, "(prefer delta over cumulative metrics)") flag.BoolVar(&preferSpanMetrics, "prefer-span-metrics", false, "(prefer span metrics for service level metrics)") flag.StringVar(&ruleRepoURL, "rules.repo-url", constants.AlertHelpPage, "(host address used to build rule link in alert messages)") flag.StringVar(&cacheConfigPath, "experimental.cache-config", "", "(cache config to use)") - flag.StringVar(&fluxInterval, "flux-interval", "5m", "(cache config to use)") + flag.StringVar(&fluxInterval, "flux-interval", "5m", "(the interval to exclude data from being cached to avoid incorrect cache for data in motion)") flag.StringVar(&cluster, "cluster", "cluster", "(cluster name - defaults to 'cluster')") // Allow using the consistent naming with the signoz collector flag.StringVar(&cluster, "cluster-name", "cluster", "(cluster name - defaults to 'cluster')") @@ -71,7 +69,6 @@ func main() { HTTPHostPort: constants.HTTPHostPort, PromConfigPath: promConfigPath, SkipTopLvlOpsPath: skipTopLvlOpsPath, - PreferDelta: preferDelta, PreferSpanMetrics: preferSpanMetrics, PrivateHostPort: constants.PrivateHostPort, DisableRules: disableRules,