Skip to content

fix: ensure that per attempt metrics tracer is below the retries #2793

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
igorbernstein2 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: ensure that per attempt metrics tracer is below the retries #2793

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f12ea4
fix: ensure that per attempt metrics tracer is below the retries
igorbernstein2 Feb 18, 2026
f55ce97
Merge branch 'main' into sql-tracer
igorbernstein2 Feb 18, 2026
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
26 changes: 13 additions & 13 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 @@ -695,10 +695,10 @@ public ApiFuture<List<KeyOffset>> futureCall(String s, ApiCallContext apiCallCon
withStatsHeaders = new StatsHeadersUnaryCallable<>(spoolable);

UnaryCallable<com.google.bigtable.v2.SampleRowKeysRequest, List<SampleRowKeysResponse>>
withBigtableTracer = new BigtableTracerUnaryCallable<>(withStatsHeaders);
withAttemptTracer = new BigtableTracerUnaryCallable<>(withStatsHeaders);

UnaryCallable<com.google.bigtable.v2.SampleRowKeysRequest, List<SampleRowKeysResponse>>
retryable = withRetries(withBigtableTracer, settings.sampleRowKeysSettings());
retryable = withRetries(withAttemptTracer, settings.sampleRowKeysSettings());

return createUserFacingUnaryCallable(
methodName,
Expand Down Expand Up @@ -774,7 +774,7 @@ private UnaryCallable<BulkMutation, MutateRowsAttemptResult> createMutateRowsBas
ServerStreamingCallable<MutateRowsRequest, MutateRowsResponse> convertException =
new ConvertExceptionCallable<>(callable);

ServerStreamingCallable<MutateRowsRequest, MutateRowsResponse> withBigtableTracer =
ServerStreamingCallable<MutateRowsRequest, MutateRowsResponse> withAttemptTracer =
new BigtableTracerStreamingCallable<>(convertException);

BasicResultRetryAlgorithm<MutateRowsAttemptResult> resultRetryAlgorithm;
Expand All @@ -797,7 +797,7 @@ private UnaryCallable<BulkMutation, MutateRowsAttemptResult> createMutateRowsBas
UnaryCallable<MutateRowsRequest, MutateRowsAttemptResult> baseCallable =
new MutateRowsRetryingCallable(
clientContext.getDefaultCallContext(),
withBigtableTracer,
withAttemptTracer,
retryingExecutor,
settings.bulkMutateRowsSettings().getRetryableCodes(),
retryAlgorithm);
Expand Down Expand Up @@ -1033,11 +1033,11 @@ private UnaryCallable<ReadModifyWriteRow, Row> createReadModifyWriteRowCallable(
ServerStreamingCallable<String, ByteStringRange> watched =
Callables.watched(convertException, innerSettings, clientContext);

ServerStreamingCallable<String, ByteStringRange> withBigtableTracer =
ServerStreamingCallable<String, ByteStringRange> withAttemptTracer =
new BigtableTracerStreamingCallable<>(watched);

ServerStreamingCallable<String, ByteStringRange> retrying =
withRetries(withBigtableTracer, innerSettings);
withRetries(withAttemptTracer, innerSettings);

SpanName span = getSpanName("GenerateInitialChangeStreamPartitions");
ServerStreamingCallable<String, ByteStringRange> traced =
Expand Down Expand Up @@ -1105,11 +1105,11 @@ private UnaryCallable<ReadModifyWriteRow, Row> createReadModifyWriteRowCallable(
ServerStreamingCallable<ReadChangeStreamRequest, ChangeStreamRecordT> watched =
Callables.watched(merging, innerSettings, clientContext);

ServerStreamingCallable<ReadChangeStreamRequest, ChangeStreamRecordT> withBigtableTracer =
ServerStreamingCallable<ReadChangeStreamRequest, ChangeStreamRecordT> withAttemptTracer =
new BigtableTracerStreamingCallable<>(watched);

ServerStreamingCallable<ReadChangeStreamRequest, ChangeStreamRecordT> readChangeStreamCallable =
withRetries(withBigtableTracer, innerSettings);
withRetries(withAttemptTracer, innerSettings);

ServerStreamingCallable<ReadChangeStreamQuery, ChangeStreamRecordT>
readChangeStreamUserCallable =
Expand Down Expand Up @@ -1175,6 +1175,9 @@ public Map<String, String> extract(ExecuteQueryRequest executeQueryRequest) {
ServerStreamingCallable<ExecuteQueryCallContext, ExecuteQueryResponse> convertException =
new ConvertExceptionCallable<>(withPlanRefresh);

ServerStreamingCallable<ExecuteQueryCallContext, ExecuteQueryResponse> withAttemptTracer =
new BigtableTracerStreamingCallable<>(convertException);

ServerStreamingCallSettings<ExecuteQueryCallContext, ExecuteQueryResponse> retrySettings =
ServerStreamingCallSettings.<ExecuteQueryCallContext, ExecuteQueryResponse>newBuilder()
.setResumptionStrategy(new ExecuteQueryResumptionStrategy())
Expand All @@ -1189,7 +1192,7 @@ public Map<String, String> extract(ExecuteQueryRequest executeQueryRequest) {
// attempt stream will have reset set to true, so any unyielded data from the previous
// attempt will be reset properly
ServerStreamingCallable<ExecuteQueryCallContext, ExecuteQueryResponse> retries =
withRetries(convertException, retrySettings);
withRetries(withAttemptTracer, retrySettings);

ServerStreamingCallable<ExecuteQueryCallContext, SqlRow> merging =
new SqlRowMergingCallable(retries);
Expand All @@ -1208,13 +1211,10 @@ public Map<String, String> extract(ExecuteQueryRequest executeQueryRequest) {
ServerStreamingCallable<ExecuteQueryCallContext, SqlRow> passingThroughErrorsToMetadata =
new MetadataErrorHandlingCallable(watched);

ServerStreamingCallable<ExecuteQueryCallContext, SqlRow> withBigtableTracer =
new BigtableTracerStreamingCallable<>(passingThroughErrorsToMetadata);

SpanName span = getSpanName("ExecuteQuery");
ServerStreamingCallable<ExecuteQueryCallContext, SqlRow> traced =
new TracedServerStreamingCallable<>(
withBigtableTracer, clientContext.getTracerFactory(), span);
passingThroughErrorsToMetadata, clientContext.getTracerFactory(), span);

return new ExecuteQueryCallable(
traced.withDefaultCallContext(
Expand Down
Loading