Merge branch 'main' into thread1

Author: mutianf

google-cloud-bigtable/clirr-ignored-differences.xml

@@ -34,6 +34,13 @@
         <className>com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub</className>
         <method>*</method>
     </difference>
+    <difference>
+        <!-- change method types is ok because EnhancedBigtableStub is InternalApi -->
+        <differenceType>7005</differenceType>
+        <className>com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub</className>
+        <method>*</method>
+        <to>*</to>
+    </difference>
     <difference>
         <!-- method name change is ok because EnhancedBigtableStub is InternalApi -->
         <differenceType>7002</differenceType>

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java

@@ -25,7 +25,6 @@
 import com.google.api.gax.batching.Batcher;
 import com.google.api.gax.grpc.GrpcCallContext;
 import com.google.api.gax.rpc.ApiExceptions;
-import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ResponseObserver;
 import com.google.api.gax.rpc.ServerStream;
 import com.google.api.gax.rpc.ServerStreamingCallable;
@@ -55,6 +54,7 @@
 import com.google.cloud.bigtable.data.v2.models.sql.PreparedStatement;
 import com.google.cloud.bigtable.data.v2.models.sql.ResultSet;
 import com.google.cloud.bigtable.data.v2.models.sql.SqlType;
+import com.google.cloud.bigtable.data.v2.stub.BigtableClientContext;
 import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStub;
 import com.google.cloud.bigtable.data.v2.stub.sql.SqlServerStream;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -186,7 +186,7 @@ public static BigtableDataClient create(BigtableDataSettings settings) throws IO
    * BigtableDataClientFactory#close()} is called.
    */
   static BigtableDataClient createWithClientContext(
-      BigtableDataSettings settings, ClientContext context) throws IOException {
+      BigtableDataSettings settings, BigtableClientContext context) throws IOException {
     EnhancedBigtableStub stub =
         EnhancedBigtableStub.createWithClientContext(settings.getStubSettings(), context);
     return new BigtableDataClient(stub);

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactory.java

@@ -114,7 +114,8 @@ public BigtableDataClient createDefault() {
                       defaultSettings.getStubSettings(), sharedClientContext.getOpenTelemetry()))
               .build();
 
-      return BigtableDataClient.createWithClientContext(defaultSettings, clientContext);
+      return BigtableDataClient.createWithClientContext(
+          defaultSettings, sharedClientContext.withClientContext(clientContext));
     } catch (IOException e) {
       // Should never happen because the connection has been established already
       throw new RuntimeException(
@@ -141,7 +142,8 @@ public BigtableDataClient createForAppProfile(@Nonnull String appProfileId) thro
                 EnhancedBigtableStub.createBigtableTracerFactory(
                     settings.getStubSettings(), sharedClientContext.getOpenTelemetry()))
             .build();
-    return BigtableDataClient.createWithClientContext(settings, clientContext);
+    return BigtableDataClient.createWithClientContext(
+        settings, sharedClientContext.withClientContext(clientContext));
   }
 
   /**
@@ -169,7 +171,8 @@ public BigtableDataClient createForInstance(@Nonnull String projectId, @Nonnull
                     settings.getStubSettings(), sharedClientContext.getOpenTelemetry()))
             .build();
 
-    return BigtableDataClient.createWithClientContext(settings, clientContext);
+    return BigtableDataClient.createWithClientContext(
+        settings, sharedClientContext.withClientContext(clientContext));
   }
 
   /**
@@ -196,6 +199,7 @@ public BigtableDataClient createForInstance(
                 EnhancedBigtableStub.createBigtableTracerFactory(
                     settings.getStubSettings(), sharedClientContext.getOpenTelemetry()))
             .build();
-    return BigtableDataClient.createWithClientContext(settings, clientContext);
+    return BigtableDataClient.createWithClientContext(
+        settings, sharedClientContext.withClientContext(clientContext));
   }
 }

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java

@@ -227,9 +227,9 @@ public ClientContext getClientContext() {
     return this.clientContext;
   }
 
-  public BigtableClientContext setClientContext(ClientContext clientContext) {
+  public BigtableClientContext withClientContext(ClientContext clientContext) {
     return new BigtableClientContext(
-        clientContext, this.openTelemetry, this.internalOpenTelemetry, this.metricsProvider);
+        clientContext, openTelemetry, internalOpenTelemetry, metricsProvider);
   }
 
   public void close() throws Exception {