address comment

mutianf · mutianf · commit f9b81491434c · 2026-01-06T11:41:38.000-05:00
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactory.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactory.java
@@ -115,7 +115,7 @@ public BigtableDataClient createDefault() {
               .build();
 
       return BigtableDataClient.createWithClientContext(
-          defaultSettings, sharedClientContext.setClientContext(clientContext));
+          defaultSettings, sharedClientContext.withClientContext(clientContext));
     } catch (IOException e) {
       // Should never happen because the connection has been established already
       throw new RuntimeException(
@@ -143,7 +143,7 @@ public BigtableDataClient createForAppProfile(@Nonnull String appProfileId) thro
                     settings.getStubSettings(), sharedClientContext.getOpenTelemetry()))
             .build();
     return BigtableDataClient.createWithClientContext(
-        settings, sharedClientContext.setClientContext(clientContext));
+        settings, sharedClientContext.withClientContext(clientContext));
   }
 
   /**
@@ -172,7 +172,7 @@ public BigtableDataClient createForInstance(@Nonnull String projectId, @Nonnull
             .build();
 
     return BigtableDataClient.createWithClientContext(
-        settings, sharedClientContext.setClientContext(clientContext));
+        settings, sharedClientContext.withClientContext(clientContext));
   }
 
   /**
@@ -200,6 +200,6 @@ public BigtableDataClient createForInstance(
                     settings.getStubSettings(), sharedClientContext.getOpenTelemetry()))
             .build();
     return BigtableDataClient.createWithClientContext(
-        settings, sharedClientContext.setClientContext(clientContext));
+        settings, sharedClientContext.withClientContext(clientContext));
   }
 }
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java
@@ -197,7 +197,7 @@ public ClientContext getClientContext() {
     return this.clientContext;
   }
 
-  public BigtableClientContext setClientContext(ClientContext clientContext) {
+  public BigtableClientContext withClientContext(ClientContext clientContext) {
     return new BigtableClientContext(
         clientContext, openTelemetry, internalOpenTelemetry, metricsProvider);
   }
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
@@ -208,7 +208,7 @@ public static EnhancedBigtableStub create(EnhancedBigtableStubSettings settings)
         bigtableClientContext.getClientContext().toBuilder()
             .setTracerFactory(createBigtableTracerFactory(settings, openTelemetry))
             .build();
-    bigtableClientContext = bigtableClientContext.setClientContext(contextWithTracer);
+    bigtableClientContext = bigtableClientContext.withClientContext(contextWithTracer);
     return new EnhancedBigtableStub(settings, bigtableClientContext);
   }
 
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracerCallableTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracerCallableTest.java
@@ -141,7 +141,7 @@ public void sendHeaders(Metadata headers) {
     attempts = settings.getStubSettings().readRowsSettings().getRetrySettings().getMaxAttempts();
     stub =
         new EnhancedBigtableStub(
-            settings.getStubSettings(), bigtableClientContext.setClientContext(clientContext));
+            settings.getStubSettings(), bigtableClientContext.withClientContext(clientContext));
 
     // Create another server without injecting the server-timing header and another stub that
     // connects to it.
@@ -168,7 +168,7 @@ public void sendHeaders(Metadata headers) {
     noHeaderStub =
         new EnhancedBigtableStub(
             noHeaderSettings.getStubSettings(),
-            noHeaderBigtableClientContext.setClientContext(noHeaderClientContext));
+            noHeaderBigtableClientContext.withClientContext(noHeaderClientContext));
   }
 
   @After
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java
@@ -135,7 +135,7 @@ public void setUp() throws Exception {
             .build();
     stub =
         new EnhancedBigtableStub(
-            settings.getStubSettings(), bigtableClientContext.setClientContext(clientContext));
+            settings.getStubSettings(), bigtableClientContext.withClientContext(clientContext));
   }
 
   @After

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public ClientContext getClientContext() {`
`197`	`197`	`return this.clientContext;`
`198`	`198`	`}`
`199`	`199`
`200`		`- public BigtableClientContext setClientContext(ClientContext clientContext) {`
	`200`	`+ public BigtableClientContext withClientContext(ClientContext clientContext) {`
`201`	`201`	`return new BigtableClientContext(`
`202`	`202`	`clientContext, openTelemetry, internalOpenTelemetry, metricsProvider);`
`203`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public static EnhancedBigtableStub create(EnhancedBigtableStubSettings settings)`
`208`	`208`	`bigtableClientContext.getClientContext().toBuilder()`
`209`	`209`	`.setTracerFactory(createBigtableTracerFactory(settings, openTelemetry))`
`210`	`210`	`.build();`
`211`		`- bigtableClientContext = bigtableClientContext.setClientContext(contextWithTracer);`
	`211`	`+ bigtableClientContext = bigtableClientContext.withClientContext(contextWithTracer);`
`212`	`212`	`return new EnhancedBigtableStub(settings, bigtableClientContext);`
`213`	`213`	`}`
`214`	`214`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public void setUp() throws Exception {`
`135`	`135`	`.build();`
`136`	`136`	`stub =`
`137`	`137`	`new EnhancedBigtableStub(`
`138`		`- settings.getStubSettings(), bigtableClientContext.setClientContext(clientContext));`
	`138`	`+ settings.getStubSettings(), bigtableClientContext.withClientContext(clientContext));`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`@After`