Skip to content
This repository was archived by the owner on Nov 7, 2022. It is now read-only.

Commit 2fc6b54

Browse files
asutoshpalaisongy23
authored andcommitted
Fixes occollector crash on exporter start failure #585 (#592)
1 parent b97678f commit 2fc6b54

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

cmd/occollector/app/collector/receivers.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@ func createReceivers(v *viper.Viper, logger *zap.Logger, traceConsumers consumer
3535
receivers := []struct {
3636
runFn func(*zap.Logger, *viper.Viper, consumer.TraceConsumer, chan<- error) (receiver.TraceReceiver, error)
3737
enabled bool
38+
name string
3839
}{
39-
{jaegerreceiver.Start, builder.JaegerReceiverEnabled(v)},
40-
{ocreceiver.Start, builder.OpenCensusReceiverEnabled(v)},
41-
{zipkinreceiver.Start, builder.ZipkinReceiverEnabled(v)},
42-
{zipkinscribereceiver.Start, builder.ZipkinScribeReceiverEnabled(v)},
40+
{jaegerreceiver.Start, builder.JaegerReceiverEnabled(v), "Jaeger"},
41+
{ocreceiver.Start, builder.OpenCensusReceiverEnabled(v), "OpenCensus"},
42+
{zipkinreceiver.Start, builder.ZipkinReceiverEnabled(v), "Zipkin"},
43+
{zipkinscribereceiver.Start, builder.ZipkinScribeReceiverEnabled(v), "Zipkin-Scribe"},
4344
}
4445

4546
var startedTraceReceivers []receiver.TraceReceiver
@@ -51,7 +52,7 @@ func createReceivers(v *viper.Viper, logger *zap.Logger, traceConsumers consumer
5152
for _, startedTraceReceiver := range startedTraceReceivers {
5253
startedTraceReceiver.StopTraceReception(context.Background())
5354
}
54-
logger.Fatal("Cannot run receiver for "+rec.TraceSource(), zap.Error(err))
55+
logger.Fatal("Cannot run receiver for "+receiver.name, zap.Error(err))
5556
}
5657
startedTraceReceivers = append(startedTraceReceivers, rec)
5758
someReceiverEnabled = true

0 commit comments

Comments
 (0)