Skip to content

Commit 54e49b7

Browse files
committed
Fix gc duration metric in runtime-telemetry-java17
1 parent 2d5775a commit 54e49b7

File tree

5 files changed

+3
-15
lines changed

5 files changed

+3
-15
lines changed

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtil.java

-5
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@
1414
*/
1515
public final class DurationUtil {
1616
private static final double NANOS_PER_SECOND = TimeUnit.SECONDS.toNanos(1);
17-
private static final double MILLIS_PER_SECOND = TimeUnit.SECONDS.toMillis(1);
1817

1918
/** Returns the duration as seconds, with fractional part included. */
2019
public static double toSeconds(Duration duration) {
2120
double epochSecs = (double) duration.getSeconds();
2221
return epochSecs + duration.getNano() / NANOS_PER_SECOND;
2322
}
2423

25-
public static double millisToSeconds(long milliseconds) {
26-
return milliseconds / MILLIS_PER_SECOND;
27-
}
28-
2924
private DurationUtil() {}
3025
}

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/G1GarbageCollectionHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public G1GarbageCollectionHandler(Meter meter) {
4141

4242
@Override
4343
public void accept(RecordedEvent ev) {
44-
histogram.record(DurationUtil.millisToSeconds(ev.getLong(Constants.DURATION)), ATTR);
44+
histogram.record(DurationUtil.toSeconds(ev.getDuration()), ATTR);
4545
}
4646

4747
@Override

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/OldGarbageCollectionHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public OldGarbageCollectionHandler(Meter meter, String gc) {
4141

4242
@Override
4343
public void accept(RecordedEvent ev) {
44-
histogram.record(DurationUtil.millisToSeconds(ev.getLong(Constants.DURATION)), attributes);
44+
histogram.record(DurationUtil.toSeconds(ev.getDuration()), attributes);
4545
}
4646

4747
@Override

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/garbagecollection/YoungGarbageCollectionHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public YoungGarbageCollectionHandler(Meter meter, String gc) {
4242

4343
@Override
4444
public void accept(RecordedEvent ev) {
45-
histogram.record(DurationUtil.millisToSeconds(ev.getLong(Constants.DURATION)), attributes);
45+
histogram.record(DurationUtil.toSeconds(ev.getDuration()), attributes);
4646
}
4747

4848
@Override

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/DurationUtilTest.java

-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static org.assertj.core.api.Assertions.assertThat;
99

1010
import java.time.Duration;
11-
import java.util.concurrent.TimeUnit;
1211
import org.junit.jupiter.api.Test;
1312

1413
class DurationUtilTest {
@@ -19,10 +18,4 @@ void convertDurationToSeconds() {
1918
double seconds = DurationUtil.toSeconds(duration);
2019
assertThat(seconds).isEqualTo(7.000000144);
2120
}
22-
23-
@Test
24-
void convertMillisSeconds() {
25-
double seconds = DurationUtil.millisToSeconds(TimeUnit.SECONDS.toMillis(5));
26-
assertThat(seconds).isEqualTo(5);
27-
}
2821
}

0 commit comments

Comments
 (0)