Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Comment thread
jkwatson marked this conversation as resolved.
return meterBuilder(instrumentationName).build();
}
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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();
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SdkDoubleGaugeBuilderTest {
.setResource(RESOURCE)
.registerMetricReader(sdkMeterReader)
.build();
private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
private final Meter sdkMeter = sdkMeterProvider.meterBuilder(getClass().getName()).build();

@Test
void collectMetrics_NoRecords() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class SdkDoubleHistogramTest {
.setResource(RESOURCE)
.registerMetricReader(sdkMeterReader)
.build();
private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
private final Meter sdkMeter = sdkMeterProvider.meterBuilder(getClass().getName()).build();

@Test
void record_PreventNullAttributes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ void collectMetrics_NoRecords() {
SdkMeterProvider sdkMeterProvider =
sdkMeterProviderBuilder.registerMetricReader(sdkMeterReader).build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.counterBuilder("testObserver")
.ofDoubles()
.setDescription("My own DoubleSumObserver")
Expand All @@ -53,7 +54,8 @@ void collectMetrics_WithOneRecord() {
SdkMeterProvider sdkMeterProvider =
sdkMeterProviderBuilder.registerMetricReader(sdkMeterReader).build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.counterBuilder("testObserver")
.ofDoubles()
.setDescription("My own DoubleSumObserver")
Expand Down Expand Up @@ -120,7 +122,8 @@ void collectMetrics_DeltaSumAggregator() {
View.builder().setAggregation(Aggregation.sum()).build())
.build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.counterBuilder("testObserver")
.ofDoubles()
.setDescription("My own DoubleSumObserver")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class SdkDoubleUpDownCounterTest {
.setResource(RESOURCE)
.registerMetricReader(sdkMeterReader)
.build();
private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
private final Meter sdkMeter = sdkMeterProvider.meterBuilder(getClass().getName()).build();

@Test
void add_PreventNullAttributes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ void collectMetrics_NoRecords() {
SdkMeterProvider sdkMeterProvider =
sdkMeterProviderBuilder.registerMetricReader(sdkMeterReader).build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.upDownCounterBuilder("testObserver")
.ofDoubles()
.setDescription("My own DoubleUpDownSumObserver")
Expand All @@ -53,7 +54,8 @@ void collectMetrics_WithOneRecord() {
SdkMeterProvider sdkMeterProvider =
sdkMeterProviderBuilder.registerMetricReader(sdkMeterReader).build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.upDownCounterBuilder("testObserver")
.ofDoubles()
.buildWithCallback(
Expand Down Expand Up @@ -116,7 +118,8 @@ void collectMetrics_DeltaSumAggregator() {
View.builder().setAggregation(Aggregation.sum()).build())
.build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.upDownCounterBuilder("testObserver")
.ofDoubles()
.buildWithCallback(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class SdkLongCounterTest {
.setResource(RESOURCE)
.registerMetricReader(sdkMeterReader)
.build();
private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
private final Meter sdkMeter = sdkMeterProvider.meterBuilder(getClass().getName()).build();

@Test
void add_PreventNullAttributes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SdkLongGaugeBuilderTest {
.setResource(RESOURCE)
.registerMetricReader(sdkMeterReader)
.build();
private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
private final Meter sdkMeter = sdkMeterProvider.meterBuilder(getClass().getName()).build();

@Test
void collectMetrics_NoRecords() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class SdkLongHistogramTest {
.setResource(RESOURCE)
.registerMetricReader(sdkMeterReader)
.build();
private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
private final Meter sdkMeter = sdkMeterProvider.meterBuilder(getClass().getName()).build();

@Test
void record_PreventNullAttributes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ void collectMetrics_NoRecords() {
SdkMeterProvider sdkMeterProvider =
sdkMeterProviderBuilder.registerMetricReader(sdkMeterReader).build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.counterBuilder("testObserver")
.setDescription("My own LongSumObserver")
.setUnit("ms")
Expand All @@ -52,7 +53,8 @@ void collectMetrics_WithOneRecord() {
SdkMeterProvider sdkMeterProvider =
sdkMeterProviderBuilder.registerMetricReader(sdkMeterReader).build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.counterBuilder("testObserver")
.buildWithCallback(
result -> result.observe(12, Attributes.builder().put("k", "v").build()));
Expand Down Expand Up @@ -114,7 +116,8 @@ void collectMetrics_DeltaSumAggregator() {
View.builder().setAggregation(Aggregation.sum()).build())
.build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.counterBuilder("testObserver")
.buildWithCallback(
result -> result.observe(12, Attributes.builder().put("k", "v").build()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class SdkLongUpDownCounterTest {
.setResource(RESOURCE)
.registerMetricReader(sdkMeterReader)
.build();
private final Meter sdkMeter = sdkMeterProvider.get(getClass().getName());
private final Meter sdkMeter = sdkMeterProvider.meterBuilder(getClass().getName()).build();

@Test
void add_PreventNullAttributes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ void collectMetrics_NoRecords() {
SdkMeterProvider sdkMeterProvider =
sdkMeterProviderBuilder.registerMetricReader(sdkMeterReader).build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.upDownCounterBuilder("testObserver")
.setDescription("My own LongUpDownSumObserver")
.setUnit("ms")
Expand All @@ -52,7 +53,8 @@ void collectMetrics_WithOneRecord() {
SdkMeterProvider sdkMeterProvider =
sdkMeterProviderBuilder.registerMetricReader(sdkMeterReader).build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.upDownCounterBuilder("testObserver")
.buildWithCallback(
result -> result.observe(12, Attributes.builder().put("k", "v").build()));
Expand Down Expand Up @@ -114,7 +116,8 @@ void collectMetrics_DeltaSumAggregator() {
View.builder().setAggregation(Aggregation.sum()).build())
.build();
sdkMeterProvider
.get(getClass().getName())
.meterBuilder(getClass().getName())
.build()
.upDownCounterBuilder("testObserver")
.buildWithCallback(
result -> result.observe(12, Attributes.builder().put("k", "v").build()));
Expand Down
Loading