12167: Pass request ID via keepclient instead of custom code.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index c2bf6bc32c792ff309a25454ada5001c551bacd8..7baadab9b9356c3e7d5360e75506d90b7dd74c0d 100644 (file)
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -622,13 +622,13 @@ func (h *proxyHandler) Index(resp http.ResponseWriter, req *http.Request) {
 
 func (h *proxyHandler) makeKeepClient(req *http.Request) *keepclient.KeepClient {
        kc := *h.KeepClient
+       kc.RequestID = req.Header.Get("X-Request-Id")
        kc.HTTPClient = &proxyClient{
                client: &http.Client{
                        Timeout:   h.timeout,
                        Transport: h.transport,
                },
-               proto:     req.Proto,
-               requestID: req.Header.Get("X-Request-Id"),
+               proto: req.Proto,
        }
        return &kc
 }

diff --git a/services/keepproxy/proxy_client.go b/services/keepproxy/proxy_client.go
index 06dfa1c0adc3a56575f7761c7c2ebecfe6c147a7..0faf4aea0e3c35354e30dc33f1e7005d491ab4d5 100644 (file)
--- a/services/keepproxy/proxy_client.go
+++ b/services/keepproxy/proxy_client.go
@@ -13,13 +13,11 @@ import (
 var viaAlias = "keepproxy"
 
 type proxyClient struct {
-       client    keepclient.HTTPClient
-       proto     string
-       requestID string
+       client keepclient.HTTPClient
+       proto  string
 }
 
 func (pc *proxyClient) Do(req *http.Request) (*http.Response, error) {
        req.Header.Add("Via", pc.proto+" "+viaAlias)
-       req.Header.Set("X-Request-Id", pc.requestID)
        return pc.client.Do(req)
 }