diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/test/java/org/skywalking/apm/plugin/grpc/v1/ClientCallStartInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/test/java/org/skywalking/apm/plugin/grpc/v1/ClientCallStartInterceptorTest.java index fd04dc72442da6a73805f987f65b070ee606824e..a266a110e1fc7e9b583f4fb63d03bae1dd27ba08 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/test/java/org/skywalking/apm/plugin/grpc/v1/ClientCallStartInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/test/java/org/skywalking/apm/plugin/grpc/v1/ClientCallStartInterceptorTest.java @@ -21,6 +21,7 @@ package org.skywalking.apm.plugin.grpc.v1; import io.grpc.Metadata; import io.grpc.MethodDescriptor; import io.grpc.Status; +import io.grpc.StatusRuntimeException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -99,7 +100,7 @@ public class ClientCallStartInterceptorTest { clientCallStartInterceptor.beforeMethod(clientCallImpl, null, arguments, argumentTypes, null); clientCallStartInterceptor.afterMethod(clientCallImpl, null, arguments, argumentTypes, null); - unaryClientOnCloseInterceptor.afterMethod(null, null, new Object[] {Status.OK}, null, null); + unaryClientOnCloseInterceptor.afterMethod(null, null, new Object[] {Status.OK, new Metadata()}, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); @@ -116,7 +117,7 @@ public class ClientCallStartInterceptorTest { clientCallStartInterceptor.beforeMethod(clientCallImpl, null, arguments, argumentTypes, null); clientCallStartInterceptor.afterMethod(clientCallImpl, null, arguments, argumentTypes, null); - unaryClientOnCloseInterceptor.afterMethod(null, null, new Object[] {exceptionStatus}, null, null); + unaryClientOnCloseInterceptor.afterMethod(null, null, new Object[] {exceptionStatus, new Metadata()}, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); @@ -125,7 +126,7 @@ public class ClientCallStartInterceptorTest { SpanAssert.assertComponent(abstractTracingSpan, ComponentsDefine.GRPC); SpanAssert.assertLayer(abstractTracingSpan, SpanLayer.RPC_FRAMEWORK); SpanAssert.assertOccurException(abstractTracingSpan, true); - SpanAssert.assertException(SpanHelper.getLogs(abstractTracingSpan).get(0), RuntimeException.class); + SpanAssert.assertException(SpanHelper.getLogs(abstractTracingSpan).get(0), StatusRuntimeException.class, "NOT_FOUND"); } @Test diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/test/java/org/skywalking/apm/plugin/grpc/v1/ServerCallHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/test/java/org/skywalking/apm/plugin/grpc/v1/ServerCallHandlerInterceptorTest.java index de82469d1c9eafce92d1c7a5f87aec9b808257f9..e25f77cae6d2b573a0443ec8e5d2c83234d1b3c7 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/test/java/org/skywalking/apm/plugin/grpc/v1/ServerCallHandlerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/test/java/org/skywalking/apm/plugin/grpc/v1/ServerCallHandlerInterceptorTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mock; +import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -34,6 +35,7 @@ import static org.mockito.Mockito.verify; import static org.powermock.api.mockito.PowerMockito.when; @RunWith(PowerMockRunner.class) +@PrepareForTest(MethodDescriptor.class) public class ServerCallHandlerInterceptorTest { @Mock private EnhancedInstance enhancedInstance;