Skip to content

Commit

Permalink
remove sleep (#3687)
Browse files Browse the repository at this point in the history
Co-authored-by: Joe Elliott <[email protected]>
  • Loading branch information
chodges15 and joe-elliott authored May 21, 2024
1 parent 46f6520 commit c1a1a29
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## main / unreleased

* [ENHANCEMENT] Remove hardcoded delay in distributor shutdown [#3687](https://github.com/grafana/tempo/pull/3687) (@chodges15)
* [ENHANCEMENT] Tempo CLI - add percentage support for query blocks #3697 [#3697](https://github.com/grafana/tempo/pull/3697) (@edgarkz)
* [ENHANCEMENT] Update OTLP and add attributes to instrumentation scope in vParquet4 [#3649](https://github.com/grafana/tempo/pull/3649) (@stoewer)
**Breaking Change** The update to OTLP 1.3.0 removes the deprecated `InstrumentationLibrary`
Expand Down
6 changes: 0 additions & 6 deletions modules/distributor/receiver/shim.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,6 @@ func (r *receiversShim) starting(ctx context.Context) error {

// Called after distributor is asked to stop via StopAsync.
func (r *receiversShim) stopping(_ error) error {
// when shutdown is called on the receiver it immediately shuts down its connection
// which drops requests on the floor. at this point in the shutdown process
// the readiness handler is already down so we are not receiving any more requests.
// sleep for 30 seconds to here to all pending requests to finish.
time.Sleep(30 * time.Second)

ctx, cancelFn := context.WithTimeout(context.Background(), 30*time.Second)
defer cancelFn()

Expand Down

0 comments on commit c1a1a29

Please sign in to comment.