impl(o11y): introduce gcp.client.service attribute

Author: diegomarquezp

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

@@ -276,6 +276,7 @@ public static ClientContext create(StubSettings settings) throws IOException {
             .setServerAddress(endpointContext.resolvedServerAddress())
             .setServerPort(endpointContext.resolvedServerPort())
             .setLibraryMetadata(settings.getLibraryMetadata())
+            .setServiceName(endpointContext.serviceName())
             .build();
     ApiTracerFactory apiTracerFactory = settings.getTracerFactory();
     if (apiTracerFactory instanceof SpanTracerFactory) {

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

@@ -186,6 +186,19 @@ void testGetAttemptAttributes_emptyStrings() {
     assertThat(attributes).isEmpty();
   }
 
+  @Test
+  void testGetAttemptAttributes_serviceName() {
+    ApiTracerContext context =
+        ApiTracerContext.newBuilder()
+            .setLibraryMetadata(LibraryMetadata.empty())
+            .setServiceName("test-service")
+            .build();
+    Map<String, Object> attributes = context.getAttemptAttributes();
+
+    assertThat(attributes)
+        .containsEntry(ObservabilityAttributes.GCP_CLIENT_SERVICE_ATTRIBUTE, "test-service");
+  }
+
   @Test
   void testGetMetricsAttributes_serverPort() {
     ApiTracerContext context =

sdk-platform-java/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelTracing.java

@@ -50,6 +50,8 @@
 import com.google.showcase.v1beta1.it.util.TestClientInitializer;
 import com.google.showcase.v1beta1.stub.EchoStub;
 import com.google.showcase.v1beta1.stub.EchoStubSettings;
+import io.grpc.ManagedChannelBuilder;
+import java.io.IOException;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
@@ -98,8 +100,22 @@ void tearDown() {
   void testTracing_successfulEcho_grpc() throws Exception {
     SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
 
-    try (EchoClient client =
-        TestClientInitializer.createGrpcEchoClientOpentelemetry(tracingFactory)) {
+    EchoSettings grpcEchoSettings =
+        EchoSettings.newBuilder()
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .setTransportChannelProvider(
+                EchoSettings.defaultGrpcTransportProviderBuilder()
+                    .setChannelConfigurator(ManagedChannelBuilder::usePlaintext)
+                    .build())
+            .setEndpoint("localhost:7469")
+            .build();
+
+    EchoStubSettings.Builder builder = (EchoStubSettings.Builder) grpcEchoSettings.getStubSettings().toBuilder();
+    builder.setTracerFactory(tracingFactory);
+    ExtendedEchoStubSettings echoStubSettings = new ExtendedEchoStubSettings(builder);
+    EchoStub stub = echoStubSettings.createStub();
+
+    try (EchoClient client = EchoClient.create(stub)) {
 
       client.echo(EchoRequest.newBuilder().setContent("tracing-test").build());
 
@@ -142,6 +158,11 @@ void testTracing_successfulEcho_grpc() throws Exception {
                   .getAttributes()
                   .get(AttributeKey.stringKey(ObservabilityAttributes.RPC_SYSTEM_NAME_ATTRIBUTE)))
           .isEqualTo("grpc");
+      assertThat(
+              attemptSpan
+                  .getAttributes()
+                  .get(AttributeKey.stringKey(ObservabilityAttributes.GCP_CLIENT_SERVICE_ATTRIBUTE)))
+          .isEqualTo("showcase");
       assertThat(
               attemptSpan
                   .getAttributes()
@@ -156,8 +177,23 @@ void testTracing_successfulEcho_grpc() throws Exception {
   void testTracing_successfulEcho_httpjson() throws Exception {
     SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
 
-    try (EchoClient client =
-        TestClientInitializer.createHttpJsonEchoClientOpentelemetry(tracingFactory)) {
+    EchoSettings httpJsonEchoSettings =
+        EchoSettings.newHttpJsonBuilder()
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .setTransportChannelProvider(
+                EchoSettings.defaultHttpJsonTransportProviderBuilder()
+                    .setHttpTransport(
+                        new NetHttpTransport.Builder().doNotValidateCertificate().build())
+                    .build())
+            .setEndpoint("http://localhost:7469")
+            .build();
+
+    EchoStubSettings.Builder builder = (EchoStubSettings.Builder) httpJsonEchoSettings.getStubSettings().toBuilder();
+    builder.setTracerFactory(tracingFactory);
+    ExtendedEchoStubSettings echoStubSettings = new ExtendedEchoStubSettings(builder);
+    EchoStub stub = echoStubSettings.createStub();
+
+    try (EchoClient client = EchoClient.create(stub)) {
 
       client.echo(EchoRequest.newBuilder().setContent("tracing-test").build());
 
@@ -196,6 +232,11 @@ void testTracing_successfulEcho_httpjson() throws Exception {
                   .getAttributes()
                   .get(AttributeKey.stringKey(ObservabilityAttributes.ARTIFACT_ATTRIBUTE)))
           .isEqualTo(SHOWCASE_ARTIFACT);
+      assertThat(
+              attemptSpan
+                  .getAttributes()
+                  .get(AttributeKey.stringKey(ObservabilityAttributes.GCP_CLIENT_SERVICE_ATTRIBUTE)))
+          .isEqualTo("showcase");
       assertThat(
               attemptSpan
                   .getAttributes()
@@ -365,4 +406,18 @@ void testTracing_retry_httpjson() throws Exception {
             .collect(java.util.stream.Collectors.toList());
     assertThat(resendCounts).containsExactlyElementsIn(expectedCounts).inOrder();
   }
+
+  /**
+   * Custom wrapper to set a service name for showcase clients, which lack one by default.
+   */
+  private static class ExtendedEchoStubSettings extends EchoStubSettings {
+    protected ExtendedEchoStubSettings(EchoStubSettings.Builder builder) throws IOException {
+      super(builder);
+    }
+
+    @Override
+    public String getServiceName() {
+      return "showcase";
+    }
+  }
 }