diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/stub/readrows/ReadRowsRetryingCallable.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/stub/readrows/ReadRowsRetryingCallable.java index d498766b3a..7009f39112 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/stub/readrows/ReadRowsRetryingCallable.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/stub/readrows/ReadRowsRetryingCallable.java @@ -55,15 +55,16 @@ public void call( ReadRowsRequest request, final ResponseObserver responseObserver, ApiCallContext context) { + ApiCallContext actualContext = this.context.merge(context); ReadRowsAttemptCallable attemptCallable = new ReadRowsAttemptCallable( innerCallable, resumptionStrategyPrototype.createNew(), request, - this.context, + actualContext, responseObserver); - RetryingFuture retryingFuture = executor.createFuture(attemptCallable, this.context); + RetryingFuture retryingFuture = executor.createFuture(attemptCallable, actualContext); attemptCallable.setExternalFuture(retryingFuture); attemptCallable.start(); diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta1/stub/readrows/ReadRowsRetryingCallable.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta1/stub/readrows/ReadRowsRetryingCallable.java index 2b4308ae70..179f14c23e 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta1/stub/readrows/ReadRowsRetryingCallable.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta1/stub/readrows/ReadRowsRetryingCallable.java @@ -55,15 +55,16 @@ public void call( ReadRowsRequest request, final ResponseObserver responseObserver, ApiCallContext context) { + ApiCallContext actualContext = this.context.merge(context); ReadRowsAttemptCallable attemptCallable = new ReadRowsAttemptCallable( innerCallable, resumptionStrategyPrototype.createNew(), request, - this.context, + actualContext, responseObserver); - RetryingFuture retryingFuture = executor.createFuture(attemptCallable, this.context); + RetryingFuture retryingFuture = executor.createFuture(attemptCallable, actualContext); attemptCallable.setExternalFuture(retryingFuture); attemptCallable.start(); diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/stub/readrows/ReadRowsRetryingCallable.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/stub/readrows/ReadRowsRetryingCallable.java index 8d3384de81..7095778691 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/stub/readrows/ReadRowsRetryingCallable.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/stub/readrows/ReadRowsRetryingCallable.java @@ -55,15 +55,16 @@ public void call( ReadRowsRequest request, final ResponseObserver responseObserver, ApiCallContext context) { + ApiCallContext actualContext = this.context.merge(context); ReadRowsAttemptCallable attemptCallable = new ReadRowsAttemptCallable( innerCallable, resumptionStrategyPrototype.createNew(), request, - this.context, + actualContext, responseObserver); - RetryingFuture retryingFuture = executor.createFuture(attemptCallable, this.context); + RetryingFuture retryingFuture = executor.createFuture(attemptCallable, actualContext); attemptCallable.setExternalFuture(retryingFuture); attemptCallable.start();