Added http2 support to yab

Remove old comments

Fix comment stating default http2 behavior in options

Fixed test TimedOutUsingHTTP2Transport

Fix comments

Check if http2 flag is enabled when sending Thrift encoding

Author: mark200

go.mod

@@ -1,6 +1,6 @@
 module github.com/yarpc/yab
 
-go 1.23
+go 1.23.0
 
 toolchain go1.24.0
 

main.go

@@ -323,7 +323,7 @@ func runWithOptions(opts Options, out output, logger *zap.Logger) {
 	opts.TOpts.PeerList = ""
 	opts.TOpts.Peers = peers
 
-	resolved := resolveProtocolEncoding(protocolScheme, opts.ROpts)
+	resolved := resolveProtocolEncoding(protocolScheme, opts)
 
 	serializer, err := NewSerializer(opts, resolved)
 	if err != nil {
@@ -406,8 +406,8 @@ type resolvedProtocolEncoding struct {
 	enc      encoding.Encoding
 }
 
-func resolveProtocolEncoding(protocolScheme string, rOpts RequestOptions) resolvedProtocolEncoding {
-	enc := rOpts.detectEncoding()
+func resolveProtocolEncoding(protocolScheme string, opts Options) resolvedProtocolEncoding {
+	enc := opts.ROpts.detectEncoding()
 
 	switch protocolScheme {
 	case "tchannel":
@@ -432,6 +432,9 @@ func resolveProtocolEncoding(protocolScheme string, rOpts RequestOptions) resolv
 	// Try to determine a transport based on the guessed encoding.
 	switch enc {
 	case encoding.Thrift:
+		if opts.TOpts.UseHTTP2 {
+			return resolvedProtocolEncoding{transport.HTTP, encoding.Thrift}
+		}
 		return resolvedProtocolEncoding{transport.TChannel, encoding.Thrift}
 	case encoding.Protobuf:
 		return resolvedProtocolEncoding{transport.GRPC, encoding.Protobuf}
@@ -443,7 +446,7 @@ func resolveProtocolEncoding(protocolScheme string, rOpts RequestOptions) resolv
 
 	// Special case --health which is for TChannel + Thrift health calls.
 	// This is for compatibility with tcurl.
-	if rOpts.Health {
+	if opts.ROpts.Health {
 		return resolvedProtocolEncoding{transport.TChannel, encoding.Thrift}
 	}
 

main_test.go

@@ -1032,9 +1032,11 @@ func TestResolveProtocolEncoding(t *testing.T) {
 		t.Run(tt.msg, func(t *testing.T) {
 			// Note: We test detectEncoding separately, so we just set the encoding which
 			// determines the result of detectEncoding.
-			got := resolveProtocolEncoding(tt.protocolScheme, RequestOptions{
-				Encoding: tt.encoding,
-				Health:   tt.health,
+			got := resolveProtocolEncoding(tt.protocolScheme, Options{
+				ROpts: RequestOptions{
+					Encoding: tt.encoding,
+					Health:   tt.health,
+				},
 			})
 			assert.Equal(t, tt.want, got)
 		})

options.go

@@ -95,6 +95,10 @@ type TransportOptions struct {
 	HTTPMethod          string            `long:"http-method" description:"The HTTP method to use"`
 	GRPCMaxResponseSize int               `long:"grpc-max-response-size" description:"Maximum response size for gRPC requests. Default value is 4MB"`
 	ForceJaegerSample   bool              `long:"force-jaeger-sample" description:"Force all requests to be sampled for Jaeger tracing (use with --jaeger)"`
+
+	// Enables HTTP2 transport
+	UseHTTP2 bool `long:"http2" description:"Enable HTTP/2 for HTTP transport"`
+
 	// This is a hack to work around go-flags not allowing disabling flags:
 	// https://github.com/jessevdk/go-flags/issues/191
 	// Do not specify this value in a defaults.ini file as it is not possible

request_test.go

@@ -556,6 +556,6 @@ func resolveOpts(t *testing.T, opts Options) (Options, resolvedProtocolEncoding)
 
 	opts.TOpts.Peers = peers
 
-	resolved := resolveProtocolEncoding(scheme, opts.ROpts)
+	resolved := resolveProtocolEncoding(scheme, opts)
 	return opts, resolved
 }

transport.go

@@ -185,6 +185,7 @@ func getTransport(opts TransportOptions, resolved resolvedProtocolEncoding, trac
 		Encoding:        resolved.enc.String(),
 		URLs:            opts.Peers,
 		Tracer:          tracer,
+		UseHTTP2:        opts.UseHTTP2,
 	}
 	return transport.NewHTTP(hopts)
 }

transport/http.go

@@ -22,14 +22,18 @@ package transport
 
 import (
 	"bytes"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"math/rand"
+	"net"
 	"net/http"
 	"strconv"
 	"time"
 
+	"golang.org/x/net/http2"
+
 	"github.com/opentracing/opentracing-go"
 	"golang.org/x/net/context"
 )
@@ -51,6 +55,9 @@ type HTTPOptions struct {
 	ShardKey        string
 	Encoding        string
 	Tracer          opentracing.Tracer
+
+	// HTTP/2 specific options
+	UseHTTP2 bool
 }
 
 var (
@@ -70,11 +77,25 @@ func NewHTTP(opts HTTPOptions) (Transport, error) {
 		opts.Method = "POST"
 	}
 
+	var transport http.RoundTripper
+
+	if opts.UseHTTP2 {
+		transport = &http2.Transport{
+			AllowHTTP: true,
+			DialTLSContext: func(ctx context.Context, network, addr string, _ *tls.Config) (net.Conn, error) {
+				var d net.Dialer
+				return d.DialContext(ctx, network, addr)
+			},
+		}
+	} else {
+		transport = &http.Transport{}
+	}
+
 	return &httpTransport{
 		opts: opts,
 		// Use independent HTTP clients for each transport.
 		client: &http.Client{
-			Transport: &http.Transport{},
+			Transport: transport,
 		},
 		tracer: opts.Tracer,
 	}, nil