fix

Author: sushanb

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/MetricsImpl.java

@@ -31,10 +31,10 @@
 import com.google.cloud.bigtable.data.v2.internal.csm.tracers.BuiltinMetricsTracerFactory;
 import com.google.cloud.bigtable.data.v2.internal.csm.tracers.ChannelPoolMetricsTracer;
 import com.google.cloud.bigtable.data.v2.internal.csm.tracers.CompositeTracerFactory;
-import com.google.cloud.bigtable.data.v2.internal.csm.tracers.DefaultDirectPathCompatibleTracer;
 import com.google.cloud.bigtable.data.v2.internal.csm.tracers.DirectPathCompatibleTracer;
-import com.google.cloud.bigtable.data.v2.internal.csm.tracers.NoopDirectPathCompatibleTracer;
+import com.google.cloud.bigtable.data.v2.internal.csm.tracers.DirectPathCompatibleTracerImpl;
 import com.google.cloud.bigtable.data.v2.internal.csm.tracers.Pacemaker;
+import com.google.cloud.bigtable.data.v2.stub.metrics.NoopMetricsProvider;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -99,7 +99,7 @@ public MetricsImpl(
       this.pacemaker = new Pacemaker(internalRecorder, clientInfo, "background");
       this.channelPoolMetricsTracer = new ChannelPoolMetricsTracer(internalRecorder, clientInfo);
       this.directPathCompatibleTracer =
-          new DefaultDirectPathCompatibleTracer(clientInfo, internalRecorder);
+          new DirectPathCompatibleTracerImpl(clientInfo, internalRecorder);
       this.grpcOtel =
           GrpcOpenTelemetry.newBuilder()
               .sdk(internalOtel)
@@ -115,7 +115,7 @@ public MetricsImpl(
       this.grpcOtel = null;
       this.pacemaker = null;
       this.channelPoolMetricsTracer = null;
-      this.directPathCompatibleTracer = NoopDirectPathCompatibleTracer.INSTANCE;
+      this.directPathCompatibleTracer = NoopMetricsProvider.NoopDirectPathCompatibleTracer.INSTANCE;
     }
 
     if (userOtel != null) {

…s/DefaultDirectPathCompatibleTracer.java …cers/DirectPathCompatibleTracerImpl.javagoogle-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/tracers/DefaultDirectPathCompatibleTracer.java renamed to google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/tracers/DirectPathCompatibleTracerImpl.java google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/tracers/DefaultDirectPathCompatibleTracer.java renamed to google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/tracers/DirectPathCompatibleTracerImpl.java

@@ -21,11 +21,11 @@
 import com.google.cloud.bigtable.data.v2.internal.csm.attributes.Util;
 
 @InternalApi
-public class DefaultDirectPathCompatibleTracer implements DirectPathCompatibleTracer {
+public class DirectPathCompatibleTracerImpl implements DirectPathCompatibleTracer {
   private final ClientInfo clientInfo;
   private final MetricRegistry.RecorderRegistry recorder;
 
-  public DefaultDirectPathCompatibleTracer(
+  public DirectPathCompatibleTracerImpl(
       ClientInfo clientInfo, MetricRegistry.RecorderRegistry recorder) {
     this.clientInfo = clientInfo;
     this.recorder = recorder;

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/csm/tracers/NoopDirectPathCompatibleTracer.java

@@ -60,7 +60,7 @@ public static void investigateAndReport(
           "Direct Access investigation: Defaulting to unknown failure reason for now.",
           originalError);
     } catch (Exception e) {
-      LOG.log(Level.WARNING, "Failed to complete Direct Access investigation", e);
+      LOG.log(Level.WARNING, "Failed to record results of the Direct Access investigation", e);
     }
   }
 

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/dp/DirectAccessInvestigator.java

@@ -32,8 +32,6 @@
 import com.google.cloud.bigtable.data.v2.internal.csm.Metrics;
 import com.google.cloud.bigtable.data.v2.internal.csm.MetricsImpl;
 import com.google.cloud.bigtable.data.v2.internal.csm.attributes.ClientInfo;
-import com.google.cloud.bigtable.data.v2.internal.csm.tracers.DirectPathCompatibleTracer;
-import com.google.cloud.bigtable.data.v2.internal.csm.tracers.NoopDirectPathCompatibleTracer;
 import com.google.cloud.bigtable.data.v2.internal.dp.ClassicDirectAccessChecker;
 import com.google.cloud.bigtable.data.v2.internal.dp.DirectAccessChecker;
 import com.google.cloud.bigtable.data.v2.internal.dp.NoopDirectAccessChecker;
@@ -166,15 +164,10 @@ public static BigtableClientContext create(
                 builder.getHeaderProvider().getHeaders());
       }
 
-      DirectPathCompatibleTracer directPathCompatibleTracer =
-          settings.isDirectPathEnabledByDefault()
-              ? metrics.getDirectPathCompatibleTracer()
-              : NoopDirectPathCompatibleTracer.INSTANCE;
-
       DirectAccessChecker directAccessChecker =
           settings.isDirectPathEnabledByDefault()
               ? new ClassicDirectAccessChecker(
-                  directPathCompatibleTracer, channelPrimer, backgroundExecutor)
+                  metrics.getDirectPathCompatibleTracer(), channelPrimer, backgroundExecutor)
               : NoopDirectAccessChecker.INSTANCE;
 
       BigtableTransportChannelProvider btTransportProvider =

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

@@ -15,6 +15,8 @@
  */
 package com.google.cloud.bigtable.data.v2.stub.metrics;
 
+import com.google.cloud.bigtable.data.v2.internal.csm.attributes.Util;
+import com.google.cloud.bigtable.data.v2.internal.csm.tracers.DirectPathCompatibleTracer;
 import com.google.common.base.MoreObjects;
 
 /**
@@ -33,4 +35,23 @@ private NoopMetricsProvider() {}
   public String toString() {
     return MoreObjects.toStringHelper(this).toString();
   }
+
+  /** A no-op implementation of {@link DirectPathCompatibleTracer}. */
+  public static final class NoopDirectPathCompatibleTracer implements DirectPathCompatibleTracer {
+
+    public static final NoopDirectPathCompatibleTracer INSTANCE =
+        new NoopDirectPathCompatibleTracer();
+
+    private NoopDirectPathCompatibleTracer() {}
+
+    @Override
+    public void recordSuccess(Util.IpProtocol ipProtocol) {
+      // No-op
+    }
+
+    @Override
+    public void recordFailure(String reason) {
+      // No-op
+    }
+  }
 }