diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-01-31 12:55:59 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-01-31 13:32:35 +0100 |
| commit | ec7fb945b9cbc0bbd3298f89e7413a27f4b13390 (patch) | |
| tree | 9663cd801abc49b292fd0e7eea614144ae634c7e /vespa-http-client/src | |
| parent | 1f6a79f2ccf12e4b1a476591409cda3de8ac96a7 (diff) | |
Add client version as header to all http requests
Diffstat (limited to 'vespa-http-client/src')
2 files changed, 5 insertions, 1 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Headers.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Headers.java index 3791ddc5462..e62e46beaf4 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Headers.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/Headers.java @@ -11,6 +11,8 @@ public final class Headers { private Headers() { } + public static final String CLIENT_VERSION = "Vespa-Http-Client-Version"; + public static final String TIMEOUT = "X-Yahoo-Feed-Timeout"; public static final String DRAIN = "X-Yahoo-Feed-Drain"; public static final String ROUTE = "X-Yahoo-Feed-Route"; diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java index 57007743b1b..fd228fb99c5 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java @@ -26,6 +26,7 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.entity.InputStreamEntity; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.apache.http.message.BasicHeader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -411,7 +412,8 @@ class ApacheGatewayConnection implements GatewayConnection { clientBuilder.setConnectionManager(connMgr); } - clientBuilder.setUserAgent(String.format("vespa-http-client (%s)", Vtag.currentVersion)); + clientBuilder.setUserAgent(String.format("vespa-http-client (%s)", Vtag.currentVersion.toFullString())); + clientBuilder.setDefaultHeaders(List.of(new BasicHeader(Headers.CLIENT_VERSION, Vtag.currentVersion.toFullString()))); clientBuilder.setMaxConnPerRoute(1); clientBuilder.setMaxConnTotal(1); clientBuilder.disableContentCompression(); |