Deprecate MeterProvider#get(..) methods

Author: jack-berg

api/metrics/src/main/java/io/opentelemetry/api/metrics/MeterProvider.java

@@ -27,7 +27,9 @@ public interface MeterProvider {
    * @param instrumentationName The name of the instrumentation library, not the name of the
    *     instrument*ed* library.
    * @return a meter instance.
+   * @deprecated Use {@link #meterBuilder(String)}
    */
+  @Deprecated
   default Meter get(String instrumentationName) {
     return meterBuilder(instrumentationName).build();
   }
@@ -40,7 +42,9 @@ default Meter get(String instrumentationName) {
    * @param instrumentationVersion The version of the instrumentation library.
    * @param schemaUrl Specifies the Schema URL that should be recorded in the emitted metrics.
    * @return a meter instance.
+   * @deprecated Use {@link #meterBuilder(String)}
    */
+  @Deprecated
   default Meter get(String instrumentationName, String instrumentationVersion, String schemaUrl) {
     return meterBuilder(instrumentationName)
         .setInstrumentationVersion(instrumentationVersion)

api/metrics/src/test/java/io/opentelemetry/api/metrics/internal/NoopMeterProviderTest.java

@@ -9,12 +9,6 @@
 import org.junit.jupiter.api.Test;
 
 public class NoopMeterProviderTest {
-  @Test
-  void noopMeterProvider_getDoesNotThrow() {
-    MeterProvider provider = MeterProvider.noop();
-    provider.get("user-instrumentation");
-    provider.get("schema-instrumentation", "1.0", "myschema://url");
-  }
 
   @Test
   void noopMeterProvider_builderDoesNotThrow() {

exporters/otlp/common/src/jmh/java/io/opentelemetry/exporter/otlp/internal/GrpcGzipBenchmark.java

@@ -74,7 +74,7 @@ public class GrpcGzipBenchmark {
                         .build()))
             .build();
 
-    Meter meter1 = meterProvider.get("longinstrumentation");
+    Meter meter1 = meterProvider.meterBuilder("longinstrumentation").build();
     meter1
         .gaugeBuilder("gauge")
         .setDescription("gauge description")
@@ -102,7 +102,7 @@ public class GrpcGzipBenchmark {
     longUpDownCounter.add(-1, Attributes.of(AttributeKey.booleanKey("on"), true));
     longUpDownCounter.add(1);
 
-    Meter meter2 = meterProvider.get("doubleinstrumentation");
+    Meter meter2 = meterProvider.meterBuilder("doubleinstrumentation").build();
     meter2
         .gaugeBuilder("doublegauge")
         .setDescription("doublegauge")

exporters/otlp/common/src/jmh/java/io/opentelemetry/exporter/otlp/internal/MetricsRequestMarshalerBenchmark.java

@@ -65,7 +65,7 @@ public class MetricsRequestMarshalerBenchmark {
                         .build()))
             .build();
 
-    Meter meter1 = meterProvider.get("longinstrumentation");
+    Meter meter1 = meterProvider.meterBuilder("longinstrumentation").build();
     meter1
         .gaugeBuilder("gauge")
         .setDescription("gauge description")
@@ -93,7 +93,7 @@ public class MetricsRequestMarshalerBenchmark {
     longUpDownCounter.add(-1, Attributes.of(AttributeKey.booleanKey("on"), true));
     longUpDownCounter.add(1);
 
-    Meter meter2 = meterProvider.get("doubleinstrumentation");
+    Meter meter2 = meterProvider.meterBuilder("doubleinstrumentation").build();
     meter2
         .gaugeBuilder("doublegauge")
         .setDescription("doublegauge")

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/ExporterMetrics.java

@@ -63,12 +63,14 @@ public void unbind() {
   /** Create an instance for recording OTLP gRPC exporter metrics. */
   public static ExporterMetrics createGrpc(String type) {
     return new ExporterMetrics(
-        GlobalMeterProvider.get().get("io.opentelemetry.exporters.otlp-grpc"), type);
+        GlobalMeterProvider.get().meterBuilder("io.opentelemetry.exporters.otlp-grpc").build(),
+        type);
   }
 
   /** Create an instance for recording OTLP http/protobuf exporter metrics. */
   public static ExporterMetrics createHttpProtobuf(String type) {
     return new ExporterMetrics(
-        GlobalMeterProvider.get().get("io.opentelemetry.exporters.otlp-http"), type);
+        GlobalMeterProvider.get().meterBuilder("io.opentelemetry.exporters.otlp-http").build(),
+        type);
   }
 }

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/grpc/OkHttpGrpcExporter.java

@@ -82,7 +82,10 @@ public final class OkHttpGrpcExporter<T extends Marshaler> implements GrpcExport
     this.headers = headers;
     this.compressionEnabled = compressionEnabled;
 
-    Meter meter = GlobalMeterProvider.get().get("io.opentelemetry.exporters.otlp-grpc-okhttp");
+    Meter meter =
+        GlobalMeterProvider.get()
+            .meterBuilder("io.opentelemetry.exporters.otlp-grpc-okhttp")
+            .build();
     Attributes attributes = Attributes.builder().put("type", type).build();
     seen = meter.counterBuilder("otlp.exporter.seen").build().bind(attributes);
     LongCounter exported = meter.counterBuilder("otlp.exported.exported").build();

sdk-extensions/autoconfigure/src/testPrometheus/java/io/opentelemetry/sdk/autoconfigure/PrometheusTest.java

@@ -36,7 +36,8 @@ void prometheusExporter() throws Exception {
     AutoConfiguredOpenTelemetrySdk.initialize();
 
     GlobalMeterProvider.get()
-        .get("test")
+        .meterBuilder("test")
+        .build()
         .gaugeBuilder("test")
         .ofLongs()
         .buildWithCallback(result -> result.observe(2, Attributes.empty()));

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

@@ -21,7 +21,7 @@ public enum TestSdk {
       new SdkBuilder() {
         @Override
         Meter build() {
-          return MeterProvider.noop().get("io.opentelemetry.sdk.metrics");
+          return MeterProvider.noop().meterBuilder("io.opentelemetry.sdk.metrics").build();
         }
       }),
   SDK_NO_EXEMPLARS(
@@ -35,7 +35,8 @@ Meter build() {
               .registerMetricReader(InMemoryMetricReader.create())
               .setExemplarFilter(ExemplarFilter.neverSample())
               .build()
-              .get("io.opentelemetry.sdk.metrics");
+              .meterBuilder("io.opentelemetry.sdk.metrics")
+              .build();
         }
       }),
   SDK(
@@ -48,7 +49,8 @@ Meter build() {
               // Must register reader for real SDK.
               .registerMetricReader(InMemoryMetricReader.create())
               .build()
-              .get("io.opentelemetry.sdk.metrics");
+              .meterBuilder("io.opentelemetry.sdk.metrics")
+              .build();
         }
       });
 

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

@@ -33,7 +33,6 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 import java.util.logging.Logger;
-import javax.annotation.Nullable;
 
 /** SDK implementation for {@link MeterProvider}. */
 public final class SdkMeterProvider implements MeterProvider, Closeable {
@@ -91,7 +90,7 @@ public static SdkMeterProviderBuilder builder() {
   }
 
   @Override
-  public MeterBuilder meterBuilder(@Nullable String instrumentationName) {
+  public MeterBuilder meterBuilder(String instrumentationName) {
     if (instrumentationName == null || instrumentationName.isEmpty()) {
       LOGGER.fine("Meter requested without instrumentation name.");
       instrumentationName = DEFAULT_METER_NAME;

sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleCounterTest.java

@@ -36,7 +36,7 @@ class SdkDoubleCounterTest {
           .registerMetricReader(sdkMeterReader)
           .setResource(RESOURCE)
           .build();
-  private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
+  private final Meter sdkMeter = sdkMeterProvider.meterBuilder(getClass().getName()).build();
 
   @Test
   void add_PreventNullAttributes() {