Skip to content

Commit c1a1a29

Browse files
remove sleep (#3687)
Co-authored-by: Joe Elliott <[email protected]>
1 parent 46f6520 commit c1a1a29

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
## main / unreleased
2+
3+
* [ENHANCEMENT] Remove hardcoded delay in distributor shutdown [#3687](https://github.com/grafana/tempo/pull/3687) (@chodges15)
24
* [ENHANCEMENT] Tempo CLI - add percentage support for query blocks #3697 [#3697](https://github.com/grafana/tempo/pull/3697) (@edgarkz)
35
* [ENHANCEMENT] Update OTLP and add attributes to instrumentation scope in vParquet4 [#3649](https://github.com/grafana/tempo/pull/3649) (@stoewer)
46
**Breaking Change** The update to OTLP 1.3.0 removes the deprecated `InstrumentationLibrary`

modules/distributor/receiver/shim.go

-6
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,6 @@ func (r *receiversShim) starting(ctx context.Context) error {
305305

306306
// Called after distributor is asked to stop via StopAsync.
307307
func (r *receiversShim) stopping(_ error) error {
308-
// when shutdown is called on the receiver it immediately shuts down its connection
309-
// which drops requests on the floor. at this point in the shutdown process
310-
// the readiness handler is already down so we are not receiving any more requests.
311-
// sleep for 30 seconds to here to all pending requests to finish.
312-
time.Sleep(30 * time.Second)
313-
314308
ctx, cancelFn := context.WithTimeout(context.Background(), 30*time.Second)
315309
defer cancelFn()
316310

0 commit comments

Comments
 (0)