Skip to content

Commit f784eac

Browse files
committed
server: fix potential nil pointer when starting flight recorder
When the flightt recorder constructor returns an error in `NewFlightRecorder`, we should make sure not to call `Start`. Epic: None Release note: None
1 parent 9de4d01 commit f784eac

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/server/env_sampler.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,11 @@ func startSampleEnvironment(
161161
simpleFlightRecorder, err := goexectrace.NewFlightRecorder(cfg.st, 10*time.Second, cfg.executionTraceDirName)
162162
if err != nil {
163163
log.Warningf(ctx, "failed to initialize flight recorder: %v", err)
164-
}
165-
err = simpleFlightRecorder.Start(ctx, cfg.stopper)
166-
if err != nil {
167-
log.Warningf(ctx, "failed to start flight recorder: %v", err)
164+
} else {
165+
err = simpleFlightRecorder.Start(ctx, cfg.stopper)
166+
if err != nil {
167+
log.Warningf(ctx, "failed to start flight recorder: %v", err)
168+
}
168169
}
169170

170171
return cfg.stopper.RunAsyncTaskEx(ctx,

0 commit comments

Comments
 (0)