summaryrefslogtreecommitdiff
path: root/opendc-telemetry
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-10-25 16:16:13 +0200
committerGitHub <noreply@github.com>2021-10-25 16:16:13 +0200
commita41cd2504f15f3e3e49eb533faca390911cc5110 (patch)
treef35e7e5c65e2985cf34ad7689526d5b5c0815230 /opendc-telemetry
parentaa9b32f8cd1467e9718959f400f6777e5d71737d (diff)
parentfe8cd32c3f79d2a6c898a1c8809792e35440a539 (diff)
merge: Address several regressions in simulator
This pull request addresses several regressions that have been introduced in the past few pull requests. - Fix queue resizing logic - Change clock resolution from milliseconds to nanoseconds in `OtelClockAdapter` - Compute energy usage in absence of convergence - Fix duplicate classpath entries - Fix release workflow **Breaking API Changes** - `OtelClockAdapter` now exports time in nanoseconds as the method contract describes.
Diffstat (limited to 'opendc-telemetry')
-rw-r--r--opendc-telemetry/opendc-telemetry-sdk/src/main/kotlin/org/opendc/telemetry/sdk/OtelClockAdapter.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/opendc-telemetry/opendc-telemetry-sdk/src/main/kotlin/org/opendc/telemetry/sdk/OtelClockAdapter.kt b/opendc-telemetry/opendc-telemetry-sdk/src/main/kotlin/org/opendc/telemetry/sdk/OtelClockAdapter.kt
index 86f6647e..cd191652 100644
--- a/opendc-telemetry/opendc-telemetry-sdk/src/main/kotlin/org/opendc/telemetry/sdk/OtelClockAdapter.kt
+++ b/opendc-telemetry/opendc-telemetry-sdk/src/main/kotlin/org/opendc/telemetry/sdk/OtelClockAdapter.kt
@@ -28,7 +28,7 @@ import io.opentelemetry.sdk.common.Clock
* An adapter class that bridges a [java.time.Clock] to a [Clock]
*/
public class OtelClockAdapter(private val clock: java.time.Clock) : Clock {
- override fun now(): Long = clock.millis()
+ override fun now(): Long = nanoTime()
override fun nanoTime(): Long = clock.millis() * 1_000_000L
}