diff --git a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryDistributionSummary.java b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryDistributionSummary.java index ce08ffd7720a..5d5ae6b5cab0 100644 --- a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryDistributionSummary.java +++ b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryDistributionSummary.java @@ -7,18 +7,22 @@ import static io.opentelemetry.instrumentation.micrometer.v1_5.Bridging.baseUnit; import static io.opentelemetry.instrumentation.micrometer.v1_5.Bridging.description; +import static io.opentelemetry.instrumentation.micrometer.v1_5.Bridging.statisticInstrumentName; import static io.opentelemetry.instrumentation.micrometer.v1_5.Bridging.tagsAsAttributes; import io.micrometer.core.instrument.AbstractDistributionSummary; import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.Measurement; +import io.micrometer.core.instrument.Statistic; import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; import io.micrometer.core.instrument.distribution.NoopHistogram; import io.micrometer.core.instrument.distribution.TimeWindowMax; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.instrumentation.api.internal.AsyncInstrumentRegistry; +import io.opentelemetry.instrumentation.api.internal.AsyncInstrumentRegistry.AsyncMeasurementHandle; import java.util.Collections; import java.util.concurrent.atomic.DoubleAdder; import java.util.concurrent.atomic.LongAdder; @@ -26,10 +30,12 @@ final class OpenTelemetryDistributionSummary extends AbstractDistributionSummary implements DistributionSummary, RemovableMeter { + private final Measurements measurements; + private final TimeWindowMax max; // TODO: use bound instruments when they're available private final DoubleHistogram otelHistogram; private final Attributes attributes; - private final Measurements measurements; + private final AsyncMeasurementHandle maxHandle; private volatile boolean removed = false; @@ -38,22 +44,32 @@ final class OpenTelemetryDistributionSummary extends AbstractDistributionSummary Clock clock, DistributionStatisticConfig distributionStatisticConfig, double scale, - Meter otelMeter) { + Meter otelMeter, + AsyncInstrumentRegistry asyncInstrumentRegistry) { super(id, clock, distributionStatisticConfig, scale, false); + if (isUsingMicrometerHistograms()) { + measurements = new MicrometerHistogramMeasurements(); + } else { + measurements = NoopMeasurements.INSTANCE; + } + max = new TimeWindowMax(clock, distributionStatisticConfig); + + this.attributes = tagsAsAttributes(id); this.otelHistogram = otelMeter .histogramBuilder(id.getName()) .setDescription(description(id)) .setUnit(baseUnit(id)) .build(); - this.attributes = tagsAsAttributes(id); - - if (isUsingMicrometerHistograms()) { - measurements = new MicrometerHistogramMeasurements(clock, distributionStatisticConfig); - } else { - measurements = NoopMeasurements.INSTANCE; - } + this.maxHandle = + asyncInstrumentRegistry.buildGauge( + statisticInstrumentName(id, Statistic.MAX), + description(id), + baseUnit(id), + attributes, + max, + TimeWindowMax::poll); } boolean isUsingMicrometerHistograms() { @@ -65,6 +81,7 @@ protected void recordNonNegative(double amount) { if (amount >= 0 && !removed) { otelHistogram.record(amount, attributes); measurements.record(amount); + max.record(amount); } } @@ -80,7 +97,7 @@ public double totalAmount() { @Override public double max() { - return measurements.max(); + return max.poll(); } @Override @@ -92,6 +109,7 @@ public Iterable measure() { @Override public void onRemove() { removed = true; + maxHandle.remove(); } private interface Measurements { @@ -100,8 +118,6 @@ private interface Measurements { long count(); double totalAmount(); - - double max(); } // if micrometer histograms are not being used then there's no need to keep any local state @@ -123,32 +139,19 @@ public double totalAmount() { UnsupportedReadLogger.logWarning(); return Double.NaN; } - - @Override - public double max() { - UnsupportedReadLogger.logWarning(); - return Double.NaN; - } } - // calculate count, totalAmount and max value for the use of micrometer histograms + // calculate count and totalAmount value for the use of micrometer histograms // kinda similar to how DropwizardDistributionSummary does that private static final class MicrometerHistogramMeasurements implements Measurements { private final LongAdder count = new LongAdder(); private final DoubleAdder totalAmount = new DoubleAdder(); - private final TimeWindowMax max; - - MicrometerHistogramMeasurements( - Clock clock, DistributionStatisticConfig distributionStatisticConfig) { - this.max = new TimeWindowMax(clock, distributionStatisticConfig); - } @Override public void record(double amount) { count.increment(); totalAmount.add(amount); - max.record(amount); } @Override @@ -160,10 +163,5 @@ public long count() { public double totalAmount() { return totalAmount.sum(); } - - @Override - public double max() { - return max.poll(); - } } } diff --git a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryMeterRegistry.java b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryMeterRegistry.java index 532558ba224f..725a64d31eb1 100644 --- a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryMeterRegistry.java +++ b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryMeterRegistry.java @@ -86,7 +86,13 @@ protected Timer newTimer( DistributionStatisticConfig distributionStatisticConfig, PauseDetector pauseDetector) { OpenTelemetryTimer timer = - new OpenTelemetryTimer(id, clock, distributionStatisticConfig, pauseDetector, otelMeter); + new OpenTelemetryTimer( + id, + clock, + distributionStatisticConfig, + pauseDetector, + otelMeter, + asyncInstrumentRegistry); if (timer.isUsingMicrometerHistograms()) { HistogramGauges.registerWithCommonFormat(timer, this); } @@ -98,7 +104,7 @@ protected DistributionSummary newDistributionSummary( Meter.Id id, DistributionStatisticConfig distributionStatisticConfig, double scale) { OpenTelemetryDistributionSummary distributionSummary = new OpenTelemetryDistributionSummary( - id, clock, distributionStatisticConfig, scale, otelMeter); + id, clock, distributionStatisticConfig, scale, otelMeter, asyncInstrumentRegistry); if (distributionSummary.isUsingMicrometerHistograms()) { HistogramGauges.registerWithCommonFormat(distributionSummary, this); } diff --git a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryTimer.java b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryTimer.java index bf97d103ff89..ae01bdb24a7b 100644 --- a/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryTimer.java +++ b/instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryTimer.java @@ -6,11 +6,13 @@ package io.opentelemetry.instrumentation.micrometer.v1_5; import static io.opentelemetry.instrumentation.micrometer.v1_5.Bridging.description; +import static io.opentelemetry.instrumentation.micrometer.v1_5.Bridging.statisticInstrumentName; import static io.opentelemetry.instrumentation.micrometer.v1_5.Bridging.tagsAsAttributes; import io.micrometer.core.instrument.AbstractTimer; import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.Measurement; +import io.micrometer.core.instrument.Statistic; import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; import io.micrometer.core.instrument.distribution.NoopHistogram; import io.micrometer.core.instrument.distribution.TimeWindowMax; @@ -19,6 +21,8 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.api.metrics.Meter; +import io.opentelemetry.instrumentation.api.internal.AsyncInstrumentRegistry; +import io.opentelemetry.instrumentation.api.internal.AsyncInstrumentRegistry.AsyncMeasurementHandle; import java.util.Collections; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.LongAdder; @@ -27,10 +31,12 @@ final class OpenTelemetryTimer extends AbstractTimer implements RemovableMeter { private static final double NANOS_PER_MS = TimeUnit.MILLISECONDS.toNanos(1); + private final Measurements measurements; + private final TimeWindowMax max; // TODO: use bound instruments when they're available private final DoubleHistogram otelHistogram; private final Attributes attributes; - private final Measurements measurements; + private final AsyncMeasurementHandle maxHandle; private volatile boolean removed = false; @@ -39,22 +45,32 @@ final class OpenTelemetryTimer extends AbstractTimer implements RemovableMeter { Clock clock, DistributionStatisticConfig distributionStatisticConfig, PauseDetector pauseDetector, - Meter otelMeter) { + Meter otelMeter, + AsyncInstrumentRegistry asyncInstrumentRegistry) { super(id, clock, distributionStatisticConfig, pauseDetector, TimeUnit.MILLISECONDS, false); + if (isUsingMicrometerHistograms()) { + measurements = new MicrometerHistogramMeasurements(); + } else { + measurements = NoopMeasurements.INSTANCE; + } + max = new TimeWindowMax(clock, distributionStatisticConfig); + + this.attributes = tagsAsAttributes(id); this.otelHistogram = otelMeter .histogramBuilder(id.getName()) .setDescription(description(id)) .setUnit("ms") .build(); - this.attributes = tagsAsAttributes(id); - - if (isUsingMicrometerHistograms()) { - measurements = new MicrometerHistogramMeasurements(clock, distributionStatisticConfig); - } else { - measurements = NoopMeasurements.INSTANCE; - } + this.maxHandle = + asyncInstrumentRegistry.buildGauge( + statisticInstrumentName(id, Statistic.MAX), + description(id), + "ms", + attributes, + max, + m -> m.poll(TimeUnit.MILLISECONDS)); } boolean isUsingMicrometerHistograms() { @@ -68,6 +84,7 @@ protected void recordNonNegative(long amount, TimeUnit unit) { double time = nanos / NANOS_PER_MS; otelHistogram.record(time, attributes); measurements.record(nanos); + max.record(nanos, TimeUnit.NANOSECONDS); } } @@ -83,7 +100,7 @@ public double totalTime(TimeUnit unit) { @Override public double max(TimeUnit unit) { - return measurements.max(unit); + return max.poll(unit); } @Override @@ -95,6 +112,7 @@ public Iterable measure() { @Override public void onRemove() { removed = true; + maxHandle.remove(); } private interface Measurements { @@ -103,8 +121,6 @@ private interface Measurements { long count(); double totalTime(TimeUnit unit); - - double max(TimeUnit unit); } // if micrometer histograms are not being used then there's no need to keep any local state @@ -126,32 +142,19 @@ public double totalTime(TimeUnit unit) { UnsupportedReadLogger.logWarning(); return Double.NaN; } - - @Override - public double max(TimeUnit unit) { - UnsupportedReadLogger.logWarning(); - return Double.NaN; - } } - // calculate count, totalTime and max value for the use of micrometer histograms + // calculate count and totalTime value for the use of micrometer histograms // kinda similar to how DropwizardTimer does that private static final class MicrometerHistogramMeasurements implements Measurements { private final LongAdder count = new LongAdder(); private final LongAdder totalTime = new LongAdder(); - private final TimeWindowMax max; - - MicrometerHistogramMeasurements( - Clock clock, DistributionStatisticConfig distributionStatisticConfig) { - this.max = new TimeWindowMax(clock, distributionStatisticConfig); - } @Override public void record(long nanos) { count.increment(); totalTime.add(nanos); - max.record(nanos, TimeUnit.NANOSECONDS); } @Override @@ -163,10 +166,5 @@ public long count() { public double totalTime(TimeUnit unit) { return TimeUtils.nanosToUnit(totalTime.sum(), unit); } - - @Override - public double max(TimeUnit unit) { - return max.poll(unit); - } } } diff --git a/instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractDistributionSummaryTest.java b/instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractDistributionSummaryTest.java index ee50adc114d0..db197c721aa1 100644 --- a/instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractDistributionSummaryTest.java +++ b/instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractDistributionSummaryTest.java @@ -11,6 +11,7 @@ import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.Metrics; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import org.assertj.core.api.AbstractIterableAssert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -169,4 +170,50 @@ void testMicrometerPercentiles() { point -> assertThat(point).attributes().containsEntry("phi", "0.99")))); } + + @Test + void testMicrometerMax() throws InterruptedException { + // given + DistributionSummary summary = + DistributionSummary.builder("testSummaryMax") + .description("This is a test distribution summary") + .baseUnit("things") + .tags("tag", "value") + .register(Metrics.globalRegistry); + + // when + summary.record(1); + summary.record(2); + summary.record(4); + + // then + testing() + .waitAndAssertMetrics( + INSTRUMENTATION_NAME, + "testSummaryMax.max", + metrics -> + metrics.anySatisfy( + metric -> + assertThat(metric) + .hasDescription("This is a test distribution summary") + .hasDoubleGauge() + .points() + .anySatisfy( + point -> + assertThat(point) + .hasValue(4) + .attributes() + .containsEntry("tag", "value")))); + + // when + Metrics.globalRegistry.remove(summary); + Thread.sleep(10); // give time for any inflight metric export to be received + testing().clearData(); + + // then + Thread.sleep(100); // interval of the test metrics exporter + testing() + .waitAndAssertMetrics( + INSTRUMENTATION_NAME, "testSummaryMax.max", AbstractIterableAssert::isEmpty); + } } diff --git a/instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractTimerTest.java b/instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractTimerTest.java index c8115a698337..2dd362904645 100644 --- a/instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractTimerTest.java +++ b/instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractTimerTest.java @@ -13,6 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.assertj.core.api.AbstractIterableAssert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -197,4 +198,49 @@ void testMicrometerPercentiles() { point -> assertThat(point).attributes().containsEntry("phi", "0.99")))); } + + @Test + void testMicrometerMax() throws InterruptedException { + // given + Timer timer = + Timer.builder("testTimerMax") + .description("This is a test timer") + .tags("tag", "value") + .register(Metrics.globalRegistry); + + // when + timer.record(1, TimeUnit.SECONDS); + timer.record(2, TimeUnit.SECONDS); + timer.record(4, TimeUnit.SECONDS); + + // then + testing() + .waitAndAssertMetrics( + INSTRUMENTATION_NAME, + "testTimerMax.max", + metrics -> + metrics.anySatisfy( + metric -> + assertThat(metric) + .hasDescription("This is a test timer") + .hasDoubleGauge() + .points() + .anySatisfy( + point -> + assertThat(point) + .hasValue(4_000) + .attributes() + .containsEntry("tag", "value")))); + + // when + Metrics.globalRegistry.remove(timer); + Thread.sleep(10); // give time for any inflight metric export to be received + testing().clearData(); + + // then + Thread.sleep(100); // interval of the test metrics exporter + testing() + .waitAndAssertMetrics( + INSTRUMENTATION_NAME, "testTimerMax.max", AbstractIterableAssert::isEmpty); + } }