feat(option/internaloption): add more option introspection (#3524)

shollyman · web-flow · commit ac5da8f06619 · 2026-03-03T12:06:37.000-08:00
This provides more visibility around directpath enablement
diff --git a/option/internaloption/unsaferesolver.go b/option/internaloption/unsaferesolver.go
@@ -60,3 +60,20 @@ func (ur *UnsafeResolver) ResolvedGRPCEndpoint() (string, error) {
 func (ur *UnsafeResolver) ResolvedGRPCConnIsCustom() bool {
 	return ur.ds.GRPCConn != nil
 }
+
+// ResolvedEnableDirectPath returns whether DirectPath was explicitly enabled.
+// This corresponds to the EnableDirectPath option in this package.
+//
+// This is an EXPERIMENTAL API and may be changed or removed in the future.
+func (ur *UnsafeResolver) ResolvedEnableDirectPath() bool {
+	return ur.ds.EnableDirectPath
+}
+
+// ResolvedEnableDirectPathXds returns whether extensible directory service (xDS)
+// support was requested as part of direct path enablement.  This corresponds to the
+// EnableDirectPathXds option in this package.
+//
+// This is an EXPERIMENTAL API and may be changed or removed in the future.
+func (ur *UnsafeResolver) ResolvedEnableDirectPathXds() bool {
+	return ur.ds.EnableDirectPathXds
+}
diff --git a/option/internaloption/unsaferesolver_test.go b/option/internaloption/unsaferesolver_test.go
@@ -19,6 +19,8 @@ func TestNewUnsafeResolver(t *testing.T) {
 		wantResolvedGRPCEndpointAddress string
 		wantResolvedGRPCEndpointError   bool
 		wantResolvedGRPCConnIsCustom    bool
+		wantResolvedEnableDirectPath    bool
+		wantResolvedEnableDirectPathXds bool
 	}{
 		{
 			desc: "empty",
@@ -55,15 +57,30 @@ func TestNewUnsafeResolver(t *testing.T) {
 			},
 			wantResolvedGRPCConnIsCustom: true,
 		},
+		{
+			desc: "direct path plain",
+			opts: []option.ClientOption{
+				EnableDirectPath(true),
+			},
+			wantResolvedEnableDirectPath: true,
+		},
+		{
+			desc: "direct path xds",
+			opts: []option.ClientOption{
+				EnableDirectPath(true),
+				EnableDirectPathXds(),
+			},
+			wantResolvedEnableDirectPath:    true,
+			wantResolvedEnableDirectPathXds: true,
+		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
 			ur, err := NewUnsafeResolver(tc.opts...)
 			if err != nil {
 				t.Fatalf("NewUnsafeResolver errored: %v", err)
 			}
 			// check ResolvedGRPCConnPoolSize
-			got := ur.ResolvedGRPCConnPoolSize()
-			if got != tc.wantResolvedGRPCConnPoolSize {
+			if got := ur.ResolvedGRPCConnPoolSize(); got != tc.wantResolvedGRPCConnPoolSize {
 				t.Errorf("ResolveGRPCConnPoolSize: got %d, want %d", got, tc.wantResolvedGRPCConnPoolSize)
 			}
 			// check ResolvedGRPCEndpoint
@@ -81,9 +98,15 @@ func TestNewUnsafeResolver(t *testing.T) {
 				t.Errorf("ResolvedGRPCEndpoint: address mismatch, got %q want %q", gotAddr, tc.wantResolvedGRPCEndpointAddress)
 			}
 			// check ResolvedGRPCConnIsCustom
-			gotCustom := ur.ResolvedGRPCConnIsCustom()
-			if gotCustom != tc.wantResolvedGRPCConnIsCustom {
-				t.Errorf("ResolvedGRPCConnIsCustom: got %T want %T", gotCustom, tc.wantResolvedGRPCConnIsCustom)
+			if gotCustom := ur.ResolvedGRPCConnIsCustom(); gotCustom != tc.wantResolvedGRPCConnIsCustom {
+				t.Errorf("ResolvedGRPCConnIsCustom: got %t want %t", gotCustom, tc.wantResolvedGRPCConnIsCustom)
+			}
+			// check ResolvedGRPCConnIsCustom
+			if gotDirectPath := ur.ResolvedEnableDirectPath(); gotDirectPath != tc.wantResolvedEnableDirectPath {
+				t.Errorf("ResolvedEnableDirectPath: got %t want %t", gotDirectPath, tc.wantResolvedEnableDirectPath)
+			}
+			if gotDirectPathXds := ur.ResolvedEnableDirectPathXds(); gotDirectPathXds != tc.wantResolvedEnableDirectPathXds {
+				t.Errorf("ResolvedEnableDirectPathXds: got %t want %t", gotDirectPathXds, tc.wantResolvedEnableDirectPathXds)
 			}
 		})
 	}
