Retain MeterProvider#get(String instrumentationName)

Author: jack-berg

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

@@ -27,9 +27,7 @@ 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();
   }

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

@@ -9,6 +9,11 @@
 import org.junit.jupiter.api.Test;
 
 public class NoopMeterProviderTest {
+  @Test
+  void noopMeterProvider_getDoesNotThrow() {
+    MeterProvider provider = MeterProvider.noop();
+    provider.get("user-instrumentation");
+  }
 
   @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.meterBuilder("longinstrumentation").build();
+    Meter meter1 = meterProvider.get("longinstrumentation");
     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.meterBuilder("doubleinstrumentation").build();
+    Meter meter2 = meterProvider.get("doubleinstrumentation");
     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.meterBuilder("longinstrumentation").build();
+    Meter meter1 = meterProvider.get("longinstrumentation");
     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.meterBuilder("doubleinstrumentation").build();
+    Meter meter2 = meterProvider.get("doubleinstrumentation");
     meter2
         .gaugeBuilder("doublegauge")
         .setDescription("doublegauge")

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

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

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

@@ -82,10 +82,7 @@ public final class OkHttpGrpcExporter<T extends Marshaler> implements GrpcExport
     this.headers = headers;
     this.compressionEnabled = compressionEnabled;
 
-    Meter meter =
-        GlobalMeterProvider.get()
-            .meterBuilder("io.opentelemetry.exporters.otlp-grpc-okhttp")
-            .build();
+    Meter meter = GlobalMeterProvider.get().get("io.opentelemetry.exporters.otlp-grpc-okhttp");
     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,8 +36,7 @@ void prometheusExporter() throws Exception {
     AutoConfiguredOpenTelemetrySdk.initialize();
 
     GlobalMeterProvider.get()
-        .meterBuilder("test")
-        .build()
+        .get("test")
         .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().meterBuilder("io.opentelemetry.sdk.metrics").build();
+          return MeterProvider.noop().get("io.opentelemetry.sdk.metrics");
         }
       }),
   SDK_NO_EXEMPLARS(
@@ -35,8 +35,7 @@ Meter build() {
               .registerMetricReader(InMemoryMetricReader.create())
               .setExemplarFilter(ExemplarFilter.neverSample())
               .build()
-              .meterBuilder("io.opentelemetry.sdk.metrics")
-              .build();
+              .get("io.opentelemetry.sdk.metrics");
         }
       }),
   SDK(
@@ -49,8 +48,7 @@ Meter build() {
               // Must register reader for real SDK.
               .registerMetricReader(InMemoryMetricReader.create())
               .build()
-              .meterBuilder("io.opentelemetry.sdk.metrics")
-              .build();
+              .get("io.opentelemetry.sdk.metrics");
         }
       });
 

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.meterBuilder(getClass().getName()).build();
+  private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
 
   @Test
   void add_PreventNullAttributes() {

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

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