Skip to content

Commit 1038937

Browse files
committed
refactor(o11y): make OpenTelemetryMetricsFactory mutable and remove internal annotations
1 parent 9b455b9 commit 1038937

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryMetricsFactory.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,13 @@
2929
*/
3030
package com.google.api.gax.tracing;
3131

32-
import com.google.api.core.BetaApi;
33-
import com.google.api.core.InternalApi;
3432
import io.opentelemetry.api.OpenTelemetry;
3533

3634
/**
3735
* A {@link ApiTracerFactory} to build instances of {@link OpenTelemetryMetricsTracer}.
3836
*
3937
* <p>This class is expected to be initialized once during client initialization.
4038
*/
41-
@BetaApi
42-
@InternalApi
4339
public class OpenTelemetryMetricsFactory implements ApiTracerFactory {
4440

4541
private ApiTracerContext clientLevelTracerContext;

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,16 @@ void newTracerWithSpanName_shouldCreateBaseTracer_ifMetricsRecorderIsNull() {
6969

7070
@Test
7171
void newTracerWithApiTracerContext_shouldMergeApiTracerContext() {
72-
ApiTracerContext clientLevelTracerContext = mock(ApiTracerContext.class, RETURNS_DEEP_STUBS);
73-
ApiTracerContext methodLevelTracerContext = mock(ApiTracerContext.class);
74-
when(clientLevelTracerContext.libraryMetadata().artifactName()).thenReturn("gax-java");
75-
when(clientLevelTracerContext.libraryMetadata().isEmpty()).thenReturn(false);
76-
when(clientLevelTracerContext.merge(methodLevelTracerContext))
77-
.thenReturn(clientLevelTracerContext);
78-
79-
tracerFactory.withContext(clientLevelTracerContext);
80-
ApiTracer actual = tracerFactory.newTracer(mock(ApiTracer.class), methodLevelTracerContext);
72+
LibraryMetadata metadata =
73+
LibraryMetadata.newBuilder().setArtifactName("gax-java").setVersion("1.0").build();
74+
ApiTracerContext clientLevelTracerContext =
75+
ApiTracerContext.newBuilder().setLibraryMetadata(metadata).build();
76+
ApiTracerContext methodLevelTracerContext =
77+
ApiTracerContext.newBuilder().setLibraryMetadata(LibraryMetadata.empty()).build();
78+
79+
ApiTracerFactory factoryWithContext = tracerFactory.withContext(clientLevelTracerContext);
80+
ApiTracer actual = factoryWithContext.newTracer(mock(ApiTracer.class), methodLevelTracerContext);
8181

82-
verify(clientLevelTracerContext).merge(methodLevelTracerContext);
8382
assertThat(actual).isInstanceOf(OpenTelemetryMetricsTracer.class);
8483
}
8584

0 commit comments

Comments
 (0)