Skip to content
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

Jump to bottom

Excavator: Upgrades Baseline to the latest version #526

Closed
wants to merge 2 commits into from
Closed

Excavator: Upgrades Baseline to the latest version #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7707a6
Excavator: Upgrades Baseline to the latest version
svc-excavator-bot Dec 4, 2019
83da265
Merge branch 'develop' into roomba/latest-baseline-oss
schlosna Dec 5, 2019
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: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
classpath 'com.palantir.baseline:gradle-baseline-java:2.37.0'
classpath 'com.palantir.baseline:gradle-baseline-java:2.40.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.13.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
classpath 'com.palantir.metricschema:gradle-metric-schema:0.4.5'
Expand Down
4 changes: 2 additions & 2 deletions tritium-lib/src/main/java/com/palantir/tritium/proxy/ByteBuddyInstrumentationAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static InvocationContext enter(
return eventHandler.preInvocation(proxy, method, arguments);
}
return disabledHandlerSentinel;
} catch (Throwable t) {
} catch (RuntimeException | Error t) {
if (logger.isWarnEnabled()) {
logger.warn(
"Failure occurred handling 'preInvocation' invocation on: {}",
Expand All @@ -87,7 +87,7 @@ static void exit(
} else {
eventHandler.onFailure(context, thrown);
}
} catch (Throwable t) {
} catch (RuntimeException | Error t) {
if (logger.isWarnEnabled()) {
Object value = thrown == null ? result : thrown;
logger.warn(
Expand Down
4 changes: 2 additions & 2 deletions tritium-lib/src/main/java/com/palantir/tritium/proxy/InvocationEventProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private boolean isEnabled(Object instance, Method method, Object[] args) {
try {
return eventHandler.isEnabled()
&& filter.shouldInstrument(instance, method, args);
} catch (Throwable t) {
} catch (RuntimeException | Error t) {
logInvocationWarning("isEnabled", instance, method, t);
return false;
}
Expand All @@ -103,7 +103,7 @@ public final Object invoke(Object proxy, Method method, @Nullable Object[] nulla
return handleOnSuccess(context, result);
} catch (InvocationTargetException ite) {
throw handleOnFailure(context, ite.getCause());
} catch (Throwable t) {
} catch (IllegalAccessException | RuntimeException | Error t) {
throw handleOnFailure(context, t);
}
} else {
Expand Down