fix: rename destination resource name to destination resource id

Author: blakeli0

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java

@@ -1508,7 +1508,7 @@ private static Predicate<String> shouldAutoPopulate(Message methodRequestMessage
   @Nullable
   protected static LambdaExpr createResourceNameExtractorClassInstance(
       Method method, ImmutableMap<String, Message> messageTypes) {
-    Field resourceNameField = getDestinationResourceNameField(method, messageTypes);
+    Field resourceNameField = getDestinationResourceIdField(method, messageTypes);
 
     if (resourceNameField == null) {
       return null;
@@ -1531,7 +1531,7 @@ protected static LambdaExpr createResourceNameExtractorClassInstance(
         .build();
   }
 
-  private static Field getDestinationResourceNameField(
+  private static Field getDestinationResourceIdField(
       Method method, ImmutableMap<String, Message> messageTypes) {
     if (method.inputType().reference() == null
         || method.inputType().reference().fullName() == null) {

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

@@ -166,7 +166,7 @@ String rpcSystemName() {
 
   /** The destination resource name of the request (e.g. projects/p/locations/l/topics/t). */
   @Nullable
-  public abstract String destinationResourceName();
+  public abstract String destinationResourceId();
 
   /**
    * @return a map of attributes to be included in attempt-level spans
@@ -205,9 +205,9 @@ public Map<String, Object> getAttemptAttributes() {
         attributes.put(ObservabilityAttributes.HTTP_URL_TEMPLATE_ATTRIBUTE, httpPathTemplate());
       }
     }
-    if (!Strings.isNullOrEmpty(destinationResourceName())) {
+    if (!Strings.isNullOrEmpty(destinationResourceId())) {
       attributes.put(
-          ObservabilityAttributes.DESTINATION_RESOURCE_NAME_ATTRIBUTE, destinationResourceName());
+          ObservabilityAttributes.DESTINATION_RESOURCE_ID_ATTRIBUTE, destinationResourceId());
     }
     return attributes;
   }
@@ -278,8 +278,8 @@ ApiTracerContext merge(ApiTracerContext other) {
     if (!Strings.isNullOrEmpty(other.urlDomain())) {
       builder.setUrlDomain(other.urlDomain());
     }
-    if (other.destinationResourceName() != null) {
-      builder.setDestinationResourceName(other.destinationResourceName());
+    if (other.destinationResourceId() != null) {
+      builder.setDestinationResourceId(other.destinationResourceId());
     }
     return builder.build();
   }
@@ -316,7 +316,7 @@ public abstract static class Builder {
 
     public abstract Builder setUrlDomain(@Nullable String urlDomain);
 
-    public abstract Builder setDestinationResourceName(@Nullable String destinationResourceName);
+    public abstract Builder setDestinationResourceId(@Nullable String destinationResourceId);
 
     public abstract ApiTracerContext build();
   }

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

@@ -85,7 +85,7 @@ public class ObservabilityAttributes {
   /** The url template of the request (e.g. /v1/{name}:access). */
   public static final String URL_TEMPLATE_ATTRIBUTE = "url.template";
 
-  public static final String DESTINATION_RESOURCE_NAME_ATTRIBUTE = "gcp.resource.destination.id";
+  public static final String DESTINATION_RESOURCE_ID_ATTRIBUTE = "gcp.resource.destination.id";
 
   // Visible for testing
 }

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

@@ -101,7 +101,7 @@ public ApiFuture<ResponseT> futureCall(RequestT request, ApiCallContext context)
       String resourceName =
           resourceNameExtractor != null ? resourceNameExtractor.extract(request) : null;
       if (!Strings.isNullOrEmpty(resourceName)) {
-        finalContext = finalContext.toBuilder().setDestinationResourceName(resourceName).build();
+        finalContext = finalContext.toBuilder().setDestinationResourceId(resourceName).build();
       }
       tracer = tracerFactory.newTracer(context.getTracer(), finalContext);
     } else {

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

@@ -280,17 +280,17 @@ void testGetMetricsAttributes_urlTemplate() {
   }
 
   @Test
-  void testGetAttemptAttributes_destinationResourceName() {
+  void testGetAttemptAttributes_destinationResourceId() {
     ApiTracerContext context =
         ApiTracerContext.newBuilder()
             .setLibraryMetadata(LibraryMetadata.empty())
-            .setDestinationResourceName("projects/123/instances/abc")
+            .setDestinationResourceId("projects/123/instances/abc")
             .build();
     Map<String, Object> attributes = context.getAttemptAttributes();
 
     assertThat(attributes)
         .containsEntry(
-            ObservabilityAttributes.DESTINATION_RESOURCE_NAME_ATTRIBUTE,
+            ObservabilityAttributes.DESTINATION_RESOURCE_ID_ATTRIBUTE,
             "projects/123/instances/abc");
   }
 
@@ -352,26 +352,26 @@ void testMerge() {
   }
 
   @Test
-  void testMerge_destinationResourceName() {
+  void testMerge_destinationResourceId() {
     ApiTracerContext context1 =
         ApiTracerContext.newBuilder()
             .setLibraryMetadata(LibraryMetadata.empty())
-            .setDestinationResourceName("name1")
+            .setDestinationResourceId("name1")
             .build();
 
     ApiTracerContext context2 =
         ApiTracerContext.newBuilder()
             .setLibraryMetadata(LibraryMetadata.empty())
-            .setDestinationResourceName("name2")
+            .setDestinationResourceId("name2")
             .build();
 
     ApiTracerContext merged = context1.merge(context2);
-    assertThat(merged.destinationResourceName()).isEqualTo("name2");
+    assertThat(merged.destinationResourceId()).isEqualTo("name2");
 
     ApiTracerContext context3 =
         ApiTracerContext.newBuilder().setLibraryMetadata(LibraryMetadata.empty()).build();
     ApiTracerContext merged2 = context1.merge(context3);
-    assertThat(merged2.destinationResourceName())
+    assertThat(merged2.destinationResourceId())
         .isEqualTo("name1"); // Should retain old if new is null/empty
   }
 

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

@@ -203,7 +203,7 @@ void testResourceNameExtractorUsed() {
     verify(tracerFactory).newTracer(any(ApiTracer.class), contextCaptor.capture());
 
     // Verify the extractor was triggered and injected the field
-    assertThat(contextCaptor.getValue().destinationResourceName())
+    assertThat(contextCaptor.getValue().destinationResourceId())
         .isEqualTo("extracted-resource-name");
   }
 }