Skip to content

Fix race condition in PekkoRouteHolder using synchronized #15839

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

Open
drghdtjr wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Fix race condition in PekkoRouteHolder using synchronized #15839

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions ...opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/route/PekkoRouteHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static PekkoRouteHolder get(Context context) {
return context.get(KEY);
}

public void push(Uri.Path beforeMatch, Uri.Path afterMatch, String pathToPush) {
public synchronized void push(Uri.Path beforeMatch, Uri.Path afterMatch, String pathToPush) {
// Only accept the suggested 'pathToPush' if:
// - either this is the first match, or
// - the unmatched part of the path from the previous match is what the current match
Expand All @@ -50,26 +50,26 @@ public void push(Uri.Path beforeMatch, Uri.Path afterMatch, String pathToPush) {
lastWasMatched = true;
}

public void didNotMatch() {
public synchronized void didNotMatch() {
lastWasMatched = false;
}

public void pushIfNotCompletelyMatched(String pathToPush) {
public synchronized void pushIfNotCompletelyMatched(String pathToPush) {
if (lastUnmatchedPath != null && !lastUnmatchedPath.isEmpty()) {
route.append(pathToPush);
}
}

public String route() {
public synchronized String route() {
return lastWasMatched ? route.toString() : null;
}

public void save() {
public synchronized void save() {
savedStates.add(new State(lastUnmatchedPath, route));
route = new StringBuilder(route);
}

public void restore() {
public synchronized void restore() {
State popped = savedStates.pollLast();
if (popped != null) {
lastUnmatchedPath = popped.lastUnmatchedPath;
Expand Down
Loading