chore(transport): remove support for go runtimes earlier than 1.16 (#…

…1844)
googleapis · Feb 6, 2023 · 1651c38 · 1651c38
1 parent 4b4c9d4
commit 1651c38
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 45 deletions.
diff --git a/transport/http/configure_http2_go116.go b/transport/http/configure_http2_go116.go
diff --git a/transport/http/configure_http2_not_go116.go b/transport/http/configure_http2_not_go116.go
diff --git a/transport/http/dial.go b/transport/http/dial.go
@@ -16,6 +16,7 @@ import (
 	"time"
 
 	"go.opencensus.io/plugin/ochttp"
+	"golang.org/x/net/http2"
 	"golang.org/x/oauth2"
 	"google.golang.org/api/googleapi/transport"
 	"google.golang.org/api/internal"
@@ -175,13 +176,22 @@ func defaultBaseTransport(ctx context.Context, clientCertSource cert.Source) htt
 		}
 	}
 
-	// If possible, configure http2 transport in order to use ReadIdleTimeout
-	// setting. This can only be done in Go 1.16 and up.
 	configureHTTP2(trans)
 
 	return trans
 }
 
+// configureHTTP2 configures the ReadIdleTimeout HTTP/2 option for the
+// transport. This allows broken idle connections to be pruned more quickly,
+// preventing the client from attempting to re-use connections that will no
+// longer work.
+func configureHTTP2(trans *http.Transport) {
+	http2Trans, err := http2.ConfigureTransports(trans)
+	if err == nil {
+		http2Trans.ReadIdleTimeout = time.Second * 31
+	}
+}
+
 // fallbackBaseTransport is used in <go1.13 as well as in the rare case if
 // http.DefaultTransport has been reassigned something that's not a
 // *http.Transport.