Skip to content

Commit

Permalink
undo parallelism and metrics_ingestion_time_range_slack
Browse files Browse the repository at this point in the history
  • Loading branch information
electron0zero committed Nov 19, 2024
1 parent 2f8ae0d commit a91c142
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/sources/tempo/configuration/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ metrics_generator:
# This option only allows spans with end times that occur within the configured duration to be
# considered in metrics generation.
# This is to filter out spans that are outdated.
[metrics_ingestion_time_range_slack: <duration> | default = 2m0s]
[metrics_ingestion_time_range_slack: <duration> | default = 30s]

# Timeout for metric requests
[query_timeout: <duration> | default = 30s ]
Expand Down
4 changes: 2 additions & 2 deletions docs/sources/tempo/configuration/manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ querier:
frontend_worker:
frontend_address: 127.0.0.1:9095
dns_lookup_duration: 10s
parallelism: 3
parallelism: 2
match_max_concurrent: true
id: ""
grpc_client_config:
Expand Down Expand Up @@ -602,7 +602,7 @@ metrics_generator:
search_encoding: none
ingestion_time_range_slack: 2m0s
version: vParquet4
metrics_ingestion_time_range_slack: 2m0s
metrics_ingestion_time_range_slack: 30s
query_timeout: 30s
override_ring_key: metrics-generator
storage:
Expand Down
2 changes: 1 addition & 1 deletion modules/generator/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet)
cfg.Registry.RegisterFlagsAndApplyDefaults(prefix, f)
cfg.Storage.RegisterFlagsAndApplyDefaults(prefix, f)
cfg.TracesWAL.Version = encoding.DefaultEncoding().Version()
cfg.TracesWAL.IngestionSlack = 2 * time.Minute
cfg.TracesWAL.IngestionSlack = 30 * time.Second

// setting default for max span age before discarding to 30s
cfg.MetricsIngestionSlack = 2 * time.Minute
Expand Down
2 changes: 1 addition & 1 deletion modules/querier/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet)
cfg.Worker = worker.Config{
MatchMaxConcurrency: true,
MaxConcurrentRequests: cfg.MaxConcurrentQueries,
Parallelism: 3,
Parallelism: 2,
GRPCClientConfig: grpcclient.Config{
MaxRecvMsgSize: 100 << 20,
MaxSendMsgSize: 16 << 20,
Expand Down

0 comments on commit a91c142

Please sign in to comment.