Skip to content

Metrics: collect metrics after the response is complete #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jknack merged 1 commit into from
May 31, 2018
+21 −10
Merged

Metrics: collect metrics after the response is complete #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions modules/jooby-metrics/src/main/java/org/jooby/metrics/InstrumentedHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@
import org.jooby.Request;
import org.jooby.Response;
import org.jooby.Route;
import org.jooby.Route.Chain;
import org.jooby.Status;

import com.codahale.metrics.Counter;
Expand All @@ -220,22 +219,22 @@
* @author edgar
* @since 0.13.0
*/
public class InstrumentedHandler implements Route.Filter {
public class InstrumentedHandler implements Route.Handler {

@Override
public void handle(final Request req, final Response rsp, final Chain chain) throws Throwable {
public void handle(final Request req, final Response rsp) throws Throwable {
MetricRegistry registry = req.require(MetricRegistry.class);
Counter counter = registry.counter("request.actives");
Timer.Context timer = registry.timer("request").time();
try {
counter.inc();
chain.next(req, rsp);
} finally {

counter.inc();

rsp.complete((ereq, ersp, x) -> {
timer.stop();
counter.dec();
Meter meter = registry.meter("responses." + rsp.status().orElse(Status.OK).value());
meter.mark();
}
});
}

}
16 changes: 14 additions & 2 deletions modules/jooby-metrics/src/test/java/org/jooby/metrics/InstrumentedHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@

public class InstrumentedHandlerTest {

private Block capture = unit -> {
Response rsp = unit.get(Response.class);
rsp.complete(unit.capture(Route.Complete.class));
};

private Block onComplete = unit -> {
unit.captured(Route.Complete.class).iterator().next()
.handle(unit.get(Request.class), unit.get(Response.class), Optional.empty());
};

private Block registry = unit -> {
Request request = unit.get(Request.class);
expect(request.require(MetricRegistry.class))
Expand Down Expand Up @@ -80,12 +90,13 @@ public void instrument() throws Exception {
.expect(registry)
.expect(counter)
.expect(timer)
.expect(capture)
.expect(meter)
.expect(next)
.run(unit -> {
new InstrumentedHandler().handle(unit.get(Request.class), unit.get(Response.class),
unit.get(Route.Chain.class));
});
}, onComplete);
}

@Test(expected = IOException.class)
Expand All @@ -94,12 +105,13 @@ public void instrumentWithErr() throws Exception {
.expect(registry)
.expect(counter)
.expect(timer)
.expect(capture)
.expect(meter)
.expect(nextErr)
.run(unit -> {
new InstrumentedHandler().handle(unit.get(Request.class), unit.get(Response.class),
unit.get(Route.Chain.class));
});
}, onComplete);
}

}