wip

kubeshop · Sep 13, 2023 · c21141a · c21141a
1 parent 9c7be99
commit c21141a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/server/executor/tracepollerworker/fetcher_worker.go b/server/executor/tracepollerworker/fetcher_worker.go
@@ -64,6 +64,10 @@ func (w *traceFetcherWorker) ProcessItem(ctx context.Context, job executor.Job)
 	if err != nil {
 		log.Printf("[TracePoller] Test %s Run %d: GetTraceByID (traceID %s) error: %s", job.Test.ID, job.Run.ID, traceID, err.Error())
 		job.Run.LastError = err
+
+		handleDBError(w.state.updater.Update(ctx, job.Run))
+		w.outputQueue.Enqueue(ctx, job)
+		return
 	}
 
 	spansBefore := 0

diff --git a/server/traces/trace_entities.go b/server/traces/trace_entities.go
@@ -237,7 +237,9 @@ func flattenSpans(res map[trace.SpanID]*Span, root Span) {
 
 	res[root.ID] = rootPtr
 	for _, child := range root.Children {
-		flattenSpans(res, *child)
+		if _, ok := res[root.ID]; !ok {
+			flattenSpans(res, *child)
+		}
 	}
 
 	// Remove children and parent because they are now part of the flatten structure