open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded catch blocks (#4130) 

* Remove unneeded catch blocks

* Update test!
This commit is contained in:
Trask Stalnaker 2021-09-15 09:42:18 -07:00 committed by GitHub
parent b8391b1354
commit d28f0d3d3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java
View File

@ -147,9 +147,6 @@ final class TracingClientInterceptor implements ClientInterceptor {
span.addEvent("message", attributes); span.addEvent("message", attributes);
try (Scope ignored = context.makeCurrent()) { try (Scope ignored = context.makeCurrent()) {
delegate().onMessage(message); delegate().onMessage(message);
} catch (Throwable e) {
instrumenter.end(context, request, null, e);
throw e;
} }
} }
@ -165,9 +162,6 @@ final class TracingClientInterceptor implements ClientInterceptor {
public void onReady() { public void onReady() {
try (Scope ignored = context.makeCurrent()) { try (Scope ignored = context.makeCurrent()) {
delegate().onReady(); delegate().onReady();
} catch (Throwable e) {
instrumenter.end(context, request, null, e);
throw e;
} }
} }
} }

1
instrumentation/grpc-1.6/testing/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.groovy
View File

@ -870,6 +870,7 @@ abstract class AbstractGrpcTest extends InstrumentationSpecification {
"${SemanticAttributes.RPC_SERVICE.key}" "example.Greeter" "${SemanticAttributes.RPC_SERVICE.key}" "example.Greeter"
"${SemanticAttributes.RPC_METHOD.key}" "SayHello" "${SemanticAttributes.RPC_METHOD.key}" "SayHello"
"${SemanticAttributes.NET_TRANSPORT.key}" SemanticAttributes.NetTransportValues.IP_TCP "${SemanticAttributes.NET_TRANSPORT.key}" SemanticAttributes.NetTransportValues.IP_TCP
"${SemanticAttributes.RPC_GRPC_STATUS_CODE.key}" Status.CANCELLED.code.value()
} }
} }
span(2) { span(2) {