From f2804d8d3c7bab1d882babb9a209ca89215462f7 Mon Sep 17 00:00:00 2001 From: Bogdan Cristian Drutu Date: Wed, 19 Feb 2020 09:17:07 -0800 Subject: [PATCH] Rename MeterSharedState with MeterProviderSharedState Signed-off-by: Bogdan Cristian Drutu --- .../sdk/metrics/AbstractCounter.java | 6 +++--- .../sdk/metrics/AbstractInstrument.java | 10 +++++----- .../sdk/metrics/AbstractMeasure.java | 6 +++--- .../sdk/metrics/AbstractObserver.java | 6 +++--- .../sdk/metrics/DoubleCounterSdk.java | 14 ++++++------- .../sdk/metrics/DoubleMeasureSdk.java | 14 ++++++------- .../sdk/metrics/DoubleObserverSdk.java | 14 ++++++------- .../sdk/metrics/LongCounterSdk.java | 14 ++++++------- .../sdk/metrics/LongMeasureSdk.java | 14 ++++++------- .../sdk/metrics/LongObserverSdk.java | 14 ++++++------- ...ate.java => MeterProviderSharedState.java} | 6 +++--- .../opentelemetry/sdk/metrics/MeterSdk.java | 20 ++++++++++--------- .../sdk/metrics/MeterSdkProvider.java | 10 +++++----- .../metrics/AbstractCounterBuilderTest.java | 8 ++++---- .../sdk/metrics/AbstractCounterTest.java | 4 ++-- .../AbstractInstrumentBuilderTest.java | 8 ++++---- .../metrics/AbstractMeasureBuilderTest.java | 8 ++++---- .../sdk/metrics/AbstractMeasureTest.java | 4 ++-- .../metrics/AbstractObserverBuilderTest.java | 8 ++++---- .../sdk/metrics/AbstractObserverTest.java | 4 ++-- 20 files changed, 97 insertions(+), 95 deletions(-) rename sdk/src/main/java/io/opentelemetry/sdk/metrics/{MeterSharedState.java => MeterProviderSharedState.java} (83%) diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractCounter.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractCounter.java index b6c4aaaece5..d08cfee1af9 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractCounter.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractCounter.java @@ -33,7 +33,7 @@ abstract class AbstractCounter extends AbstractInstrument { Map constantLabels, List labelKeys, InstrumentValueType instrumentValueType, - MeterSharedState meterSharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo, boolean monotonic) { super(name, description, unit, constantLabels, labelKeys); @@ -76,9 +76,9 @@ abstract static class Builder, V> Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java index 36a5315afae..3e572c96b95 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java @@ -105,7 +105,7 @@ abstract static class Builder, V> + " characters."; private final String name; - private final MeterSharedState meterSharedState; + private final MeterProviderSharedState meterProviderSharedState; private final InstrumentationLibraryInfo instrumentationLibraryInfo; private String description = ""; private String unit = "1"; @@ -114,14 +114,14 @@ abstract static class Builder, V> Builder( String name, - MeterSharedState meterSharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { Utils.checkNotNull(name, "name"); Utils.checkArgument( StringUtils.isValidMetricName(name) && name.length() <= NAME_MAX_LENGTH, ERROR_MESSAGE_INVALID_NAME); this.name = name; - this.meterSharedState = meterSharedState; + this.meterProviderSharedState = meterProviderSharedState; this.instrumentationLibraryInfo = instrumentationLibraryInfo; } @@ -156,8 +156,8 @@ final String getName() { return name; } - final MeterSharedState getMeterSharedState() { - return meterSharedState; + final MeterProviderSharedState getMeterProviderSharedState() { + return meterProviderSharedState; } final InstrumentationLibraryInfo getInstrumentationLibraryInfo() { diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractMeasure.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractMeasure.java index d72c7002665..cb22b76bc5d 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractMeasure.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractMeasure.java @@ -33,7 +33,7 @@ abstract class AbstractMeasure extends AbstractInstrument { Map constantLabels, List labelKeys, InstrumentValueType instrumentValueType, - MeterSharedState meterSharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo, boolean absolute) { super(name, description, unit, constantLabels, labelKeys); @@ -76,9 +76,9 @@ abstract static class Builder, V> Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractObserver.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractObserver.java index cba8a21f12a..7750d75cfff 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractObserver.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/AbstractObserver.java @@ -33,7 +33,7 @@ class AbstractObserver extends AbstractInstrument { Map constantLabels, List labelKeys, InstrumentValueType instrumentValueType, - MeterSharedState meterSharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo, boolean monotonic) { super(name, description, unit, constantLabels, labelKeys); @@ -76,9 +76,9 @@ abstract static class Builder, V> Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java index b252b95409b..9ab2b87fde2 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java @@ -32,7 +32,7 @@ private DoubleCounterSdk( Map constantLabels, List labelKeys, boolean monotonic, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { super( name, @@ -41,7 +41,7 @@ private DoubleCounterSdk( constantLabels, labelKeys, InstrumentValueType.DOUBLE, - sharedState, + meterProviderSharedState, instrumentationLibraryInfo, monotonic); } @@ -78,9 +78,9 @@ public void add(double delta) { static DoubleCounter.Builder builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - return new Builder(name, sharedState, instrumentationLibraryInfo); + return new Builder(name, meterProviderSharedState, instrumentationLibraryInfo); } private static final class Builder @@ -89,9 +89,9 @@ private static final class Builder private Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override @@ -108,7 +108,7 @@ public DoubleCounter build() { getConstantLabels(), getLabelKeys(), isMonotonic(), - getMeterSharedState(), + getMeterProviderSharedState(), getInstrumentationLibraryInfo()); } } diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleMeasureSdk.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleMeasureSdk.java index 390832af45b..70f463475da 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleMeasureSdk.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleMeasureSdk.java @@ -31,7 +31,7 @@ private DoubleMeasureSdk( String unit, Map constantLabels, List labelKeys, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo, boolean absolute) { super( @@ -41,7 +41,7 @@ private DoubleMeasureSdk( constantLabels, labelKeys, InstrumentValueType.DOUBLE, - sharedState, + meterProviderSharedState, instrumentationLibraryInfo, absolute); } @@ -78,9 +78,9 @@ public void record(double value) { static DoubleMeasure.Builder builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - return new Builder(name, sharedState, instrumentationLibraryInfo); + return new Builder(name, meterProviderSharedState, instrumentationLibraryInfo); } private static final class Builder @@ -89,9 +89,9 @@ private static final class Builder private Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override @@ -107,7 +107,7 @@ public DoubleMeasure build() { getUnit(), getConstantLabels(), getLabelKeys(), - getMeterSharedState(), + getMeterProviderSharedState(), getInstrumentationLibraryInfo(), isAbsolute()); } diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleObserverSdk.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleObserverSdk.java index bb04f4992eb..b0b66d4623e 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleObserverSdk.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/DoubleObserverSdk.java @@ -29,7 +29,7 @@ final class DoubleObserverSdk extends AbstractObserver implements DoubleObserver String unit, Map constantLabels, List labelKeys, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo, boolean monotonic) { super( @@ -39,7 +39,7 @@ final class DoubleObserverSdk extends AbstractObserver implements DoubleObserver constantLabels, labelKeys, InstrumentValueType.DOUBLE, - sharedState, + meterProviderSharedState, instrumentationLibraryInfo, monotonic); } @@ -51,9 +51,9 @@ public void setCallback(Callback metricUpda static DoubleObserver.Builder builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - return new Builder(name, sharedState, instrumentationLibraryInfo); + return new Builder(name, meterProviderSharedState, instrumentationLibraryInfo); } private static final class Builder @@ -62,9 +62,9 @@ private static final class Builder private Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override @@ -80,7 +80,7 @@ public DoubleObserver build() { getUnit(), getConstantLabels(), getLabelKeys(), - getMeterSharedState(), + getMeterProviderSharedState(), getInstrumentationLibraryInfo(), isMonotonic()); } diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java index 93c7362166e..d5a45ac66b5 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java @@ -31,7 +31,7 @@ private LongCounterSdk( String unit, Map constantLabels, List labelKeys, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo, boolean monotonic) { super( @@ -41,7 +41,7 @@ private LongCounterSdk( constantLabels, labelKeys, InstrumentValueType.LONG, - sharedState, + meterProviderSharedState, instrumentationLibraryInfo, monotonic); } @@ -78,9 +78,9 @@ public void add(long delta) { static LongCounter.Builder builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - return new Builder(name, sharedState, instrumentationLibraryInfo); + return new Builder(name, meterProviderSharedState, instrumentationLibraryInfo); } private static final class Builder @@ -89,9 +89,9 @@ private static final class Builder private Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override @@ -107,7 +107,7 @@ public LongCounter build() { getUnit(), getConstantLabels(), getLabelKeys(), - getMeterSharedState(), + getMeterProviderSharedState(), getInstrumentationLibraryInfo(), isMonotonic()); } diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongMeasureSdk.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongMeasureSdk.java index af1b639e21a..6bb14d6db59 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongMeasureSdk.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongMeasureSdk.java @@ -31,7 +31,7 @@ private LongMeasureSdk( String unit, Map constantLabels, List labelKeys, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo, boolean absolute) { super( @@ -41,7 +41,7 @@ private LongMeasureSdk( constantLabels, labelKeys, InstrumentValueType.LONG, - sharedState, + meterProviderSharedState, instrumentationLibraryInfo, absolute); } @@ -78,9 +78,9 @@ public void record(long value) { static LongMeasure.Builder builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - return new Builder(name, sharedState, instrumentationLibraryInfo); + return new Builder(name, meterProviderSharedState, instrumentationLibraryInfo); } private static final class Builder @@ -89,9 +89,9 @@ private static final class Builder private Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override @@ -107,7 +107,7 @@ public LongMeasure build() { getUnit(), getConstantLabels(), getLabelKeys(), - getMeterSharedState(), + getMeterProviderSharedState(), getInstrumentationLibraryInfo(), isAbsolute()); } diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongObserverSdk.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongObserverSdk.java index a2afd44a655..2de14c5eee6 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongObserverSdk.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/LongObserverSdk.java @@ -29,7 +29,7 @@ final class LongObserverSdk extends AbstractObserver implements LongObserver { String unit, Map constantLabels, List labelKeys, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo, boolean monotonic) { super( @@ -39,7 +39,7 @@ final class LongObserverSdk extends AbstractObserver implements LongObserver { constantLabels, labelKeys, InstrumentValueType.LONG, - sharedState, + meterProviderSharedState, instrumentationLibraryInfo, monotonic); } @@ -51,9 +51,9 @@ public void setCallback(Callback metricUpdater) static LongObserver.Builder builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - return new Builder(name, sharedState, instrumentationLibraryInfo); + return new Builder(name, meterProviderSharedState, instrumentationLibraryInfo); } private static final class Builder @@ -62,9 +62,9 @@ private static final class Builder private Builder( String name, - MeterSharedState sharedState, + MeterProviderSharedState meterProviderSharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - super(name, sharedState, instrumentationLibraryInfo); + super(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override @@ -80,7 +80,7 @@ public LongObserver build() { getUnit(), getConstantLabels(), getLabelKeys(), - getMeterSharedState(), + getMeterProviderSharedState(), getInstrumentationLibraryInfo(), isMonotonic()); } diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSharedState.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterProviderSharedState.java similarity index 83% rename from sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSharedState.java rename to sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterProviderSharedState.java index 766b7d9fe58..7aebe9b9518 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSharedState.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterProviderSharedState.java @@ -23,9 +23,9 @@ @AutoValue @Immutable -abstract class MeterSharedState { - static MeterSharedState create(Clock clock, Resource resource) { - return new AutoValue_MeterSharedState(clock, resource); +abstract class MeterProviderSharedState { + static MeterProviderSharedState create(Clock clock, Resource resource) { + return new AutoValue_MeterProviderSharedState(clock, resource); } abstract Clock getClock(); diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java index d924a4c8de0..34ef5de088c 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java @@ -30,11 +30,13 @@ /** {@link MeterSdk} is SDK implementation of {@link Meter}. */ final class MeterSdk implements Meter { - private final MeterSharedState sharedState; + private final MeterProviderSharedState meterProviderSharedState; private final InstrumentationLibraryInfo instrumentationLibraryInfo; - MeterSdk(MeterSharedState sharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { - this.sharedState = sharedState; + MeterSdk( + MeterProviderSharedState meterProviderSharedState, + InstrumentationLibraryInfo instrumentationLibraryInfo) { + this.meterProviderSharedState = meterProviderSharedState; this.instrumentationLibraryInfo = instrumentationLibraryInfo; } @@ -44,32 +46,32 @@ InstrumentationLibraryInfo getInstrumentationLibraryInfo() { @Override public DoubleCounter.Builder doubleCounterBuilder(String name) { - return DoubleCounterSdk.builder(name, sharedState, instrumentationLibraryInfo); + return DoubleCounterSdk.builder(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override public LongCounter.Builder longCounterBuilder(String name) { - return LongCounterSdk.builder(name, sharedState, instrumentationLibraryInfo); + return LongCounterSdk.builder(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override public DoubleMeasure.Builder doubleMeasureBuilder(String name) { - return DoubleMeasureSdk.builder(name, sharedState, instrumentationLibraryInfo); + return DoubleMeasureSdk.builder(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override public LongMeasure.Builder longMeasureBuilder(String name) { - return LongMeasureSdk.builder(name, sharedState, instrumentationLibraryInfo); + return LongMeasureSdk.builder(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override public DoubleObserver.Builder doubleObserverBuilder(String name) { - return DoubleObserverSdk.builder(name, sharedState, instrumentationLibraryInfo); + return DoubleObserverSdk.builder(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override public LongObserver.Builder longObserverBuilder(String name) { - return LongObserverSdk.builder(name, sharedState, instrumentationLibraryInfo); + return LongObserverSdk.builder(name, meterProviderSharedState, instrumentationLibraryInfo); } @Override diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java index 5106c988898..a63981182d9 100644 --- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java +++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java @@ -37,7 +37,7 @@ public final class MeterSdkProvider implements MeterProvider { private final MeterSdkComponentRegistry registry; private MeterSdkProvider(Clock clock, Resource resource) { - this.registry = new MeterSdkComponentRegistry(MeterSharedState.create(clock, resource)); + this.registry = new MeterSdkComponentRegistry(MeterProviderSharedState.create(clock, resource)); } @Override @@ -107,15 +107,15 @@ public MeterSdkProvider build() { } private static final class MeterSdkComponentRegistry extends ComponentRegistry { - private final MeterSharedState sharedState; + private final MeterProviderSharedState meterProviderSharedState; - private MeterSdkComponentRegistry(MeterSharedState sharedState) { - this.sharedState = sharedState; + private MeterSdkComponentRegistry(MeterProviderSharedState meterProviderSharedState) { + this.meterProviderSharedState = meterProviderSharedState; } @Override public MeterSdk newComponent(InstrumentationLibraryInfo instrumentationLibraryInfo) { - return new MeterSdk(sharedState, instrumentationLibraryInfo); + return new MeterSdk(meterProviderSharedState, instrumentationLibraryInfo); } } } diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractCounterBuilderTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractCounterBuilderTest.java index a06cfc45a13..e2ef0a755dd 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractCounterBuilderTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractCounterBuilderTest.java @@ -36,8 +36,8 @@ public class AbstractCounterBuilderTest { @Rule public ExpectedException thrown = ExpectedException.none(); private static final String NAME = "name"; - private static final MeterSharedState METER_SHARED_STATE = - MeterSharedState.create(TestClock.create(), Resource.getEmpty()); + private static final MeterProviderSharedState METER_SHARED_STATE = + MeterProviderSharedState.create(TestClock.create(), Resource.getEmpty()); private static final InstrumentationLibraryInfo INSTRUMENTATION_LIBRARY_INFO = InstrumentationLibraryInfo.EMPTY; @@ -51,7 +51,7 @@ public void defaultValue() { assertThat(testMetricBuilder.getLabelKeys()).isEmpty(); assertThat(testMetricBuilder.getConstantLabels()).isEmpty(); assertThat(testMetricBuilder.isMonotonic()).isTrue(); - assertThat(testMetricBuilder.getMeterSharedState()).isEqualTo(METER_SHARED_STATE); + assertThat(testMetricBuilder.getMeterProviderSharedState()).isEqualTo(METER_SHARED_STATE); assertThat(testMetricBuilder.getInstrumentationLibraryInfo()) .isEqualTo(INSTRUMENTATION_LIBRARY_INFO); assertThat(testMetricBuilder.build()).isInstanceOf(TestInstrument.class); @@ -71,7 +71,7 @@ private static final class TestInstrumentBuilder extends AbstractCounter.Builder { TestInstrumentBuilder( String name, - MeterSharedState sharedState, + MeterProviderSharedState sharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { super(name, sharedState, instrumentationLibraryInfo); } diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractCounterTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractCounterTest.java index 7b8418c2819..cfac8ce1a87 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractCounterTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractCounterTest.java @@ -65,8 +65,8 @@ private static final class TestCounterInstrument extends AbstractCounter { private static final Map CONSTANT_LABELS = Collections.singletonMap("key_2", "value_2"); private static final List LABEL_KEY = Collections.singletonList("key"); - private static final MeterSharedState METER_SHARED_STATE = - MeterSharedState.create(TestClock.create(), Resource.getEmpty()); + private static final MeterProviderSharedState METER_SHARED_STATE = + MeterProviderSharedState.create(TestClock.create(), Resource.getEmpty()); private static final InstrumentationLibraryInfo INSTRUMENTATION_LIBRARY_INFO = InstrumentationLibraryInfo.create("test_abstract_instrument", ""); diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentBuilderTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentBuilderTest.java index 0d445645a91..6b7817960f9 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentBuilderTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractInstrumentBuilderTest.java @@ -43,8 +43,8 @@ public class AbstractInstrumentBuilderTest { private static final List LABEL_KEY = Collections.singletonList("key"); private static final Map CONSTANT_LABELS = Collections.singletonMap("key_2", "value_2"); - private static final MeterSharedState METER_SHARED_STATE = - MeterSharedState.create(TestClock.create(), Resource.getEmpty()); + private static final MeterProviderSharedState METER_SHARED_STATE = + MeterProviderSharedState.create(TestClock.create(), Resource.getEmpty()); private static final InstrumentationLibraryInfo INSTRUMENTATION_LIBRARY_INFO = InstrumentationLibraryInfo.EMPTY; @@ -154,7 +154,7 @@ public void setAndGetValues() { assertThat(testInstrumentBuilder.getUnit()).isEqualTo(UNIT); assertThat(testInstrumentBuilder.getLabelKeys()).isEqualTo(LABEL_KEY); assertThat(testInstrumentBuilder.getConstantLabels()).isEqualTo(CONSTANT_LABELS); - assertThat(testInstrumentBuilder.getMeterSharedState()).isEqualTo(METER_SHARED_STATE); + assertThat(testInstrumentBuilder.getMeterProviderSharedState()).isEqualTo(METER_SHARED_STATE); assertThat(testInstrumentBuilder.getInstrumentationLibraryInfo()) .isEqualTo(INSTRUMENTATION_LIBRARY_INFO); assertThat(testInstrumentBuilder.build()).isInstanceOf(TestInstrument.class); @@ -164,7 +164,7 @@ private static final class TestInstrumentBuilder extends AbstractInstrument.Builder { TestInstrumentBuilder( String name, - MeterSharedState sharedState, + MeterProviderSharedState sharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { super(name, sharedState, instrumentationLibraryInfo); } diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractMeasureBuilderTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractMeasureBuilderTest.java index 23987ec2386..4f4807f2895 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractMeasureBuilderTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractMeasureBuilderTest.java @@ -36,8 +36,8 @@ public class AbstractMeasureBuilderTest { @Rule public ExpectedException thrown = ExpectedException.none(); private static final String NAME = "name"; - private static final MeterSharedState METER_SHARED_STATE = - MeterSharedState.create(TestClock.create(), Resource.getEmpty()); + private static final MeterProviderSharedState METER_SHARED_STATE = + MeterProviderSharedState.create(TestClock.create(), Resource.getEmpty()); private static final InstrumentationLibraryInfo INSTRUMENTATION_LIBRARY_INFO = InstrumentationLibraryInfo.EMPTY; @@ -51,7 +51,7 @@ public void defaultValue() { assertThat(testMetricBuilder.getLabelKeys()).isEmpty(); assertThat(testMetricBuilder.getConstantLabels()).isEmpty(); assertThat(testMetricBuilder.isAbsolute()).isTrue(); - assertThat(testMetricBuilder.getMeterSharedState()).isEqualTo(METER_SHARED_STATE); + assertThat(testMetricBuilder.getMeterProviderSharedState()).isEqualTo(METER_SHARED_STATE); assertThat(testMetricBuilder.getInstrumentationLibraryInfo()) .isEqualTo(INSTRUMENTATION_LIBRARY_INFO); assertThat(testMetricBuilder.build()).isInstanceOf(TestInstrument.class); @@ -71,7 +71,7 @@ private static final class TestInstrumentBuilder extends AbstractMeasure.Builder { TestInstrumentBuilder( String name, - MeterSharedState sharedState, + MeterProviderSharedState sharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { super(name, sharedState, instrumentationLibraryInfo); } diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractMeasureTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractMeasureTest.java index 2a81be51711..ed92532a8cf 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractMeasureTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractMeasureTest.java @@ -64,8 +64,8 @@ private static final class TestMeasureInstrument extends AbstractMeasure { private static final Map CONSTANT_LABELS = Collections.singletonMap("key_2", "value_2"); private static final List LABEL_KEY = Collections.singletonList("key"); - private static final MeterSharedState METER_SHARED_STATE = - MeterSharedState.create(TestClock.create(), Resource.getEmpty()); + private static final MeterProviderSharedState METER_SHARED_STATE = + MeterProviderSharedState.create(TestClock.create(), Resource.getEmpty()); private static final InstrumentationLibraryInfo INSTRUMENTATION_LIBRARY_INFO = InstrumentationLibraryInfo.create("test_abstract_instrument", ""); diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractObserverBuilderTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractObserverBuilderTest.java index 672d33fe97b..539da8e2d50 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractObserverBuilderTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractObserverBuilderTest.java @@ -34,8 +34,8 @@ public class AbstractObserverBuilderTest { @Rule public ExpectedException thrown = ExpectedException.none(); private static final String NAME = "name"; - private static final MeterSharedState METER_SHARED_STATE = - MeterSharedState.create(TestClock.create(), Resource.getEmpty()); + private static final MeterProviderSharedState METER_SHARED_STATE = + MeterProviderSharedState.create(TestClock.create(), Resource.getEmpty()); private static final InstrumentationLibraryInfo INSTRUMENTATION_LIBRARY_INFO = InstrumentationLibraryInfo.EMPTY; @@ -49,7 +49,7 @@ public void defaultValue() { assertThat(testMetricBuilder.getLabelKeys()).isEmpty(); assertThat(testMetricBuilder.getConstantLabels()).isEmpty(); assertThat(testMetricBuilder.isMonotonic()).isFalse(); - assertThat(testMetricBuilder.getMeterSharedState()).isEqualTo(METER_SHARED_STATE); + assertThat(testMetricBuilder.getMeterProviderSharedState()).isEqualTo(METER_SHARED_STATE); assertThat(testMetricBuilder.getInstrumentationLibraryInfo()) .isEqualTo(INSTRUMENTATION_LIBRARY_INFO); assertThat(testMetricBuilder.build()).isInstanceOf(TestInstrument.class); @@ -69,7 +69,7 @@ private static final class TestInstrumentBuilder extends AbstractObserver.Builder { TestInstrumentBuilder( String name, - MeterSharedState sharedState, + MeterProviderSharedState sharedState, InstrumentationLibraryInfo instrumentationLibraryInfo) { super(name, sharedState, instrumentationLibraryInfo); } diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractObserverTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractObserverTest.java index b2aa8f377c4..2598ab25f04 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractObserverTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/AbstractObserverTest.java @@ -65,8 +65,8 @@ private static final class TestObserverInstrument extends AbstractObserver { private static final Map CONSTANT_LABELS = Collections.singletonMap("key_2", "value_2"); private static final List LABEL_KEY = Collections.singletonList("key"); - private static final MeterSharedState METER_SHARED_STATE = - MeterSharedState.create(TestClock.create(), Resource.getEmpty()); + private static final MeterProviderSharedState METER_SHARED_STATE = + MeterProviderSharedState.create(TestClock.create(), Resource.getEmpty()); private static final InstrumentationLibraryInfo INSTRUMENTATION_LIBRARY_INFO = InstrumentationLibraryInfo.create("test_abstract_instrument", "");