-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extend the set of Vert.x metrics reported in
quarkus-micrometer: - Added Vert.x client metrics (as close as possible to the pool metrics) - Added TCP (Net) client metrics - Added TCP (Net) server metrics - Added UDP metrics - Added event bus metrics - Added HTTP client metrics - Do not monitor the REST client as it's already tracked using a Rest client filter - Configure the metric names of various Vert.x clients to get the data collected correctly - this include reactive DB drivers, redis... - Tags and metrics names are aligned with the existing ones
- Loading branch information
1 parent
495bb13
commit e49c264
Showing
27 changed files
with
1,572 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...yment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxEventBusMetricsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
package io.quarkus.micrometer.deployment.binder; | ||
|
||
import javax.inject.Inject; | ||
|
||
import org.junit.jupiter.api.Assertions; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
||
import io.micrometer.core.instrument.Metrics; | ||
import io.micrometer.core.instrument.search.Search; | ||
import io.quarkus.test.QuarkusUnitTest; | ||
import io.vertx.mutiny.core.Vertx; | ||
|
||
public class VertxEventBusMetricsTest { | ||
|
||
@RegisterExtension | ||
static final QuarkusUnitTest config = new QuarkusUnitTest() | ||
.withConfigurationResource("test-logging.properties") | ||
.overrideConfigKey("quarkus.redis.devservices.enabled", "false") | ||
.withEmptyApplication(); | ||
|
||
@Inject | ||
Vertx vertx; | ||
|
||
private Search getMeter(String name, String address) { | ||
return Metrics.globalRegistry.find(name).tags("address", address); | ||
} | ||
|
||
@Test | ||
void testEventBusMetrics() { | ||
var bus = vertx.eventBus(); | ||
bus.consumer("address").handler(m -> { | ||
// ignored | ||
}); | ||
bus.consumer("address").handler(m -> { | ||
// ignored | ||
}); | ||
bus.<String> consumer("rpc").handler(m -> m.reply(m.body().toUpperCase())); | ||
|
||
bus.send("address", "a"); | ||
bus.publish("address", "b"); | ||
String resp = bus.<String> requestAndAwait("rpc", "hello").body(); | ||
Assertions.assertEquals("HELLO", resp); | ||
|
||
Assertions.assertEquals(1, getMeter("eventBus.sent", "address").counter().count()); | ||
Assertions.assertEquals(1, getMeter("eventBus.sent", "rpc").counter().count()); | ||
Assertions.assertEquals(1, getMeter("eventBus.published", "address").counter().count()); | ||
|
||
Assertions.assertEquals(2, getMeter("eventBus.handlers", "address").gauge().value()); | ||
Assertions.assertEquals(1, getMeter("eventBus.handlers", "rpc").gauge().value()); | ||
|
||
Assertions.assertEquals(0, getMeter("eventBus.discarded", "address").gauge().value()); | ||
Assertions.assertEquals(0, getMeter("eventBus.discarded", "rpc").gauge().value()); | ||
|
||
Assertions.assertEquals(3, getMeter("eventBus.delivered", "address").gauge().value()); | ||
Assertions.assertEquals(1, getMeter("eventBus.delivered", "rpc").gauge().value()); | ||
} | ||
|
||
} |
210 changes: 210 additions & 0 deletions
210
...ent/src/test/java/io/quarkus/micrometer/deployment/binder/VertxHttpClientMetricsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,210 @@ | ||
package io.quarkus.micrometer.deployment.binder; | ||
|
||
import static org.awaitility.Awaitility.await; | ||
|
||
import java.time.Duration; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
import javax.annotation.PostConstruct; | ||
import javax.annotation.PreDestroy; | ||
import javax.enterprise.context.ApplicationScoped; | ||
import javax.inject.Inject; | ||
|
||
import org.junit.jupiter.api.Assertions; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
||
import io.micrometer.core.instrument.Metrics; | ||
import io.micrometer.core.instrument.search.Search; | ||
import io.quarkus.micrometer.test.Util; | ||
import io.quarkus.test.QuarkusUnitTest; | ||
import io.vertx.core.http.HttpClientOptions; | ||
import io.vertx.ext.web.client.WebClientOptions; | ||
import io.vertx.mutiny.core.Vertx; | ||
import io.vertx.mutiny.core.buffer.Buffer; | ||
import io.vertx.mutiny.core.http.HttpServer; | ||
import io.vertx.mutiny.core.http.WebSocket; | ||
import io.vertx.mutiny.ext.web.Router; | ||
import io.vertx.mutiny.ext.web.client.HttpResponse; | ||
import io.vertx.mutiny.ext.web.client.WebClient; | ||
import io.vertx.mutiny.ext.web.handler.BodyHandler; | ||
|
||
public class VertxHttpClientMetricsTest { | ||
|
||
@RegisterExtension | ||
static final QuarkusUnitTest config = new QuarkusUnitTest() | ||
.withConfigurationResource("test-logging.properties") | ||
.overrideConfigKey("quarkus.redis.devservices.enabled", "false") | ||
.withApplicationRoot((jar) -> jar | ||
.addClasses(App.class, HttpClient.class, WsClient.class, Util.class)); | ||
|
||
@Inject | ||
HttpClient client; | ||
|
||
@Inject | ||
App server; | ||
|
||
@Inject | ||
WsClient ws; | ||
|
||
private Search getMeter(String name) { | ||
return Metrics.globalRegistry.find(name); | ||
} | ||
|
||
@Test | ||
void testWebClientMetrics() { | ||
server.start(); | ||
client.init(); | ||
|
||
// If the WS test runs before, some data was already written | ||
double sizeBefore = 0; | ||
if (getMeter("http.client.bytes.written").summary() != null) { | ||
sizeBefore = Metrics.globalRegistry.find("http.client.bytes.written") | ||
.tag("clientName", "my-client") | ||
.summary().totalAmount(); | ||
} | ||
|
||
try { | ||
Assertions.assertEquals("ok", client.get()); | ||
Assertions.assertEquals("HELLO", client.post("hello")); | ||
|
||
Assertions.assertNotNull(getMeter("http.client.connections").longTaskTimer()); | ||
|
||
// Body sizes | ||
double expectedBytesWritten = sizeBefore + 5; | ||
await().untilAsserted( | ||
() -> Assertions.assertEquals(expectedBytesWritten, | ||
Metrics.globalRegistry.find("http.client.bytes.written") | ||
.tag("clientName", "my-client").summary().totalAmount())); | ||
await().untilAsserted(() -> Assertions.assertEquals(7, | ||
Metrics.globalRegistry.find("http.client.bytes.read") | ||
.tag("clientName", "my-client").summary().totalAmount())); | ||
|
||
await().until(() -> getMeter("http.client.requests").timer().totalTime(TimeUnit.NANOSECONDS) > 0); | ||
await().until(() -> { | ||
// Because of the different tag, the timer got called a single time | ||
return getMeter("http.client.requests").timer().count() == 1; | ||
}); | ||
|
||
Assertions.assertEquals(1, Metrics.globalRegistry.find("http.client.requests") | ||
.tag("uri", "root") | ||
.tag("outcome", "SUCCESS").timers().size(), | ||
Util.foundClientRequests(Metrics.globalRegistry, "/ with tag outcome=SUCCESS.")); | ||
|
||
// Queue | ||
Assertions.assertEquals(2, Metrics.globalRegistry.find("http.client.queue.delay") | ||
.tag("clientName", "my-client").timer().count()); | ||
Assertions.assertTrue(Metrics.globalRegistry.find("http.client.queue.delay") | ||
.tag("clientName", "my-client").timer().totalTime(TimeUnit.NANOSECONDS) > 0); | ||
|
||
await().until(() -> getMeter("http.client.queue.size").gauge().value() == 0.0); | ||
} finally { | ||
server.stop(); | ||
} | ||
} | ||
|
||
@Test | ||
void testWebSocket() { | ||
server.start(); | ||
try { | ||
ws.send("hello"); | ||
ws.send("how are you?"); | ||
Assertions.assertNotNull(getMeter("http.client.websocket.connections").gauge()); | ||
} finally { | ||
server.stop(); | ||
} | ||
} | ||
|
||
@ApplicationScoped | ||
static class App { | ||
|
||
@Inject | ||
Vertx vertx; | ||
private HttpServer server; | ||
|
||
public void start() { | ||
Router router = Router.router(vertx); | ||
router.route().handler(BodyHandler.create()); | ||
router.get().handler(rc -> rc.endAndForget("ok")); | ||
router.post("/post") | ||
.handler(rc -> rc.response().endAndForget(rc.body().asString().toUpperCase())); | ||
server = vertx.createHttpServer() | ||
.requestHandler(req -> { | ||
if (!req.path().endsWith("/ws")) { | ||
router.handle(req); | ||
} else { | ||
req.toWebSocket() | ||
.subscribe().with(socket -> { | ||
socket.handler(buffer -> { | ||
socket.writeAndForget(Buffer.buffer(buffer.toString().toUpperCase())); | ||
}); | ||
}); | ||
} | ||
}) | ||
.listenAndAwait(8888); | ||
} | ||
|
||
public void stop() { | ||
server.closeAndAwait(); | ||
} | ||
|
||
} | ||
|
||
@ApplicationScoped | ||
static class WsClient { | ||
@Inject | ||
Vertx vertx; | ||
private WebSocket client; | ||
|
||
@PostConstruct | ||
public void init() { | ||
client = vertx.createHttpClient(new HttpClientOptions().setShared(false) | ||
.setMetricsName("ws")).webSocket(8888, "localhost", "/ws") | ||
.await().indefinitely(); | ||
client.handler(b -> { | ||
// Do nothing | ||
}); | ||
} | ||
|
||
public void send(String s) { | ||
client.writeAndAwait(Buffer.buffer(s)); | ||
} | ||
|
||
@PreDestroy | ||
public void cleanup() { | ||
client.close(); | ||
} | ||
} | ||
|
||
@ApplicationScoped | ||
static class HttpClient { | ||
@Inject | ||
Vertx vertx; | ||
private WebClient client; | ||
|
||
public void init() { | ||
client = WebClient.create(vertx, new WebClientOptions() | ||
.setMetricsName("http-client|my-client")); | ||
} | ||
|
||
public String get() { | ||
return client.getAbs("http://localhost:8888/") | ||
.send() | ||
.map(HttpResponse::bodyAsString) | ||
.await().atMost(Duration.ofSeconds(10)); | ||
} | ||
|
||
public String post(String payload) { | ||
return client.postAbs("http://localhost:8888/post") | ||
.sendBuffer(Buffer.buffer(payload)) | ||
.map(HttpResponse::bodyAsString) | ||
.await().atMost(Duration.ofSeconds(10)); | ||
} | ||
|
||
@PreDestroy | ||
public void cleanup() { | ||
client.close(); | ||
} | ||
} | ||
|
||
} |
Oops, something went wrong.