Skip to content

Commit 4d87435

Browse files
otelbot[bot]otelbot[bot]
authored
Code review sweep (run 24920691237) (open-telemetry#18284)
1 parent f5d1d0d commit 4d87435

16 files changed

Lines changed: 110 additions & 39 deletions

File tree

‎instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/RedisStandaloneConnectionInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static AdviceScope onEnter(
104104
@AssignReturned.ToReturned
105105
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
106106
public static Future<Response> onExit(
107-
@Advice.Thrown Throwable throwable,
107+
@Advice.Thrown @Nullable Throwable throwable,
108108
@Advice.Return @Nullable Future<Response> responseFuture,
109109
@Advice.Enter @Nullable AdviceScope adviceScope) {
110110

‎instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedisClientTest.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import static org.assertj.core.api.Assertions.assertThat;
2727

2828
import io.opentelemetry.api.trace.SpanKind;
29+
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
2930
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
3031
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
3132
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
@@ -35,7 +36,6 @@
3536
import io.vertx.redis.client.RedisConnection;
3637
import java.net.InetAddress;
3738
import java.util.concurrent.CompletableFuture;
38-
import org.junit.jupiter.api.AfterAll;
3939
import org.junit.jupiter.api.BeforeAll;
4040
import org.junit.jupiter.api.Test;
4141
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -45,6 +45,9 @@ class VertxRedisClientTest {
4545
@RegisterExtension
4646
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
4747

48+
@RegisterExtension
49+
private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
50+
4851
private static final GenericContainer<?> redisServer =
4952
new GenericContainer<>("redis:6.2.3-alpine").withExposedPorts(6379);
5053
private static String host;
@@ -57,24 +60,20 @@ class VertxRedisClientTest {
5760
@BeforeAll
5861
static void setup() throws Exception {
5962
redisServer.start();
63+
cleanup.deferAfterAll(redisServer::stop);
6064

6165
host = redisServer.getHost();
6266
ip = InetAddress.getByName(host).getHostAddress();
6367
port = redisServer.getMappedPort(6379);
6468

6569
vertx = Vertx.vertx();
70+
cleanup.deferAfterAll(vertx::close);
6671
client = Redis.createClient(vertx, "redis://" + host + ":" + port + "/1");
72+
cleanup.deferAfterAll(client::close);
6773
RedisConnection connection =
6874
client.connect().toCompletionStage().toCompletableFuture().get(30, SECONDS);
6975
redis = RedisAPI.api(connection);
70-
}
71-
72-
@AfterAll
73-
static void cleanup() {
74-
redis.close();
75-
client.close();
76-
vertx.close();
77-
redisServer.stop();
76+
cleanup.deferAfterAll(redis::close);
7877
}
7978

8079
@Test

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxReactivePropagationTest.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import java.util.concurrent.Executors;
6262
import java.util.concurrent.TimeoutException;
6363
import java.util.function.Consumer;
64-
import org.junit.jupiter.api.AfterAll;
6564
import org.junit.jupiter.api.BeforeAll;
6665
import org.junit.jupiter.api.Test;
6766
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -80,14 +79,10 @@ class VertxReactivePropagationTest {
8079
static void setUp() throws ExecutionException, InterruptedException, TimeoutException {
8180
port = PortUtils.findOpenPort();
8281
server = VertxReactiveWebServer.start(port);
82+
cleanup.deferAfterAll(server::close);
8383
client = WebClient.of("h1c://localhost:" + port);
8484
}
8585

86-
@AfterAll
87-
static void cleanUp() {
88-
server.close();
89-
}
90-
9186
// Verifies that context is correctly propagated and sql query span has correct parent.
9287
// Tests io.opentelemetry.javaagent.instrumentation.vertx.rx.v3_5.VertxRxInstrumentation
9388
@SuppressWarnings("deprecation") // uses deprecated db semconv

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxReactiveWebServer.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public static Vertx start(int port)
6969
RuntimeException exception =
7070
new RuntimeException("Cannot deploy server Verticle", res.cause());
7171
future.completeExceptionally(exception);
72+
return;
7273
}
7374
future.complete(null);
7475
});
@@ -95,7 +96,15 @@ public void start(Future<Void> startFuture) {
9596
vertx
9697
.createHttpServer()
9798
.requestHandler(router::accept)
98-
.listen(port, h -> startFuture.complete());
99+
.listen(
100+
port,
101+
httpServerAsyncResult -> {
102+
if (httpServerAsyncResult.failed()) {
103+
startFuture.fail(httpServerAsyncResult.cause());
104+
return;
105+
}
106+
startFuture.complete();
107+
});
99108
},
100109
throwable -> startFuture.fail(throwable));
101110
}

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxRxCircuitBreakerHttpServerTest.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,15 @@ public void start(Future<Void> startFuture) {
8686
vertx
8787
.createHttpServer()
8888
.requestHandler(router::accept)
89-
.listen(port, httpServerAsyncResult -> startFuture.complete());
89+
.listen(
90+
port,
91+
httpServerAsyncResult -> {
92+
if (httpServerAsyncResult.failed()) {
93+
startFuture.fail(httpServerAsyncResult.cause());
94+
return;
95+
}
96+
startFuture.complete();
97+
});
9098
}
9199
}
92100
}

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxRxHttpServerTest.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,15 @@ public void start(Future<Void> startFuture) {
5252
vertx
5353
.createHttpServer()
5454
.requestHandler(router::accept)
55-
.listen(port, httpServerAsyncResult -> startFuture.complete());
55+
.listen(
56+
port,
57+
httpServerAsyncResult -> {
58+
if (httpServerAsyncResult.failed()) {
59+
startFuture.fail(httpServerAsyncResult.cause());
60+
return;
61+
}
62+
startFuture.complete();
63+
});
5664
}
5765
}
5866
}

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/AbstractVertxRxHttpServerTest.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,15 @@ public void start(Promise<Void> startFuture) {
103103
vertx
104104
.createHttpServer()
105105
.requestHandler(router)
106-
.listen(port, httpServerAsyncResult -> startFuture.complete());
106+
.listen(
107+
port,
108+
httpServerAsyncResult -> {
109+
if (httpServerAsyncResult.failed()) {
110+
startFuture.fail(httpServerAsyncResult.cause());
111+
return;
112+
}
113+
startFuture.complete();
114+
});
107115
}
108116
}
109117
}

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxReactivePropagationTest.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import java.util.concurrent.Executors;
6262
import java.util.concurrent.TimeoutException;
6363
import java.util.function.Consumer;
64-
import org.junit.jupiter.api.AfterAll;
6564
import org.junit.jupiter.api.BeforeAll;
6665
import org.junit.jupiter.api.Test;
6766
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -80,14 +79,10 @@ class VertxReactivePropagationTest {
8079
static void setUp() throws ExecutionException, InterruptedException, TimeoutException {
8180
port = PortUtils.findOpenPort();
8281
server = VertxReactiveWebServer.start(port);
82+
cleanup.deferAfterAll(server::close);
8383
client = WebClient.of("h1c://localhost:" + port);
8484
}
8585

86-
@AfterAll
87-
static void cleanUp() {
88-
server.close();
89-
}
90-
9186
// Verifies that context is correctly propagated and sql query span has correct parent.
9287
// Tests io.opentelemetry.javaagent.instrumentation.vertx.rx.v3_5.VertxRxInstrumentation
9388
@SuppressWarnings("deprecation") // uses deprecated db semconv

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxReactiveWebServer.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public static Vertx start(int port)
6969
RuntimeException exception =
7070
new RuntimeException("Cannot deploy server Verticle", res.cause());
7171
future.completeExceptionally(exception);
72+
return;
7273
}
7374
future.complete(null);
7475
});
@@ -95,7 +96,15 @@ public void start(Promise<Void> startPromise) {
9596
vertx
9697
.createHttpServer()
9798
.requestHandler(router)
98-
.listen(port, h -> startPromise.complete());
99+
.listen(
100+
port,
101+
httpServerAsyncResult -> {
102+
if (httpServerAsyncResult.failed()) {
103+
startPromise.fail(httpServerAsyncResult.cause());
104+
return;
105+
}
106+
startPromise.complete();
107+
});
99108
},
100109
throwable -> startPromise.fail(throwable));
101110
}

‎instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxRxCircuitBreakerHttpServerTest.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,15 @@ public void start(Promise<Void> startPromise) {
8686
vertx
8787
.createHttpServer()
8888
.requestHandler(router)
89-
.listen(port, httpServerAsyncResult -> startPromise.complete());
89+
.listen(
90+
port,
91+
httpServerAsyncResult -> {
92+
if (httpServerAsyncResult.failed()) {
93+
startPromise.fail(httpServerAsyncResult.cause());
94+
return;
95+
}
96+
startPromise.complete();
97+
});
9098
}
9199
}
92100
}

0 commit comments

Comments
 (0)