rebase

grpc · Dec 23, 2024 · 4483e95 · 4483e95
1 parent a292b63
commit 4483e95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/transport/http2_client.go b/internal/transport/http2_client.go
@@ -159,7 +159,7 @@ func dial(ctx context.Context, fn func(context.Context, string) (net.Conn, error
 
 	// A non-empty ConnectAddr attribute indicates that a proxy is configured,
 	// so initiate a proxy dial.
-	if _, present := proxyattributes.ExtractOptions(addr); present {
+	if _, present := proxyattributes.Get(addr); present {
 		return proxyDial(ctx, addr, grpcUA)
 	}
 	networkType, ok := networktype.Get(addr)

diff --git a/internal/transport/proxy.go b/internal/transport/proxy.go
@@ -61,7 +61,7 @@ func doHTTPConnectHandshake(ctx context.Context, conn net.Conn, addr resolver.Ad
 		}
 	}()
 
-	opts, _ := proxyattributes.ExtractOptions(addr)
+	opts, _ := proxyattributes.Get(addr)
 	req := &http.Request{
 		Method: http.MethodConnect,
 		URL:    &url.URL{Host: opts.ConnectAddr},