Skip to content
This repository was archived by the owner on Jan 3, 2019. It is now read-only.

Commit bb49801

Browse files
author
Adrian Cole
committed
Updates to support http template parsing
1 parent 07f7e18 commit bb49801

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
version=2.3.1-SNAPSHOT
22

3-
braveVersion=4.15.1
3+
braveVersion=4.15.2-SNAPSHOT
44
ratpackVersion=1.4.6

src/main/java/ratpack/zipkin/internal/ServerHttpAdapter.java

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ratpack.zipkin.internal;
22

33
import com.google.common.net.HttpHeaders;
4+
import ratpack.path.PathBinding;
45
import ratpack.zipkin.ServerRequest;
56
import ratpack.zipkin.ServerResponse;
67
import zipkin2.Endpoint;
@@ -36,6 +37,10 @@ public boolean parseClientAddress(final ServerRequest serverRequest,
3637
return request.getHeaders().get(name);
3738
}
3839

40+
@Override public String template(ServerResponse response) {
41+
return response.pathBinding().map(PathBinding::getDescription).orElse(null);
42+
}
43+
3944
@Override public Integer statusCode(ServerResponse response) {
4045
return response.getStatus().getCode();
4146
}

src/test/java/brave/http/ITServerTracingModule.java

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ protected void init() throws Exception {
3131
httpTracing.tracing().tracer().nextSpan().name("child").start().finish();
3232
ctx.getResponse().send("happy");
3333
})
34+
.get("/items/:itemId", ctx ->
35+
ctx.getResponse().send(ctx.getPathTokens().get("itemId"))
36+
)
3437
.get("/extra", ctx -> ctx.getResponse().send("joey"))
3538
.get("/exception", ctx -> {
3639
throw new IOException();

0 commit comments

Comments
 (0)