From f9dcd03b4bebeea8f7a9eef33d50f8eee7ae2777 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 6 Jun 2021 19:41:50 -0700 Subject: [PATCH] Rename unused try-with-resources scope variables (#3201) --- .../main/java/io/opentelemetry/perftest/Worker.java | 2 +- .../io/opentelemetry/perftest/jetty/JettyPerftest.java | 10 ++++------ .../ApacheHttpAsyncClientInstrumentation.java | 6 +++--- .../armeria/v1_3/SubscriberWrapper.java | 8 ++++---- .../playws/v1_0/AsyncHandlerWrapper.java | 4 ++-- .../rabbitmq/TracedDelegatingConsumer.java | 2 +- .../spring/webflux/server/AdviceUtils.java | 4 ++-- .../vertx/client/ExceptionHandlerWrapper.java | 2 +- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/Worker.java b/benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/Worker.java index 48ae33ef6f..5696665ad8 100644 --- a/benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/Worker.java +++ b/benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/Worker.java @@ -18,7 +18,7 @@ public final class Worker { /** Simulate work for the give number of milliseconds. */ public static void doWork(long workTimeMillis) { Span span = tracer.spanBuilder("work").startSpan(); - try (Scope scope = span.makeCurrent()) { + try (Scope ignored = span.makeCurrent()) { if (span != null) { span.setAttribute("work-time", workTimeMillis); span.setAttribute("info", "interesting stuff"); diff --git a/benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/jetty/JettyPerftest.java b/benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/jetty/JettyPerftest.java index a816d6fd92..6250c6933c 100644 --- a/benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/jetty/JettyPerftest.java +++ b/benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/jetty/JettyPerftest.java @@ -66,12 +66,10 @@ public final class JettyPerftest { private static void scheduleWork(long workTimeMillis) { Span span = tracer.spanBuilder("work").startSpan(); - try (Scope scope = span.makeCurrent()) { - if (span != null) { - span.setAttribute("work-time", workTimeMillis); - span.setAttribute("info", "interesting stuff"); - span.setAttribute("additionalInfo", "interesting stuff"); - } + try (Scope ignored = span.makeCurrent()) { + span.setAttribute("work-time", workTimeMillis); + span.setAttribute("info", "interesting stuff"); + span.setAttribute("additionalInfo", "interesting stuff"); if (workTimeMillis > 0) { Worker.doWork(workTimeMillis); } diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java index 09f178fe60..33e494f84d 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java @@ -181,7 +181,7 @@ public class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation if (parentContext == null) { completeDelegate(result); } else { - try (Scope scope = parentContext.makeCurrent()) { + try (Scope ignored = parentContext.makeCurrent()) { completeDelegate(result); } } @@ -195,7 +195,7 @@ public class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation if (parentContext == null) { failDelegate(ex); } else { - try (Scope scope = parentContext.makeCurrent()) { + try (Scope ignored = parentContext.makeCurrent()) { failDelegate(ex); } } @@ -209,7 +209,7 @@ public class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation if (parentContext == null) { cancelDelegate(); } else { - try (Scope scope = parentContext.makeCurrent()) { + try (Scope ignored = parentContext.makeCurrent()) { cancelDelegate(); } } diff --git a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java b/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java index a28d33fa7f..ef006aec64 100644 --- a/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java +++ b/instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java @@ -29,28 +29,28 @@ public class SubscriberWrapper implements Subscriber { @Override public void onSubscribe(Subscription subscription) { - try (Scope ignore = context.makeCurrent()) { + try (Scope ignored = context.makeCurrent()) { delegate.onSubscribe(subscription); } } @Override public void onNext(Object o) { - try (Scope ignore = context.makeCurrent()) { + try (Scope ignored = context.makeCurrent()) { delegate.onNext(o); } } @Override public void onError(Throwable throwable) { - try (Scope ignore = context.makeCurrent()) { + try (Scope ignored = context.makeCurrent()) { delegate.onError(throwable); } } @Override public void onComplete() { - try (Scope ignore = context.makeCurrent()) { + try (Scope ignored = context.makeCurrent()) { delegate.onComplete(); } } diff --git a/instrumentation/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/AsyncHandlerWrapper.java b/instrumentation/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/AsyncHandlerWrapper.java index e884bfad97..3f3d810dd5 100644 --- a/instrumentation/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/AsyncHandlerWrapper.java +++ b/instrumentation/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/AsyncHandlerWrapper.java @@ -51,7 +51,7 @@ public class AsyncHandlerWrapper implements AsyncHandler { public Object onCompleted() throws Exception { tracer().end(context, builder.build()); - try (Scope scope = parentContext.makeCurrent()) { + try (Scope ignored = parentContext.makeCurrent()) { return delegate.onCompleted(); } } @@ -60,7 +60,7 @@ public class AsyncHandlerWrapper implements AsyncHandler { public void onThrowable(Throwable throwable) { tracer().endExceptionally(context, throwable); - try (Scope scope = parentContext.makeCurrent()) { + try (Scope ignored = parentContext.makeCurrent()) { delegate.onThrowable(throwable); } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TracedDelegatingConsumer.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TracedDelegatingConsumer.java index 3ffdd95fb7..0caacb43d9 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TracedDelegatingConsumer.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TracedDelegatingConsumer.java @@ -64,7 +64,7 @@ public class TracedDelegatingConsumer implements Consumer { throws IOException { Context context = tracer().startDeliverySpan(queue, envelope, properties, body); - try (Scope scope = context.makeCurrent()) { + try (Scope ignored = context.makeCurrent()) { // Call delegate. delegate.handleDelivery(consumerTag, envelope, properties, body); tracer().end(context); diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/AdviceUtils.java b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/AdviceUtils.java index 79b079820e..9a6f56055d 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/AdviceUtils.java +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/AdviceUtils.java @@ -102,14 +102,14 @@ public class AdviceUtils { @Override public void onSubscribe(Subscription subscription) { this.subscription = subscription; - try (Scope scope = otelContext.makeCurrent()) { + try (Scope ignored = otelContext.makeCurrent()) { subscriber.onSubscribe(this); } } @Override public void onNext(T t) { - try (Scope scope = otelContext.makeCurrent()) { + try (Scope ignored = otelContext.makeCurrent()) { subscriber.onNext(t); } } diff --git a/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java b/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java index a89687d165..e56146efc5 100644 --- a/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java +++ b/instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java @@ -36,7 +36,7 @@ public class ExceptionHandlerWrapper implements Handler { tracer().endExceptionally(contexts.context, throwable); - try (Scope scope = contexts.parentContext.makeCurrent()) { + try (Scope ignored = contexts.parentContext.makeCurrent()) { callHandler(throwable); } }