From 831515ae8d105f83b6c064acbc963df0ba69c174 Mon Sep 17 00:00:00 2001
From: Sergei Trofimov <sergei.trofimov@arm.com>
Date: Thu, 28 Sep 2017 13:06:33 +0100
Subject: [PATCH] instrumentation/energy_measurement: update for DerivedMetrics

DerivedMeasurements in devlib was changed to return DerivedMetrics
instead of Measurements. The former do not have "channel" attribute, so
just pass its name to WA's metrics.
---
 wa/instrumentation/energy_measurement.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wa/instrumentation/energy_measurement.py b/wa/instrumentation/energy_measurement.py
index c2a5bb85..6c7a17c3 100644
--- a/wa/instrumentation/energy_measurement.py
+++ b/wa/instrumentation/energy_measurement.py
@@ -255,5 +255,4 @@ class EnergyMeasurement(Instrument):
     def extract_metrics(self, context):
         derived_measurements = DerivedEnergyMeasurements.process(self.measurement_csv)
         for meas in derived_measurements:
-            name = '{}_{}'.format(meas.channel.site, meas.channel.name)
-            context.add_metric(name, meas.value, meas.units)
+            context.add_metric(meas.name, meas.value, meas.units)