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

Rename unused try-with-resources scope variables (#3201)

This commit is contained in:
Trask Stalnaker 2021-06-06 19:41:50 -07:00 committed by GitHub
parent cefaecab3f
commit f9dcd03b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/Worker.java
View File

@ -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");

10
benchmark-integration/jetty-perftest/src/main/java/io/opentelemetry/perftest/jetty/JettyPerftest.java
View File

@ -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);
}

6
instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java
View File

@ -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();
}
}

8
instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java
View File

@ -29,28 +29,28 @@ public class SubscriberWrapper implements Subscriber<Object> {
@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();
}
}

4
instrumentation/play-ws/play-ws-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/v1_0/AsyncHandlerWrapper.java
View File

@ -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);
}
}

2
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TracedDelegatingConsumer.java
View File

@ -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);

4
instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/AdviceUtils.java
View File

@ -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);
}
}

2
instrumentation/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/ExceptionHandlerWrapper.java
View File

@ -36,7 +36,7 @@ public class ExceptionHandlerWrapper implements Handler<Throwable> {
tracer().endExceptionally(contexts.context, throwable);
try (Scope scope = contexts.parentContext.makeCurrent()) {
try (Scope ignored = contexts.parentContext.makeCurrent()) {
callHandler(throwable);
}
}