Support HTTP/3 (QUIC)

.gitignore

@@ -1 +1,5 @@
-bin/
+bin/
+vendor/
+.idea/
+
+hey

README.md

@@ -9,7 +9,7 @@ tool at [tarekziade/boom](https://github.com/tarekziade/boom). Using the same na
 where binary name conflicts created confusion.
 To preserve the name for its original owner, we renamed this project to hey.
 
-## Installation
+## ~~Installation~~ Build it on your own if you want to use this fork
 
 * Linux 64-bit: https://hey-release.s3.us-east-2.amazonaws.com/hey_linux_amd64
 * Mac 64-bit: https://hey-release.s3.us-east-2.amazonaws.com/hey_darwin_amd64
@@ -24,7 +24,8 @@ macOS:
 
 hey runs provided number of requests in the provided concurrency level and prints stats.
 
-It also supports HTTP2 endpoints.
+~~It also supports HTTP2 endpoints.~~
+**It now supports HTTP/3 (QUIC) endpoints**
 
 ```
 Usage: hey [options...] <url>
@@ -52,6 +53,7 @@ Options:
   -a  Basic authentication, username:password.
   -x  HTTP Proxy address as host:port.
   -h2 Enable HTTP/2.
+  -h3 Enable HTTP/3 (QUIC).
 
   -host	HTTP Host header.
 

go.mod

@@ -1,8 +1,8 @@
 module github.com/rakyll/hey
 
 require (
-	golang.org/x/net v0.0.0-20191009170851-d66e71096ffb
-	golang.org/x/text v0.3.2 // indirect
+	github.com/lucas-clemente/quic-go v0.25.0
+	golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
 )
 
 go 1.13

hey.go

@@ -58,6 +58,7 @@ var (
 	z = flag.Duration("z", 0, "")
 
 	h2   = flag.Bool("h2", false, "")
+	h3   = flag.Bool("h3", false, "")
 	cpus = flag.Int("cpus", runtime.GOMAXPROCS(-1), "")
 
 	disableCompression = flag.Bool("disable-compression", false, "")
@@ -92,6 +93,7 @@ Options:
   -a  Basic authentication, username:password.
   -x  HTTP Proxy address as host:port.
   -h2 Enable HTTP/2.
+  -h3 Enable HTTP/3 (QUIC).
 
   -host	HTTP Host header.
 
@@ -232,6 +234,7 @@ func main() {
 		DisableKeepAlives:  *disableKeepAlives,
 		DisableRedirects:   *disableRedirects,
 		H2:                 *h2,
+		H3:                 *h3,
 		ProxyAddr:          proxyURL,
 		Output:             *output,
 	}

requester/print.go

@@ -38,6 +38,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"math"
 	"strings"
 	"text/template"
 )
@@ -58,6 +59,16 @@ var tmplFuncMap = template.FuncMap{
 	"formatNumberInt": formatNumberInt,
 	"histogram":       histogram,
 	"jsonify":         jsonify,
+	"formatBytes":     formatBytes,
+}
+
+// Convert size in bytes to B/KB/MB/GB/TB
+func formatBytes(sizeByte int64) string {
+	units := []string{"B", "KB", "MB", "GB", "TB"}
+	unitIdx := math.Floor(math.Log(float64(sizeByte)) / math.Log(1024))
+	size := float64(sizeByte) / math.Pow(1024, unitIdx)
+	unit := units[int64(unitIdx)]
+	return fmt.Sprintf("%v %v", formatNumber(size), unit)
 }
 
 func jsonify(v interface{}) string {
@@ -101,8 +112,10 @@ Summary:
   Average:	{{ formatNumber .Average }} secs
   Requests/sec:	{{ formatNumber .Rps }}
   {{ if gt .SizeTotal 0 }}
-  Total data:	{{ .SizeTotal }} bytes
-  Size/request:	{{ .SizeReq }} bytes{{ end }}
+  Total data:	{{ .SizeTotal }} bytes ({{ formatBytes .SizeTotal }})
+  Size/request:	{{ .SizeReq }} bytes ({{ formatBytes .SizeReq }})
+  Size/sec:	{{ .SizeSec }} bytes ({{ formatBytes .SizeSec }})
+  {{ end }}
 
 Response time histogram:
 {{ histogram .Histogram }}

requester/report.go

@@ -169,6 +169,7 @@ func (r *report) snapshot() Report {
 	}
 
 	snapshot.SizeReq = r.sizeTotal / int64(len(r.lats))
+	snapshot.SizeSec = int64(float64(r.sizeTotal) / r.total.Seconds())
 
 	copy(snapshot.Lats, r.lats)
 	copy(snapshot.ConnLats, r.connLats)
@@ -306,6 +307,7 @@ type Report struct {
 	SizeTotal      int64
 	SizeReq        int64
 	NumRes         int64
+	SizeSec        int64 // size per second
 
 	LatencyDistribution []LatencyDistribution
 	Histogram           []Bucket

requester/requester.go

@@ -27,6 +27,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/lucas-clemente/quic-go"
+	"github.com/lucas-clemente/quic-go/http3"
 	"golang.org/x/net/http2"
 )
 
@@ -66,6 +68,9 @@ type Work struct {
 	// H2 is an option to make HTTP/2 requests
 	H2 bool
 
+	// H3 is an option to make HTTP/3 (QUIC) requests
+	H3 bool
+
 	// Timeout in seconds.
 	Timeout int
 
@@ -184,9 +189,8 @@ func (b *Work) makeRequest(c *http.Client) {
 	req = req.WithContext(httptrace.WithClientTrace(req.Context(), trace))
 	resp, err := c.Do(req)
 	if err == nil {
-		size = resp.ContentLength
 		code = resp.StatusCode
-		io.Copy(ioutil.Discard, resp.Body)
+		size, _ = io.Copy(ioutil.Discard, resp.Body)
 		resp.Body.Close()
 	}
 	t := now()
@@ -235,22 +239,37 @@ func (b *Work) runWorkers() {
 	var wg sync.WaitGroup
 	wg.Add(b.C)
 
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-			ServerName:         b.Request.Host,
-		},
-		MaxIdleConnsPerHost: min(b.C, maxIdleConn),
-		DisableCompression:  b.DisableCompression,
-		DisableKeepAlives:   b.DisableKeepAlives,
-		Proxy:               http.ProxyURL(b.ProxyAddr),
+	tlsConf := &tls.Config{
+		InsecureSkipVerify: true,
+		ServerName:         b.Request.Host,
 	}
-	if b.H2 {
-		http2.ConfigureTransport(tr)
+
+	var client *http.Client
+	if b.H3 {
+		client = &http.Client{
+			Transport: &http3.RoundTripper{
+				TLSClientConfig:    tlsConf,
+				QuicConfig:         &quic.Config{KeepAlive: !b.DisableKeepAlives},
+				DisableCompression: b.DisableCompression,
+			},
+			Timeout: time.Duration(b.Timeout) * time.Second,
+		}
+
 	} else {
-		tr.TLSNextProto = make(map[string]func(string, *tls.Conn) http.RoundTripper)
+		tr := &http.Transport{
+			TLSClientConfig:     tlsConf,
+			MaxIdleConnsPerHost: min(b.C, maxIdleConn),
+			DisableCompression:  b.DisableCompression,
+			DisableKeepAlives:   b.DisableKeepAlives,
+			Proxy:               http.ProxyURL(b.ProxyAddr),
+		}
+		if b.H2 {
+			http2.ConfigureTransport(tr)
+		} else {
+			tr.TLSNextProto = make(map[string]func(string, *tls.Conn) http.RoundTripper)
+		}
+		client = &http.Client{Transport: tr, Timeout: time.Duration(b.Timeout) * time.Second}
 	}
-	client := &http.Client{Transport: tr, Timeout: time.Duration(b.Timeout) * time.Second}
 
 	// Ignore the case where b.N % b.C != 0.
 	for i := 0; i < b.C; i++ {