@@ -85,9 +85,6 @@ public class EnhancedBigtableStubSettings extends StubSettings<EnhancedBigtableS
85
85
private static final int MAX_MESSAGE_SIZE = 256 * 1024 * 1024 ;
86
86
private static final String SERVER_DEFAULT_APP_PROFILE_ID = "" ;
87
87
88
- // TODO(weiranf): Remove this temporary endpoint once DirectPath goes to public beta
89
- private static final String DIRECT_PATH_ENDPOINT = "test-bigtable.sandbox.googleapis.com:443" ;
90
-
91
88
private static final Set <Code > IDEMPOTENT_RETRY_CODES =
92
89
ImmutableSet .of (Code .DEADLINE_EXCEEDED , Code .UNAVAILABLE );
93
90
@@ -166,12 +163,6 @@ public class EnhancedBigtableStubSettings extends StubSettings<EnhancedBigtableS
166
163
private EnhancedBigtableStubSettings (Builder builder ) {
167
164
super (builder );
168
165
169
- if (DIRECT_PATH_ENDPOINT .equals (builder .getEndpoint ())) {
170
- logger .warning (
171
- "Connecting to Bigtable using DirectPath."
172
- + " This is currently an experimental feature and should not be used in production." );
173
- }
174
-
175
166
// Since point reads, streaming reads, bulk reads share the same base callable that converts
176
167
// grpc errors into ApiExceptions, they must have the same retry codes.
177
168
Preconditions .checkState (
@@ -245,13 +236,9 @@ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProvi
245
236
.setKeepAliveTimeout (
246
237
Duration .ofSeconds (10 )) // wait this long before considering the connection dead
247
238
.setKeepAliveWithoutCalls (true ) // sends ping without active streams
248
- // TODO(weiranf): Set this to true by default once DirectPath goes to public beta
249
- .setAttemptDirectPath (isDirectPathEnabled ());
250
- }
251
-
252
- // TODO(weiranf): Remove this once DirectPath goes to public beta
253
- private static boolean isDirectPathEnabled () {
254
- return Boolean .getBoolean ("bigtable.attempt-directpath" );
239
+ // Attempts direct access to CBT service over gRPC to improve throughput,
240
+ // whether the attempt is allowed is totally controlled by service owner.
241
+ .setAttemptDirectPath (true );
255
242
}
256
243
257
244
static int getDefaultChannelPoolSize () {
@@ -526,13 +513,7 @@ private Builder() {
526
513
// Defaults provider
527
514
BigtableStubSettings .Builder baseDefaults = BigtableStubSettings .newBuilder ();
528
515
529
- // TODO(weiranf): remove this once DirectPath goes to public Beta and uses the default
530
- // endpoint.
531
- if (isDirectPathEnabled ()) {
532
- setEndpoint (DIRECT_PATH_ENDPOINT );
533
- } else {
534
- setEndpoint (baseDefaults .getEndpoint ());
535
- }
516
+ setEndpoint (baseDefaults .getEndpoint ());
536
517
537
518
setTransportChannelProvider (defaultTransportChannelProvider ());
538
519
setStreamWatchdogCheckInterval (baseDefaults .getStreamWatchdogCheckInterval ());
0 commit comments