diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrument.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrument.java index b21b4d34ff..029a70066d 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrument.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrument.java @@ -6,7 +6,6 @@ package io.opentelemetry.api.metrics; import io.opentelemetry.api.common.Labels; -import java.util.function.Consumer; import javax.annotation.concurrent.ThreadSafe; /** @@ -20,21 +19,6 @@ import javax.annotation.concurrent.ThreadSafe; */ @ThreadSafe public interface AsynchronousInstrument extends Instrument { - /** Builder class for {@link AsynchronousInstrument}. */ - interface Builder extends Instrument.Builder { - /** - * Sets a consumer that gets executed every collection interval. - * - *

Evaluation is deferred until needed, if this {@code AsynchronousInstrument} metric is not - * exported then it will never be called. - * - * @param updater the consumer to be executed before export. - */ - Builder setUpdater(Consumer updater); - - @Override - AsynchronousInstrument build(); - } /** The result pass to the updater. */ interface LongResult { diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrumentBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrumentBuilder.java new file mode 100644 index 0000000000..046f87ed59 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/AsynchronousInstrumentBuilder.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import java.util.function.Consumer; + +/** Builder class for {@link AsynchronousInstrument}. */ +public interface AsynchronousInstrumentBuilder extends InstrumentBuilder { + /** + * Sets a consumer that gets executed every collection interval. + * + *

Evaluation is deferred until needed, if this {@code AsynchronousInstrument} metric is not + * exported then it will never be called. + * + * @param updater the consumer to be executed before export. + */ + AsynchronousInstrumentBuilder setUpdater(Consumer updater); + + @Override + AsynchronousInstrument build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleCounter.java new file mode 100644 index 0000000000..6a3c450c81 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleCounter.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import javax.annotation.concurrent.ThreadSafe; + +/** A {@code Bound Instrument} for a {@link DoubleCounter}. */ +@ThreadSafe +public interface BoundDoubleCounter extends BoundSynchronousInstrument { + /** + * Adds the given {@code increment} to the current value. The values cannot be negative. + * + *

The value added is associated with the current {@code Context}. + * + * @param increment the value to add. + */ + void add(double increment); + + @Override + void unbind(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleUpDownCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleUpDownCounter.java new file mode 100644 index 0000000000..24223cb177 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleUpDownCounter.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import javax.annotation.concurrent.ThreadSafe; + +/** A {@code Bound Instrument} for a {@link DoubleUpDownCounter}. */ +@ThreadSafe +public interface BoundDoubleUpDownCounter extends BoundSynchronousInstrument { + /** + * Adds the given {@code increment} to the current value. + * + *

The value added is associated with the current {@code Context}. + * + * @param increment the value to add. + */ + void add(double increment); + + @Override + void unbind(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleValueRecorder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleValueRecorder.java new file mode 100644 index 0000000000..6fc3866d14 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundDoubleValueRecorder.java @@ -0,0 +1,23 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import javax.annotation.concurrent.ThreadSafe; + +/** A {@code Bound Instrument} for a {@link DoubleValueRecorder}. */ +@ThreadSafe +public interface BoundDoubleValueRecorder extends BoundSynchronousInstrument { + /** + * Records the given measurement, associated with the current {@code Context}. + * + * @param value the measurement to record. + * @throws IllegalArgumentException if value is negative. + */ + void record(double value); + + @Override + void unbind(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongCounter.java new file mode 100644 index 0000000000..c7fa15e053 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongCounter.java @@ -0,0 +1,25 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import javax.annotation.concurrent.ThreadSafe; + +/** A {@code Bound Instrument} for a {@link LongCounter}. */ +@ThreadSafe +public interface BoundLongCounter extends BoundSynchronousInstrument { + + /** + * Adds the given {@code increment} to the current value. The values cannot be negative. + * + *

The value added is associated with the current {@code Context}. + * + * @param increment the value to add. + */ + void add(long increment); + + @Override + void unbind(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongUpDownCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongUpDownCounter.java new file mode 100644 index 0000000000..b0c253f1ae --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongUpDownCounter.java @@ -0,0 +1,25 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import javax.annotation.concurrent.ThreadSafe; + +/** A {@code Bound Instrument} for a {@link LongUpDownCounter}. */ +@ThreadSafe +public interface BoundLongUpDownCounter extends BoundSynchronousInstrument { + + /** + * Adds the given {@code increment} to the current value. + * + *

The value added is associated with the current {@code Context}. + * + * @param increment the value to add. + */ + void add(long increment); + + @Override + void unbind(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongValueRecorder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongValueRecorder.java new file mode 100644 index 0000000000..f7c716c767 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundLongValueRecorder.java @@ -0,0 +1,23 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import javax.annotation.concurrent.ThreadSafe; + +/** A {@code Bound Instrument} for a {@link LongValueRecorder}. */ +@ThreadSafe +public interface BoundLongValueRecorder extends BoundSynchronousInstrument { + /** + * Records the given measurement, associated with the current {@code Context}. + * + * @param value the measurement to record. + * @throws IllegalArgumentException if value is negative. + */ + void record(long value); + + @Override + void unbind(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundSynchronousInstrument.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundSynchronousInstrument.java new file mode 100644 index 0000000000..17fdc0da48 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/BoundSynchronousInstrument.java @@ -0,0 +1,16 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +interface BoundSynchronousInstrument { + /** + * Unbinds the current {@code Bound} from the Instrument. + * + *

After this method returns the current instance {@code Bound} is considered invalid (not + * being managed by the instrument). + */ + void unbind(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DefaultMeter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DefaultMeter.java index b4b0204e4d..f6810ba21f 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DefaultMeter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DefaultMeter.java @@ -30,84 +30,84 @@ final class DefaultMeter implements Meter { } @Override - public DoubleCounter.Builder doubleCounterBuilder(String name) { + public DoubleCounterBuilder doubleCounterBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopDoubleCounter.NoopBuilder(); } @Override - public LongCounter.Builder longCounterBuilder(String name) { + public LongCounterBuilder longCounterBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopLongCounter.NoopBuilder(); } @Override - public DoubleUpDownCounter.Builder doubleUpDownCounterBuilder(String name) { + public DoubleUpDownCounterBuilder doubleUpDownCounterBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopDoubleUpDownCounter.NoopBuilder(); } @Override - public LongUpDownCounter.Builder longUpDownCounterBuilder(String name) { + public LongUpDownCounterBuilder longUpDownCounterBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopLongUpDownCounter.NoopBuilder(); } @Override - public DoubleValueRecorder.Builder doubleValueRecorderBuilder(String name) { + public DoubleValueRecorderBuilder doubleValueRecorderBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopDoubleValueRecorder.NoopBuilder(); } @Override - public LongValueRecorder.Builder longValueRecorderBuilder(String name) { + public LongValueRecorderBuilder longValueRecorderBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopLongValueRecorder.NoopBuilder(); } @Override - public DoubleSumObserver.Builder doubleSumObserverBuilder(String name) { + public DoubleSumObserverBuilder doubleSumObserverBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopDoubleSumObserver.NoopBuilder(); } @Override - public LongSumObserver.Builder longSumObserverBuilder(String name) { + public LongSumObserverBuilder longSumObserverBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopLongSumObserver.NoopBuilder(); } @Override - public DoubleUpDownSumObserver.Builder doubleUpDownSumObserverBuilder(String name) { + public DoubleUpDownSumObserverBuilder doubleUpDownSumObserverBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopDoubleUpDownSumObserver.NoopBuilder(); } @Override - public LongUpDownSumObserver.Builder longUpDownSumObserverBuilder(String name) { + public LongUpDownSumObserverBuilder longUpDownSumObserverBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopLongUpDownSumObserver.NoopBuilder(); } @Override - public DoubleValueObserver.Builder doubleValueObserverBuilder(String name) { + public DoubleValueObserverBuilder doubleValueObserverBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopDoubleValueObserver.NoopBuilder(); } @Override - public LongValueObserver.Builder longValueObserverBuilder(String name) { + public LongValueObserverBuilder longValueObserverBuilder(String name) { Objects.requireNonNull(name, "name"); Utils.checkArgument(StringUtils.isValidMetricName(name), ERROR_MESSAGE_INVALID_NAME); return new NoopLongValueObserver.NoopBuilder(); @@ -158,7 +158,7 @@ final class DefaultMeter implements Meter { } private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements DoubleCounterBuilder { @Override protected NoopBuilder getThis() { @@ -209,7 +209,7 @@ final class DefaultMeter implements Meter { } private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements LongCounterBuilder { @Override protected NoopBuilder getThis() { @@ -257,7 +257,7 @@ final class DefaultMeter implements Meter { } private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements DoubleUpDownCounterBuilder { @Override protected NoopBuilder getThis() { @@ -305,7 +305,7 @@ final class DefaultMeter implements Meter { } private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements LongUpDownCounterBuilder { @Override protected NoopBuilder getThis() { @@ -353,7 +353,7 @@ final class DefaultMeter implements Meter { } private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements DoubleValueRecorderBuilder { @Override protected NoopBuilder getThis() { @@ -401,7 +401,7 @@ final class DefaultMeter implements Meter { } private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements LongValueRecorderBuilder { @Override protected NoopBuilder getThis() { @@ -422,7 +422,7 @@ final class DefaultMeter implements Meter { private NoopDoubleSumObserver() {} private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements DoubleSumObserverBuilder { @Override protected NoopBuilder getThis() { @@ -430,7 +430,7 @@ final class DefaultMeter implements Meter { } @Override - public Builder setUpdater(Consumer updater) { + public DoubleSumObserverBuilder setUpdater(Consumer updater) { Objects.requireNonNull(updater, "callback"); return this; } @@ -449,7 +449,7 @@ final class DefaultMeter implements Meter { private NoopLongSumObserver() {} private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements LongSumObserverBuilder { @Override protected NoopBuilder getThis() { @@ -476,7 +476,7 @@ final class DefaultMeter implements Meter { private NoopDoubleUpDownSumObserver() {} private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements DoubleUpDownSumObserverBuilder { @Override protected NoopBuilder getThis() { @@ -484,7 +484,7 @@ final class DefaultMeter implements Meter { } @Override - public Builder setUpdater(Consumer updater) { + public DoubleUpDownSumObserverBuilder setUpdater(Consumer updater) { Objects.requireNonNull(updater, "callback"); return this; } @@ -503,7 +503,7 @@ final class DefaultMeter implements Meter { private NoopLongUpDownSumObserver() {} private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements LongUpDownSumObserverBuilder { @Override protected NoopBuilder getThis() { @@ -511,7 +511,7 @@ final class DefaultMeter implements Meter { } @Override - public Builder setUpdater(Consumer updater) { + public LongUpDownSumObserverBuilder setUpdater(Consumer updater) { Objects.requireNonNull(updater, "callback"); return this; } @@ -530,7 +530,7 @@ final class DefaultMeter implements Meter { private NoopDoubleValueObserver() {} private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements DoubleValueObserverBuilder { @Override protected NoopBuilder getThis() { @@ -538,7 +538,7 @@ final class DefaultMeter implements Meter { } @Override - public Builder setUpdater(Consumer updater) { + public DoubleValueObserverBuilder setUpdater(Consumer updater) { Objects.requireNonNull(updater, "callback"); return this; } @@ -557,7 +557,7 @@ final class DefaultMeter implements Meter { private NoopLongValueObserver() {} private static final class NoopBuilder extends NoopAbstractInstrumentBuilder - implements Builder { + implements LongValueObserverBuilder { @Override protected NoopBuilder getThis() { @@ -565,7 +565,7 @@ final class DefaultMeter implements Meter { } @Override - public Builder setUpdater(Consumer updater) { + public LongValueObserverBuilder setUpdater(Consumer updater) { Objects.requireNonNull(updater, "callback"); return this; } @@ -625,7 +625,7 @@ final class DefaultMeter implements Meter { private abstract static class NoopAbstractInstrumentBuilder< B extends NoopAbstractInstrumentBuilder> - implements Instrument.Builder { + implements InstrumentBuilder { @Override public B setDescription(String description) { diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java index 9b8042ef39..5995d1581d 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounter.java @@ -6,7 +6,6 @@ package io.opentelemetry.api.metrics; import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.metrics.DoubleCounter.BoundDoubleCounter; import javax.annotation.concurrent.ThreadSafe; /** @@ -61,32 +60,4 @@ public interface DoubleCounter extends SynchronousInstrument @Override BoundDoubleCounter bind(Labels labels); - - /** A {@code Bound Instrument} for a {@link DoubleCounter}. */ - @ThreadSafe - interface BoundDoubleCounter extends SynchronousInstrument.BoundInstrument { - /** - * Adds the given {@code increment} to the current value. The values cannot be negative. - * - *

The value added is associated with the current {@code Context}. - * - * @param increment the value to add. - */ - void add(double increment); - - @Override - void unbind(); - } - - /** Builder class for {@link DoubleCounter}. */ - interface Builder extends SynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - DoubleCounter build(); - } } diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounterBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounterBuilder.java new file mode 100644 index 0000000000..d7bf2dd367 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleCounterBuilder.java @@ -0,0 +1,18 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +/** Builder class for {@link DoubleCounter}. */ +public interface DoubleCounterBuilder extends SynchronousInstrumentBuilder { + @Override + DoubleCounterBuilder setDescription(String description); + + @Override + DoubleCounterBuilder setUnit(String unit); + + @Override + DoubleCounter build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleSumObserver.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleSumObserver.java index f134886ef5..f09de55791 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleSumObserver.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleSumObserver.java @@ -5,7 +5,6 @@ package io.opentelemetry.api.metrics; -import java.util.function.Consumer; import javax.annotation.concurrent.ThreadSafe; /** @@ -47,20 +46,4 @@ import javax.annotation.concurrent.ThreadSafe; * } */ @ThreadSafe -public interface DoubleSumObserver extends AsynchronousInstrument { - - /** Builder class for {@link DoubleSumObserver}. */ - interface Builder extends AsynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - Builder setUpdater(Consumer updater); - - @Override - DoubleSumObserver build(); - } -} +public interface DoubleSumObserver extends AsynchronousInstrument {} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleSumObserverBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleSumObserverBuilder.java new file mode 100644 index 0000000000..c0e2054177 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleSumObserverBuilder.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import java.util.function.Consumer; + +/** Builder class for {@link DoubleSumObserver}. */ +public interface DoubleSumObserverBuilder + extends AsynchronousInstrumentBuilder { + @Override + DoubleSumObserverBuilder setDescription(String description); + + @Override + DoubleSumObserverBuilder setUnit(String unit); + + @Override + DoubleSumObserverBuilder setUpdater(Consumer updater); + + @Override + DoubleSumObserver build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounter.java index 40bc4148c7..689ca28e5d 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounter.java @@ -6,7 +6,6 @@ package io.opentelemetry.api.metrics; import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.metrics.DoubleUpDownCounter.BoundDoubleUpDownCounter; import javax.annotation.concurrent.ThreadSafe; /** @@ -64,32 +63,4 @@ public interface DoubleUpDownCounter extends SynchronousInstrumentThe value added is associated with the current {@code Context}. - * - * @param increment the value to add. - */ - void add(double increment); - - @Override - void unbind(); - } - - /** Builder class for {@link DoubleUpDownCounter}. */ - interface Builder extends SynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - DoubleUpDownCounter build(); - } } diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounterBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounterBuilder.java new file mode 100644 index 0000000000..953da7a86f --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownCounterBuilder.java @@ -0,0 +1,18 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +/** Builder class for {@link DoubleUpDownCounter}. */ +public interface DoubleUpDownCounterBuilder extends SynchronousInstrumentBuilder { + @Override + DoubleUpDownCounterBuilder setDescription(String description); + + @Override + DoubleUpDownCounterBuilder setUnit(String unit); + + @Override + DoubleUpDownCounter build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownSumObserver.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownSumObserver.java index 533465632c..703fdc86dd 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownSumObserver.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownSumObserver.java @@ -5,7 +5,6 @@ package io.opentelemetry.api.metrics; -import java.util.function.Consumer; import javax.annotation.concurrent.ThreadSafe; /** @@ -47,20 +46,4 @@ import javax.annotation.concurrent.ThreadSafe; * } */ @ThreadSafe -public interface DoubleUpDownSumObserver extends AsynchronousInstrument { - - /** Builder class for {@link DoubleUpDownSumObserver}. */ - interface Builder extends AsynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - Builder setUpdater(Consumer updater); - - @Override - DoubleUpDownSumObserver build(); - } -} +public interface DoubleUpDownSumObserver extends AsynchronousInstrument {} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownSumObserverBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownSumObserverBuilder.java new file mode 100644 index 0000000000..e824091e1f --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleUpDownSumObserverBuilder.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import java.util.function.Consumer; + +/** Builder class for {@link DoubleUpDownSumObserver}. */ +public interface DoubleUpDownSumObserverBuilder + extends AsynchronousInstrumentBuilder { + @Override + DoubleUpDownSumObserverBuilder setDescription(String description); + + @Override + DoubleUpDownSumObserverBuilder setUnit(String unit); + + @Override + DoubleUpDownSumObserverBuilder setUpdater(Consumer updater); + + @Override + DoubleUpDownSumObserver build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueObserver.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueObserver.java index c8320bebd7..78476a870e 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueObserver.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueObserver.java @@ -5,7 +5,6 @@ package io.opentelemetry.api.metrics; -import java.util.function.Consumer; import javax.annotation.concurrent.ThreadSafe; /** @@ -43,20 +42,4 @@ import javax.annotation.concurrent.ThreadSafe; * } */ @ThreadSafe -public interface DoubleValueObserver extends AsynchronousInstrument { - - /** Builder class for {@link DoubleValueObserver}. */ - interface Builder extends AsynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - Builder setUpdater(Consumer updater); - - @Override - DoubleValueObserver build(); - } -} +public interface DoubleValueObserver extends AsynchronousInstrument {} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueObserverBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueObserverBuilder.java new file mode 100644 index 0000000000..eafa8f0dcd --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueObserverBuilder.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import java.util.function.Consumer; + +/** Builder class for {@link DoubleValueObserver}. */ +public interface DoubleValueObserverBuilder + extends AsynchronousInstrumentBuilder { + @Override + DoubleValueObserverBuilder setDescription(String description); + + @Override + DoubleValueObserverBuilder setUnit(String unit); + + @Override + DoubleValueObserverBuilder setUpdater(Consumer updater); + + @Override + DoubleValueObserver build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueRecorder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueRecorder.java index 0e9fdb01f8..ec6a86a94c 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueRecorder.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/DoubleValueRecorder.java @@ -6,7 +6,6 @@ package io.opentelemetry.api.metrics; import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.metrics.DoubleValueRecorder.BoundDoubleValueRecorder; import javax.annotation.concurrent.ThreadSafe; /** @@ -72,31 +71,4 @@ public interface DoubleValueRecorder extends SynchronousInstrumentDefault value is {@code ""}. - * - * @param description the description of the Instrument. - * @return this. - */ - Builder setDescription(String description); - - /** - * Sets the unit of the {@code Instrument}. - * - *

Default value is {@code "1"}. - * - * @param unit the unit of the Instrument. - * @return this. - */ - Builder setUnit(String unit); - - /** - * Builds and returns a {@code Instrument} with the desired options. - * - * @return a {@code Instrument} with the desired options. - */ - Instrument build(); - } -} +public interface Instrument {} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/InstrumentBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/InstrumentBuilder.java new file mode 100644 index 0000000000..ef146ed4df --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/InstrumentBuilder.java @@ -0,0 +1,36 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +/** The {@code Builder} class for the {@code Instrument}. */ +public interface InstrumentBuilder { + /** + * Sets the description of the {@code Instrument}. + * + *

Default value is {@code ""}. + * + * @param description the description of the Instrument. + * @return this. + */ + InstrumentBuilder setDescription(String description); + + /** + * Sets the unit of the {@code Instrument}. + * + *

Default value is {@code "1"}. + * + * @param unit the unit of the Instrument. + * @return this. + */ + InstrumentBuilder setUnit(String unit); + + /** + * Builds and returns a {@code Instrument} with the desired options. + * + * @return a {@code Instrument} with the desired options. + */ + Instrument build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounter.java index 53c708f0c1..4c5b6f091a 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounter.java @@ -6,7 +6,6 @@ package io.opentelemetry.api.metrics; import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.metrics.LongCounter.BoundLongCounter; import javax.annotation.concurrent.ThreadSafe; /** @@ -61,33 +60,4 @@ public interface LongCounter extends SynchronousInstrument { @Override BoundLongCounter bind(Labels labels); - - /** A {@code Bound Instrument} for a {@link LongCounter}. */ - @ThreadSafe - interface BoundLongCounter extends SynchronousInstrument.BoundInstrument { - - /** - * Adds the given {@code increment} to the current value. The values cannot be negative. - * - *

The value added is associated with the current {@code Context}. - * - * @param increment the value to add. - */ - void add(long increment); - - @Override - void unbind(); - } - - /** Builder class for {@link LongCounter}. */ - interface Builder extends SynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - LongCounter build(); - } } diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounterBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounterBuilder.java new file mode 100644 index 0000000000..fd0811b43c --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongCounterBuilder.java @@ -0,0 +1,18 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +/** Builder class for {@link LongCounter}. */ +public interface LongCounterBuilder extends SynchronousInstrumentBuilder { + @Override + LongCounterBuilder setDescription(String description); + + @Override + LongCounterBuilder setUnit(String unit); + + @Override + LongCounter build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongSumObserver.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongSumObserver.java index f44192ecd2..a4169d202b 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongSumObserver.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongSumObserver.java @@ -5,7 +5,6 @@ package io.opentelemetry.api.metrics; -import java.util.function.Consumer; import javax.annotation.concurrent.ThreadSafe; /** @@ -47,20 +46,4 @@ import javax.annotation.concurrent.ThreadSafe; * } */ @ThreadSafe -public interface LongSumObserver extends AsynchronousInstrument { - - /** Builder class for {@link LongSumObserver}. */ - interface Builder extends AsynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - Builder setUpdater(Consumer updater); - - @Override - LongSumObserver build(); - } -} +public interface LongSumObserver extends AsynchronousInstrument {} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongSumObserverBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongSumObserverBuilder.java new file mode 100644 index 0000000000..0d80e50cf6 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongSumObserverBuilder.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import java.util.function.Consumer; + +/** Builder class for {@link LongSumObserver}. */ +public interface LongSumObserverBuilder + extends AsynchronousInstrumentBuilder { + @Override + LongSumObserverBuilder setDescription(String description); + + @Override + LongSumObserverBuilder setUnit(String unit); + + @Override + LongSumObserverBuilder setUpdater(Consumer updater); + + @Override + LongSumObserver build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounter.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounter.java index 72d17b1815..c76dce9047 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounter.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounter.java @@ -6,7 +6,6 @@ package io.opentelemetry.api.metrics; import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.metrics.LongUpDownCounter.BoundLongUpDownCounter; import javax.annotation.concurrent.ThreadSafe; /** @@ -64,33 +63,4 @@ public interface LongUpDownCounter extends SynchronousInstrumentThe value added is associated with the current {@code Context}. - * - * @param increment the value to add. - */ - void add(long increment); - - @Override - void unbind(); - } - - /** Builder class for {@link LongUpDownCounter}. */ - interface Builder extends SynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - LongUpDownCounter build(); - } } diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounterBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounterBuilder.java new file mode 100644 index 0000000000..94c203099a --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownCounterBuilder.java @@ -0,0 +1,18 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +/** Builder class for {@link LongUpDownCounter}. */ +public interface LongUpDownCounterBuilder extends SynchronousInstrumentBuilder { + @Override + LongUpDownCounterBuilder setDescription(String description); + + @Override + LongUpDownCounterBuilder setUnit(String unit); + + @Override + LongUpDownCounter build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownSumObserver.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownSumObserver.java index 8c983170f1..ece1aea1ba 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownSumObserver.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownSumObserver.java @@ -5,7 +5,6 @@ package io.opentelemetry.api.metrics; -import java.util.function.Consumer; import javax.annotation.concurrent.ThreadSafe; /** @@ -47,20 +46,4 @@ import javax.annotation.concurrent.ThreadSafe; * } */ @ThreadSafe -public interface LongUpDownSumObserver extends AsynchronousInstrument { - - /** Builder class for {@link LongUpDownSumObserver}. */ - interface Builder extends AsynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - Builder setUpdater(Consumer updater); - - @Override - LongUpDownSumObserver build(); - } -} +public interface LongUpDownSumObserver extends AsynchronousInstrument {} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownSumObserverBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownSumObserverBuilder.java new file mode 100644 index 0000000000..547f07e159 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongUpDownSumObserverBuilder.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import java.util.function.Consumer; + +/** Builder class for {@link LongUpDownSumObserver}. */ +public interface LongUpDownSumObserverBuilder + extends AsynchronousInstrumentBuilder { + @Override + LongUpDownSumObserverBuilder setDescription(String description); + + @Override + LongUpDownSumObserverBuilder setUnit(String unit); + + @Override + LongUpDownSumObserverBuilder setUpdater(Consumer updater); + + @Override + LongUpDownSumObserver build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueObserver.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueObserver.java index 9b1d835c80..c8a2ad883b 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueObserver.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueObserver.java @@ -5,7 +5,6 @@ package io.opentelemetry.api.metrics; -import java.util.function.Consumer; import javax.annotation.concurrent.ThreadSafe; /** @@ -43,20 +42,4 @@ import javax.annotation.concurrent.ThreadSafe; * } */ @ThreadSafe -public interface LongValueObserver extends AsynchronousInstrument { - - /** Builder class for {@link LongValueObserver}. */ - interface Builder extends AsynchronousInstrument.Builder { - @Override - Builder setDescription(String description); - - @Override - Builder setUnit(String unit); - - @Override - Builder setUpdater(Consumer updater); - - @Override - LongValueObserver build(); - } -} +public interface LongValueObserver extends AsynchronousInstrument {} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueObserverBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueObserverBuilder.java new file mode 100644 index 0000000000..2757bea6c9 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueObserverBuilder.java @@ -0,0 +1,24 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +import java.util.function.Consumer; + +/** Builder class for {@link LongValueObserver}. */ +public interface LongValueObserverBuilder + extends AsynchronousInstrumentBuilder { + @Override + LongValueObserverBuilder setDescription(String description); + + @Override + LongValueObserverBuilder setUnit(String unit); + + @Override + LongValueObserverBuilder setUpdater(Consumer updater); + + @Override + LongValueObserver build(); +} diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueRecorder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueRecorder.java index d691e29339..c3e80ee371 100644 --- a/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueRecorder.java +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/LongValueRecorder.java @@ -6,7 +6,6 @@ package io.opentelemetry.api.metrics; import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.metrics.LongValueRecorder.BoundLongValueRecorder; import javax.annotation.concurrent.ThreadSafe; /** @@ -72,31 +71,4 @@ public interface LongValueRecorder extends SynchronousInstrument the specific type of Bound Instrument this instrument can provide. */ @ThreadSafe -public interface SynchronousInstrument extends Instrument { +public interface SynchronousInstrument extends Instrument { /** * Returns a {@code Bound Instrument} associated with the specified labels. Multiples requests * with the same set of labels may return the same {@code Bound Instrument} instance. @@ -32,20 +31,4 @@ public interface SynchronousInstrument extends Instru * @throws NullPointerException if {@code labelValues} is null. */ B bind(Labels labels); - - interface BoundInstrument { - /** - * Unbinds the current {@code Bound} from the Instrument. - * - *

After this method returns the current instance {@code Bound} is considered invalid (not - * being managed by the instrument). - */ - void unbind(); - } - - /** Builder class for {@link SynchronousInstrument}. */ - interface Builder extends Instrument.Builder { - @Override - SynchronousInstrument build(); - } } diff --git a/api/metrics/src/main/java/io/opentelemetry/api/metrics/SynchronousInstrumentBuilder.java b/api/metrics/src/main/java/io/opentelemetry/api/metrics/SynchronousInstrumentBuilder.java new file mode 100644 index 0000000000..40961b7a66 --- /dev/null +++ b/api/metrics/src/main/java/io/opentelemetry/api/metrics/SynchronousInstrumentBuilder.java @@ -0,0 +1,12 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.api.metrics; + +/** Builder class for {@link SynchronousInstrument}. */ +public interface SynchronousInstrumentBuilder extends InstrumentBuilder { + @Override + SynchronousInstrument build(); +} diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleCounterTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleCounterTest.java index 67c12a9dc3..affff50450 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleCounterTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleCounterTest.java @@ -9,7 +9,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.internal.StringUtils; -import io.opentelemetry.api.metrics.DoubleCounter.BoundDoubleCounter; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleUpDownCounterTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleUpDownCounterTest.java index e6594487c1..6689f462b3 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleUpDownCounterTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleUpDownCounterTest.java @@ -9,7 +9,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.internal.StringUtils; -import io.opentelemetry.api.metrics.DoubleUpDownCounter.BoundDoubleUpDownCounter; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleValueRecorderTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleValueRecorderTest.java index 35d1d9cd85..820052a10c 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleValueRecorderTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/DoubleValueRecorderTest.java @@ -8,7 +8,6 @@ package io.opentelemetry.api.metrics; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.metrics.DoubleValueRecorder.BoundDoubleValueRecorder; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongCounterTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongCounterTest.java index 7c73442dfc..6531286f96 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongCounterTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongCounterTest.java @@ -9,7 +9,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.internal.StringUtils; -import io.opentelemetry.api.metrics.LongCounter.BoundLongCounter; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongUpDownCounterTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongUpDownCounterTest.java index 0d426cbf2d..4b130e5269 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongUpDownCounterTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongUpDownCounterTest.java @@ -9,7 +9,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.internal.StringUtils; -import io.opentelemetry.api.metrics.LongUpDownCounter.BoundLongUpDownCounter; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongValueRecorderTest.java b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongValueRecorderTest.java index e29d3e5293..d6a645557d 100644 --- a/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongValueRecorderTest.java +++ b/api/metrics/src/test/java/io/opentelemetry/api/metrics/LongValueRecorderTest.java @@ -10,7 +10,6 @@ import static java.util.Arrays.fill; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Labels; -import io.opentelemetry.api.metrics.LongValueRecorder.BoundLongValueRecorder; import org.junit.jupiter.api.Test; /** Tests for {@link LongValueRecorder}. */ diff --git a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java b/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java index 27fc85b0de..2d5eaab5a1 100644 --- a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java +++ b/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java @@ -11,6 +11,7 @@ import com.google.common.util.concurrent.MoreExecutors; import io.grpc.ConnectivityState; import io.grpc.ManagedChannel; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.GlobalMetricsProvider; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.Meter; @@ -90,9 +91,9 @@ public final class OtlpGrpcSpanExporter implements SpanExporter { private final ManagedChannel managedChannel; private final long timeoutNanos; - private final LongCounter.BoundLongCounter spansSeen; - private final LongCounter.BoundLongCounter spansExportedSuccess; - private final LongCounter.BoundLongCounter spansExportedFailure; + private final BoundLongCounter spansSeen; + private final BoundLongCounter spansExportedSuccess; + private final BoundLongCounter spansExportedFailure; /** * Creates a new OTLP gRPC Span Reporter with the given name, using the given channel. diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java b/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java index 1384b91c58..945ac9daaa 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java +++ b/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java @@ -7,9 +7,9 @@ package io.opentelemetry.sdk.logging.export; import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.internal.Utils; +import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.GlobalMetricsProvider; import io.opentelemetry.api.metrics.LongCounter; -import io.opentelemetry.api.metrics.LongCounter.BoundLongCounter; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.internal.DaemonThreadFactory; diff --git a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java index dee4d830ca..685c9458d6 100644 --- a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java +++ b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java @@ -7,12 +7,14 @@ package io.opentelemetry.sdk.metrics; import com.google.errorprone.annotations.Immutable; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundDoubleCounter; +import io.opentelemetry.api.metrics.BoundDoubleValueRecorder; +import io.opentelemetry.api.metrics.BoundLongCounter; +import io.opentelemetry.api.metrics.BoundLongValueRecorder; import io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.api.metrics.DoubleValueRecorder; -import io.opentelemetry.api.metrics.DoubleValueRecorder.BoundDoubleValueRecorder; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongValueRecorder; -import io.opentelemetry.api.metrics.LongValueRecorder.BoundLongValueRecorder; import io.opentelemetry.api.metrics.Meter; /** @@ -26,7 +28,7 @@ public enum MetricsTestOperationBuilder { meter -> { return new Operation() { final LongCounter metric = meter.longCounterBuilder("long_counter").build(); - final LongCounter.BoundLongCounter boundMetric = + final BoundLongCounter boundMetric = meter .longCounterBuilder("bound_long_counter") .build() @@ -47,7 +49,7 @@ public enum MetricsTestOperationBuilder { meter -> { return new Operation() { final DoubleCounter metric = meter.doubleCounterBuilder("double_counter").build(); - final DoubleCounter.BoundDoubleCounter boundMetric = + final BoundDoubleCounter boundMetric = meter .doubleCounterBuilder("bound_double_counter") .build() diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java index 9ca382f6fc..da454fe58a 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java @@ -8,6 +8,7 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.internal.StringUtils; import io.opentelemetry.api.internal.Utils; import io.opentelemetry.api.metrics.Instrument; +import io.opentelemetry.api.metrics.InstrumentBuilder; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; import io.opentelemetry.sdk.metrics.common.InstrumentValueType; @@ -53,7 +54,7 @@ abstract class AbstractInstrument implements Instrument { } abstract static class Builder> - implements Instrument.Builder { + implements InstrumentBuilder { /* VisibleForTesting */ static final String ERROR_MESSAGE_INVALID_NAME = "Name should be a ASCII string with a length no greater than " + StringUtils.METRIC_NAME_MAX_LENGTH diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java index f81f44e135..f7114fdce8 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java @@ -6,7 +6,9 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundDoubleCounter; import io.opentelemetry.api.metrics.DoubleCounter; +import io.opentelemetry.api.metrics.DoubleCounterBuilder; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; @@ -42,7 +44,7 @@ final class DoubleCounterSdk extends AbstractSynchronousInstrument implements Do return new BoundInstrument(acquireHandle(labels)); } - static final class BoundInstrument implements DoubleCounter.BoundDoubleCounter { + static final class BoundInstrument implements BoundDoubleCounter { private final AggregatorHandle aggregatorHandle; BoundInstrument(AggregatorHandle aggregatorHandle) { @@ -64,7 +66,7 @@ final class DoubleCounterSdk extends AbstractSynchronousInstrument implements Do } static final class Builder extends AbstractSynchronousInstrumentBuilder - implements DoubleCounter.Builder { + implements DoubleCounterBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdk.java index 60b7492ca5..9d87bdbfb5 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdk.java @@ -6,6 +6,7 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.metrics.DoubleSumObserver; +import io.opentelemetry.api.metrics.DoubleSumObserverBuilder; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; import io.opentelemetry.sdk.metrics.common.InstrumentValueType; @@ -20,7 +21,7 @@ final class DoubleSumObserverSdk extends AbstractAsynchronousInstrument static final class Builder extends AbstractDoubleAsynchronousInstrumentBuilder - implements DoubleSumObserver.Builder { + implements DoubleSumObserverBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java index a4d1c097f8..545a684a35 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java @@ -6,7 +6,9 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundDoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounter; +import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; @@ -60,7 +62,7 @@ final class DoubleUpDownCounterSdk extends AbstractSynchronousInstrument static final class Builder extends AbstractSynchronousInstrumentBuilder - implements DoubleUpDownCounter.Builder { + implements DoubleUpDownCounterBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdk.java index 1e2a16dffa..0ce56434fb 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdk.java @@ -6,6 +6,7 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.metrics.DoubleUpDownSumObserver; +import io.opentelemetry.api.metrics.DoubleUpDownSumObserverBuilder; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; import io.opentelemetry.sdk.metrics.common.InstrumentValueType; @@ -20,7 +21,7 @@ final class DoubleUpDownSumObserverSdk extends AbstractAsynchronousInstrument static final class Builder extends AbstractDoubleAsynchronousInstrumentBuilder - implements DoubleUpDownSumObserver.Builder { + implements DoubleUpDownSumObserverBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java index 766abdcb2d..ef5af03037 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java @@ -6,6 +6,7 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.metrics.DoubleValueObserver; +import io.opentelemetry.api.metrics.DoubleValueObserverBuilder; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; import io.opentelemetry.sdk.metrics.common.InstrumentValueType; @@ -20,7 +21,7 @@ final class DoubleValueObserverSdk extends AbstractAsynchronousInstrument static final class Builder extends AbstractDoubleAsynchronousInstrumentBuilder - implements DoubleValueObserver.Builder { + implements DoubleValueObserverBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java index 61d6b00c3a..c86177510e 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java @@ -6,7 +6,9 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundDoubleValueRecorder; import io.opentelemetry.api.metrics.DoubleValueRecorder; +import io.opentelemetry.api.metrics.DoubleValueRecorderBuilder; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; @@ -60,7 +62,7 @@ final class DoubleValueRecorderSdk extends AbstractSynchronousInstrument static final class Builder extends AbstractSynchronousInstrumentBuilder - implements DoubleValueRecorder.Builder { + implements DoubleValueRecorderBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java index 2cb38f9bd3..47a309e4f1 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java @@ -6,7 +6,9 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.LongCounter; +import io.opentelemetry.api.metrics.LongCounterBuilder; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; @@ -42,7 +44,7 @@ final class LongCounterSdk extends AbstractSynchronousInstrument implements Long return new BoundInstrument(acquireHandle(labels)); } - static final class BoundInstrument implements LongCounter.BoundLongCounter { + static final class BoundInstrument implements BoundLongCounter { private final AggregatorHandle aggregatorHandle; BoundInstrument(AggregatorHandle aggregatorHandle) { @@ -64,7 +66,7 @@ final class LongCounterSdk extends AbstractSynchronousInstrument implements Long } static final class Builder extends AbstractSynchronousInstrumentBuilder - implements LongCounter.Builder { + implements LongCounterBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongSumObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongSumObserverSdk.java index f3224d0fcc..8ed14be050 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongSumObserverSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongSumObserverSdk.java @@ -6,6 +6,7 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.metrics.LongSumObserver; +import io.opentelemetry.api.metrics.LongSumObserverBuilder; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; import io.opentelemetry.sdk.metrics.common.InstrumentValueType; @@ -19,7 +20,7 @@ final class LongSumObserverSdk extends AbstractAsynchronousInstrument implements static final class Builder extends AbstractLongAsynchronousInstrumentBuilder - implements LongSumObserver.Builder { + implements LongSumObserverBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java index c1478bb005..fe3e99cd74 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java @@ -6,7 +6,9 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundLongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounter; +import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; @@ -60,7 +62,7 @@ final class LongUpDownCounterSdk extends AbstractSynchronousInstrument static final class Builder extends AbstractSynchronousInstrumentBuilder - implements LongUpDownCounter.Builder { + implements LongUpDownCounterBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdk.java index b2630791e9..cb79e12c0d 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdk.java @@ -6,6 +6,7 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.metrics.LongUpDownSumObserver; +import io.opentelemetry.api.metrics.LongUpDownSumObserverBuilder; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; import io.opentelemetry.sdk.metrics.common.InstrumentValueType; @@ -20,7 +21,7 @@ final class LongUpDownSumObserverSdk extends AbstractAsynchronousInstrument static final class Builder extends AbstractLongAsynchronousInstrumentBuilder - implements LongUpDownSumObserver.Builder { + implements LongUpDownSumObserverBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java index e35b742623..59c44e118f 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java @@ -6,6 +6,7 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.metrics.LongValueObserver; +import io.opentelemetry.api.metrics.LongValueObserverBuilder; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; import io.opentelemetry.sdk.metrics.common.InstrumentValueType; @@ -20,7 +21,7 @@ final class LongValueObserverSdk extends AbstractAsynchronousInstrument static final class Builder extends AbstractLongAsynchronousInstrumentBuilder - implements LongValueObserver.Builder { + implements LongValueObserverBuilder { Builder( String name, diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java index 6c458b50dd..c86de5848c 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java @@ -6,7 +6,9 @@ package io.opentelemetry.sdk.metrics; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundLongValueRecorder; import io.opentelemetry.api.metrics.LongValueRecorder; +import io.opentelemetry.api.metrics.LongValueRecorderBuilder; import io.opentelemetry.sdk.metrics.aggregator.AggregatorHandle; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentType; @@ -60,7 +62,7 @@ final class LongValueRecorderSdk extends AbstractSynchronousInstrument static final class Builder extends AbstractSynchronousInstrumentBuilder - implements LongValueRecorder.Builder { + implements LongValueRecorderBuilder { Builder( String name, 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 8dbf093a4d..0b4fc7a7eb 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 @@ -11,8 +11,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundDoubleCounter; import io.opentelemetry.api.metrics.DoubleCounter; -import io.opentelemetry.api.metrics.DoubleCounter.BoundDoubleCounter; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; @@ -254,7 +254,7 @@ class DoubleCounterSdkTest { } private static class OperationUpdaterWithBinding extends OperationUpdater { - private final DoubleCounter.BoundDoubleCounter boundDoubleCounter; + private final BoundDoubleCounter boundDoubleCounter; private OperationUpdaterWithBinding(BoundDoubleCounter boundDoubleCounter) { this.boundDoubleCounter = boundDoubleCounter; 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 d5de6015bd..546c6867f7 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 @@ -11,8 +11,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundDoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounter; -import io.opentelemetry.api.metrics.DoubleUpDownCounter.BoundDoubleUpDownCounter; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; 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 1dea497f77..7de93af808 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 @@ -11,8 +11,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundDoubleValueRecorder; import io.opentelemetry.api.metrics.DoubleValueRecorder; -import io.opentelemetry.api.metrics.DoubleValueRecorder.BoundDoubleValueRecorder; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; 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 1191d3724a..5d842be571 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 @@ -11,8 +11,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.LongCounter; -import io.opentelemetry.api.metrics.LongCounter.BoundLongCounter; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; @@ -250,7 +250,7 @@ class LongCounterSdkTest { } private static class OperationUpdaterWithBinding extends OperationUpdater { - private final LongCounter.BoundLongCounter boundLongCounter; + private final BoundLongCounter boundLongCounter; private OperationUpdaterWithBinding(BoundLongCounter boundLongCounter) { this.boundLongCounter = boundLongCounter; 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 7e369059fe..f958bcfd44 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 @@ -11,8 +11,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundLongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounter; -import io.opentelemetry.api.metrics.LongUpDownCounter.BoundLongUpDownCounter; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; 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 b83044a7ad..a6fc3f9d47 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 @@ -11,8 +11,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundLongValueRecorder; import io.opentelemetry.api.metrics.LongValueRecorder; -import io.opentelemetry.api.metrics.LongValueRecorder.BoundLongValueRecorder; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.internal.TestClock; import io.opentelemetry.sdk.metrics.StressTestRunner.OperationUpdater; diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java index a1bf7105f7..be727ec1fd 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java @@ -6,9 +6,9 @@ package io.opentelemetry.sdk.trace.export; import io.opentelemetry.api.common.Labels; +import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.GlobalMetricsProvider; import io.opentelemetry.api.metrics.LongCounter; -import io.opentelemetry.api.metrics.LongCounter.BoundLongCounter; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.CompletableResultCode;