test: adapt showcase tests

Author: diegomarquezp

java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelMetrics.java

@@ -349,7 +349,7 @@ void testHttpJson_operationSucceeded_recordsMetrics() throws InterruptedExceptio
     Map<String, String> expectedAttributes =
         ImmutableMap.of(
             MetricsTracer.METHOD_ATTRIBUTE,
-            "google.showcase.v1beta1.Echo/Echo",
+            "Echo.Echo",
             MetricsTracer.LANGUAGE_ATTRIBUTE,
             MetricsTracer.DEFAULT_LANGUAGE);
     verifyDefaultMetricsAttributes(actualMetricDataList, expectedAttributes);
@@ -406,7 +406,7 @@ void testHttpJson_operationCancelled_recordsMetrics() throws Exception {
     Map<String, String> expectedAttributes =
         ImmutableMap.of(
             MetricsTracer.METHOD_ATTRIBUTE,
-            "google.showcase.v1beta1.Echo/Block",
+            "Echo.Block",
             MetricsTracer.LANGUAGE_ATTRIBUTE,
             MetricsTracer.DEFAULT_LANGUAGE);
     verifyDefaultMetricsAttributes(actualMetricDataList, expectedAttributes);
@@ -464,7 +464,7 @@ void testHttpJson_operationFailed_recordsMetrics() throws InterruptedException {
     Map<String, String> expectedAttributes =
         ImmutableMap.of(
             MetricsTracer.METHOD_ATTRIBUTE,
-            "google.showcase.v1beta1.Echo/Block",
+            "Echo.Block",
             MetricsTracer.LANGUAGE_ATTRIBUTE,
             MetricsTracer.DEFAULT_LANGUAGE);
     verifyDefaultMetricsAttributes(actualMetricDataList, expectedAttributes);
@@ -588,7 +588,7 @@ void testHttpJson_attemptFailedRetriesExhausted_recordsMetrics() throws Exceptio
     Map<String, String> expectedAttributes =
         ImmutableMap.of(
             MetricsTracer.METHOD_ATTRIBUTE,
-            "google.showcase.v1beta1.Echo/Echo",
+            "Echo.Echo",
             MetricsTracer.LANGUAGE_ATTRIBUTE,
             MetricsTracer.DEFAULT_LANGUAGE);
     verifyDefaultMetricsAttributes(actualMetricDataList, expectedAttributes);
@@ -645,7 +645,7 @@ void testHttpJson_attemptPermanentFailure_recordsMetrics() throws InterruptedExc
     Map<String, String> expectedAttributes =
         ImmutableMap.of(
             MetricsTracer.METHOD_ATTRIBUTE,
-            "google.showcase.v1beta1.Echo/Block",
+            "Echo.Block",
             MetricsTracer.LANGUAGE_ATTRIBUTE,
             MetricsTracer.DEFAULT_LANGUAGE);
     verifyDefaultMetricsAttributes(actualMetricDataList, expectedAttributes);
@@ -777,7 +777,7 @@ void testHttpJson_multipleFailedAttempts_successfulOperation() throws Exception
     Map<String, String> expectedAttributes =
         ImmutableMap.of(
             MetricsTracer.METHOD_ATTRIBUTE,
-            "google.showcase.v1beta1.Echo/Block",
+            "Echo.Block",
             MetricsTracer.LANGUAGE_ATTRIBUTE,
             MetricsTracer.DEFAULT_LANGUAGE);
     verifyDefaultMetricsAttributes(actualMetricDataList, expectedAttributes);

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

@@ -138,7 +138,7 @@ void testTracing_successfulEcho_httpjson() throws Exception {
 
       SpanData attemptSpan =
           spans.stream()
-              .filter(span -> span.getName().equals("google.showcase.v1beta1/Echo/Echo/attempt"))
+              .filter(span -> span.getName().equals("Echo/Echo/attempt"))
               .findFirst()
               .orElseThrow(() -> new AssertionError("Attempt span 'Echo/Echo/attempt' not found"));
       assertThat(attemptSpan.getKind()).isEqualTo(SpanKind.CLIENT);