feat(o11y): introduce server.port attribute

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

@@ -274,6 +274,7 @@ public static ClientContext create(StubSettings settings) throws IOException {
     ApiTracerContext apiTracerContext =
         ApiTracerContext.newBuilder()
             .setServerAddress(endpointContext.resolvedServerAddress())
+            .setServerPort(endpointContext.resolvedServerPort())
             .setLibraryMetadata(settings.getLibraryMetadata())
             .build();
     ApiTracerFactory apiTracerFactory = settings.getTracerFactory();

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

@@ -136,6 +136,9 @@ public static EndpointContext getDefaultInstance() {
 
   public abstract String resolvedServerAddress();
 
+  @Nullable
+  public abstract Integer resolvedServerPort();
+
   public abstract Builder toBuilder();
 
   public static Builder newBuilder() {
@@ -233,6 +236,8 @@ public abstract static class Builder {
 
     public abstract Builder setResolvedServerAddress(String serverAddress);
 
+    public abstract Builder setResolvedServerPort(Integer serverPort);
+
     public abstract Builder setResolvedUniverseDomain(String resolvedUniverseDomain);
 
     abstract Builder setUseS2A(boolean useS2A);
@@ -264,6 +269,8 @@ public abstract static class Builder {
 
     abstract String resolvedUniverseDomain();
 
+    abstract String resolvedEndpoint();
+
     abstract EndpointContext autoBuild();
 
     private String determineUniverseDomain() {
@@ -388,19 +395,38 @@ boolean shouldUseS2A() {
     }
 
     private String parseServerAddress(String endpoint) {
-      if (Strings.isNullOrEmpty(endpoint)) {
+      if (endpoint.isEmpty()) {
         return endpoint;
       }
+      HostAndPort hostAndPort = parseServerHostAndPort(endpoint);
+      if (hostAndPort == null) {
+        return null;
+      }
+      return hostAndPort.getHost();
+    }
+
+    private Integer parseServerPort(String endpoint) {
+      if (endpoint.isEmpty()) {
+        return null;
+      }
+      HostAndPort hostAndPort = parseServerHostAndPort(endpoint);
+      if (!hostAndPort.hasPort()) {
+        return null;
+      }
+      return hostAndPort.getPort();
+    }
+
+    private HostAndPort parseServerHostAndPort(String endpoint) {
       String hostPort = endpoint;
       if (hostPort.contains("://")) {
         // Strip the scheme if present. HostAndPort doesn't support schemes.
         hostPort = hostPort.substring(hostPort.indexOf("://") + 3);
       }
       try {
-        return HostAndPort.fromString(hostPort).getHost();
+        return HostAndPort.fromString(hostPort);
       } catch (IllegalArgumentException e) {
         // Fallback for cases HostAndPort can't handle.
-        return hostPort;
+        return null;
       }
     }
 
@@ -440,7 +466,8 @@ public EndpointContext build() throws IOException {
       setResolvedUniverseDomain(determineUniverseDomain());
       String endpoint = determineEndpoint();
       setResolvedEndpoint(endpoint);
-      setResolvedServerAddress(parseServerAddress(endpoint));
+      setResolvedServerAddress(parseServerAddress(resolvedEndpoint()));
+      setResolvedServerPort(parseServerPort(resolvedEndpoint()));
       setUseS2A(shouldUseS2A());
       return autoBuild();
     }

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

@@ -33,6 +33,7 @@
 import com.google.api.core.InternalApi;
 import com.google.api.gax.rpc.LibraryMetadata;
 import com.google.auto.value.AutoValue;
+import com.google.common.base.Strings;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -49,20 +50,26 @@ public abstract class ApiTracerContext {
   @Nullable
   public abstract String serverAddress();
 
+  @Nullable
+  public abstract Integer serverPort();
+
   public abstract LibraryMetadata libraryMetadata();
 
   /**
    * @return a map of attributes to be included in attempt-level spans
    */
-  public Map<String, String> getAttemptAttributes() {
-    Map<String, String> attributes = new HashMap<>();
-    if (serverAddress() != null) {
+  public Map<String, Object> getAttemptAttributes() {
+    Map<String, Object> attributes = new HashMap<>();
+    if (!Strings.isNullOrEmpty(serverAddress())) {
       attributes.put(ObservabilityAttributes.SERVER_ADDRESS_ATTRIBUTE, serverAddress());
     }
-    if (libraryMetadata().repository() != null) {
+    if (serverPort() != null) {
+      attributes.put(ObservabilityAttributes.SERVER_PORT_ATTRIBUTE, serverPort());
+    }
+    if (!Strings.isNullOrEmpty(libraryMetadata().repository())) {
       attributes.put(ObservabilityAttributes.REPO_ATTRIBUTE, libraryMetadata().repository());
     }
-    if (libraryMetadata().artifactName() != null) {
+    if (!Strings.isNullOrEmpty(libraryMetadata().artifactName())) {
       attributes.put(ObservabilityAttributes.ARTIFACT_ATTRIBUTE, libraryMetadata().artifactName());
     }
     return attributes;
@@ -82,6 +89,8 @@ public abstract static class Builder {
 
     public abstract Builder setLibraryMetadata(LibraryMetadata gapicProperties);
 
+    public abstract Builder setServerPort(Integer serverPort);
+
     public abstract ApiTracerContext build();
   }
 }

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

@@ -44,6 +44,9 @@ public class ObservabilityAttributes {
   /** The address of the server being called (e.g., "pubsub.googleapis.com"). */
   public static final String SERVER_ADDRESS_ATTRIBUTE = "server.address";
 
+  /** The port of the server being called (e.g., 443). */
+  public static final String SERVER_PORT_ATTRIBUTE = "server.port";
+
   /** The repository of the client library (e.g., "googleapis/google-cloud-java"). */
   public static final String REPO_ATTRIBUTE = "gcp.client.repo";
 

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

@@ -51,14 +51,21 @@
   }
 
   @Override
-  public Span createSpan(String name, Map<String, String> attributes) {
+  public Span createSpan(String name, Map<String, Object> attributes) {
     SpanBuilder spanBuilder = tracer.spanBuilder(name);
 
     // Attempt spans are of the CLIENT kind
     spanBuilder.setSpanKind(SpanKind.CLIENT);
 
     if (attributes != null) {
-      attributes.forEach((k, v) -> spanBuilder.setAttribute(k, v));
+      attributes.forEach(
+          (k, v) -> {
+            if (v instanceof String) {
+              spanBuilder.setAttribute(k, (String) v);
+            } else if (v instanceof Integer) {
+              spanBuilder.setAttribute(k, (long) (Integer) v);
+            }
+          });
     }
 
     io.opentelemetry.api.trace.Span span = spanBuilder.startSpan();

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

@@ -48,7 +48,7 @@ public class SpanTracer implements ApiTracer {
   public static final String DEFAULT_LANGUAGE = "Java";
 
   private final TraceManager traceManager;
-  private final Map<String, String> attemptAttributes;
+  private final Map<String, Object> attemptAttributes;
   private final String attemptSpanName;
   private final ApiTracerContext apiTracerContext;
   private TraceManager.Span attemptHandle;
@@ -75,7 +75,7 @@ private void buildAttributes() {
 
   @Override
   public void attemptStarted(Object request, int attemptNumber) {
-    Map<String, String> attemptAttributes = new HashMap<>(this.attemptAttributes);
+    Map<String, Object> attemptAttributes = new HashMap<>(this.attemptAttributes);
     // Start the specific attempt span with the operation span as parent
     this.attemptHandle = traceManager.createSpan(attemptSpanName, attemptAttributes);
   }

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

@@ -42,7 +42,7 @@
 @InternalApi
 public interface TraceManager {
   /** Starts a span and returns a handle to manage its lifecycle. */
-  Span createSpan(String name, Map<String, String> attributes);
+  Span createSpan(String name, Map<String, Object> attributes);
 
   interface Span {
     void end();

gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java

@@ -595,7 +595,7 @@ void shouldUseS2A_success() throws IOException {
   }
 
   @Test
-  void endpointContextBuild_resolvesPortAndServerAddress() throws IOException {
+  void endpointContextBuild_resolvesServerAddress() throws IOException {
     String endpoint = "http://localhost:7469";
     EndpointContext endpointContext =
         defaultEndpointContextBuilder
@@ -638,4 +638,49 @@ void endpointContextBuild_resolvesPortAndServerAddress() throws IOException {
             .build();
     Truth.assertThat(endpointContext.resolvedServerAddress()).isEqualTo("2001:db8::1");
   }
+
+  @Test
+  void endpointContextBuild_resolvesPort() throws IOException {
+    String endpoint = "http://localhost:7469";
+    EndpointContext endpointContext =
+        defaultEndpointContextBuilder
+            .setClientSettingsEndpoint(endpoint)
+            .setTransportChannelProviderEndpoint(null)
+            .build();
+    Truth.assertThat(endpointContext.resolvedServerPort()).isEqualTo(7469);
+
+    endpoint = "localhost:7469";
+    endpointContext =
+        defaultEndpointContextBuilder
+            .setClientSettingsEndpoint(endpoint)
+            .setTransportChannelProviderEndpoint(null)
+            .build();
+    Truth.assertThat(endpointContext.resolvedServerPort()).isEqualTo(7469);
+
+    endpoint = "test.googleapis.com:443";
+    endpointContext =
+        defaultEndpointContextBuilder
+            .setClientSettingsEndpoint(endpoint)
+            .setTransportChannelProviderEndpoint(null)
+            .build();
+    Truth.assertThat(endpointContext.resolvedServerPort()).isEqualTo(443);
+
+    // IPv6 literal with port
+    endpoint = "[2001:db8::1]:443";
+    endpointContext =
+        defaultEndpointContextBuilder
+            .setClientSettingsEndpoint(endpoint)
+            .setTransportChannelProviderEndpoint(null)
+            .build();
+    Truth.assertThat(endpointContext.resolvedServerPort()).isEqualTo(443);
+
+    // Bare IPv6 literal (no port)
+    endpoint = "2001:db8::1";
+    endpointContext =
+        defaultEndpointContextBuilder
+            .setClientSettingsEndpoint(endpoint)
+            .setTransportChannelProviderEndpoint(null)
+            .build();
+    Truth.assertThat(endpointContext.resolvedServerPort()).isNull();
+  }
 }

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

@@ -45,7 +45,7 @@ void testGetAttemptAttributes_serverAddress() {
             .setLibraryMetadata(LibraryMetadata.empty())
             .setServerAddress("test-address")
             .build();
-    Map<String, String> attributes = context.getAttemptAttributes();
+    Map<String, Object> attributes = context.getAttemptAttributes();
 
     assertThat(attributes)
         .containsEntry(ObservabilityAttributes.SERVER_ADDRESS_ATTRIBUTE, "test-address");
@@ -57,7 +57,7 @@ void testGetAttemptAttributes_repo() {
         LibraryMetadata.newBuilder().setRepository("test-repo").build();
     ApiTracerContext context =
         ApiTracerContext.newBuilder().setLibraryMetadata(libraryMetadata).build();
-    Map<String, String> attributes = context.getAttemptAttributes();
+    Map<String, Object> attributes = context.getAttemptAttributes();
 
     assertThat(attributes).containsEntry(ObservabilityAttributes.REPO_ATTRIBUTE, "test-repo");
   }
@@ -68,7 +68,7 @@ void testGetAttemptAttributes_artifact() {
         LibraryMetadata.newBuilder().setArtifactName("test-artifact").build();
     ApiTracerContext context =
         ApiTracerContext.newBuilder().setLibraryMetadata(libraryMetadata).build();
-    Map<String, String> attributes = context.getAttemptAttributes();
+    Map<String, Object> attributes = context.getAttemptAttributes();
 
     assertThat(attributes)
         .containsEntry(ObservabilityAttributes.ARTIFACT_ATTRIBUTE, "test-artifact");
@@ -77,7 +77,21 @@ void testGetAttemptAttributes_artifact() {
   @Test
   void testGetAttemptAttributes_empty() {
     ApiTracerContext context = ApiTracerContext.empty();
-    Map<String, String> attributes = context.getAttemptAttributes();
+    Map<String, Object> attributes = context.getAttemptAttributes();
+
+    assertThat(attributes).isEmpty();
+  }
+
+  @Test
+  void testGetAttemptAttributes_emptyStrings() {
+    LibraryMetadata libraryMetadata =
+        LibraryMetadata.newBuilder().setRepository("").setArtifactName("").build();
+    ApiTracerContext context =
+        ApiTracerContext.newBuilder()
+            .setLibraryMetadata(libraryMetadata)
+            .setServerAddress("")
+            .build();
+    Map<String, Object> attributes = context.getAttemptAttributes();
 
     assertThat(attributes).isEmpty();
   }

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

@@ -30,6 +30,7 @@
 
 package com.google.api.gax.tracing;
 
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -90,7 +91,7 @@ void testCreateSpan_attempt_isClient() {
   @Test
   void testCreateSpan_recordsSpan() {
     String spanName = "test-span";
-    Map<String, String> attributes = ImmutableMap.of("key1", "value1");
+    Map<String, Object> attributes = ImmutableMap.of("key1", "value1");
 
     when(tracer.spanBuilder(spanName)).thenReturn(spanBuilder);
     when(spanBuilder.setSpanKind(SpanKind.CLIENT)).thenReturn(spanBuilder);
@@ -102,4 +103,19 @@ void testCreateSpan_recordsSpan() {
 
     verify(span).end();
   }
+
+  @Test
+  void testCreateSpan_recordsIntegerAttribute() {
+    String spanName = "test-span";
+    Map<String, Object> attributes = ImmutableMap.of("port", 443);
+
+    when(tracer.spanBuilder(spanName)).thenReturn(spanBuilder);
+    when(spanBuilder.setSpanKind(SpanKind.CLIENT)).thenReturn(spanBuilder);
+    when(spanBuilder.setAttribute(anyString(), anyLong())).thenReturn(spanBuilder);
+    when(spanBuilder.startSpan()).thenReturn(span);
+
+    recorder.createSpan(spanName, attributes);
+
+    verify(spanBuilder).setAttribute("port", 443L);
+  }
 }

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

@@ -76,10 +76,10 @@ void testNewTracer_addsAttributes() {
 
     tracer.attemptStarted(null, 1);
 
-    ArgumentCaptor<Map<String, String>> attributesCaptor = ArgumentCaptor.forClass(Map.class);
+    ArgumentCaptor<Map<String, Object>> attributesCaptor = ArgumentCaptor.forClass(Map.class);
     verify(recorder, atLeastOnce()).createSpan(anyString(), attributesCaptor.capture());
 
-    Map<String, String> attemptAttributes = attributesCaptor.getValue();
+    Map<String, Object> attemptAttributes = attributesCaptor.getValue();
     assertThat(attemptAttributes).containsEntry("server.address", "test-address");
   }
 
@@ -104,10 +104,10 @@ void testWithContext_addsInferredAttributes() {
 
     tracer.attemptStarted(null, 1);
 
-    ArgumentCaptor<Map<String, String>> attributesCaptor = ArgumentCaptor.forClass(Map.class);
+    ArgumentCaptor<Map<String, Object>> attributesCaptor = ArgumentCaptor.forClass(Map.class);
     verify(recorder, atLeastOnce()).createSpan(anyString(), attributesCaptor.capture());
 
-    Map<String, String> attemptAttributes = attributesCaptor.getValue();
+    Map<String, Object> attemptAttributes = attributesCaptor.getValue();
     assertThat(attemptAttributes)
         .containsEntry(ObservabilityAttributes.SERVER_ADDRESS_ATTRIBUTE, "example.com");
   }
@@ -129,10 +129,10 @@ void testWithContext_noEndpointContext_doesNotAddAttributes() {
 
     tracer.attemptStarted(null, 1);
 
-    ArgumentCaptor<Map<String, String>> attributesCaptor = ArgumentCaptor.forClass(Map.class);
+    ArgumentCaptor<Map<String, Object>> attributesCaptor = ArgumentCaptor.forClass(Map.class);
     verify(recorder, atLeastOnce()).createSpan(anyString(), attributesCaptor.capture());
 
-    Map<String, String> attemptAttributes = attributesCaptor.getValue();
+    Map<String, Object> attemptAttributes = attributesCaptor.getValue();
     assertThat(attemptAttributes)
         .doesNotContainKey(ObservabilityAttributes.SERVER_ADDRESS_ATTRIBUTE);
   }

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

@@ -70,7 +70,7 @@ void testAttemptStarted_includesLanguageAttribute() {
 
     tracer.attemptStarted(new Object(), 1);
 
-    ArgumentCaptor<Map<String, String>> attributesCaptor = ArgumentCaptor.forClass(Map.class);
+    ArgumentCaptor<Map<String, Object>> attributesCaptor = ArgumentCaptor.forClass(Map.class);
     verify(recorder).createSpan(eq(ATTEMPT_SPAN_NAME), attributesCaptor.capture());
 
     assertThat(attributesCaptor.getValue())