refactor(o11y): remove @BetaApi and @internalapi annotations from observability classes and make factory mutable

Author: blakeli0

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

@@ -30,8 +30,6 @@
 
 package com.google.api.gax.tracing;
 
-import com.google.api.core.BetaApi;
-import com.google.api.core.InternalApi;
 import com.google.api.gax.logging.LoggerProvider;
 import com.google.api.gax.logging.LoggingUtils;
 import com.google.common.annotations.VisibleForTesting;
@@ -44,8 +42,6 @@
  * An {@link ApiTracer} that logs actionable errors using {@link LoggingUtils} when an RPC attempt
  * fails.
  */
-@BetaApi
-@InternalApi
 class LoggingTracer extends BaseApiTracer {
   private static final LoggerProvider LOGGER_PROVIDER =
       LoggerProvider.forClazz(LoggingTracer.class);

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

@@ -30,7 +30,6 @@
 
 package com.google.api.gax.tracing;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.logging.LoggingUtils;
 import com.google.common.annotations.VisibleForTesting;
@@ -41,7 +40,6 @@
  * managed automatically by the system, when {@link LoggingUtils#isLoggingEnabled()} returning
  * {@code true}.
  */
-@BetaApi
 @InternalApi
 public class LoggingTracerFactory implements ApiTracerFactory {
   private final ApiTracerContext apiTracerContext;

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

@@ -29,17 +29,13 @@
  */
 package com.google.api.gax.tracing;
 
-import com.google.api.core.BetaApi;
-import com.google.api.core.InternalApi;
 import io.opentelemetry.api.OpenTelemetry;
 
 /**
  * A {@link ApiTracerFactory} to build instances of {@link OpenTelemetryMetricsTracer}.
  *
  * <p>This class is expected to be initialized once during client initialization.
  */
-@BetaApi
-@InternalApi
 public class OpenTelemetryMetricsFactory implements ApiTracerFactory {
 
   private ApiTracerContext clientLevelTracerContext;

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

@@ -31,8 +31,6 @@
 package com.google.api.gax.tracing;
 
 import com.google.api.client.util.Strings;
-import com.google.api.core.BetaApi;
-import com.google.api.core.InternalApi;
 import com.google.api.gax.rpc.LibraryMetadata;
 import com.google.common.annotations.VisibleForTesting;
 import io.opentelemetry.api.OpenTelemetry;
@@ -46,8 +44,6 @@
  *
  * <p>This class is expected to be initialized once during client initialization.
  */
-@BetaApi
-@InternalApi
 public class OpenTelemetryTracingFactory implements ApiTracerFactory {
   private final Tracer tracer;
   private final OpenTelemetry openTelemetry;

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

@@ -31,7 +31,6 @@
 package com.google.api.gax.tracing;
 
 import com.google.api.client.util.Strings;
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
@@ -42,8 +41,6 @@
 import java.util.concurrent.CancellationException;
 
 /** An implementation of {@link ApiTracer} that uses OpenTelemetry to record traces. */
-@BetaApi
-@InternalApi
 class OpenTelemetryTracingTracer implements ApiTracer {
 
   static final String CONTENT_LENGTH_KEY = "Content-Length";

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

@@ -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);
   }