From 54e49b78da3f2b97f9438c94c256d5d5ef8448cc Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Sun, 15 Sep 2024 13:48:41 +0300 Subject: [PATCH] Fix gc duration metric in runtime-telemetry-java17 --- .../runtimemetrics/java17/internal/DurationUtil.java | 5 ----- .../garbagecollection/G1GarbageCollectionHandler.java | 2 +- .../garbagecollection/OldGarbageCollectionHandler.java | 2 +- .../garbagecollection/YoungGarbageCollectionHandler.java | 2 +- .../runtimemetrics/java17/internal/DurationUtilTest.java | 7 ------- 5 files changed, 3 insertions(+), 15 deletions(-) diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtil.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtil.java index 4a89420b183f..3087166e8217 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtil.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtil.java @@ -14,7 +14,6 @@ */ public final class DurationUtil { private static final double NANOS_PER_SECOND = TimeUnit.SECONDS.toNanos(1); - private static final double MILLIS_PER_SECOND = TimeUnit.SECONDS.toMillis(1); /** Returns the duration as seconds, with fractional part included. */ public static double toSeconds(Duration duration) { @@ -22,9 +21,5 @@ public static double toSeconds(Duration duration) { return epochSecs + duration.getNano() / NANOS_PER_SECOND; } - public static double millisToSeconds(long milliseconds) { - return milliseconds / MILLIS_PER_SECOND; - } - private DurationUtil() {} } diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/G1GarbageCollectionHandler.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/G1GarbageCollectionHandler.java index 53b550552ffc..2ac74dd9b8f9 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/G1GarbageCollectionHandler.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/G1GarbageCollectionHandler.java @@ -41,7 +41,7 @@ public G1GarbageCollectionHandler(Meter meter) { @Override public void accept(RecordedEvent ev) { - histogram.record(DurationUtil.millisToSeconds(ev.getLong(Constants.DURATION)), ATTR); + histogram.record(DurationUtil.toSeconds(ev.getDuration()), ATTR); } @Override diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/OldGarbageCollectionHandler.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/OldGarbageCollectionHandler.java index 02d812948027..7fbaeeadefed 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/OldGarbageCollectionHandler.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/OldGarbageCollectionHandler.java @@ -41,7 +41,7 @@ public OldGarbageCollectionHandler(Meter meter, String gc) { @Override public void accept(RecordedEvent ev) { - histogram.record(DurationUtil.millisToSeconds(ev.getLong(Constants.DURATION)), attributes); + histogram.record(DurationUtil.toSeconds(ev.getDuration()), attributes); } @Override diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/YoungGarbageCollectionHandler.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/YoungGarbageCollectionHandler.java index 1e824d08f6de..53fa2f22da81 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/YoungGarbageCollectionHandler.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/YoungGarbageCollectionHandler.java @@ -42,7 +42,7 @@ public YoungGarbageCollectionHandler(Meter meter, String gc) { @Override public void accept(RecordedEvent ev) { - histogram.record(DurationUtil.millisToSeconds(ev.getLong(Constants.DURATION)), attributes); + histogram.record(DurationUtil.toSeconds(ev.getDuration()), attributes); } @Override diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtilTest.java b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtilTest.java index bcb3047aedf1..401894c5b2f7 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtilTest.java +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtilTest.java @@ -8,7 +8,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; -import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; class DurationUtilTest { @@ -19,10 +18,4 @@ void convertDurationToSeconds() { double seconds = DurationUtil.toSeconds(duration); assertThat(seconds).isEqualTo(7.000000144); } - - @Test - void convertMillisSeconds() { - double seconds = DurationUtil.millisToSeconds(TimeUnit.SECONDS.toMillis(5)); - assertThat(seconds).isEqualTo(5); - } }