Remove panic in ReportFatalError (#343)

* Remove panic Signed-off-by: Joe Elliott <number101010@gmail.com> * changelog Signed-off-by: Joe Elliott <number101010@gmail.com>
grafana · Nov 17, 2020 · fca9484 · fca9484
1 parent 1e492cb
commit fca9484
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * [CHANGE] Upgrade Cortex from v1.3.0 to v.1.4.0 [#341](https://github.com/grafana/tempo/pull/341)
 * [ENHANCEMENT] Add tempodb_compaction_objects_combined metric. [#339](https://github.com/grafana/tempo/pull/339)
 * [BUGFIX] Frequent errors logged by compactor regarding meta not found [#327](https://github.com/grafana/tempo/pull/327)
+* [BUGFIX] Fix distributors panicking on rollout [#343](https://github.com/grafana/tempo/pull/343)
 
 ## v0.3.0
 

diff --git a/modules/distributor/receiver/shim.go b/modules/distributor/receiver/shim.go
@@ -184,7 +184,6 @@ func (r *receiversShim) ConsumeTraces(ctx context.Context, td pdata.Traces) erro
 // implements component.Host
 func (r *receiversShim) ReportFatalError(err error) {
 	level.Error(util.Logger).Log("msg", "fatal error reported", "err", err)
-	panic(fmt.Sprintf("Fatal error %v", err))
 }
 
 // implements component.Host