fix: add sleep. Add service name

Author: blakeli0

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

@@ -99,11 +99,12 @@ void testMetrics_successfulEcho_grpc() throws Exception {
     try (EchoClient client =
         TestClientInitializer.createGrpcEchoClientOpentelemetry(tracerFactory)) {
 
-      EchoResponse echo = client.echo(EchoRequest.newBuilder().setContent("metrics-test").build());
-      System.out.println(echo.getContent());
-      System.out.println("in test:" + Thread.currentThread().getName());
+      client.echo(EchoRequest.newBuilder().setContent("metrics-test").build());
 
-      // Slight delay to ensure the background callback completes its OpenTelemetry recording.
+      // The end of an operation is tracked in a separate thread.
+      // Add a small sleep to make sure the tracking is completed.
+      // This is implemented by adding a TraceFinisher to ApiFuture as a callback in TracedUnaryCallable,
+      // which could be executed in a different thread.
       Thread.sleep(100);
       Collection<MetricData> metrics = metricReader.collectAllMetrics();
       assertThat(metrics).isNotEmpty();
@@ -186,6 +187,7 @@ public void sendMessage(ReqT message) {}
           UnavailableException.class,
           () -> client.echo(EchoRequest.newBuilder().setContent("metrics-test").build()));
 
+      Thread.sleep(100);
       Collection<MetricData> metrics = metricReader.collectAllMetrics();
       assertThat(metrics).isNotEmpty();
 
@@ -217,6 +219,7 @@ void testMetrics_successfulEcho_httpjson() throws Exception {
 
       client.echo(EchoRequest.newBuilder().setContent("metrics-test").build());
 
+      Thread.sleep(100);
       Collection<MetricData> metrics = metricReader.collectAllMetrics();
       assertThat(metrics).isNotEmpty();
 
@@ -228,8 +231,6 @@ void testMetrics_successfulEcho_httpjson() throws Exception {
 
       assertThat(durationMetric.getInstrumentationScopeInfo().getName())
           .isEqualTo(SHOWCASE_ARTIFACT);
-      assertThat(durationMetric.getInstrumentationScopeInfo().getVersion())
-          .isEqualTo(com.google.api.gax.core.GaxProperties.getLibraryVersion(EchoClient.class));
 
       io.opentelemetry.api.common.Attributes attributes =
           durationMetric.getHistogramData().getPoints().iterator().next().getAttributes();
@@ -354,6 +355,7 @@ public String getHeaderValue(int index) {
           UnavailableException.class,
           () -> client.echo(EchoRequest.newBuilder().setContent("metrics-test").build()));
 
+      Thread.sleep(100);
       Collection<MetricData> metrics = metricReader.collectAllMetrics();
       assertThat(metrics).isNotEmpty();
 

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

@@ -38,6 +38,8 @@
 import com.google.showcase.v1beta1.stub.EchoStubSettings;
 import io.grpc.ClientInterceptor;
 import io.grpc.ManagedChannelBuilder;
+
+import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
@@ -307,14 +309,7 @@ public static EchoClient createGrpcEchoClientOpentelemetry(
             .setEndpoint(DEFAULT_GRPC_ENDPOINT)
             .build();
 
-    EchoStubSettings echoStubSettings =
-        (EchoStubSettings)
-            grpcEchoSettings.getStubSettings().toBuilder()
-                .setTracerFactory(metricsTracerFactory)
-                .build();
-    EchoStub stub = echoStubSettings.createStub();
-
-    return EchoClient.create(stub);
+    return EchoClient.create(createStubWithServiceName(grpcEchoSettings, metricsTracerFactory));
   }
 
   public static EchoClient createHttpJsonEchoClientOpentelemetry(
@@ -331,14 +326,7 @@ public static EchoClient createHttpJsonEchoClientOpentelemetry(
                     .build())
             .build();
 
-    EchoStubSettings echoStubSettings =
-        (EchoStubSettings)
-            httpJsonEchoSettings.getStubSettings().toBuilder()
-                .setTracerFactory(metricsTracerFactory)
-                .build();
-    EchoStub stub = echoStubSettings.createStub();
-
-    return EchoClient.create(stub);
+    return EchoClient.create(createStubWithServiceName(httpJsonEchoSettings, metricsTracerFactory));
   }
 
   public static IdentityClient createGrpcIdentityClientOpentelemetry(ApiTracerFactory tracerFactory)
@@ -381,4 +369,24 @@ public static IdentityClient createHttpJsonIdentityClientOpentelemetry(
                 .build();
     return IdentityClient.create(identityStubSettings.createStub());
   }
+
+  private static EchoStub createStubWithServiceName(
+          EchoSettings settings, ApiTracerFactory tracingFactory) throws IOException {
+    EchoStubSettings.Builder builder =
+            (EchoStubSettings.Builder) settings.getStubSettings().toBuilder();
+    builder.setTracerFactory(tracingFactory);
+    return new ExtendedEchoStubSettings(builder).createStub();
+  }
+
+  /** 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";
+    }
+  }
 }