-
Notifications
You must be signed in to change notification settings - Fork 12
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.
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
Invoke onSuccess and onFailure handlers properly for async methods #181
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e964505
Invoke onSuccess and onFailure handlers properly for async methods
ellisjoe f0c81b9
fix imports
ellisjoe 9a74663
checkstyle
ellisjoe 7d3d177
remove empty test
ellisjoe c45ada9
Handler declares whether it is able to support async method invocations
ellisjoe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,10 @@ | |
import static com.google.common.base.Preconditions.checkNotNull; | ||
|
||
import com.google.common.reflect.AbstractInvocationHandler; | ||
import com.google.common.util.concurrent.FutureCallback; | ||
import com.google.common.util.concurrent.Futures; | ||
import com.google.common.util.concurrent.ListenableFuture; | ||
import com.google.common.util.concurrent.MoreExecutors; | ||
import com.google.errorprone.annotations.CompileTimeConstant; | ||
import com.palantir.logsafe.SafeArg; | ||
import com.palantir.logsafe.UnsafeArg; | ||
|
@@ -32,6 +36,8 @@ | |
import java.lang.reflect.Method; | ||
import java.util.Arrays; | ||
import java.util.List; | ||
import java.util.concurrent.CompletableFuture; | ||
import java.util.concurrent.CompletionStage; | ||
import javax.annotation.Nullable; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
@@ -82,13 +88,19 @@ public String toString() { | |
private boolean isEnabled(Object instance, Method method, Object[] args) { | ||
try { | ||
return eventHandler.isEnabled() | ||
&& filter.shouldInstrument(instance, method, args); | ||
&& filter.shouldInstrument(instance, method, args) | ||
&& (eventHandler.asyncSupport() || !isAsync(method)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we want to remove this line. Tracing doesn't support async operations, but the tracing thread state is passed to executors, which will provide valuable information. |
||
} catch (Throwable t) { | ||
logInvocationWarning("isEnabled", instance, method, args, t); | ||
return false; | ||
} | ||
} | ||
|
||
private boolean isAsync(Method method) { | ||
Class<?> returnType = method.getReturnType(); | ||
return ListenableFuture.class.isAssignableFrom(returnType) | ||
|| CompletionStage.class.isAssignableFrom(returnType); | ||
} | ||
|
||
@Override | ||
@Nullable | ||
|
@@ -116,14 +128,53 @@ public final Object instrumentInvocation(Object instance, Method method, Object[ | |
InvocationContext context = handlePreInvocation(instance, method, args); | ||
try { | ||
Object result = execute(method, args); | ||
return handleOnSuccess(context, result); | ||
return handleResult(context, result); | ||
} catch (InvocationTargetException e) { | ||
throw handleOnFailure(context, e.getCause()); | ||
} catch (Throwable t) { | ||
throw handleOnFailure(context, t); | ||
} | ||
} | ||
|
||
@Nullable | ||
private Object handleResult(InvocationContext context, Object result) { | ||
if (result instanceof ListenableFuture) { | ||
return handleFuture(context, (ListenableFuture) result); | ||
} else if (result instanceof CompletionStage) { | ||
return handleFuture(context, (CompletionStage) result); | ||
} else { | ||
return handleOnSuccess(context, result); | ||
} | ||
} | ||
|
||
private CompletionStage<?> handleFuture(InvocationContext context, CompletionStage<?> future) { | ||
future.handleAsync((result, throwable) -> { | ||
if (throwable == null) { | ||
return handleOnSuccess(context, result); | ||
} else { | ||
return handleOnFailure(context, throwable); | ||
} | ||
}, MoreExecutors.directExecutor()); | ||
|
||
return future; | ||
} | ||
|
||
private ListenableFuture<?> handleFuture(InvocationContext context, ListenableFuture<?> future) { | ||
Futures.addCallback(future, new FutureCallback<Object>() { | ||
@Override | ||
public void onSuccess(Object result) { | ||
handleOnSuccess(context, result); | ||
} | ||
|
||
@Override | ||
public void onFailure(Throwable throwable) { | ||
handleOnFailure(context, throwable); | ||
} | ||
}, MoreExecutors.directExecutor()); | ||
|
||
return future; | ||
} | ||
|
||
@Nullable | ||
final InvocationContext handlePreInvocation(Object instance, Method method, Object[] args) { | ||
try { | ||
|
156 changes: 156 additions & 0 deletions
156
tritium-lib/src/test/java/com/palantir/tritium/proxy/AsyncInvocationEventProxyTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,156 @@ | ||
/* | ||
* (c) Copyright 2019 Palantir Technologies Inc. All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.palantir.tritium.proxy; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.mockito.ArgumentMatchers.any; | ||
import static org.mockito.ArgumentMatchers.eq; | ||
import static org.mockito.Mockito.never; | ||
import static org.mockito.Mockito.verify; | ||
import static org.mockito.Mockito.verifyNoMoreInteractions; | ||
import static org.mockito.Mockito.when; | ||
|
||
import com.google.common.util.concurrent.ListenableFuture; | ||
import com.google.common.util.concurrent.SettableFuture; | ||
import com.palantir.tritium.event.DefaultInvocationContext; | ||
import com.palantir.tritium.event.InvocationContext; | ||
import com.palantir.tritium.event.InvocationEventHandler; | ||
import java.lang.reflect.Method; | ||
import java.util.concurrent.CompletableFuture; | ||
import java.util.concurrent.ExecutionException; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.mockito.Mock; | ||
import org.mockito.junit.MockitoJUnitRunner; | ||
|
||
@RunWith(MockitoJUnitRunner.class) | ||
public final class AsyncInvocationEventProxyTest { | ||
private static final String result = "Result"; | ||
|
||
@Mock private AsyncIface delegate; | ||
@Mock private SimpleInvocationEventHandler handler; | ||
private AsyncIface proxy; | ||
|
||
@Before | ||
public void before() { | ||
proxy = Instrumentation.builder(AsyncIface.class, delegate) | ||
.withHandler(handler) | ||
.build(); | ||
when(handler.isEnabled()).thenCallRealMethod(); | ||
when(handler.preInvocation(any(), any(), any())).thenCallRealMethod(); | ||
when(handler.asyncSupport()).thenReturn(true); | ||
} | ||
|
||
@Test | ||
public void testCfSuccess() throws ExecutionException, InterruptedException { | ||
CompletableFuture<String> future = new CompletableFuture<>(); | ||
when(delegate.cf()).thenReturn(future); | ||
|
||
CompletableFuture<String> ret = proxy.cf(); | ||
assertThat(ret.isDone()).isFalse(); | ||
verify(handler, never()).onSuccess(any(), any()); | ||
|
||
future.complete(result); | ||
assertThat(ret.get()).isEqualTo(result); | ||
verify(handler).onSuccess(any(), eq(result)); | ||
} | ||
|
||
@Test | ||
public void testCfThrows() { | ||
RuntimeException exception = new RuntimeException(); | ||
CompletableFuture<String> future = new CompletableFuture<>(); | ||
when(delegate.cf()).thenReturn(future); | ||
|
||
CompletableFuture<String> ret = proxy.cf(); | ||
assertThat(ret.isDone()).isFalse(); | ||
verify(handler, never()).onSuccess(any(), any()); | ||
|
||
future.completeExceptionally(exception); | ||
assertThat(ret.isCompletedExceptionally()).isTrue(); | ||
verify(handler).onFailure(any(), eq(exception)); | ||
} | ||
|
||
@Test | ||
public void testCf_noAsyncSupport() { | ||
when(handler.asyncSupport()).thenReturn(false); | ||
|
||
proxy.cf(); | ||
|
||
verify(handler).isEnabled(); | ||
verify(handler).asyncSupport(); | ||
verifyNoMoreInteractions(handler); | ||
} | ||
|
||
@Test | ||
public void testLfSuccess() { | ||
SettableFuture<String> future = SettableFuture.create(); | ||
when(delegate.lf()).thenReturn(future); | ||
|
||
ListenableFuture<String> ret = proxy.lf(); | ||
assertThat(ret.isDone()).isFalse(); | ||
verify(handler, never()).onSuccess(any(), any()); | ||
|
||
future.set(result); | ||
assertThat(ret.isDone()).isTrue(); | ||
verify(handler).onSuccess(any(), eq(result)); | ||
} | ||
|
||
@Test | ||
public void testLfThrows() { | ||
RuntimeException exception = new RuntimeException(); | ||
SettableFuture<String> future = SettableFuture.create(); | ||
when(delegate.lf()).thenReturn(future); | ||
|
||
ListenableFuture<String> ret = proxy.lf(); | ||
assertThat(ret.isDone()).isFalse(); | ||
verify(handler, never()).onFailure(any(), any()); | ||
|
||
future.setException(exception); | ||
assertThat(ret.isDone()).isTrue(); | ||
verify(handler).onFailure(any(), eq(exception)); | ||
} | ||
|
||
@Test | ||
public void testLf_noAsyncSupport() { | ||
when(handler.asyncSupport()).thenReturn(false); | ||
|
||
proxy.lf(); | ||
|
||
verify(handler).isEnabled(); | ||
verify(handler).asyncSupport(); | ||
verifyNoMoreInteractions(handler); | ||
} | ||
|
||
interface AsyncIface { | ||
CompletableFuture<String> cf(); | ||
|
||
ListenableFuture<String> lf(); | ||
} | ||
|
||
interface SimpleInvocationEventHandler extends InvocationEventHandler<InvocationContext> { | ||
@Override | ||
default boolean isEnabled() { | ||
return true; | ||
} | ||
|
||
@Override | ||
default InvocationContext preInvocation(Object instance, Method method, Object[] args) { | ||
return DefaultInvocationContext.of(instance, method, args); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tritium bundles all handlers together using the composite handler, I think this will disable async support if the tracing handler is enabled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I not sure CompositeInvocationEventHandler is the right abstraction for InvocationEventProxy any longer given this change.