You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/01/05 17:37:17 UTC
lucene-solr:branch_6x: SOLR-9877: Unwrap the
EntityEnclosingRequestWrapper to get the right URI which has host/port
information
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 9bf72748b -> fd2c8cb12
SOLR-9877: Unwrap the EntityEnclosingRequestWrapper to get the right URI which has host/port information
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fd2c8cb1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fd2c8cb1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fd2c8cb1
Branch: refs/heads/branch_6x
Commit: fd2c8cb125c1955940bd33f19ee06b4230f38a36
Parents: 9bf7274
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Jan 5 23:07:08 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Jan 5 23:07:08 2017 +0530
----------------------------------------------------------------------
.../util/stats/InstrumentedHttpRequestExecutor.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fd2c8cb1/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java
index 91ddd8a..54a6e73 100644
--- a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java
+++ b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java
@@ -28,8 +28,8 @@ import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.RequestLine;
-import org.apache.http.client.methods.HttpRequestWrapper;
import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.EntityEnclosingRequestWrapper;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.solr.metrics.SolrMetricManager;
@@ -74,14 +74,15 @@ public class InstrumentedHttpRequestExecutor extends HttpRequestExecutor impleme
private String getNameFor(HttpRequest request) {
try {
- final RequestLine requestLine = request.getRequestLine();
- String schemeHostPort = null;
- if (request instanceof HttpRequestWrapper) {
- HttpRequestWrapper wrapper = (HttpRequestWrapper) request;
- schemeHostPort = wrapper.getTarget().getSchemeName() + "://" + wrapper.getTarget().getHostName() + ":" + wrapper.getTarget().getPort();
+ RequestLine requestLine = request.getRequestLine();
+ if (request instanceof EntityEnclosingRequestWrapper) {
+ EntityEnclosingRequestWrapper wrapper = (EntityEnclosingRequestWrapper) request;
+ if (wrapper.getOriginal() != null) {
+ requestLine = wrapper.getOriginal().getRequestLine();
+ }
}
final URIBuilder url = new URIBuilder(requestLine.getUri());
- return SolrMetricManager.mkName((schemeHostPort != null ? schemeHostPort : "") + url.removeQuery().build().toString() + "." + methodNameString(request), scope);
+ return SolrMetricManager.mkName(url.removeQuery().build().toString() + "." + methodNameString(request), scope);
} catch (URISyntaxException e) {
throw new IllegalArgumentException(e);
}