chore: Rename otel classes (#12699)

Rename Otel classes so they are easier to understand by customers.
Notable changes of the public classes:
- SpanTracerFactory -> OpenTelemetryTracingFactory
- GoldenMetricsTracerFactory -> OpenTelemetryMetricsFactory

Author: blakeli0

…g/GoldenSignalsMetricsTracerFactory.java …tracing/OpenTelemetryMetricsFactory.javasdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerFactory.java renamed to sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryMetricsFactory.java sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerFactory.java renamed to sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryMetricsFactory.java

@@ -34,19 +34,19 @@
 import io.opentelemetry.api.OpenTelemetry;
 
 /**
- * A {@link ApiTracerFactory} to build instances of {@link GoldenSignalsMetricsTracer}.
+ * 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 GoldenSignalsMetricsTracerFactory implements ApiTracerFactory {
+public class OpenTelemetryMetricsFactory implements ApiTracerFactory {
 
   private ApiTracerContext clientLevelTracerContext;
   private final OpenTelemetry openTelemetry;
   private GoldenSignalsMetricsRecorder metricsRecorder;
 
-  public GoldenSignalsMetricsTracerFactory(OpenTelemetry openTelemetry) {
+  public OpenTelemetryMetricsFactory(OpenTelemetry openTelemetry) {
     this.openTelemetry = openTelemetry;
     this.clientLevelTracerContext = ApiTracerContext.empty();
   }
@@ -58,7 +58,7 @@ public ApiTracer newTracer(ApiTracer parent, SpanName spanName, OperationType op
       // regular requests.
       return new BaseApiTracer();
     }
-    return new GoldenSignalsMetricsTracer(metricsRecorder, clientLevelTracerContext);
+    return new OpenTelemetryMetricsTracer(metricsRecorder, clientLevelTracerContext);
   }
 
   @Override
@@ -69,7 +69,7 @@ public ApiTracer newTracer(ApiTracer parent, ApiTracerContext methodLevelTracerC
       return new BaseApiTracer();
     }
     ApiTracerContext mergedTracerContext = clientLevelTracerContext.merge(methodLevelTracerContext);
-    return new GoldenSignalsMetricsTracer(metricsRecorder, mergedTracerContext);
+    return new OpenTelemetryMetricsTracer(metricsRecorder, mergedTracerContext);
   }
 
   @Override

…/tracing/GoldenSignalsMetricsTracer.java …/tracing/OpenTelemetryMetricsTracer.javasdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracer.java renamed to sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryMetricsTracer.java sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracer.java renamed to sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryMetricsTracer.java

@@ -43,13 +43,13 @@
  * GoldenSignalsMetricsRecorder}, hence this class should not have any knowledge about the
  * observability framework (e.g. OpenTelemetry).
  */
-class GoldenSignalsMetricsTracer implements ApiTracer {
+class OpenTelemetryMetricsTracer implements ApiTracer {
   private final Stopwatch clientRequestTimer;
   private final GoldenSignalsMetricsRecorder metricsRecorder;
   private final Map<String, Object> attributes;
   private final ApiTracerContext.Transport transport;
 
-  GoldenSignalsMetricsTracer(
+  OpenTelemetryMetricsTracer(
       GoldenSignalsMetricsRecorder metricsRecorder, ApiTracerContext apiTracerContext) {
     this.clientRequestTimer = Stopwatch.createStarted();
     this.metricsRecorder = metricsRecorder;
@@ -58,7 +58,7 @@ class GoldenSignalsMetricsTracer implements ApiTracer {
   }
 
   @VisibleForTesting
-  GoldenSignalsMetricsTracer(
+  OpenTelemetryMetricsTracer(
       GoldenSignalsMetricsRecorder metricsRecorder,
       ApiTracerContext apiTracerContext,
       Ticker ticker) {

…e/api/gax/tracing/SpanTracerFactory.java …tracing/OpenTelemetryTracingFactory.javasdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/SpanTracerFactory.java renamed to sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingFactory.java sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/SpanTracerFactory.java renamed to sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingFactory.java

@@ -39,32 +39,32 @@
 import io.opentelemetry.api.trace.Tracer;
 
 /**
- * A {@link ApiTracerFactory} to build instances of {@link SpanTracer}.
+ * A {@link ApiTracerFactory} to build instances of {@link OpenTelemetryTracingTracer}.
  *
- * <p>This class wraps the {@link Tracer} and pass it to {@link SpanTracer}. It will be used to
- * record traces in {@link SpanTracer}.
+ * <p>This class wraps the {@link Tracer} and pass it to {@link OpenTelemetryTracingTracer}. It will
+ * be used to record traces in {@link OpenTelemetryTracingTracer}.
  *
  * <p>This class is expected to be initialized once during client initialization.
  */
 @BetaApi
 @InternalApi
-public class SpanTracerFactory implements ApiTracerFactory {
+public class OpenTelemetryTracingFactory implements ApiTracerFactory {
   private final Tracer tracer;
   private final OpenTelemetry openTelemetry;
   private final ApiTracerContext apiTracerContext;
 
-  /** Creates a SpanTracerFactory */
-  public SpanTracerFactory(OpenTelemetry openTelemetry) {
+  public OpenTelemetryTracingFactory(OpenTelemetry openTelemetry) {
     this(openTelemetry, null, ApiTracerContext.empty());
   }
 
   /**
-   * Pass in a Map of client level attributes which will be added to every single SpanTracer created
-   * from the ApiTracerFactory. This is package private since span attributes are determined
-   * internally.
+   * Pass in a Map of client level attributes which will be added to every single
+   * OpenTelemetryTracingTracer created from the ApiTracerFactory. This is package private since
+   * span attributes are determined internally.
    */
   @VisibleForTesting
-  SpanTracerFactory(OpenTelemetry openTelemetry, Tracer tracer, ApiTracerContext apiTracerContext) {
+  OpenTelemetryTracingFactory(
+      OpenTelemetry openTelemetry, Tracer tracer, ApiTracerContext apiTracerContext) {
     this.openTelemetry = openTelemetry;
     this.tracer = tracer;
     this.apiTracerContext = apiTracerContext;
@@ -80,7 +80,7 @@ public ApiTracer newTracer(ApiTracer parent, SpanName spanName, OperationType op
     // feature is developed.
     String attemptSpanName = spanName.getClientName() + "/" + spanName.getMethodName() + "/attempt";
 
-    return new SpanTracer(tracer, this.apiTracerContext, attemptSpanName);
+    return new OpenTelemetryTracingTracer(tracer, this.apiTracerContext, attemptSpanName);
   }
 
   @Override
@@ -90,7 +90,7 @@ public ApiTracer newTracer(ApiTracer parent, ApiTracerContext apiTracerContext)
       return new BaseApiTracer();
     }
     ApiTracerContext mergedContext = this.apiTracerContext.merge(apiTracerContext);
-    return new SpanTracer(tracer, mergedContext);
+    return new OpenTelemetryTracingTracer(tracer, mergedContext);
   }
 
   @Override
@@ -99,8 +99,8 @@ public boolean needsContext() {
   }
 
   /**
-   * Returns a new SpanTracerFactory with the provided context. The Tracer is re-initialized using
-   * the artifact name and version from the library metadata.
+   * Returns a new OpenTelemetryTracingFactory with the provided context. The Tracer is
+   * re-initialized using the artifact name and version from the library metadata.
    */
   @Override
   public ApiTracerFactory withContext(ApiTracerContext context) {
@@ -113,6 +113,6 @@ public ApiTracerFactory withContext(ApiTracerContext context) {
     }
     Tracer newTracer = openTelemetry.getTracer(metadata.artifactName(), metadata.version());
     ApiTracerContext mergedContext = this.apiTracerContext.merge(context);
-    return new SpanTracerFactory(openTelemetry, newTracer, mergedContext);
+    return new OpenTelemetryTracingFactory(openTelemetry, newTracer, mergedContext);
   }
 }

…m/google/api/gax/tracing/SpanTracer.java …/tracing/OpenTelemetryTracingTracer.javasdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/SpanTracer.java renamed to sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingTracer.java sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/SpanTracer.java renamed to sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/OpenTelemetryTracingTracer.java

@@ -44,7 +44,7 @@
 /** An implementation of {@link ApiTracer} that uses OpenTelemetry to record traces. */
 @BetaApi
 @InternalApi
-public class SpanTracer implements ApiTracer {
+class OpenTelemetryTracingTracer implements ApiTracer {
 
   static final String CONTENT_LENGTH_KEY = "Content-Length";
 
@@ -72,12 +72,12 @@ public void injectTraceContext(java.util.Map<String, String> carrier) {
   }
 
   /**
-   * Creates a new instance of {@code SpanTracer}.
+   * Creates a new instance of {@code OpenTelemetryTracingTracer}.
    *
    * @param tracer the {@link Tracer} to use for recording spans
    * @param apiTracerContext the {@link ApiTracerContext} to use for recording spans
    */
-  public SpanTracer(Tracer tracer, ApiTracerContext apiTracerContext) {
+  OpenTelemetryTracingTracer(Tracer tracer, ApiTracerContext apiTracerContext) {
     this.tracer = tracer;
     this.apiTracerContext = apiTracerContext;
     this.attemptSpanName = resolveAttemptSpanName(apiTracerContext);
@@ -86,14 +86,16 @@ public SpanTracer(Tracer tracer, ApiTracerContext apiTracerContext) {
   }
 
   /**
-   * Creates a new instance of {@code SpanTracer} with an explicitly provided span name.
+   * Creates a new instance of {@code OpenTelemetryTracingTracer} with an explicitly provided span
+   * name.
    *
    * @param tracer the {@link Tracer} to use for recording spans
    * @param apiTracerContext the {@link ApiTracerContext} to use for recording spans
    * @param attemptSpanName the name of the individual attempt spans
    */
   @InternalApi
-  SpanTracer(Tracer tracer, ApiTracerContext apiTracerContext, String attemptSpanName) {
+  OpenTelemetryTracingTracer(
+      Tracer tracer, ApiTracerContext apiTracerContext, String attemptSpanName) {
     this.tracer = tracer;
     this.attemptSpanName = attemptSpanName;
     this.apiTracerContext = apiTracerContext;

…ldenSignalsMetricsTracerFactoryTest.java …ing/OpenTelemetryMetricsFactoryTest.javasdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerFactoryTest.java renamed to sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryMetricsFactoryTest.java sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerFactoryTest.java renamed to sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryMetricsFactoryTest.java

@@ -38,13 +38,13 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class GoldenSignalsMetricsTracerFactoryTest {
+class OpenTelemetryMetricsFactoryTest {
 
-  private GoldenSignalsMetricsTracerFactory tracerFactory;
+  private OpenTelemetryMetricsFactory tracerFactory;
 
   @BeforeEach
   void setUp() {
-    tracerFactory = new GoldenSignalsMetricsTracerFactory(OpenTelemetry.noop());
+    tracerFactory = new OpenTelemetryMetricsFactory(OpenTelemetry.noop());
   }
 
   @Test
@@ -56,7 +56,7 @@ void newTracerWithSpanName_shouldCreateTracer_ifMetricsRecorderIsNotNull() {
     ApiTracer actual =
         tracerFactory.newTracer(
             mock(ApiTracer.class), mock(SpanName.class), ApiTracerFactory.OperationType.Unary);
-    assertThat(actual).isInstanceOf(GoldenSignalsMetricsTracer.class);
+    assertThat(actual).isInstanceOf(OpenTelemetryMetricsTracer.class);
   }
 
   @Test
@@ -80,29 +80,26 @@ void newTracerWithApiTracerContext_shouldMergeApiTracerContext() {
     ApiTracer actual = tracerFactory.newTracer(mock(ApiTracer.class), methodLevelTracerContext);
 
     verify(clientLevelTracerContext).merge(methodLevelTracerContext);
-    assertThat(actual).isInstanceOf(GoldenSignalsMetricsTracer.class);
+    assertThat(actual).isInstanceOf(OpenTelemetryMetricsTracer.class);
   }
 
   @Test
   void testWithContext_nullContext_returnsBaseApiTracerFactory() {
-    GoldenSignalsMetricsTracerFactory factory =
-        new GoldenSignalsMetricsTracerFactory(OpenTelemetry.noop());
+    OpenTelemetryMetricsFactory factory = new OpenTelemetryMetricsFactory(OpenTelemetry.noop());
     ApiTracerFactory factoryWithContext = factory.withContext(null);
     assertThat(factoryWithContext).isInstanceOf(BaseApiTracerFactory.class);
   }
 
   @Test
   void testWithContext_nullMetadata_returnsBaseApiTracerFactory() {
-    GoldenSignalsMetricsTracerFactory factory =
-        new GoldenSignalsMetricsTracerFactory(OpenTelemetry.noop());
+    OpenTelemetryMetricsFactory factory = new OpenTelemetryMetricsFactory(OpenTelemetry.noop());
     ApiTracerFactory factoryWithContext = factory.withContext(ApiTracerContext.empty());
     assertThat(factoryWithContext).isInstanceOf(BaseApiTracerFactory.class);
   }
 
   @Test
   void testWithContext_emptyArtifactName_returnsBaseApiTracerFactory() {
-    GoldenSignalsMetricsTracerFactory factory =
-        new GoldenSignalsMetricsTracerFactory(OpenTelemetry.noop());
+    OpenTelemetryMetricsFactory factory = new OpenTelemetryMetricsFactory(OpenTelemetry.noop());
     LibraryMetadata metadata =
         LibraryMetadata.newBuilder().setArtifactName("").setVersion("1.0").build();
     ApiTracerContext context = ApiTracerContext.newBuilder().setLibraryMetadata(metadata).build();
@@ -113,8 +110,7 @@ void testWithContext_emptyArtifactName_returnsBaseApiTracerFactory() {
 
   @Test
   void testWithContext_nullArtifactName_returnsBaseApiTracerFactory() {
-    GoldenSignalsMetricsTracerFactory factory =
-        new GoldenSignalsMetricsTracerFactory(OpenTelemetry.noop());
+    OpenTelemetryMetricsFactory factory = new OpenTelemetryMetricsFactory(OpenTelemetry.noop());
     LibraryMetadata metadata = LibraryMetadata.newBuilder().setVersion("1.0").build();
     ApiTracerContext context = ApiTracerContext.newBuilder().setLibraryMetadata(metadata).build();
 
@@ -124,17 +120,16 @@ void testWithContext_nullArtifactName_returnsBaseApiTracerFactory() {
 
   @Test
   void newTracerWithApiTracerContext_shouldCreateBaseTracer_ifMetricsRecorderIsNull() {
-    GoldenSignalsMetricsTracerFactory factory =
-        new GoldenSignalsMetricsTracerFactory(OpenTelemetry.noop());
+    OpenTelemetryMetricsFactory factory = new OpenTelemetryMetricsFactory(OpenTelemetry.noop());
     ApiTracer actual = factory.newTracer(mock(ApiTracer.class), mock(ApiTracerContext.class));
 
     assertThat(actual).isInstanceOf(BaseApiTracer.class);
   }
 
   @Test
   void testNeedsContext_returnsTrueWhenContextIsEmpty() {
-    GoldenSignalsMetricsTracerFactory factoryWithoutContext =
-        new GoldenSignalsMetricsTracerFactory(OpenTelemetry.noop());
+    OpenTelemetryMetricsFactory factoryWithoutContext =
+        new OpenTelemetryMetricsFactory(OpenTelemetry.noop());
 
     assertThat(factoryWithoutContext.needsContext()).isTrue();
   }

…cing/GoldenSignalsMetricsTracerTest.java …cing/OpenTelemetryMetricsTracerTest.javasdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerTest.java renamed to sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryMetricsTracerTest.java sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/GoldenSignalsMetricsTracerTest.java renamed to sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/OpenTelemetryMetricsTracerTest.java

@@ -48,14 +48,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class GoldenSignalsMetricsTracerTest {
+class OpenTelemetryMetricsTracerTest {
   private static final String ARTIFACT_NAME = "test-library";
   public static final int TEST_REQUEST_DURATION_NANO = 2345698;
   public static final double EXPECTED_REQUEST_DURATION_SECOND = 2345698 / 1_000_000_000.0;
 
   private InMemoryMetricReader metricReader;
 
-  private GoldenSignalsMetricsTracer tracer;
+  private OpenTelemetryMetricsTracer tracer;
 
   private FakeTicker ticker;
 
@@ -68,7 +68,7 @@ void setUp() {
         OpenTelemetrySdk.builder().setMeterProvider(meterProvider).build();
     ticker = new FakeTicker();
     tracer =
-        new GoldenSignalsMetricsTracer(
+        new OpenTelemetryMetricsTracer(
             GoldenSignalsMetricsRecorder.create(
                 openTelemetry,
                 LibraryMetadata.newBuilder()