diff --git a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java index 36dc66959f7..28e576419e0 100644 --- a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java +++ b/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(); } diff --git a/sdk/all/src/jmh/java/io/opentelemetry/sdk/metrics/TestSdk.java b/sdk/all/src/jmh/java/io/opentelemetry/sdk/metrics/TestSdk.java index cdc9874f600..3c22fbeb0c7 100644 --- a/sdk/all/src/jmh/java/io/opentelemetry/sdk/metrics/TestSdk.java +++ b/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); } }); diff --git a/sdk/all/src/jmh/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorDroppedSpansBenchmark.java b/sdk/all/src/jmh/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorDroppedSpansBenchmark.java index 26db74224d5..caa6a6dfdc5 100644 --- a/sdk/all/src/jmh/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorDroppedSpansBenchmark.java +++ b/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 allMetrics; diff --git a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java b/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java index aa662ac17ef..829dde615bc 100644 --- a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java +++ b/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(); diff --git a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdkBuilder.java b/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdkBuilder.java index 1f9a052e6fd..33e467a81ee 100644 --- a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdkBuilder.java +++ b/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) { diff --git a/sdk/all/src/test/java/io/opentelemetry/sdk/OpenTelemetrySdkTest.java b/sdk/all/src/test/java/io/opentelemetry/sdk/OpenTelemetrySdkTest.java index 1193b98e166..710116c5b44 100644 --- a/sdk/all/src/test/java/io/opentelemetry/sdk/OpenTelemetrySdkTest.java +++ b/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()); diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeter.java similarity index 97% rename from sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java rename to sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeter.java index b7e498a489c..6b298b6bcf7 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java +++ b/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; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProvider.java similarity index 83% rename from sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java rename to sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProvider.java index 72fadeb973e..c1f622f619f 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java +++ b/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}. * *

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 registry; + private final ComponentRegistry 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 registry; + private final ComponentRegistry registry; - private MetricProducerSdk(ComponentRegistry registry) { + private MetricProducerSdk(ComponentRegistry registry) { this.registry = registry; } @Override public Collection collectAllMetrics() { - Collection meters = registry.getComponents(); + Collection meters = registry.getComponents(); List result = new ArrayList<>(meters.size()); - for (MeterSdk meter : meters) { + for (SdkMeter meter : meters) { result.addAll(meter.collectAll()); } return Collections.unmodifiableCollection(result); diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java index b7b4cca53a0..1b50ff096e0 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java +++ b/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 { diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/package-info.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/package-info.java index 08a34c1e804..683f8f5f5b3 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/package-info.java +++ b/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; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdk.java index 95469b61cfb..db1fccb9cbd 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdk.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.metrics.spi; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.sdk.metrics.MeterSdkProvider; +import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.spi.metrics.MeterProviderFactory; /** @@ -18,7 +18,7 @@ public final class MeterProviderFactorySdk implements MeterProviderFactory { @Override - public MeterSdkProvider create() { - return MeterSdkProvider.builder().build(); + public SdkMeterProvider create() { + return SdkMeterProvider.builder().build(); } } diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java index f29bf4272cb..fa4642b3a25 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/BatchRecorderSdkTest.java @@ -32,8 +32,8 @@ class BatchRecorderSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void batchRecorder_badLabelSet() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java index 6bf99036656..0a8580020e6 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleCounterSdkTest.java @@ -33,8 +33,8 @@ class DoubleCounterSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void add_PreventNullLabels() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdkTest.java index b2299f65d86..e51a201ddbb 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdkTest.java @@ -29,8 +29,8 @@ class DoubleSumObserverSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void collectMetrics_NoCallback() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdkTest.java index b9a77646e6a..1aea77afae9 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdkTest.java @@ -34,8 +34,8 @@ class DoubleUpDownCounterSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void add_PreventNullLabels() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdkTest.java index 763a3ee6d16..44d969c5340 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdkTest.java @@ -29,8 +29,8 @@ class DoubleUpDownSumObserverSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void collectMetrics_NoCallback() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdkTest.java index 862187e81b6..3172e013ae7 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdkTest.java @@ -30,8 +30,8 @@ class DoubleValueObserverSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void collectMetrics_NoCallback() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdkTest.java index 145997ae052..58f035fd611 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdkTest.java @@ -37,8 +37,8 @@ class DoubleValueRecorderSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void record_PreventNullLabels() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java index 609e7362da8..ba4dcf3aa33 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongCounterSdkTest.java @@ -34,8 +34,8 @@ class LongCounterSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void add_PreventNullLabels() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongSumObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongSumObserverSdkTest.java index d3a43c4664f..fc015bc7184 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongSumObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongSumObserverSdkTest.java @@ -29,8 +29,8 @@ class LongSumObserverSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void collectMetrics_NoCallback() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdkTest.java index a4bfbe66562..4fa11502b6d 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdkTest.java @@ -34,8 +34,8 @@ class LongUpDownCounterSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void add_PreventNullLabels() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdkTest.java index aa390f49d7d..62fe967e57f 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdkTest.java @@ -29,8 +29,8 @@ class LongUpDownSumObserverSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void collectMetrics_NoCallback() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueObserverSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueObserverSdkTest.java index 1c72346df10..d1d21491570 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueObserverSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueObserverSdkTest.java @@ -29,8 +29,8 @@ class LongValueObserverSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void collectMetrics_NoCallback() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdkTest.java index 1b9ad3c7dbd..92283f1d529 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdkTest.java @@ -37,8 +37,8 @@ class LongValueRecorderSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void record_PreventNullLabels() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkRegistryTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterRegistryTest.java similarity index 75% rename from sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkRegistryTest.java rename to sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterRegistryTest.java index 539f6228e2c..398ed3efd06 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkRegistryTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterRegistryTest.java @@ -19,16 +19,16 @@ import java.util.Collections; import org.junit.jupiter.api.Test; -/** Unit tests for {@link MeterSdkProvider}. */ -class MeterSdkRegistryTest { +/** Unit tests for {@link SdkMeterProvider}. */ +class SdkMeterRegistryTest { private final TestClock testClock = TestClock.create(); - private final MeterSdkProvider meterProvider = - MeterSdkProvider.builder().setClock(testClock).setResource(Resource.getEmpty()).build(); + private final SdkMeterProvider meterProvider = + SdkMeterProvider.builder().setClock(testClock).setResource(Resource.getEmpty()).build(); @Test void builder_HappyPath() { assertThat( - MeterSdkProvider.builder() + SdkMeterProvider.builder() .setClock(mock(Clock.class)) .setResource(mock(Resource.class)) .build()) @@ -38,18 +38,18 @@ void builder_HappyPath() { @Test void builder_NullClock() { assertThrows( - NullPointerException.class, () -> MeterSdkProvider.builder().setClock(null), "clock"); + NullPointerException.class, () -> SdkMeterProvider.builder().setClock(null), "clock"); } @Test void builder_NullResource() { assertThrows( - NullPointerException.class, () -> MeterSdkProvider.builder().setResource(null), "resource"); + NullPointerException.class, () -> SdkMeterProvider.builder().setResource(null), "resource"); } @Test void defaultGet() { - assertThat(meterProvider.get("test")).isInstanceOf(MeterSdk.class); + assertThat(meterProvider.get("test")).isInstanceOf(SdkMeter.class); } @Test @@ -67,24 +67,24 @@ void getSameInstanceForSameName_WithVersion() { void propagatesInstrumentationLibraryInfoToMeter() { InstrumentationLibraryInfo expected = InstrumentationLibraryInfo.create("theName", "theVersion"); - MeterSdk meter = meterProvider.get(expected.getName(), expected.getVersion()); + SdkMeter meter = meterProvider.get(expected.getName(), expected.getVersion()); assertThat(meter.getInstrumentationLibraryInfo()).isEqualTo(expected); } @Test void metricProducer_GetAllMetrics() { - MeterSdk meterSdk1 = meterProvider.get("io.opentelemetry.sdk.metrics.MeterSdkRegistryTest_1"); - LongCounterSdk longCounter1 = meterSdk1.longCounterBuilder("testLongCounter").build(); + SdkMeter sdkMeter1 = meterProvider.get("io.opentelemetry.sdk.metrics.MeterSdkRegistryTest_1"); + LongCounterSdk longCounter1 = sdkMeter1.longCounterBuilder("testLongCounter").build(); longCounter1.add(10, Labels.empty()); - MeterSdk meterSdk2 = meterProvider.get("io.opentelemetry.sdk.metrics.MeterSdkRegistryTest_2"); - LongCounterSdk longCounter2 = meterSdk2.longCounterBuilder("testLongCounter").build(); + SdkMeter sdkMeter2 = meterProvider.get("io.opentelemetry.sdk.metrics.MeterSdkRegistryTest_2"); + LongCounterSdk longCounter2 = sdkMeter2.longCounterBuilder("testLongCounter").build(); longCounter2.add(10, Labels.empty()); assertThat(meterProvider.getMetricProducer().collectAllMetrics()) .containsExactlyInAnyOrder( MetricData.createLongSum( Resource.getEmpty(), - meterSdk1.getInstrumentationLibraryInfo(), + sdkMeter1.getInstrumentationLibraryInfo(), "testLongCounter", "", "1", @@ -95,7 +95,7 @@ void metricProducer_GetAllMetrics() { LongPoint.create(testClock.now(), testClock.now(), Labels.empty(), 10)))), MetricData.createLongSum( Resource.getEmpty(), - meterSdk2.getInstrumentationLibraryInfo(), + sdkMeter2.getInstrumentationLibraryInfo(), "testLongCounter", "", "1", @@ -108,23 +108,23 @@ void metricProducer_GetAllMetrics() { @Test void suppliesDefaultMeterForNullName() { - MeterSdk meter = meterProvider.get(null); + SdkMeter meter = meterProvider.get(null); assertThat(meter.getInstrumentationLibraryInfo().getName()) - .isEqualTo(MeterSdkProvider.DEFAULT_METER_NAME); + .isEqualTo(SdkMeterProvider.DEFAULT_METER_NAME); meter = meterProvider.get(null, null); assertThat(meter.getInstrumentationLibraryInfo().getName()) - .isEqualTo(MeterSdkProvider.DEFAULT_METER_NAME); + .isEqualTo(SdkMeterProvider.DEFAULT_METER_NAME); } @Test void suppliesDefaultMeterForEmptyName() { - MeterSdk meter = meterProvider.get(""); + SdkMeter meter = meterProvider.get(""); assertThat(meter.getInstrumentationLibraryInfo().getName()) - .isEqualTo(MeterSdkProvider.DEFAULT_METER_NAME); + .isEqualTo(SdkMeterProvider.DEFAULT_METER_NAME); meter = meterProvider.get("", ""); assertThat(meter.getInstrumentationLibraryInfo().getName()) - .isEqualTo(MeterSdkProvider.DEFAULT_METER_NAME); + .isEqualTo(SdkMeterProvider.DEFAULT_METER_NAME); } } diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterTest.java similarity index 99% rename from sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkTest.java rename to sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterTest.java index 287dbf995ba..f1973f479ff 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/MeterSdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterTest.java @@ -26,8 +26,8 @@ import java.util.Collections; import org.junit.jupiter.api.Test; -/** Unit tests for {@link MeterSdk}. */ -class MeterSdkTest { +/** Unit tests for {@link SdkMeter}. */ +class SdkMeterTest { private static final Resource RESOURCE = Resource.create(Attributes.of(stringKey("resource_key"), "resource_value")); private static final InstrumentationLibraryInfo INSTRUMENTATION_LIBRARY_INFO = @@ -35,8 +35,8 @@ class MeterSdkTest { private final TestClock testClock = TestClock.create(); private final MeterProviderSharedState meterProviderSharedState = MeterProviderSharedState.create(testClock, RESOURCE); - private final MeterSdk testSdk = - new MeterSdk(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); + private final SdkMeter testSdk = + new SdkMeter(meterProviderSharedState, INSTRUMENTATION_LIBRARY_INFO); @Test void testLongCounter() { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdkTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdkTest.java index 25f72800aee..9335c34052b 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdkTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdkTest.java @@ -8,13 +8,13 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.metrics.GlobalMetricsProvider; -import io.opentelemetry.sdk.metrics.MeterSdkProvider; +import io.opentelemetry.sdk.metrics.SdkMeterProvider; import org.junit.jupiter.api.Test; /** Unit tests for {@link MeterProviderFactorySdk}. */ class MeterProviderFactorySdkTest { @Test void testDefault() { - assertThat(GlobalMetricsProvider.get()).isInstanceOf(MeterSdkProvider.class); + assertThat(GlobalMetricsProvider.get()).isInstanceOf(SdkMeterProvider.class); } }