Skip to content
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

Jump to bottom

chore: refactor TracerFactory creation #2102

Merged
merged 1 commit into from
Feb 16, 2024
Merged

chore: refactor TracerFactory creation #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
chore: refactor TracerFactory creation
  • Loading branch information
@mutianf
mutianf committed Feb 6, 2024
commit 157d9c466b7b595e1c62400980fd7905a20284c9
11 changes: 7 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 @@ -112,7 +112,7 @@ public BigtableDataClient createDefault() {
.toBuilder()
.setTracerFactory(
EnhancedBigtableStub.createBigtableTracerFactory(
defaultSettings.getStubSettings()))
defaultSettings.getStubSettings(), sharedClientContext))
.build();

return BigtableDataClient.createWithClientContext(defaultSettings, clientContext);
Expand Down Expand Up @@ -140,7 +140,8 @@ public BigtableDataClient createForAppProfile(@Nonnull String appProfileId) thro
sharedClientContext
.toBuilder()
.setTracerFactory(
EnhancedBigtableStub.createBigtableTracerFactory(settings.getStubSettings()))
EnhancedBigtableStub.createBigtableTracerFactory(
settings.getStubSettings(), sharedClientContext))
.build();
return BigtableDataClient.createWithClientContext(settings, clientContext);
}
Expand Down Expand Up @@ -168,7 +169,8 @@ public BigtableDataClient createForInstance(@Nonnull String projectId, @Nonnull
sharedClientContext
.toBuilder()
.setTracerFactory(
EnhancedBigtableStub.createBigtableTracerFactory(settings.getStubSettings()))
EnhancedBigtableStub.createBigtableTracerFactory(
settings.getStubSettings(), sharedClientContext))
.build();

return BigtableDataClient.createWithClientContext(settings, clientContext);
Expand Down Expand Up @@ -197,7 +199,8 @@ public BigtableDataClient createForInstance(
sharedClientContext
.toBuilder()
.setTracerFactory(
EnhancedBigtableStub.createBigtableTracerFactory(settings.getStubSettings()))
EnhancedBigtableStub.createBigtableTracerFactory(
settings.getStubSettings(), sharedClientContext))
.build();
return BigtableDataClient.createWithClientContext(settings, clientContext);
}
Expand Down
18 changes: 13 additions & 5 deletions ...d-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,14 @@ public class EnhancedBigtableStub implements AutoCloseable {
public static EnhancedBigtableStub create(EnhancedBigtableStubSettings settings)
throws IOException {

settings = settings.toBuilder().setTracerFactory(createBigtableTracerFactory(settings)).build();
ClientContext clientContext = createClientContext(settings);
ClientContext contextWithTracer =
clientContext
.toBuilder()
.setTracerFactory(createBigtableTracerFactory(settings, clientContext))
.build();

return new EnhancedBigtableStub(settings, clientContext);
return new EnhancedBigtableStub(settings, contextWithTracer);
}

public static EnhancedBigtableStub createWithClientContext(
Expand Down Expand Up @@ -237,13 +241,17 @@ public static ClientContext createClientContext(EnhancedBigtableStubSettings set
}

public static ApiTracerFactory createBigtableTracerFactory(
EnhancedBigtableStubSettings settings) {
return createBigtableTracerFactory(settings, Tags.getTagger(), Stats.getStatsRecorder());
EnhancedBigtableStubSettings settings, ClientContext clientContext) {
return createBigtableTracerFactory(
settings, Tags.getTagger(), Stats.getStatsRecorder(), clientContext);
}

@VisibleForTesting
public static ApiTracerFactory createBigtableTracerFactory(
EnhancedBigtableStubSettings settings, Tagger tagger, StatsRecorder stats) {
EnhancedBigtableStubSettings settings,
Tagger tagger,
StatsRecorder stats,
ClientContext clientContext) {
String projectId = settings.getProjectId();
String instanceId = settings.getInstanceId();
String appProfileId = settings.getAppProfileId();
Expand Down
31 changes: 19 additions & 12 deletions .../test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracerCallableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import com.google.cloud.bigtable.data.v2.models.ReadModifyWriteRow;
import com.google.cloud.bigtable.data.v2.models.RowMutation;
import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStub;
import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStubSettings;
import com.google.common.collect.ImmutableMap;
import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
import io.grpc.Metadata;
Expand Down Expand Up @@ -125,16 +124,21 @@ public void sendHeaders(Metadata headers) {
.setInstanceId(INSTANCE_ID)
.setAppProfileId(APP_PROFILE_ID)
.build();
EnhancedBigtableStubSettings stubSettings =
settings
.getStubSettings()

ClientContext clientContext =
EnhancedBigtableStub.createClientContext(settings.getStubSettings());
clientContext =
clientContext
.toBuilder()
.setTracerFactory(
EnhancedBigtableStub.createBigtableTracerFactory(
settings.getStubSettings(), Tags.getTagger(), localStats.getStatsRecorder()))
settings.getStubSettings(),
Tags.getTagger(),
localStats.getStatsRecorder(),
clientContext))
.build();
attempts = stubSettings.readRowsSettings().getRetrySettings().getMaxAttempts();
stub = new EnhancedBigtableStub(stubSettings, ClientContext.create(stubSettings));
attempts = settings.getStubSettings().readRowsSettings().getRetrySettings().getMaxAttempts();
stub = new EnhancedBigtableStub(settings.getStubSettings(), clientContext);

// Create another server without injecting the server-timing header and another stub that
// connects to it.
Expand All @@ -146,18 +150,21 @@ public void sendHeaders(Metadata headers) {
.setInstanceId(INSTANCE_ID)
.setAppProfileId(APP_PROFILE_ID)
.build();
EnhancedBigtableStubSettings noHeaderStubSettings =
noHeaderSettings
.getStubSettings()

ClientContext noHeaderClientContext =
EnhancedBigtableStub.createClientContext(noHeaderSettings.getStubSettings());
noHeaderClientContext =
noHeaderClientContext
.toBuilder()
.setTracerFactory(
EnhancedBigtableStub.createBigtableTracerFactory(
noHeaderSettings.getStubSettings(),
Tags.getTagger(),
localStats.getStatsRecorder()))
localStats.getStatsRecorder(),
noHeaderClientContext))
.build();
noHeaderStub =
new EnhancedBigtableStub(noHeaderStubSettings, ClientContext.create(noHeaderStubSettings));
new EnhancedBigtableStub(noHeaderSettings.getStubSettings(), noHeaderClientContext);
}

@After
Expand Down
16 changes: 10 additions & 6 deletions ...table/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import com.google.cloud.bigtable.data.v2.models.Row;
import com.google.cloud.bigtable.data.v2.models.RowMutationEntry;
import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStub;
import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStubSettings;
import com.google.cloud.bigtable.data.v2.stub.mutaterows.MutateRowsBatchingDescriptor;
import com.google.common.base.Stopwatch;
import com.google.common.collect.ImmutableMap;
Expand Down Expand Up @@ -120,15 +119,20 @@ public void setUp() throws Exception {
.setInstanceId(INSTANCE_ID)
.setAppProfileId(APP_PROFILE_ID)
.build();
EnhancedBigtableStubSettings stubSettings =
settings
.getStubSettings()

ClientContext clientContext =
EnhancedBigtableStub.createClientContext(settings.getStubSettings());
clientContext =
clientContext
.toBuilder()
.setTracerFactory(
EnhancedBigtableStub.createBigtableTracerFactory(
settings.getStubSettings(), Tags.getTagger(), localStats.getStatsRecorder()))
settings.getStubSettings(),
Tags.getTagger(),
localStats.getStatsRecorder(),
clientContext))
.build();
stub = new EnhancedBigtableStub(stubSettings, ClientContext.create(stubSettings));
stub = new EnhancedBigtableStub(settings.getStubSettings(), clientContext);
}

@After
Expand Down
Loading