Consistent naming for metrics SDK implementations with trace (#2325)

Signed-off-by: Bogdan Drutu <[email protected]>

Author: bogdandrutu

perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java

@@ -18,7 +18,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.metrics.MeterSdkProvider;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.data.MetricData.LongPoint;
 import io.opentelemetry.sdk.metrics.data.MetricData.Point;
@@ -246,7 +246,7 @@ private static IntervalMetricReader setupSdk(MetricExporter metricExporter) {
         .setMetricExporter(metricExporter)
         .setMetricProducers(
             Collections.singleton(
-                ((MeterSdkProvider) GlobalMetricsProvider.get()).getMetricProducer()))
+                ((SdkMeterProvider) GlobalMetricsProvider.get()).getMetricProducer()))
         .setExportIntervalMillis(1000)
         .build();
   }

sdk/all/src/jmh/java/io/opentelemetry/sdk/metrics/TestSdk.java

@@ -28,7 +28,7 @@ Meter build() {
           InstrumentationLibraryInfo instrumentationLibraryInfo =
               InstrumentationLibraryInfo.create("io.opentelemetry.sdk.metrics", null);
 
-          return new MeterSdk(meterProviderSharedState, instrumentationLibraryInfo);
+          return new SdkMeter(meterProviderSharedState, instrumentationLibraryInfo);
         }
       });
 

sdk/all/src/jmh/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorDroppedSpansBenchmark.java

@@ -9,7 +9,7 @@
 import io.opentelemetry.api.metrics.GlobalMetricsProvider;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.metrics.MeterSdkProvider;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.data.MetricData.LongPoint;
 import io.opentelemetry.sdk.metrics.data.MetricData.Point;
@@ -56,7 +56,7 @@ public CompletableResultCode shutdown() {
   @State(Scope.Benchmark)
   public static class BenchmarkState {
     private final MetricProducer metricProducer =
-        ((MeterSdkProvider) GlobalMetricsProvider.get()).getMetricProducer();
+        ((SdkMeterProvider) GlobalMetricsProvider.get()).getMetricProducer();
     private BatchSpanProcessor processor;
     private Tracer tracer;
     private Collection<MetricData> allMetrics;

sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java

@@ -12,7 +12,7 @@
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
-import io.opentelemetry.sdk.metrics.MeterSdkProvider;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.trace.SdkTracerManagement;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -47,13 +47,13 @@ public static SdkTracerManagement getGlobalTracerManagement() {
   }
 
   /**
-   * Returns the global {@link MeterSdkProvider}.
+   * Returns the global {@link SdkMeterProvider}.
    *
    * @deprecated this will be removed soon in preparation for the initial otel release.
    */
   @Deprecated
-  public static MeterSdkProvider getGlobalMeterProvider() {
-    return (MeterSdkProvider) GlobalOpenTelemetry.get().getMeterProvider();
+  public static SdkMeterProvider getGlobalMeterProvider() {
+    return (SdkMeterProvider) GlobalOpenTelemetry.get().getMeterProvider();
   }
 
   static final AtomicBoolean INITIALIZED_GLOBAL = new AtomicBoolean();

sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdkBuilder.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk.ObfuscatedTracerProvider;
-import io.opentelemetry.sdk.metrics.MeterSdkProvider;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 
@@ -41,14 +41,14 @@ public OpenTelemetrySdkBuilder setTracerProvider(TracerProvider tracerProvider)
 
   /**
    * Sets the {@link MeterProvider} to use.. This can be used to configure tracing settings by
-   * returning the instance created by a {@link MeterSdkProvider.Builder}.
+   * returning the instance created by a {@link SdkMeterProvider.Builder}.
    *
-   * @see MeterSdkProvider#builder()
+   * @see SdkMeterProvider#builder()
    */
   @Override
   @Deprecated
   public OpenTelemetrySdkBuilder setMeterProvider(MeterProvider meterProvider) {
-    if (!(meterProvider instanceof MeterSdkProvider)) {
+    if (!(meterProvider instanceof SdkMeterProvider)) {
       throw new IllegalArgumentException(
           "The OpenTelemetrySdk can only be configured with a MeterSdkProvider");
     }
@@ -70,7 +70,7 @@ public OpenTelemetrySdkBuilder setPropagators(ContextPropagators propagators) {
   @Override
   public OpenTelemetrySdk build() {
     if (meterProvider == null) {
-      meterProvider = MeterSdkProvider.builder().build();
+      meterProvider = SdkMeterProvider.builder().build();
     }
 
     if (tracerProvider == null) {

sdk/all/src/test/java/io/opentelemetry/sdk/OpenTelemetrySdkTest.java

@@ -22,7 +22,7 @@
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.sdk.OpenTelemetrySdk.ObfuscatedTracerProvider;
 import io.opentelemetry.sdk.common.Clock;
-import io.opentelemetry.sdk.metrics.MeterSdkProvider;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.IdGenerator;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
@@ -38,7 +38,7 @@
 class OpenTelemetrySdkTest {
 
   @Mock private SdkTracerProvider tracerProvider;
-  @Mock private MeterSdkProvider meterProvider;
+  @Mock private SdkMeterProvider meterProvider;
   @Mock private ContextPropagators propagators;
   @Mock private Clock clock;
 
@@ -91,7 +91,7 @@ void testBuilderDefaults() {
             obfuscatedTracerProvider ->
                 assertThat(obfuscatedTracerProvider.unobfuscate())
                     .isInstanceOf(SdkTracerProvider.class));
-    assertThat(openTelemetry.getMeterProvider()).isInstanceOf(MeterSdkProvider.class);
+    assertThat(openTelemetry.getMeterProvider()).isInstanceOf(SdkMeterProvider.class);
   }
 
   @Test
@@ -123,7 +123,7 @@ void testConfiguration_tracerSettings() {
                     .setTraceConfig(traceConfig)
                     .build())
             .setMeterProvider(
-                MeterSdkProvider.builder().setResource(resource).setClock(clock).build())
+                SdkMeterProvider.builder().setResource(resource).setClock(clock).build())
             .build();
     TracerProvider unobfuscatedTracerProvider =
         ((ObfuscatedTracerProvider) openTelemetry.getTracerProvider()).unobfuscate();
@@ -138,7 +138,7 @@ void testConfiguration_tracerSettings() {
         .hasFieldOrPropertyWithValue("idGenerator", idGenerator)
         .hasFieldOrPropertyWithValue("activeTraceConfig", traceConfig);
 
-    assertThat(openTelemetry.getMeterProvider()).isInstanceOf(MeterSdkProvider.class);
+    assertThat(openTelemetry.getMeterProvider()).isInstanceOf(SdkMeterProvider.class);
     // Since MeterProvider is in a different package, the only alternative to this reflective
     // approach would be to make the fields public for testing which is worse than this.
     assertThat(openTelemetry.getMeterProvider())
@@ -194,7 +194,7 @@ void fullOpenTelemetrySdkConfigurationDemo() {
                     .setTraceConfig(newConfig)
                     .build())
             .setMeterProvider(
-                MeterSdkProvider.builder()
+                SdkMeterProvider.builder()
                     .setClock(mock(Clock.class))
                     .setResource(mock(Resource.class))
                     .build());

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java renamed to sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeter.java

@@ -12,12 +12,12 @@
 import java.util.Collection;
 import java.util.List;
 
-/** {@link MeterSdk} is SDK implementation of {@link Meter}. */
-final class MeterSdk implements Meter {
+/** {@link SdkMeter} is SDK implementation of {@link Meter}. */
+final class SdkMeter implements Meter {
   private final MeterProviderSharedState meterProviderSharedState;
   private final MeterSharedState meterSharedState;
 
-  MeterSdk(
+  SdkMeter(
       MeterProviderSharedState meterProviderSharedState,
       InstrumentationLibraryInfo instrumentationLibraryInfo) {
     this.meterProviderSharedState = meterProviderSharedState;

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java renamed to sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProvider.java

@@ -25,34 +25,34 @@
 import javax.annotation.Nullable;
 
 /**
- * {@code Meter} provider implementation for {@link MeterProvider}.
+ * {@code SdkMeterProvider} implementation for {@link MeterProvider}.
  *
  * <p>This class is not intended to be used in application code and it is used only by {@link
  * OpenTelemetry}.
  */
-public final class MeterSdkProvider implements MeterProvider {
+public final class SdkMeterProvider implements MeterProvider {
 
-  private static final Logger LOGGER = Logger.getLogger(MeterSdkProvider.class.getName());
+  private static final Logger LOGGER = Logger.getLogger(SdkMeterProvider.class.getName());
   static final String DEFAULT_METER_NAME = "unknown";
-  private final ComponentRegistry<MeterSdk> registry;
+  private final ComponentRegistry<SdkMeter> registry;
   private final MetricProducer metricProducer;
   private final MeterProviderSharedState sharedState;
 
-  private MeterSdkProvider(Clock clock, Resource resource) {
+  private SdkMeterProvider(Clock clock, Resource resource) {
     this.sharedState = MeterProviderSharedState.create(clock, resource);
     this.registry =
         new ComponentRegistry<>(
-            instrumentationLibraryInfo -> new MeterSdk(sharedState, instrumentationLibraryInfo));
+            instrumentationLibraryInfo -> new SdkMeter(sharedState, instrumentationLibraryInfo));
     this.metricProducer = new MetricProducerSdk(this.registry);
   }
 
   @Override
-  public MeterSdk get(String instrumentationName) {
+  public SdkMeter get(String instrumentationName) {
     return get(instrumentationName, null);
   }
 
   @Override
-  public MeterSdk get(String instrumentationName, @Nullable String instrumentationVersion) {
+  public SdkMeter get(String instrumentationName, @Nullable String instrumentationVersion) {
     // Per the spec, both null and empty are "invalid" and a "default" should be used.
     if (instrumentationName == null || instrumentationName.isEmpty()) {
       LOGGER.fine("Meter requested without instrumentation name.");
@@ -78,16 +78,16 @@ public MetricProducer getMetricProducer() {
   }
 
   /**
-   * Returns a new {@link Builder} for {@link MeterSdkProvider}.
+   * Returns a new {@link Builder} for {@link SdkMeterProvider}.
    *
-   * @return a new {@link Builder} for {@link MeterSdkProvider}.
+   * @return a new {@link Builder} for {@link SdkMeterProvider}.
    */
   public static Builder builder() {
     return new Builder();
   }
 
   /**
-   * Builder class for the {@link MeterSdkProvider}. Has fully functional default implementations of
+   * Builder class for the {@link SdkMeterProvider}. Has fully functional default implementations of
    * all three required interfaces.
    */
   public static final class Builder {
@@ -126,8 +126,8 @@ public Builder setResource(@Nonnull Resource resource) {
      *
      * @return An initialized TracerSdkFactory.
      */
-    public MeterSdkProvider build() {
-      return new MeterSdkProvider(clock, resource);
+    public SdkMeterProvider build() {
+      return new SdkMeterProvider(clock, resource);
     }
   }
 
@@ -160,17 +160,17 @@ public void registerView(InstrumentSelector selector, AggregationConfiguration s
   }
 
   private static final class MetricProducerSdk implements MetricProducer {
-    private final ComponentRegistry<MeterSdk> registry;
+    private final ComponentRegistry<SdkMeter> registry;
 
-    private MetricProducerSdk(ComponentRegistry<MeterSdk> registry) {
+    private MetricProducerSdk(ComponentRegistry<SdkMeter> registry) {
       this.registry = registry;
     }
 
     @Override
     public Collection<MetricData> collectAllMetrics() {
-      Collection<MeterSdk> meters = registry.getComponents();
+      Collection<SdkMeter> meters = registry.getComponents();
       List<MetricData> result = new ArrayList<>(meters.size());
-      for (MeterSdk meter : meters) {
+      for (SdkMeter meter : meters) {
         result.addAll(meter.collectAll());
       }
       return Collections.unmodifiableCollection(result);

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java

@@ -26,7 +26,7 @@
 
 /**
  * Central location for Views to be registered. Registration of a view should eventually be done via
- * the {@link io.opentelemetry.sdk.metrics.MeterSdkProvider}.
+ * the {@link SdkMeterProvider}.
  */
 class ViewRegistry {
 

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/package-info.java

@@ -6,7 +6,7 @@
 /**
  * The SDK implementation of metrics.
  *
- * @see io.opentelemetry.sdk.metrics.MeterSdkProvider
+ * @see io.opentelemetry.sdk.metrics.SdkMeterProvider
  */
 @ParametersAreNonnullByDefault
 package io.opentelemetry.sdk.metrics;