Assert max live traces limits in local-blocks processor

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## main / unreleased
 
+* [CHANGE] Assert max live traces limits in local-blocks processor [#5170](https://github.com/grafana/tempo/pull/5170) (@mapno)
+
 # v2.8.0-rc.0
 
 * [CHANGE] **BREAKING CHANGE** Change default http-listen-port from 80 to 3200 [#4960](https://github.com/grafana/tempo/pull/4960) (@martialblog)

modules/generator/instance.go

@@ -345,7 +345,6 @@ func (i *instance) addProcessor(processorName string, cfg ProcessorConfig) error
 		if i.traceQueryWAL != nil {
 			nonFlushingConfig := cfg.LocalBlocks
 			nonFlushingConfig.FlushToStorage = false
-			nonFlushingConfig.AssertMaxLiveTraces = true
 			nonFlushingConfig.AdjustTimeRangeForSlack = false
 			i.queuebasedLocalBlocks, err = localblocks.New(nonFlushingConfig, i.instanceID, i.traceQueryWAL, i.writer, i.overrides)
 			if err != nil {

modules/generator/processor/localblocks/config.go

@@ -29,7 +29,6 @@ type Config struct {
 	FlushToStorage       bool                  `yaml:"flush_to_storage"`
 	Metrics              MetricsConfig         `yaml:",inline"`
 
-	AssertMaxLiveTraces     bool `yaml:"-"` // Used internally for non-flushing instance
 	AdjustTimeRangeForSlack bool `yaml:"-"` // Used internally for non-flushing instance
 }
 

modules/generator/processor/localblocks/processor.go

@@ -259,10 +259,6 @@ func (p *Processor) push(ts time.Time, req *tempopb.PushSpansRequest) {
 
 // maxLiveTraces for the tenant, if enabled, and read from config in order of precedence.
 func (p *Processor) maxLiveTraces() uint64 {
-	if !p.Cfg.AssertMaxLiveTraces {
-		return 0
-	}
-
 	if m := p.overrides.MaxLocalTracesPerUser(p.tenant); m > 0 {
 		return uint64(m)
 	}