chore: revert changes and pass server address from ClientContext

diegomarquezp · diegomarquezp · commit 4aa17c4ab9e8 · 2026-02-20T13:17:32.000-05:00
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java
@@ -2100,30 +2100,24 @@ private static MethodDefinition createNestedClassBuildMethod(
 
   private MethodDefinition createGetApiTracerContextMethod(Service service, TypeStore typeStore) {
     TypeNode returnType = FIXED_TYPESTORE.get("ApiTracerContext");
+    VariableExpr serverAddressVarExpr =
+        VariableExpr.withVariable(
+            Variable.builder().setType(TypeNode.STRING).setName("serverAddress").build());
 
     TypeNode serviceApiTracerContextType =
         typeStore.get(ClassNames.getServiceApiTracerContextClassName(service));
 
-    Expr getEndpointContextExpr =
-        MethodInvocationExpr.builder().setMethodName("getEndpointContext").build();
-
-    Expr resolvedServerAddressExpr =
-        MethodInvocationExpr.builder()
-            .setExprReferenceExpr(getEndpointContextExpr)
-            .setMethodName("resolvedServerAddress")
-            .setReturnType(TypeNode.STRING)
-            .build();
-
     return MethodDefinition.builder()
         .setIsOverride(true)
         .setScope(ScopeNode.PROTECTED)
         .setReturnType(returnType)
         .setName("getApiTracerContext")
+        .setArguments(serverAddressVarExpr.toBuilder().setIsDecl(true).build())
         .setReturnExpr(
             MethodInvocationExpr.builder()
                 .setStaticReferenceType(serviceApiTracerContextType)
                 .setMethodName("create")
-                .setArguments(resolvedServerAddressExpr)
+                .setArguments(serverAddressVarExpr)
                 .setReturnType(returnType)
                 .build())
         .build();
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/ApiVersionTestingStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/ApiVersionTestingStubSettings.golden
@@ -168,8 +168,8 @@ public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStu
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return EchoWithVersionApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return EchoWithVersionApiTracerContext.create(serverAddress);
   }
 
   /** Builder for EchoWithVersionStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden
@@ -185,8 +185,8 @@ public class DeprecatedServiceStubSettings extends StubSettings<DeprecatedServic
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return DeprecatedServiceApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return DeprecatedServiceApiTracerContext.create(serverAddress);
   }
 
   /** Builder for DeprecatedServiceStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicStubSettings.golden
@@ -222,9 +222,8 @@ public class EchoServiceShouldGeneratePartialUsualStubSettings
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return EchoServiceShouldGeneratePartialUsualApiTracerContext.create(
-        getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return EchoServiceShouldGeneratePartialUsualApiTracerContext.create(serverAddress);
   }
 
   /** Builder for EchoServiceShouldGeneratePartialUsualStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden
@@ -408,8 +408,8 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return EchoApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return EchoApiTracerContext.create(serverAddress);
   }
 
   /** Builder for EchoStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/JobServiceStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/JobServiceStubSettings.golden
@@ -258,8 +258,8 @@ public class JobServiceStubSettings extends StubSettings<JobServiceStubSettings>
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return JobServiceApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return JobServiceApiTracerContext.create(serverAddress);
   }
 
   /** Builder for JobServiceStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden
@@ -510,8 +510,8 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return LoggingServiceV2ApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return LoggingServiceV2ApiTracerContext.create(serverAddress);
   }
 
   /** Builder for LoggingServiceV2StubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden
@@ -520,8 +520,8 @@ public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return PublisherApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return PublisherApiTracerContext.create(serverAddress);
   }
 
   /** Builder for PublisherStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden
@@ -440,8 +440,8 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return EchoApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return EchoApiTracerContext.create(serverAddress);
   }
 
   /** Builder for EchoStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden
@@ -187,8 +187,8 @@ public class WickedStubSettings extends StubSettings<WickedStubSettings> {
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return WickedApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return WickedApiTracerContext.create(serverAddress);
   }
 
   /** Builder for WickedStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden
@@ -223,8 +223,8 @@ public class ComplianceStubSettings extends StubSettings<ComplianceStubSettings>
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return ComplianceApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return ComplianceApiTracerContext.create(serverAddress);
   }
 
   /** Builder for ComplianceStubSettings. */
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonApiVersionTestingStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonApiVersionTestingStubSettings.golden
@@ -170,8 +170,8 @@ public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStu
   }
 
   @Override
-  protected ApiTracerContext getApiTracerContext() {
-    return EchoWithVersionApiTracerContext.create(getEndpointContext().resolvedServerAddress());
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return EchoWithVersionApiTracerContext.create(serverAddress);
   }
 
   /** Builder for EchoWithVersionStubSettings. */
diff --git a/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java b/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java
@@ -270,7 +270,8 @@ public static ClientContext create(StubSettings settings) throws IOException {
     if (watchdogProvider != null && watchdogProvider.shouldAutoClose()) {
       backgroundResources.add(watchdog);
     }
-    ApiTracerContext apiTracerContext = settings.getApiTracerContext();
+    ApiTracerContext apiTracerContext =
+        settings.getApiTracerContext(endpointContext.resolvedServerAddress());
     ApiTracerFactory apiTracerFactory = settings.getTracerFactory().withContext(apiTracerContext);
 
     return newBuilder()
diff --git a/gax-java/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java b/gax-java/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java
@@ -250,10 +250,14 @@ public final String getApiKey() {
     return apiKey;
   }
 
-  /** Returns an {@link ApiTracerContext} that contains information about the client library. */
+  /**
+   * Returns an {@link ApiTracerContext} that contains information about the client library.
+   *
+   * @param serverAddress The address of the server being called.
+   */
   @InternalApi
-  protected ApiTracerContext getApiTracerContext() {
-    return ApiTracerContext.create(endpointContext.resolvedServerAddress(), null);
+  protected ApiTracerContext getApiTracerContext(String serverAddress) {
+    return ApiTracerContext.create(serverAddress, null);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,8 @@ public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStu`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`@Override`
`171`		`- protected ApiTracerContext getApiTracerContext() {`
`172`		`- return EchoWithVersionApiTracerContext.create(getEndpointContext().resolvedServerAddress());`
	`171`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`172`	`+ return EchoWithVersionApiTracerContext.create(serverAddress);`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`/** Builder for EchoWithVersionStubSettings. */`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ public class DeprecatedServiceStubSettings extends StubSettings<DeprecatedServic`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`@Override`
`188`		`- protected ApiTracerContext getApiTracerContext() {`
`189`		`- return DeprecatedServiceApiTracerContext.create(getEndpointContext().resolvedServerAddress());`
	`188`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`189`	`+ return DeprecatedServiceApiTracerContext.create(serverAddress);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`/** Builder for DeprecatedServiceStubSettings. */`
Original file line number	Diff line number	Diff line change
`@@ -222,9 +222,8 @@ public class EchoServiceShouldGeneratePartialUsualStubSettings`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`@Override`
`225`		`- protected ApiTracerContext getApiTracerContext() {`
`226`		`- return EchoServiceShouldGeneratePartialUsualApiTracerContext.create(`
`227`		`- getEndpointContext().resolvedServerAddress());`
	`225`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`226`	`+ return EchoServiceShouldGeneratePartialUsualApiTracerContext.create(serverAddress);`
`228`	`227`	`}`
`229`	`228`
`230`	`229`	`/** Builder for EchoServiceShouldGeneratePartialUsualStubSettings. */`
Original file line number	Diff line number	Diff line change
`@@ -408,8 +408,8 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`@Override`
`411`		`- protected ApiTracerContext getApiTracerContext() {`
`412`		`- return EchoApiTracerContext.create(getEndpointContext().resolvedServerAddress());`
	`411`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`412`	`+ return EchoApiTracerContext.create(serverAddress);`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`/** Builder for EchoStubSettings. */`
Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,8 @@ public class JobServiceStubSettings extends StubSettings<JobServiceStubSettings>`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`@Override`
`261`		`- protected ApiTracerContext getApiTracerContext() {`
`262`		`- return JobServiceApiTracerContext.create(getEndpointContext().resolvedServerAddress());`
	`261`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`262`	`+ return JobServiceApiTracerContext.create(serverAddress);`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`/** Builder for JobServiceStubSettings. */`
Original file line number	Diff line number	Diff line change
`@@ -510,8 +510,8 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S`
`510`	`510`	`}`
`511`	`511`
`512`	`512`	`@Override`
`513`		`- protected ApiTracerContext getApiTracerContext() {`
`514`		`- return LoggingServiceV2ApiTracerContext.create(getEndpointContext().resolvedServerAddress());`
	`513`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`514`	`+ return LoggingServiceV2ApiTracerContext.create(serverAddress);`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`/** Builder for LoggingServiceV2StubSettings. */`
Original file line number	Diff line number	Diff line change
`@@ -520,8 +520,8 @@ public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`@Override`
`523`		`- protected ApiTracerContext getApiTracerContext() {`
`524`		`- return PublisherApiTracerContext.create(getEndpointContext().resolvedServerAddress());`
	`523`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`524`	`+ return PublisherApiTracerContext.create(serverAddress);`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`/** Builder for PublisherStubSettings. */`
Original file line number	Diff line number	Diff line change
`@@ -440,8 +440,8 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`@Override`
`443`		`- protected ApiTracerContext getApiTracerContext() {`
`444`		`- return EchoApiTracerContext.create(getEndpointContext().resolvedServerAddress());`
	`443`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`444`	`+ return EchoApiTracerContext.create(serverAddress);`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`/** Builder for EchoStubSettings. */`
Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,8 @@ public class WickedStubSettings extends StubSettings<WickedStubSettings> {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`@Override`
`190`		`- protected ApiTracerContext getApiTracerContext() {`
`191`		`- return WickedApiTracerContext.create(getEndpointContext().resolvedServerAddress());`
	`190`	`+ protected ApiTracerContext getApiTracerContext(String serverAddress) {`
	`191`	`+ return WickedApiTracerContext.create(serverAddress);`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`/** Builder for WickedStubSettings. */`