fix null handling of sideband data formating and remove stale code

Change-Id: Icf1b8ed5d020c9bf5386173b817a89f1679369b4

Author: igorbernstein2

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

@@ -17,7 +17,6 @@
 
 import com.google.api.core.InternalApi;
 import com.google.api.gax.grpc.GrpcCallContext;
-import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.bigtable.v2.PeerInfo;
 import com.google.bigtable.v2.ResponseParams;
 import com.google.common.base.Strings;

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

@@ -34,20 +34,17 @@
 import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.retrying.ServerStreamingAttemptException;
 import com.google.api.gax.tracing.SpanName;
-import com.google.auto.value.AutoValue;
 import com.google.bigtable.v2.PeerInfo;
 import com.google.cloud.bigtable.Version;
 import com.google.cloud.bigtable.data.v2.stub.MetadataExtractorInterceptor;
 import com.google.common.base.Stopwatch;
 import com.google.common.math.IntMath;
-import com.google.gson.reflect.TypeToken;
 import io.grpc.Deadline;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.DoubleGauge;
 import io.opentelemetry.api.metrics.DoubleHistogram;
 import io.opentelemetry.api.metrics.LongCounter;
 import java.time.Duration;
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.TimeUnit;
@@ -61,22 +58,6 @@
  * bigtable.googleapis.com/client namespace
  */
 class BuiltinMetricsTracer extends BigtableTracer {
-  @AutoValue
-  abstract static class TransportAttrs {
-    @Nullable
-    abstract String getLocality();
-
-    @Nullable
-    abstract String getBackendService();
-
-    static TransportAttrs create(@Nullable String locality, @Nullable String backendService) {
-      return new AutoValue_BuiltinMetricsTracer_TransportAttrs(locality, backendService);
-    }
-  }
-
-  private static final TypeToken<Map<String, String>> LOCALITY_TYPE =
-      new TypeToken<Map<String, String>>() {};
-
   private static final String NAME = "java-bigtable/" + Version.VERSION;
   private final OperationType operationType;
   private final SpanName spanName;
@@ -370,8 +351,8 @@ private void recordOperationCompletion(@Nullable Throwable status) {
     Attributes attributes =
         baseAttributes.toBuilder()
             .put(TABLE_ID_KEY, tableId)
-            .put(CLUSTER_ID_KEY, Util.formatClusterIdMetricLabel(sidebandData.getResponseParams()))
-            .put(ZONE_ID_KEY, Util.formatZoneIdMetricLabel(sidebandData.getResponseParams()))
+            .put(CLUSTER_ID_KEY, Util.formatClusterIdMetricLabel(sidebandData))
+            .put(ZONE_ID_KEY, Util.formatZoneIdMetricLabel(sidebandData))
             .put(METHOD_KEY, spanName.toString())
             .put(CLIENT_NAME_KEY, NAME)
             .put(STREAMING_KEY, isStreaming)
@@ -425,8 +406,8 @@ private void recordAttemptCompletion(@Nullable Throwable status) {
     Attributes attributes =
         baseAttributes.toBuilder()
             .put(TABLE_ID_KEY, tableId)
-            .put(CLUSTER_ID_KEY, Util.formatClusterIdMetricLabel(sidebandData.getResponseParams()))
-            .put(ZONE_ID_KEY, Util.formatZoneIdMetricLabel(sidebandData.getResponseParams()))
+            .put(CLUSTER_ID_KEY, Util.formatClusterIdMetricLabel(sidebandData))
+            .put(ZONE_ID_KEY, Util.formatZoneIdMetricLabel(sidebandData))
             .put(METHOD_KEY, spanName.toString())
             .put(CLIENT_NAME_KEY, NAME)
             .put(STREAMING_KEY, isStreaming)
@@ -445,7 +426,7 @@ private void recordAttemptCompletion(@Nullable Throwable status) {
     String transportSubzone = "";
 
     if (sidebandData != null) {
-      transportTypeStr = Util.formatTransportTypeMetricLabel(sidebandData.getPeerInfo());
+      transportTypeStr = Util.formatTransportTypeMetricLabel(sidebandData);
       transportZone =
           Optional.ofNullable(sidebandData.getPeerInfo())
               .map(PeerInfo::getApplicationFrontendZone)

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

@@ -35,7 +35,7 @@
 import com.google.bigtable.v2.SampleRowKeysRequest;
 import com.google.bigtable.v2.TableName;
 import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStubSettings;
-import com.google.common.base.Strings;
+import com.google.cloud.bigtable.data.v2.stub.MetadataExtractorInterceptor;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
 import io.grpc.Metadata;
@@ -177,26 +177,32 @@ public static OpenTelemetrySdk newInternalOpentelemetry(
     return OpenTelemetrySdk.builder().setMeterProvider(meterProviderBuilder.build()).build();
   }
 
-  public static String formatTransportTypeMetricLabel(PeerInfo peerInfo) {
-    return Optional.ofNullable(peerInfo)
+  public static String formatTransportTypeMetricLabel(
+      MetadataExtractorInterceptor.SidebandData sidebandData) {
+    return Optional.ofNullable(sidebandData)
+        .flatMap(s -> Optional.ofNullable(s.getPeerInfo()))
         .map(PeerInfo::getTransportType)
         .orElse(PeerInfo.TransportType.TRANSPORT_TYPE_UNKNOWN)
         .name()
         .replace("TRANSPORT_TYPE_", "")
         .toLowerCase(Locale.ENGLISH);
   }
 
-  public static String formatClusterIdMetricLabel(ResponseParams params) {
-    if (params == null || Strings.isNullOrEmpty(params.getClusterId())) {
-      return "<unspecified>";
-    }
-    return params.getClusterId();
+  public static String formatClusterIdMetricLabel(
+      @Nullable MetadataExtractorInterceptor.SidebandData sidebandData) {
+    return Optional.ofNullable(sidebandData)
+        .flatMap(d -> Optional.ofNullable(d.getResponseParams()))
+        .map(ResponseParams::getClusterId)
+        .filter(s -> !s.isEmpty())
+        .orElse("<unspecified>");
   }
 
-  public static String formatZoneIdMetricLabel(ResponseParams params) {
-    if (params == null || Strings.isNullOrEmpty(params.getZoneId())) {
-      return "global";
-    }
-    return params.getZoneId();
+  public static String formatZoneIdMetricLabel(
+      @Nullable MetadataExtractorInterceptor.SidebandData sidebandData) {
+    return Optional.ofNullable(sidebandData)
+        .flatMap(d -> Optional.ofNullable(d.getResponseParams()))
+        .map(ResponseParams::getZoneId)
+        .filter(s -> !s.isEmpty())
+        .orElse("global");
   }
 }