From 2516635d43c024ae0fc8f313e5edf88036980107 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Thu, 18 Nov 2021 15:54:12 -0500 Subject: [PATCH] clean up code --- .../cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java | 4 ++-- .../cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java | 2 +- .../cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java | 4 ++-- .../data/v2/stub/metrics/TracedBatcherUnaryCallable.java | 1 + .../cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java | 2 -- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java index f01dcd94f6..4282882729 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java @@ -465,7 +465,7 @@ private UnaryCallable> createBulkReadRowsCallable( new TracedBatcherUnaryCallable<>(readRowsUserCallable.all()); UnaryCallable> withHeaderTracer = - new HeaderTracerUnaryCallable(tracedBatcher); + new HeaderTracerUnaryCallable(tracedBatcher); UnaryCallable> traced = new TracedUnaryCallable<>(withHeaderTracer, clientContext.getTracerFactory(), span); @@ -596,7 +596,7 @@ private UnaryCallable createBulkMutateRowsCallable() { UnaryCallable tracedBatcher = new TracedBatcherUnaryCallable<>(userFacing); UnaryCallable withHeaderTracer = - new HeaderTracerUnaryCallable<>(tracedBatcher); + new HeaderTracerUnaryCallable<>(tracedBatcher); UnaryCallable traced = new TracedUnaryCallable<>(withHeaderTracer, clientContext.getTracerFactory(), spanName); diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java index 814114e13c..57cae559e9 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java @@ -182,7 +182,7 @@ public void recordGfeMetadata(@Nullable Long latency) { @Override public void batchRequestThrottled(long throttledTimeMs) { for (BigtableTracer tracer : bigtableTracers) { - tracer.batchRequestThrottled(throttledTimeMs); + tracer.batchRequestThrottled(throttledTimeMs); } } } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java index 5625577b9f..e911fea309 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/MetricsTracer.java @@ -215,8 +215,8 @@ public void recordGfeMetadata(@Nullable Long latency) { MeasureMap measures = stats.newMeasureMap(); if (latency != null) { measures - .put(RpcMeasureConstants.BIGTABLE_GFE_LATENCY, latency) - .put(RpcMeasureConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT, 0L); + .put(RpcMeasureConstants.BIGTABLE_GFE_LATENCY, latency) + .put(RpcMeasureConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT, 0L); } else { measures.put(RpcMeasureConstants.BIGTABLE_GFE_HEADER_MISSING_COUNT, 1L); } diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/TracedBatcherUnaryCallable.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/TracedBatcherUnaryCallable.java index ba1860bb26..ffe1d23e52 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/TracedBatcherUnaryCallable.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/TracedBatcherUnaryCallable.java @@ -39,6 +39,7 @@ public TracedBatcherUnaryCallable(UnaryCallable innerCallable) { public ApiFuture futureCall(RequestT request, ApiCallContext context) { if (context.getOption(Batcher.THROTTLED_TIME_KEY) != null) { ApiTracer tracer = context.getTracer(); + // this should always be true if (tracer instanceof BigtableTracer) { ((BigtableTracer) tracer) .batchRequestThrottled(context.getOption(Batcher.THROTTLED_TIME_KEY)); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java index 7addd59701..ae045123f1 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java @@ -29,7 +29,6 @@ import com.google.api.gax.grpc.GaxGrpcProperties; import com.google.api.gax.grpc.GrpcCallContext; import com.google.api.gax.grpc.GrpcTransportChannel; -import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.FixedTransportChannelProvider; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.auth.oauth2.ServiceAccountJwtAccessCredentials; @@ -440,7 +439,6 @@ public void testCallContextPropagatedInMutationBatcher() .setPrimedTableIds("table1", "table2") .build(); - ClientContext context = ClientContext.create(settings); try (EnhancedBigtableStub stub = EnhancedBigtableStub.create(settings)) { // clear the previous contexts contextInterceptor.contexts.clear();