Skip to content

[WIP] Tmp code to verify xDS HTTP Connect end-to-end #12624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sergiitk wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[WIP] Tmp code to verify xDS HTTP Connect end-to-end #12624

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dcf939
[WIP] Tmp code to verify xDS HTTP Connect end-to-end
sergiitk Jan 24, 2026
582c6ba
fix warnings
sergiitk Jan 24, 2026
dc66629
h11 proxy parsing bug: check for name, not type
sergiitk Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix warnings
  • Loading branch information
@sergiitk
sergiitk committed Jan 24, 2026
commit 582c6baace0a60c16167f19a2a61b73861a8835e
27 changes: 19 additions & 8 deletions xds/src/main/java/io/grpc/xds/XdsClusterResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import io.envoyproxy.envoy.extensions.transport_sockets.http_11_proxy.v3.Http11ProxyUpstreamTransport;
import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext;
import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.CommonTlsContext;
import io.grpc.InternalLogId;
import io.grpc.LoadBalancerRegistry;
import io.grpc.NameResolver;
import io.grpc.internal.GrpcUtil;
Expand All @@ -50,6 +51,8 @@
import io.grpc.xds.XdsClusterResource.CdsUpdate;
import io.grpc.xds.client.BackendMetricPropagation;
import io.grpc.xds.client.XdsClient.ResourceUpdate;
import io.grpc.xds.client.XdsLogger;
import io.grpc.xds.client.XdsLogger.XdsLogLevel;
import io.grpc.xds.client.XdsResourceType;
import io.grpc.xds.internal.security.CommonTlsContextUtil;
import java.util.List;
Expand Down Expand Up @@ -87,6 +90,8 @@ class XdsClusterResource extends XdsResourceType<CdsUpdate> {
"type.googleapis.com/envoy.extensions.transport_sockets.raw_buffer.v3.RawBuffer";
private final LoadBalancerRegistry loadBalancerRegistry
= LoadBalancerRegistry.getDefaultRegistry();
private static final XdsLogger logger = XdsLogger.withLogId(
InternalLogId.allocate("xds-cluster-resource", "sergiitk"));

private static final XdsClusterResource instance = new XdsClusterResource();

Expand Down Expand Up @@ -266,17 +271,23 @@ private static StructOrError<CdsUpdate.Builder> parseNonAggregateCluster(
String transportSocketName = hasTransportSocket ? transportSocket.getName() : "<invalid>";
boolean socketIsTls = transportSocketName.equals(TRANSPORT_SOCKET_NAME_TLS);
boolean socketIsH1Proxy = transportSocketName.equals(TRANSPORT_SOCKET_NAME_HTTP11_PROXY);
boolean supportSocketIsH1Proxy = isEnabledXdsHttpConnect && socketIsH1Proxy;
boolean socketIsH1ProxyAndSupported = isEnabledXdsHttpConnect && socketIsH1Proxy;

if (hasTransportSocket && !socketIsTls && !supportSocketIsH1Proxy) {
return StructOrError.fromError(
"transport-socket with name " + transportSocketName + " not supported, socketIsTls="
+ socketIsTls + ", socketIsH1Proxy=" + socketIsH1Proxy
+ ", isEnabledXdsHttpConnect=" + isEnabledXdsHttpConnect
+ ", supportSocketIsH1Proxy=" + supportSocketIsH1Proxy + ".");
if (hasTransportSocket && !(socketIsTls || socketIsH1ProxyAndSupported)) {
String errMsg = "transport-socket with name " + transportSocketName + " not supported";

@SuppressWarnings("AlreadyChecked") // todo remove
String extraErrorMsg = errMsg
+ ", socketIsTls=" + socketIsTls
+ ", socketIsH1Proxy=" + socketIsH1Proxy
+ ", isEnabledXdsHttpConnect=" + isEnabledXdsHttpConnect
+ ", socketIsH1ProxyAndSupported=" + socketIsH1ProxyAndSupported + ".";
logger.log(XdsLogLevel.ERROR, extraErrorMsg);

return StructOrError.fromError(errMsg + ".");
}

if (hasTransportSocket && supportSocketIsH1Proxy) {
if (hasTransportSocket && socketIsH1ProxyAndSupported) {
isHttp11ProxyAvailable = true;
try {
Http11ProxyUpstreamTransport wrappedTransportSocket = transportSocket
Expand Down