Skip to content

check entire Throwable in RetryMapping::matchesThrowable #1169

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

check entire Throwable in RetryMapping::matchesThrowable #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c8de5e
check entire Throwable in RetryMapping::matchesThrowable
alexeyqu-fb Oct 4, 2022
e8c517b
update gradle deps
alexeyqu-fb Oct 4, 2022
1466cce
Merge branch 'master' into feature/check-entire-throwable-in-RetryMap…
xokker Oct 20, 2022
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
2 changes: 2 additions & 0 deletions portability-types-transfer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ dependencies {
annotationProcessor "com.google.auto.value:auto-value:${autoValueVersion}"

compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}")

compile('org.apache.commons:commons-lang3:3.11')

testCompile("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
testCompile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}")
Expand Down
8 changes: 7 additions & 1 deletion ...pes-transfer/src/main/java/org/datatransferproject/types/transfer/retry/RetryMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.datatransferproject.types.transfer.retry;

import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.lang3.exception.ExceptionUtils;
import java.util.Arrays;

/**
Expand Down Expand Up @@ -48,13 +49,18 @@ public RetryStrategy getStrategy() {
}

public boolean matchesThrowable(Throwable throwable) {
// TODO: examine entire throwable, not just toString
String input = throwable.toString();
for (String regex : regexes) {
if (input.matches(regex)) {
return true;
}
}
Copy link
Collaborator

@jzacsh jzacsh Oct 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does leaving the previous loop seem like a micro-optimization? should we just delete it for now and add something like this (or something else) in later, if we do performance testing and find this area problematic?

EDIT: I see the loop before is actually probably very different (first loop vs. second loop). so maybe just add a comment block atop both loops explaining (eg: // try to match on throwable's faster-to-compute string and // see if maybe the fuller stacktrace reveals any matches)?

String stacktrace = ExceptionUtils.getStackTrace(throwable);
for (String regex : regexes) {
if (stacktrace.matches(regex)) {
return true;
}
}
return false;
}

Expand Down