remove replaced location & gfe methods

Change-Id: I2aff3f13f2f07b400d6f2099b75c9f1462077e44

Author: igorbernstein2

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/BigtableTracer.java

@@ -71,18 +71,6 @@ public int getAttempt() {
     return attempt;
   }
 
-  /**
-   * Record the latency between Google's network receives the RPC and reads back the first byte of
-   * the response from server-timing header. If server-timing header is missing, increment the
-   * missing header count.
-   *
-   * @deprecated Use {@link #setSidebandData(MetadataExtractorInterceptor.SidebandData)}
-   */
-  @Deprecated
-  public void recordGfeMetadata(@Nullable Long latency, @Nullable Throwable throwable) {
-    // noop
-  }
-
   /** Adds an annotation of the total throttled time of a batch. */
   public void batchRequestThrottled(long throttledTimeMs) {
     // noop
@@ -92,31 +80,6 @@ public void setSidebandData(MetadataExtractorInterceptor.SidebandData sidebandDa
     // noop
   }
 
-  /**
-   * Set the Bigtable zone and cluster so metrics can be tagged with location information. This will
-   * be called in BuiltinMetricsTracer.
-   *
-   * @deprecated Use {@link #setSidebandData(MetadataExtractorInterceptor.SidebandData)}
-   */
-  @Deprecated
-  public void setLocations(String zone, String cluster) {}
-
-  /**
-   * Set the underlying transport used to process the attempt
-   *
-   * @deprecated Use {@link #setSidebandData(MetadataExtractorInterceptor.SidebandData)}
-   */
-  @Deprecated
-  public void setTransportAttrs(BuiltinMetricsTracer.TransportAttrs attrs) {}
-
-  @Deprecated
-  /**
-   * @deprecated {@link #grpcMessageSent()} is called instead.
-   */
-  public void grpcChannelQueuedLatencies(long queuedTimeMs) {
-    // noop
-  }
-
   /** Called when the message is sent on a grpc channel. */
   public void grpcMessageSent() {
     // noop

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracer.java

@@ -198,34 +198,13 @@ public int getAttempt() {
     return attempt;
   }
 
-  @Override
-  public void recordGfeMetadata(@Nullable Long latency, @Nullable Throwable throwable) {
-    for (BigtableTracer tracer : bigtableTracers) {
-      tracer.recordGfeMetadata(latency, throwable);
-    }
-  }
-
   @Override
   public void batchRequestThrottled(long throttledTimeMs) {
     for (BigtableTracer tracer : bigtableTracers) {
       tracer.batchRequestThrottled(throttledTimeMs);
     }
   }
 
-  @Override
-  public void setLocations(String zone, String cluster) {
-    for (BigtableTracer tracer : bigtableTracers) {
-      tracer.setLocations(zone, cluster);
-    }
-  }
-
-  @Override
-  public void setTransportAttrs(BuiltinMetricsTracer.TransportAttrs attrs) {
-    for (BigtableTracer tracer : bigtableTracers) {
-      tracer.setTransportAttrs(attrs);
-    }
-  }
-
   @Override
   public void setSidebandData(MetadataExtractorInterceptor.SidebandData sidebandData) {
     for (BigtableTracer bigtableTracer : bigtableTracers) {
@@ -254,13 +233,6 @@ public void afterResponse(long applicationLatency) {
     }
   }
 
-  @Override
-  public void grpcChannelQueuedLatencies(long queuedTimeMs) {
-    for (BigtableTracer tracer : bigtableTracers) {
-      tracer.grpcChannelQueuedLatencies(queuedTimeMs);
-    }
-  }
-
   @Override
   public void grpcMessageSent() {
     for (BigtableTracer tracer : bigtableTracers) {

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/CompositeTracerTest.java

@@ -25,10 +25,9 @@
 import com.google.api.gax.tracing.ApiTracer;
 import com.google.api.gax.tracing.ApiTracer.Scope;
 import com.google.bigtable.v2.ReadRowsRequest;
+import com.google.cloud.bigtable.data.v2.stub.MetadataExtractorInterceptor;
 import com.google.cloud.bigtable.misc_utilities.MethodComparator;
 import com.google.common.collect.ImmutableList;
-import io.grpc.Status;
-import io.grpc.StatusRuntimeException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import org.junit.Assert;
@@ -241,11 +240,12 @@ public void testGetAttempt() {
   }
 
   @Test
-  public void testRecordGfeLatency() {
-    Throwable t = new StatusRuntimeException(Status.UNAVAILABLE);
-    compositeTracer.recordGfeMetadata(20L, t);
-    verify(child3, times(1)).recordGfeMetadata(20L, t);
-    verify(child4, times(1)).recordGfeMetadata(20L, t);
+  public void testSidebandData() {
+    MetadataExtractorInterceptor.SidebandData sidebandData =
+        new MetadataExtractorInterceptor.SidebandData();
+    compositeTracer.setSidebandData(sidebandData);
+    verify(child3, times(1)).setSidebandData(sidebandData);
+    verify(child4, times(1)).setSidebandData(sidebandData);
   }
 
   @Test
@@ -264,13 +264,6 @@ public void testMethodsOverride() {
         .containsAtLeastElementsIn(baseMethods);
   }
 
-  @Test
-  public void testRequestBlockedOnChannel() {
-    compositeTracer.grpcChannelQueuedLatencies(5L);
-    verify(child3, times(1)).grpcChannelQueuedLatencies(5L);
-    verify(child4, times(1)).grpcChannelQueuedLatencies(5L);
-  }
-
   @Test
   public void testGrpcMessageSent() {
     compositeTracer.grpcMessageSent();