Skip to content

fix: create stub with BigtableClientContext so otels are closed #2747

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

Open
mutianf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: create stub with BigtableClientContext so otels are closed #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions google-cloud-bigtable/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...le-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 8 additions & 4 deletions ...d-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ public BigtableDataClient createDefault() {
defaultSettings.getStubSettings(), sharedClientContext.getOpenTelemetry()))
.build();

return BigtableDataClient.createWithClientContext(defaultSettings, clientContext);
return BigtableDataClient.createWithClientContext(
defaultSettings, sharedClientContext.setClientContext(clientContext));
} catch (IOException e) {
// Should never happen because the connection has been established already
throw new RuntimeException(
Expand All @@ -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.setClientContext(clientContext));
}

/**
Expand Down Expand Up @@ -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.setClientContext(clientContext));
}

/**
Expand All @@ -196,6 +199,7 @@ public BigtableDataClient createForInstance(
EnhancedBigtableStub.createBigtableTracerFactory(
settings.getStubSettings(), sharedClientContext.getOpenTelemetry()))
.build();
return BigtableDataClient.createWithClientContext(settings, clientContext);
return BigtableDataClient.createWithClientContext(
settings, sharedClientContext.setClientContext(clientContext));
}
}
5 changes: 5 additions & 0 deletions ...-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ public ClientContext getClientContext() {
return this.clientContext;
}

public BigtableClientContext setClientContext(ClientContext clientContext) {
return new BigtableClientContext(
clientContext, openTelemetry, internalOpenTelemetry, metricsProvider);
}

public void close() throws Exception {
for (BackgroundResource resource : clientContext.getBackgroundResources()) {
resource.close();
Expand Down
Loading
Loading