diff options
| author | Jon Bratseth <bratseth@oath.com> | 2020-09-15 10:01:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 10:01:05 +0200 |
| commit | 37e49b902cf1c7c64c1e07094ec2924fbc6cd6a6 (patch) | |
| tree | cd1126015150768fca02562186557d2bb8f50039 /container-core | |
| parent | 16f823ce2060f4220425f2e4008d507b75cb3bad (diff) | |
| parent | b445f59b10b5f02e0209611ced663f290cf19cbb (diff) | |
Merge pull request #14393 from vespa-engine/bratseth/request-type-test
Test request statistics
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java | 6 | ||||
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java index dd03d72d97d..a6042c541c0 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java @@ -27,8 +27,6 @@ public abstract class HttpResponse { private final Response parentResponse; - private Request.RequestType requestType; - /** * Creates a new HTTP response * @@ -126,12 +124,12 @@ public abstract class HttpResponse { } /** Sets the type classification of this request for metric collection purposes */ - public void setRequestType(Request.RequestType requestType) { this.requestType = requestType; } + public void setRequestType(Request.RequestType requestType) { parentResponse.setRequestType(requestType); } /** * Returns the type classification of this request for metric collection purposes, or null if not set. * When not set, the request type will be "read" for GET requests and "write" for other request methods. */ - public Request.RequestType getRequestType() { return requestType; } + public Request.RequestType getRequestType() { return parentResponse.getRequestType(); } } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index ac1aa533201..3a99ee7d0c6 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -78,7 +78,6 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler try { channel = new LazyContentChannel(httpRequest, responseHandler, metric, log); HttpResponse httpResponse = handle(httpRequest, channel); - request.setRequestType(httpResponse.getRequestType()); channel.setHttpResponse(httpResponse); // may or may not have already been done render(httpRequest, httpResponse, channel, jdiscRequest.creationTime(TimeUnit.MILLISECONDS)); } catch (Exception e) { |