chore: use server address instead of endpoint context

Author: diegomarquezp

gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java

@@ -271,7 +271,9 @@ public static ClientContext create(StubSettings settings) throws IOException {
       backgroundResources.add(watchdog);
     }
     ApiTracerContext apiTracerContext =
-        ApiTracerContext.newBuilder().setEndpointContext(endpointContext).build();
+        ApiTracerContext.newBuilder()
+            .setServerAddress(endpointContext.resolvedServerAddress())
+            .build();
     ApiTracerFactory apiTracerFactory = settings.getTracerFactory().withContext(apiTracerContext);
 
     return newBuilder()

gax-java/gax/src/main/java/com/google/api/gax/tracing/ApiTracerContext.java

@@ -31,7 +31,6 @@
 package com.google.api.gax.tracing;
 
 import com.google.api.core.InternalApi;
-import com.google.api.gax.rpc.EndpointContext;
 import com.google.auto.value.AutoValue;
 import javax.annotation.Nullable;
 
@@ -46,15 +45,15 @@
 public abstract class ApiTracerContext {
 
   @Nullable
-  public abstract EndpointContext getEndpointContext();
+  public abstract String getServerAddress();
 
   public static Builder newBuilder() {
     return new AutoValue_ApiTracerContext.Builder();
   }
 
   @AutoValue.Builder
   public abstract static class Builder {
-    public abstract Builder setEndpointContext(EndpointContext endpointContext);
+    public abstract Builder setServerAddress(String serverAddress);
 
     public abstract ApiTracerContext build();
   }

gax-java/gax/src/main/java/com/google/api/gax/tracing/TracingTracerFactory.java

@@ -97,10 +97,8 @@ public ApiTracer newTracer(ApiTracer parent, SpanName spanName, OperationType op
   @Override
   public ApiTracerFactory withContext(ApiTracerContext context) {
     Map<String, String> newAttemptAttributes = new HashMap<>(this.attemptAttributes);
-    if (context.getEndpointContext() != null) {
-      newAttemptAttributes.put(
-          TracingTracer.SERVER_ADDRESS_ATTRIBUTE,
-          context.getEndpointContext().resolvedServerAddress());
+    if (context.getServerAddress() != null) {
+      newAttemptAttributes.put(TracingTracer.SERVER_ADDRESS_ATTRIBUTE, context.getServerAddress());
     }
     return new TracingTracerFactory(tracingRecorder, operationAttributes, newAttemptAttributes);
   }

gax-java/gax/src/test/java/com/google/api/gax/tracing/TracingTracerFactoryTest.java

@@ -39,7 +39,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.api.gax.rpc.EndpointContext;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
@@ -89,11 +88,8 @@ void testWithContext_addsInferredAttributes() {
     TracingRecorder.GaxSpan operationHandle = mock(TracingRecorder.GaxSpan.class);
     when(recorder.createSpan(anyString(), anyMap())).thenReturn(operationHandle);
 
-    EndpointContext endpointContext = mock(EndpointContext.class);
-    when(endpointContext.resolvedServerAddress()).thenReturn("example.com");
-
     ApiTracerContext context =
-        ApiTracerContext.newBuilder().setEndpointContext(endpointContext).build();
+        ApiTracerContext.newBuilder().setServerAddress("example.com").build();
 
     TracingTracerFactory factory = new TracingTracerFactory(recorder);
     ApiTracerFactory factoryWithContext = factory.withContext(context);