Skip to content

Fix thread-safety bug in TestSpanHandler causing flaky tracing tests #2971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reta merged 4 commits into from
Mar 26, 2026
+2 −2
Merged

Fix thread-safety bug in TestSpanHandler causing flaky tracing tests #2971

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
679473d
Increase Awaitility timeout in tracing tests from 5s to 10s
gnodet Mar 13, 2026
6952a07
Increase Awaitility timeout in tracing tests from 10s to 30s
gnodet Mar 26, 2026
22df455
Merge remote-tracking branch 'origin/main' into fix/tracing-timeout-10s
gnodet Mar 26, 2026
73dd3e4
Fix TestSpanHandler thread-safety and revert timeout increase
gnodet Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions systests/tracing/src/test/java/org/apache/cxf/systest/brave/TestSpanHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
*/
package org.apache.cxf.systest.brave;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;

import brave.handler.MutableSpan;
import brave.handler.SpanHandler;
import brave.propagation.TraceContext;

public class TestSpanHandler extends SpanHandler {
private static final List<MutableSpan> SPANS = new ArrayList<>(12);
private static final List<MutableSpan> SPANS = new CopyOnWriteArrayList<>();

@Override
public boolean end(TraceContext context, MutableSpan span, Cause cause) {
Expand Down