make naming consistent with gax

googleapis · Nov 12, 2024 · ec0c170 · ec0c170
1 parent 6dba8b3
commit ec0c170
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/...bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracer.java b/...bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracer.java
@@ -106,7 +106,7 @@ public void grpcMessageSent() {
    * Record the operation timeout from user settings for calculating remaining deadline. This will
    * be called in BuiltinMetricsTracer.
    */
-  public void setOperationTimeout(Duration operationTimeout) {
+  public void setTotalTimeoutDuration(Duration totalTimeoutDuration) {
     // noop
   }
 }
diff --git a/.../java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracerStreamingCallable.java b/.../java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracerStreamingCallable.java
@@ -63,7 +63,7 @@ public void call(
       BigtableTracerResponseObserver<ResponseT> innerObserver =
           new BigtableTracerResponseObserver<>(responseObserver, tracer, responseMetadata);
       if (context.getRetrySettings() != null) {
-        tracer.setOperationTimeout(context.getRetrySettings().getTotalTimeoutDuration());
+        tracer.setTotalTimeoutDuration(context.getRetrySettings().getTotalTimeoutDuration());
       }
       innerCallable.call(
           request,

diff --git a/...main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracerUnaryCallable.java b/...main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracerUnaryCallable.java
@@ -60,7 +60,7 @@ public ApiFuture<ResponseT> futureCall(RequestT request, ApiCallContext context)
           new BigtableTracerUnaryCallback<ResponseT>(
               (BigtableTracer) context.getTracer(), responseMetadata);
       if (context.getRetrySettings() != null) {
-        tracer.setOperationTimeout(context.getRetrySettings().getTotalTimeoutDuration());
+        tracer.setTotalTimeoutDuration(context.getRetrySettings().getTotalTimeoutDuration());
       }
       ApiFuture<ResponseT> future =
           innerCallable.futureCall(

diff --git a/...le/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracer.java b/...le/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracer.java
@@ -303,10 +303,11 @@ public void grpcMessageSent() {
   This is called by BigtableTracerCallables that sets operation timeout from user settings.
   */
   @Override
-  public void setOperationTimeout(java.time.Duration operationTimeout) {
+  public void setTotalTimeoutDuration(java.time.Duration totalTimeoutDuration) {
     if (operationDeadline == null) {
-      this.operationDeadline = Deadline.after(operationTimeout.toMillis(), TimeUnit.MILLISECONDS);
-      this.remainingDeadline = operationTimeout.toMillis();
+      this.operationDeadline =
+          Deadline.after(totalTimeoutDuration.toMillis(), TimeUnit.MILLISECONDS);
+      this.remainingDeadline = totalTimeoutDuration.toMillis();
     }
   }
 

diff --git a/...igtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java b/...igtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java
@@ -241,9 +241,9 @@ public void grpcMessageSent() {
   }
 
   @Override
-  public void setOperationTimeout(java.time.Duration operationTimeout) {
+  public void setTotalTimeoutDuration(java.time.Duration totalTimeoutDuration) {
     for (BigtableTracer tracer : bigtableTracers) {
-      tracer.setOperationTimeout(operationTimeout);
+      tracer.setTotalTimeoutDuration(totalTimeoutDuration);
     }
   }
 }