Merge pull request #36 from kazeburo/use-xid

use xid. xid is good performance

Gopkg.toml

@@ -33,10 +33,6 @@
   name = "github.com/jessevdk/go-flags"
   version = "1.4.0"
 
-[[constraint]]
-  name = "github.com/lestrrat-go/apache-logformat"
-  branch = "master"
-
 [[constraint]]
   name = "github.com/lestrrat-go/file-rotatelogs"
   branch = "master"
@@ -45,18 +41,10 @@
   branch = "master"
   name = "github.com/lestrrat/go-server-starter-listener"
 
-[[constraint]]
-  name = "github.com/renstrom/shortuuid"
-  version = "3.0.1"
-
 [[constraint]]
   name = "github.com/stretchr/testify"
   version = "1.3.0"
 
-[[constraint]]
-  name = "go.mercari.io/go-dnscache"
-  version = "0.1.0"
-
 [[constraint]]
   name = "go.uber.org/zap"
   version = "1.9.1"

proxy/handler.go

@@ -13,7 +13,7 @@ import (
 	"sync"
 
 	"github.com/kazeburo/chocon/upstream"
-	"github.com/renstrom/shortuuid"
+	"github.com/rs/xid"
 	"go.uber.org/zap"
 )
 
@@ -65,7 +65,7 @@ func New(transport *http.RoundTripper, version string, upstream *upstream.Upstre
 func (proxy *Proxy) ServeHTTP(writer http.ResponseWriter, originalRequest *http.Request) {
 	proxyID := originalRequest.Header.Get(proxyIDHeader)
 	if proxyID == "" {
-		proxyID = shortuuid.New()
+		proxyID = xid.New().String()
 		originalRequest.Header.Set(proxyIDHeader, proxyID)
 	}
 	writer.Header().Set(proxyIDHeader, proxyID)
@@ -129,9 +129,8 @@ func (proxy *Proxy) ServeHTTP(writer http.ResponseWriter, originalRequest *http.
 
 	buf := pool.Get().([]byte)
 	defer func() {
-		defer response.Body.Close()
-		// Ensure a response body from upstream will be always closed.
-		defer pool.Put(buf)
+		response.Body.Close()
+		pool.Put(buf)
 	}()
 
 	// Copy all header fields.
@@ -216,13 +215,5 @@ func (proxy *Proxy) copyRequest(originalRequest *http.Request) *http.Request {
 		sv = sv[n:]
 	}
 
-	// Append this machine's host name into X-Forwarded-For.
-	// if requestHost, _, err := net.SplitHostPort(originalRequest.RemoteAddr); err == nil {
-	// 	if originalValues, ok := proxyRequest.Header["X-Forwarded-For"]; ok {
-	// 		requestHost = strings.Join(originalValues, ", ") + ", " + requestHost
-	// 	}
-	// 	proxyRequest.Header.Set("X-Forwarded-For", requestHost)
-	// }
-
 	return proxyRequest
 }

upstream/upstream.go

@@ -177,7 +177,6 @@ func (u *Upstream) Get() (string, *IPwc, error) {
 	ipwc := &IPwc{
 		ip:      u.ipwcs[0].ip,
 		version: u.ipwcs[0].version,
-		busy:    0, // dummy
 	}
 	return h, ipwc, nil
 }