From d28f0d3d3f704ba01fd24293a700d6529f348e84 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 15 Sep 2021 09:42:18 -0700 Subject: [PATCH] Remove unneeded catch blocks (#4130) * Remove unneeded catch blocks * Update test! --- .../instrumentation/grpc/v1_6/TracingClientInterceptor.java | 6 ------ .../instrumentation/grpc/v1_6/AbstractGrpcTest.groovy | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java index 7a1bae0864..e7aa0e0660 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java @@ -147,9 +147,6 @@ final class TracingClientInterceptor implements ClientInterceptor { span.addEvent("message", attributes); try (Scope ignored = context.makeCurrent()) { 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() { try (Scope ignored = context.makeCurrent()) { delegate().onReady(); - } catch (Throwable e) { - instrumenter.end(context, request, null, e); - throw e; } } } diff --git a/instrumentation/grpc-1.6/testing/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.groovy b/instrumentation/grpc-1.6/testing/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.groovy index f9345e5119..95156b1cfe 100644 --- a/instrumentation/grpc-1.6/testing/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.groovy +++ b/instrumentation/grpc-1.6/testing/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.groovy @@ -870,6 +870,7 @@ abstract class AbstractGrpcTest extends InstrumentationSpecification { "${SemanticAttributes.RPC_SERVICE.key}" "example.Greeter" "${SemanticAttributes.RPC_METHOD.key}" "SayHello" "${SemanticAttributes.NET_TRANSPORT.key}" SemanticAttributes.NetTransportValues.IP_TCP + "${SemanticAttributes.RPC_GRPC_STATUS_CODE.key}" Status.CANCELLED.code.value() } } span(2) {