test(o11y): fix OpenTelemetryMetricsFactoryTest and cover withContext

Author: blakeli0

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

@@ -52,9 +52,9 @@ void newTracerWithSpanName_shouldCreateTracer_ifMetricsRecorderIsNotNull() {
     LibraryMetadata metadata =
         LibraryMetadata.newBuilder().setArtifactName("gax-java").setVersion("1.0").build();
     ApiTracerContext context = ApiTracerContext.newBuilder().setLibraryMetadata(metadata).build();
-    tracerFactory.withContext(context);
+    ApiTracerFactory factoryWithContext = tracerFactory.withContext(context);
     ApiTracer actual =
-        tracerFactory.newTracer(
+        factoryWithContext.newTracer(
             mock(ApiTracer.class), mock(SpanName.class), ApiTracerFactory.OperationType.Unary);
     assertThat(actual).isInstanceOf(OpenTelemetryMetricsTracer.class);
   }
@@ -69,17 +69,16 @@ void newTracerWithSpanName_shouldCreateBaseTracer_ifMetricsRecorderIsNull() {
 
   @Test
   void newTracerWithApiTracerContext_shouldMergeApiTracerContext() {
-    ApiTracerContext clientLevelTracerContext = mock(ApiTracerContext.class, RETURNS_DEEP_STUBS);
-    ApiTracerContext methodLevelTracerContext = mock(ApiTracerContext.class);
-    when(clientLevelTracerContext.libraryMetadata().artifactName()).thenReturn("gax-java");
-    when(clientLevelTracerContext.libraryMetadata().isEmpty()).thenReturn(false);
-    when(clientLevelTracerContext.merge(methodLevelTracerContext))
-        .thenReturn(clientLevelTracerContext);
-
-    tracerFactory.withContext(clientLevelTracerContext);
-    ApiTracer actual = tracerFactory.newTracer(mock(ApiTracer.class), methodLevelTracerContext);
+    LibraryMetadata metadata =
+        LibraryMetadata.newBuilder().setArtifactName("gax-java").setVersion("1.0").build();
+    ApiTracerContext clientLevelTracerContext =
+        ApiTracerContext.newBuilder().setLibraryMetadata(metadata).build();
+    ApiTracerContext methodLevelTracerContext =
+        ApiTracerContext.newBuilder().setLibraryMetadata(LibraryMetadata.empty()).build();
+    
+    ApiTracerFactory factoryWithContext = tracerFactory.withContext(clientLevelTracerContext);
+    ApiTracer actual = factoryWithContext.newTracer(mock(ApiTracer.class), methodLevelTracerContext);
 
-    verify(clientLevelTracerContext).merge(methodLevelTracerContext);
     assertThat(actual).isInstanceOf(OpenTelemetryMetricsTracer.class);
   }
 
@@ -140,8 +139,8 @@ void testNeedsContext_returnsFalseWhenContextIsNotEmpty() {
         LibraryMetadata.newBuilder().setArtifactName("gax-java").setVersion("1.0").build();
     ApiTracerContext context = ApiTracerContext.newBuilder().setLibraryMetadata(metadata).build();
 
-    tracerFactory.withContext(context);
+    ApiTracerFactory factoryWithContext = tracerFactory.withContext(context);
 
-    assertThat(tracerFactory.needsContext()).isFalse();
+    assertThat(factoryWithContext.needsContext()).isFalse();
   }
 }