@@ -227,14 +227,16 @@ func collectRemoteHost(ctx context.Context, collectSpecs []*troubleshootv1beta2.
227
227
228
228
isExcluded , _ := collector .IsExcluded ()
229
229
if isExcluded {
230
- opts .ProgressChan <- fmt .Sprintf ("[%s] Excluding host collector" , collector .Title ())
230
+ msg := fmt .Sprintf ("[%s] Excluding host collector" , collector .Title ())
231
+ opts .CollectorProgressCallback (opts .ProgressChan , msg )
231
232
span .SetAttributes (attribute .Bool (constants .EXCLUDED , true ))
232
233
span .End ()
233
234
continue
234
235
}
235
236
236
237
// Send progress event: starting the collector
237
- opts .ProgressChan <- fmt .Sprintf ("[%s] Running host collector..." , collector .Title ())
238
+ msg := fmt .Sprintf ("[%s] Running host collector..." , collector .Title ())
239
+ opts .CollectorProgressCallback (opts .ProgressChan , msg )
238
240
239
241
// Parameters for remote collection
240
242
params := & collect.RemoteCollectParams {
@@ -255,12 +257,14 @@ func collectRemoteHost(ctx context.Context, collectSpecs []*troubleshootv1beta2.
255
257
result , err := collect .RemoteHostCollect (ctx , * params )
256
258
if err != nil {
257
259
span .SetStatus (codes .Error , err .Error ())
258
- opts .ProgressChan <- fmt .Sprintf ("[%s] Error: %v" , collector .Title (), err )
260
+ msg = fmt .Sprintf ("[%s] Error: %v" , collector .Title (), err )
261
+ opts .CollectorProgressCallback (opts .ProgressChan , msg )
259
262
return errors .Wrap (err , "failed to run remote host collector" )
260
263
}
261
264
262
265
// Send progress event: completed successfully
263
- opts .ProgressChan <- fmt .Sprintf ("[%s] Completed host collector" , collector .Title ())
266
+ msg = fmt .Sprintf ("[%s] Completed host collector" , collector .Title ())
267
+ opts .CollectorProgressCallback (opts .ProgressChan , msg )
264
268
265
269
// Aggregate the results
266
270
for k , v := range result {
0 commit comments