fix(#56): fix an issue

Closes #56

Author: mcolmant

powerapi-core/src/main/scala/org/powerapi/PowerMeter.scala

@@ -22,6 +22,8 @@
  */
 package org.powerapi
 
+import java.util.UUID
+
 import akka.actor.{ ActorRef, ActorRefFactory, ActorSystem, Props }
 import akka.event.LoggingReceive
 import akka.pattern.{ ask, after, gracefulStop }
@@ -239,5 +241,5 @@ trait PowerDisplay {
   /**
    * Displays data from power reports.
    */
-  def display(timestamp: Long, targets: Set[Target], devices: Set[String], power: Power): Unit
+  def display(muid: UUID, timestamp: Long, targets: Set[Target], devices: Set[String], power: Power)
 }

powerapi-core/src/main/scala/org/powerapi/reporter/ConsoleDisplay.scala

@@ -22,6 +22,7 @@
  */
 package org.powerapi.reporter
 
+import java.util.UUID
 import org.powerapi.PowerDisplay
 import org.powerapi.core.power.Power
 import org.powerapi.core.target.Target
@@ -34,8 +35,8 @@ import org.powerapi.core.target.Target
  */
 class ConsoleDisplay extends PowerDisplay {
 
-  def display(timestamp: Long, targets: Set[Target], devices: Set[String], power: Power) {
-    println(s"timestamp=$timestamp;target=${targets.mkString(";")};devices=${devices.mkString(",")};power=${power.toWatts}")
+  def display(muid: UUID, timestamp: Long, targets: Set[Target], devices: Set[String], power: Power) {
+    println(s"muid=$muid;timestamp=$timestamp;target=${targets.mkString(";")};devices=${devices.mkString(",")};power=${power.toWatts}")
   }
 }
 

powerapi-core/src/main/scala/org/powerapi/reporter/FileDisplay.scala

@@ -22,6 +22,7 @@
  */
 package org.powerapi.reporter
 
+import java.util.UUID
 import org.powerapi.PowerDisplay
 import org.powerapi.core.power.Power
 import org.powerapi.core.target.Target
@@ -37,7 +38,7 @@ class FileDisplay(filepath: String) extends PowerDisplay  {
 
   lazy val output = Resource.fromFile(filepath)
 
-  def display(timestamp: Long, targets: Set[Target], devices: Set[String], power: Power) {
-    output.append(s"timestamp=$timestamp;targets=${targets.mkString(",")};devices=${devices.mkString(",")};power=${power.toWatts}\n")
+  def display(muid: UUID, timestamp: Long, targets: Set[Target], devices: Set[String], power: Power) {
+    output.append(s"muid=$muid;timestamp=$timestamp;targets=${targets.mkString(",")};devices=${devices.mkString(",")};power=${power.toWatts}\n")
   }
 }

powerapi-core/src/main/scala/org/powerapi/reporter/JFreeChartDisplay.scala

@@ -22,6 +22,7 @@
  */
 package org.powerapi.reporter
 
+import java.util.UUID
 import javax.swing.SwingUtilities
 import org.powerapi.PowerDisplay
 import org.powerapi.core.power.Power
@@ -43,7 +44,7 @@ class JFreeChartDisplay extends PowerDisplay {
     }
   })
 
-  def display(timestamp: Long, targets: Set[Target], devices: Set[String], power: Power) {
+  def display(muid: UUID, timestamp: Long, targets: Set[Target], devices: Set[String], power: Power) {
     Chart.process(Map(s"${targets.mkString(",")}" -> power.toWatts), timestamp)
   }
 }

powerapi-core/src/main/scala/org/powerapi/reporter/ReporterComponent.scala

@@ -39,6 +39,6 @@ class ReporterComponent(output: PowerDisplay) extends APIComponent {
   } orElse default
 
   def report(aggPowerReport: AggregatePowerReport): Unit = {
-    output.display(aggPowerReport.tick.timestamp, aggPowerReport.targets, aggPowerReport.devices, aggPowerReport.power)
+    output.display(aggPowerReport.muid, aggPowerReport.tick.timestamp, aggPowerReport.targets, aggPowerReport.devices, aggPowerReport.power)
   }
 }

powerapi-core/src/test/scala/org/powerapi/reporter/ConsoleDisplaySuite.scala

@@ -36,8 +36,8 @@ import org.powerapi.module.PowerChannel.{ AggregatePowerReport, RawPowerReport,
 import scala.concurrent.duration.DurationInt
 
 class ConsoleDisplayMock(testActor: ActorRef) extends ConsoleDisplay {
-  override def display(timestamp: Long, targets: Set[Target], devices: Set[String], power: Power) {
-    testActor ! s"timestamp=$timestamp;targets=${targets.mkString(",")};devices=${devices.mkString(",")};power=${power.toWatts}"
+  override def display(muid: UUID, timestamp: Long, targets: Set[Target], devices: Set[String], power: Power) {
+    testActor ! s"muid=$muid;timestamp=$timestamp;targets=${targets.mkString(",")};devices=${devices.mkString(",")};power=${power.toWatts}"
   }
 }
 
@@ -76,9 +76,9 @@ class ConsoleDisplaySuite(system: ActorSystem) extends UnitTest(system) {
     render(aggR2)(eventBus)
     render(aggR3)(eventBus)
 
-    expectMsgClass(classOf[String]) should equal(s"timestamp=${tickMock.timestamp};targets=1;devices=$device;power=${3.W.toWatts}")
-    expectMsgClass(classOf[String]) should equal(s"timestamp=${tickMock.timestamp};targets=2;devices=$device;power=${1.W.toWatts}")
-    expectMsgClass(classOf[String]) should equal(s"timestamp=${tickMock.timestamp};targets=3,4;devices=$device;power=${6.W.toWatts}")
+    expectMsgClass(classOf[String]) should equal(s"muid=$muid;timestamp=${tickMock.timestamp};targets=1;devices=$device;power=${3.W.toWatts}")
+    expectMsgClass(classOf[String]) should equal(s"muid=$muid;timestamp=${tickMock.timestamp};targets=2;devices=$device;power=${1.W.toWatts}")
+    expectMsgClass(classOf[String]) should equal(s"muid=$muid;timestamp=${tickMock.timestamp};targets=3,4;devices=$device;power=${6.W.toWatts}")
   }
 }
 

powerapi-core/src/test/scala/org/powerapi/reporter/FileDisplaySuite.scala

@@ -74,9 +74,9 @@ class FileDisplaySuite(system: ActorSystem) extends UnitTest(system) {
     testFile.size.get should be > 0L
     testFile.lines() should (
       have size 3 and
-      contain(s"timestamp=${tickMock.timestamp};targets=1;devices=$device;power=${3.W.toWatts}") and
-      contain(s"timestamp=${tickMock.timestamp};targets=2;devices=$device;power=${1.W.toWatts}") and
-      contain(s"timestamp=${tickMock.timestamp};targets=3,4;devices=$device;power=${6.W.toWatts}")
+      contain(s"muid=$muid;timestamp=${tickMock.timestamp};targets=1;devices=$device;power=${3.W.toWatts}") and
+      contain(s"muid=$muid;timestamp=${tickMock.timestamp};targets=2;devices=$device;power=${1.W.toWatts}") and
+      contain(s"muid=$muid;timestamp=${tickMock.timestamp};targets=3,4;devices=$device;power=${6.W.toWatts}")
     )
     testFile.delete(true)
   }