diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-05-04 14:45:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-04 14:45:23 +0200 |
| commit | e021d46ab1601d0c3a00724358164483608f6297 (patch) | |
| tree | 0a57294f06102a57a42ed24bbbca34591ee7da34 /opendc-experiments/opendc-experiments-capelin/src/test | |
| parent | 1ce1210be893e7333dfa09266f6990af87c98dc2 (diff) | |
| parent | 652b8691143f6e65e192de6b940fbfa0a50784e2 (diff) | |
exp: Fix power draw reporting
This pull request fixes an issue with the power draw reporting in experiments.
Previously, when the power draw of a machine did not change in subsequent metric collection cycles,
the power draw would be reported as zero.
* Update power draw as soon as the machine is started.
* Use OpenTelemetry view to aggregate based on the power draw's last reported value.
Diffstat (limited to 'opendc-experiments/opendc-experiments-capelin/src/test')
| -rw-r--r-- | opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt index 4cb50ab9..2d5cc68c 100644 --- a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt +++ b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt @@ -22,8 +22,6 @@ package org.opendc.experiments.capelin -import io.opentelemetry.api.metrics.MeterProvider -import io.opentelemetry.sdk.metrics.SdkMeterProvider import io.opentelemetry.sdk.metrics.export.MetricProducer import kotlinx.coroutines.cancel import kotlinx.coroutines.channels.Channel @@ -45,7 +43,6 @@ import org.opendc.format.environment.sc20.Sc20ClusterEnvironmentReader import org.opendc.format.trace.TraceReader import org.opendc.simulator.compute.workload.SimWorkload import org.opendc.simulator.core.runBlockingSimulation -import org.opendc.telemetry.sdk.toOtelClock import java.io.File /** @@ -78,11 +75,7 @@ class CapelinIntegrationTest { val environmentReader = createTestEnvironmentReader() lateinit var monitorResults: ComputeMetrics - val meterProvider: MeterProvider = SdkMeterProvider - .builder() - .setClock(clock.toOtelClock()) - .build() - + val meterProvider = createMeterProvider(clock) withComputeService(clock, meterProvider, environmentReader, allocationPolicy) { scheduler -> val failureDomain = if (failures) { println("ENABLING failures") @@ -138,10 +131,7 @@ class CapelinIntegrationTest { val traceReader = createTestTraceReader(0.5, seed) val environmentReader = createTestEnvironmentReader("single") - val meterProvider: MeterProvider = SdkMeterProvider - .builder() - .setClock(clock.toOtelClock()) - .build() + val meterProvider = createMeterProvider(clock) withComputeService(clock, meterProvider, environmentReader, allocationPolicy) { scheduler -> withMonitor(monitor, clock, meterProvider as MetricProducer, scheduler) { |