core,testing: deprecate passing ServerCall to StatsTraceContext (#3912)

Instead, pass a ServerCallInfo object containing the interesting bits
of info. This lets us modify the call handler for binary logging, but
still provide the original info to the StatsTraceContext API.

2 files changed, 7 insertions, 8 deletions

diff --git a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
index 05ec5f4ad..0af6b761a 100644
--- a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
+++ b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
@@ -581,7 +581,7 @@ public abstract class AbstractTransportTest {
         any(CallOptions.class), any(Metadata.class));
     assertSame(shutdownReason, clientStreamTracer1.getStatus());
     // Assert no interactions
-    assertNull(serverStreamTracer1.getServerCall());
+    assertNull(serverStreamTracer1.getServerCallInfo());
   }
 
   @Test
diff --git a/testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java b/testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java
index d8e3a3aa5..a7c347a47 100644
--- a/testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java
+++ b/testing/src/main/java/io/grpc/internal/testing/TestServerStreamTracer.java
@@ -16,7 +16,6 @@
 
 package io.grpc.internal.testing;
 
-import io.grpc.ServerCall;
 import io.grpc.ServerStreamTracer;
 import io.grpc.Status;
 import java.util.concurrent.TimeUnit;
@@ -27,8 +26,8 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 public class TestServerStreamTracer extends ServerStreamTracer implements TestStreamTracer {
   private final TestBaseStreamTracer delegate = new TestBaseStreamTracer();
-  protected final AtomicReference<ServerCall<?,?>> serverCall =
-      new AtomicReference<ServerCall<?,?>>();
+  protected final AtomicReference<ServerCallInfo<?, ?>> serverCallInfo =
+      new AtomicReference<ServerCallInfo<?, ?>>();
 
   @Override
   public void await() throws InterruptedException {
@@ -43,8 +42,8 @@ public class TestServerStreamTracer extends ServerStreamTracer implements TestSt
   /**
    * Returns the ServerCall passed to {@link ServerStreamTracer#serverCallStarted}.
    */
-  public ServerCall<?, ?> getServerCall() {
-    return serverCall.get();
+  public ServerCallInfo<?, ?> getServerCallInfo() {
+    return serverCallInfo.get();
   }
 
   @Override
@@ -145,8 +144,8 @@ public class TestServerStreamTracer extends ServerStreamTracer implements TestSt
   }
 
   @Override
-  public void serverCallStarted(ServerCall<?, ?> call) {
-    if (!serverCall.compareAndSet(null, call) && delegate.failDuplicateCallbacks.get()) {
+  public void serverCallStarted(ServerCallInfo<?, ?> callInfo) {
+    if (!serverCallInfo.compareAndSet(null, callInfo) && delegate.failDuplicateCallbacks.get()) {
       throw new AssertionError("serverCallStarted called more than once");
     }
   }