Merge branch 'main' into dario.castane/AIT-7944/update-supported-vers…

…ions

ddtrace/tracer/abandonedspans.go

@@ -119,10 +119,6 @@ type abandonedSpansDebugger struct {
 	// addedSpans and removedSpans are internal counters, mainly for testing
 	// purposes
 	addedSpans, removedSpans uint32
-
-	// logged reports if the debugger has logged abandoned spans at least once
-	// (when non-zero).
-	logged uint32
 }
 
 // newAbandonedSpansDebugger creates a new abandonedSpansDebugger debugger
@@ -278,7 +274,6 @@ func (d *abandonedSpansDebugger) log(interval *time.Duration) {
 		sb.WriteString("...")
 	}
 	log.Warn(sb.String())
-	atomic.SwapUint32(&d.logged, 1)
 }
 
 // formatAbandonedSpans takes a bucket and returns a human-readable string representing

ddtrace/tracer/abandonedspans_test.go

@@ -44,15 +44,16 @@ func assertProcessedSpans(assert *assert.Assertions, t *tracer, startedSpans, fi
 		return atomic.LoadUint32(&d.addedSpans) >= uint32(startedSpans) &&
 			atomic.LoadUint32(&d.removedSpans) >= uint32(finishedSpans)
 	}
-	assert.Eventually(cond, 500*time.Millisecond, 50*time.Millisecond)
+	assert.Eventually(cond, 1*time.Second, 75*time.Millisecond)
 	// We expect logs to be generated when startedSpans and finishedSpans are different.
+	// At least there should be 3 lines: 1. debugger activation, 2. detected spans warn, and 3. the details.
 	if startedSpans == finishedSpans {
 		return
 	}
 	cond = func() bool {
-		return atomic.LoadUint32(&d.logged) == 1
+		return len(t.config.logger.(*log.RecordLogger).Logs()) > 2
 	}
-	assert.Eventually(cond, 300*time.Millisecond, 50*time.Millisecond)
+	assert.Eventually(cond, 1*time.Second, 75*time.Millisecond)
 }
 
 func formatSpanString(s *span) string {