feat: update scala version (2.12) and libraries

Author: mcolmant

.travis.yml

@@ -6,7 +6,7 @@ services:
 env:
   global:
     - secure: "BfP5e/OPM62e3ktm4RD2nuBJls2u8zdXg/YjNyght5dpD2vCjL6ZHWhgDM2mNFpzgYPiE3DPsSE7g2ZlsBUJCuK8a7lB5r+OiWFcWkilC1E9QX6OMcDTpEKb5A9InFGcpt0xbjY5+8qaIbaN8TJcdxaxeit0TZEvxeirQa5OOEY=" # COVERALLS_REPO_TOKEN
-    - secure: "ldIw526YR2Fe6FlfIPlbbOojEeg7etbO4dqiL4TLm00SBhVkKG+DuckhFixVAvAJx1Q1LuVyUPsXaR77OjqiTxSkaH+GbsmR5VIM4qA/kBheD4IiV4wTamg679d+AldRNWcGtLpefgwqlCJ53FcMzUT9TH/MJcbEaOJ5GKW9v+s=" # CODACY_PROJECT_TOKEN
+#    - secure: "ldIw526YR2Fe6FlfIPlbbOojEeg7etbO4dqiL4TLm00SBhVkKG+DuckhFixVAvAJx1Q1LuVyUPsXaR77OjqiTxSkaH+GbsmR5VIM4qA/kBheD4IiV4wTamg679d+AldRNWcGtLpefgwqlCJ53FcMzUT9TH/MJcbEaOJ5GKW9v+s=" # CODACY_PROJECT_TOKEN
     - secure: "MLFJWju96LymkPNIsUeJelNN5J3BK55OV/RXVMONC5kDr4N7T4JyhT6KUa4k+FSJ0S1GTPQMWQQEkWDF1MlZXv5yGwW4h5rN3tt//vqyHk968SyqlhTdygqzx6tO6t3OsfQ2F1AqVWAWsHQckL+VmhEo53VqVXpsqLy9DyLYGjs=" # DOCKER_EMAIL
     - secure: "FbLHLKNAtpj7ZVgSobOPgAgdLK3/P4sR6RcaOmpVRsgaqodTPx7VkzGpkf4rOqPwxKU3+96vr0TlIdPRYWAE39Y3gMb1dyZ34+CxsrJ3avJYc2+9NT3kmAuU33Iy1DCo3IEnR7pWVVEyR80ob0c1ASfPAW1JN8DhBRRERpkMyn4=" # DOCKER_USER
     - secure: "VLK9NI4yE+hLV8rgjiB0hOfQn1uFO7cEHHL4sEDZKNu1TgvwfTrEWEzMMLvG8pwK/7eG78xfNB489m/Imj7Y52xK6sZuY7Y78Y06mkepZS8PisAJiW59kHWH1Ci84DYHZ0y07NAgvCOSLS9l0ncgLdlGvRboR9KBYDMEWycwEn8=" # DOCKER_PWD
@@ -24,7 +24,7 @@ cache:
 language: scala
 
 scala:
-  - 2.11.7
+  - 2.12.1
 
 jdk:
   - oraclejdk8
@@ -51,7 +51,7 @@ before_install:
 
 after_success:
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" coverageReport; fi'
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" codacyCoverage; fi'
+#  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" codacyCoverage; fi'
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" coveralls; fi'
 
 before_deploy:

README.md

@@ -5,7 +5,6 @@
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](http://www.gnu.org/licenses/agpl-3.0)
 [![Build Status](https://travis-ci.org/Spirals-Team/powerapi.svg)](https://travis-ci.org/Spirals-Team/powerapi)
 [![Coverage Status](https://coveralls.io/repos/Spirals-Team/powerapi/badge.svg)](https://coveralls.io/r/Spirals-Team/powerapi)
-[![Codacy Badge](https://www.codacy.com/project/badge/31f7762213c340fbb5fe1463a5b871d4)](https://www.codacy.com/app/mcolmant/powerapi)
 
 PowerAPI is a middleware toolkit for building software-defined power meters.
 Software-defined power meters are configurable software libraries that can estimate the power consumption of software in real-time.
@@ -46,20 +45,20 @@ PowerAPI is used in a variety of projects to address key challenges of GreenIT:
 * [Greenspector](http://greenspector.com) optimises the power consumption of software by identifying potential energy leaks in the source code.
 
 ## Acknowledgments
-We all stand on the shoulders of giants and get by with a little help from our friends. PowerAPI is written in [Scala](http://www.scala-lang.org) (version 2.11.7 under [3-clause BSD license](http://www.scala-lang.org/license.html)) and built on top of:
-* [Akka](http://akka.io) (version 2.3.14 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for asynchronous processing
-* [Typesafe Config](https://github.com/typesafehub/config) (version 1.2.1 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for reading configuration files.
-* [Apache log4j2](http://logging.apache.org/log4j/2.x) (version 2.5 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for logging outside actors.
-* [powerspy.scala](https://github.com/Spirals-Team/powerspy.scala) (version 1.2 under [AGPL license](http://www.gnu.org/licenses/agpl-3.0.html)), for using the [PowerSpy powermeter](http://www.alciom.com/en/products/powerspy2-en-gb-2.html).
+We all stand on the shoulders of giants and get by with a little help from our friends. PowerAPI is written in [Scala](http://www.scala-lang.org) (version 2.12.1 under [3-clause BSD license](http://www.scala-lang.org/license.html)) and built on top of:
+* [Akka](http://akka.io) (version 2.4.14 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for asynchronous processing.
+* [Typesafe Config](https://github.com/typesafehub/config) (version 1.3.1 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for reading configuration files.
+* [scala-logging](https://github.com/typesafehub/scala-logging) (version 3.5.0 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for Scala wrapping SL4J.
+* [logback](https://github.com/qos-ch/logback) (version 1.1.7 under [LGPL 2.1 license](https://github.com/qos-ch/logback/blob/master/LICENSE.txt)), for logging purpose.
+* [powerspy.scala](https://github.com/Spirals-Team/powerspy.scala) (version 1.2 under [AGPL license](http://www.gnu.org/licenses/agpl-3.0.html)), for using the [PowerSpy](http://www.alciom.com/en/products/powerspy2-en-gb-2.html) power meter.
 * [BridJ](https://code.google.com/p/bridj/) (version 0.7.0 under [3-clause BSD license](https://github.com/ochafik/nativelibs4java/blob/master/libraries/BridJ/LICENSE)), for system or C calls.
-* [JNA](https://github.com/twall/jna) (version 4.2.1 under [LGPL 2.1 license](https://github.com/twall/jna/blob/master/LGPL2.1)), for system or C calls.
-* [perfmon2](http://sourceforge.net/p/perfmon2/libpfm4/ci/master/tree) (version 4.6.0 under [MIT license](http://sourceforge.net/p/perfmon2/libpfm4/ci/master/tree/COPYING)), for accessing hardware performance counters.
+* [JNA](https://github.com/twall/jna) (version 4.2.2 under [LGPL 2.1 license](https://github.com/twall/jna/blob/master/LGPL2.1)), for system or C calls.
+* [perfmon2](http://sourceforge.net/p/perfmon2/libpfm4/ci/master/tree) (version 4.7.0 under [MIT license](http://sourceforge.net/p/perfmon2/libpfm4/ci/master/tree/COPYING)), for accessing hardware performance counters.
 * [JFreeChart](http://www.jfree.org/jfreechart/) (version 1.0.19 under [LGPL license](https://www.gnu.org/licenses/lgpl.html)), for creation of interactive and animated charts.
-* [Scala IO](http://jesseeichar.github.io/scala-io-doc/0.4.3/index.html#!/overview) (version 0.4.3 under [3-clause BSD license](http://www.scala-lang.org/license.html)), for an extensions of IO.
-* [Saddle](http://saddle.github.io/) (version 1.3.4 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for data manipulation.
+* [grizzled-scala](http://software.clapper.org/grizzled-scala/) (version 4.0.0 under [3-clause BSD license](https://github.com/bmc/grizzled-scala/blob/master/LICENSE.md)), for new utility classes and objects.
 * [Sigar](https://support.hyperic.com/display/SIGAR/Home) (version 1.6.5 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for providing a portable interface for gathering system information.
 * [spray-json](http://spray.io/) (version 1.3.2 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for (de)serializing JSON.
-* [scala-influxdb-client](https://github.com/paulgoldbaum/scala-influxdb-client) (version 0.4.5 under [MIT license](https://github.com/paulgoldbaum/scala-influxdb-client/blob/master/LICENSE)), for using an asynchronous scala API for InfluxDB.
+* [scala-influxdb-client](https://github.com/paulgoldbaum/scala-influxdb-client) (version 0.5.2 under [MIT license](https://github.com/paulgoldbaum/scala-influxdb-client/blob/master/LICENSE)), for using an asynchronous scala API for InfluxDB.
 
 # License
 This software is licensed under the *GNU Affero General Public License*, quoted below.

build.sbt

@@ -2,6 +2,6 @@ name := "powerapi"
 
 // Logging
 libraryDependencies in ThisBuild ++= Seq(
-  "org.apache.logging.log4j" % "log4j-api" % "2.5",
-  "org.apache.logging.log4j" % "log4j-core" % "2.5"
+  "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
+  "ch.qos.logback" % "logback-classic" % "1.1.7"
 )

docker/sampling/Dockerfile-sampling

@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ENV POWERAPI_PACKAGE powerapi-sampling
+ENV POWERAPI_PACKAGE powerapi-sampling-cpu
 ENV LIBPFM_PACKAGE libpfm-4.6.0
 
 ENV INSTALL_PACKAGES ca-certificates linux-headers libc-dev make gcc patch

powerapi-cli/src/main/scala/org/powerapi/app/PowerAPI.scala

@@ -50,7 +50,7 @@ import org.powerapi.{PowerDisplay, PowerMeter, PowerMonitoring}
   */
 object PowerAPI extends App {
   val modulesR = """(procfs-cpu-simple|sigar-cpu-simple|cpu-dvfs|libpfm|libpfm-process|libpfm-core|libpfm-core-process|powerspy|g5k-omegawatt|rapl|disk-simple)(,(procfs-cpu-simple|sigar-cpu-simple|cpu-dvfs|libpfm|libpfm-process|libpfm-core|libpfm-core-process|powerspy|g5k-omegawatt|rapl|disk-simple))*""".r
-  val aggR = """max|min|geomean|logsum|mean|median|stdev|sum|variance""".r
+  val aggR = """max|min|mean|median|sum""".r
   val durationR = """\d+""".r
   val pidsR = """(\d+)(,(\d+))*""".r
   val appsR = """([^,]+)(,([^,]+))*""".r
@@ -76,13 +76,9 @@ object PowerAPI extends App {
     str match {
       case "max" => MAX
       case "min" => MIN
-      case "geomean" => GEOMEAN
-      case "logsum" => LOGSUM
       case "mean" => MEAN
       case "median" => MEDIAN
-      case "stdev" => STDEV
       case "sum" => SUM
-      case "variance" => VARIANCE
     }
   }
 

powerapi-core/build.sbt

@@ -12,25 +12,24 @@ resolvers ++= Seq(
 
 // App
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.3.14",
-  "com.typesafe" % "config" % "1.2.1",
+  "com.typesafe.akka" %% "akka-actor" % "2.4.14",
+  "com.typesafe" % "config" % "1.3.1",
   "fr.inria.powerspy" % "powerspy-core_2.11" % "1.2",
   "com.nativelibs4java" % "bridj" % "0.7.0",
-  "com.github.scala-incubator.io" %% "scala-io-core" % "0.4.3",
-  "com.github.scala-incubator.io" %% "scala-io-file" % "0.4.3",
   "org.jfree" % "jfreechart" % "1.0.19",
-  "org.scala-saddle" %% "saddle-core" % "1.3.4",
+  "org.clapper" %% "grizzled-scala" % "4.0.0",
   "org.hyperic" % "sigar" % "1.6.5.132",
-  "net.java.dev.jna" % "jna" % "4.2.1",
+  "net.java.dev.jna" % "jna" % "4.2.2",
   "io.spray" %% "spray-json" % "1.3.2",
-  "com.paulgoldbaum" %% "scala-influxdb-client" % "0.4.5"
+  "com.paulgoldbaum" %% "scala-influxdb-client" % "0.5.2",
+  "joda-time" % "joda-time" % "2.9.6"
 )
 
 // Tests
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-testkit" % "2.3.14" % "test",
-  "org.scalatest" %% "scalatest" % "2.2.5" % "test",
-  "org.scalamock" %% "scalamock-scalatest-support" % "3.2.2" % "test"
+  "com.typesafe.akka" %% "akka-testkit" % "2.4.14" % "test",
+  "org.scalatest" %% "scalatest" % "3.0.1" % "test",
+  "org.scalamock" %% "scalamock-scalatest-support" % "3.4.2" % "test"
 )
 
 startYear := Some(2014)

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

@@ -24,12 +24,11 @@ package org.powerapi.core
 
 import java.io.{File, IOException}
 
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
 import scala.io.Source
 import scala.sys.process.stringSeqToProcess
-
 import com.typesafe.config.Config
-import org.apache.logging.log4j.LogManager
+import com.typesafe.scalalogging.Logger
 import org.hyperic.sigar.ptql.ProcessFinder
 import org.hyperic.sigar.{SigarException, SigarProxy}
 import org.powerapi.core.FileHelper.using
@@ -255,8 +254,8 @@ class LinuxHelper extends Configuration(None) with OSHelper {
     * CPU's topology.
     */
   lazy val topology: Map[Int, Set[Int]] = load { conf =>
-    (for (item: Config <- conf.getConfigList("powerapi.cpu.topology"))
-      yield (item.getInt("core"), item.getIntList("indexes").map(_.toInt).toSet)).toMap
+    (for (item: Config <- conf.getConfigList("powerapi.cpu.topology").asScala)
+      yield (item.getInt("core"), item.getIntList("indexes").asScala.map(_.toInt).toSet)).toMap
   } match {
     case ConfigValue(values) => values
     case _ => Map()
@@ -271,7 +270,7 @@ class LinuxHelper extends Configuration(None) with OSHelper {
     case _ => "/proc/mounts"
   }
 
-  private val log = LogManager.getLogger
+  private val log = Logger(classOf[OSHelper])
   private val PSFormat = """^\s*(\d+)\s*""".r
   private val GlobalStatFormat = """cpu\s+([\d\s]+)""".r
   private val TimeInStateFormat = """(\d+)\s+(\d+)""".r
@@ -394,7 +393,7 @@ class LinuxHelper extends Configuration(None) with OSHelper {
         using(timeInStatePath.replace("%?index", s"$core"))(source => {
           log.debug("using {} as a sysfs timeinstates path", timeInStatePath)
 
-          for (line <- source.getLines) {
+          for (line: String <- source.getLines) {
             line match {
               case TimeInStateFormat(freq, t) => result += (freq.toLong -> (t.toLong + result.getOrElse(freq.toLong, 0l)))
               case _ => log.warn("unable to parse line {} from file {}", line, timeInStatePath)
@@ -515,7 +514,7 @@ trait SigarHelperConfiguration extends Configuration {
   */
 class SigarHelper(sigar: SigarProxy) extends OSHelper {
   lazy val cores = sigar.getCpuInfoList()(0).getTotalCores
-  private val log = LogManager.getLogger
+  private val log = Logger(classOf[SigarHelper])
 
   def getCPUFrequencies: Set[Long] = throw new SigarException("sigar cannot be able to get CPU frequencies")
 

powerapi-core/src/main/scala/org/powerapi/core/power/Power.scala

@@ -23,8 +23,6 @@
 package org.powerapi.core.power
 
 import scala.concurrent.duration.{DurationInt, FiniteDuration}
-
-import org.apache.logging.log4j.LogManager
 import org.powerapi.core.power.RawPower._
 
 object Power {
@@ -113,8 +111,6 @@ object RawPower {
   * @author Romain Rouvoy <romain.rouvoy@univ-lille1.fr>
   */
 final class RawPower(val value: Double, val unit: PowerUnit) extends Power {
-  private val log = LogManager.getLogger
-
   def toWatts: Double = unit.toWatts(value)
 
   require(unit match {
@@ -133,7 +129,7 @@ final class RawPower(val value: Double, val unit: PowerUnit) extends Power {
 
   def toUnit(u: PowerUnit): Double = toMilliWatts / MILLIWATTS.convert(1, u)
 
-  override def toString(): String = s"$value $unit"
+  override def toString: String = s"$value $unit"
 
   def compare(other: Power): Int = toMilliWatts compare other.toMilliWatts
 

powerapi-core/src/main/scala/org/powerapi/core/power/package.scala

@@ -22,7 +22,8 @@
  */
 package org.powerapi.core
 
-import org.saddle.Vec
+import Numeric._
+import grizzled.math.stats._
 
 package object power {
   type PowerUnit = org.powerapi.core.power.PowerConverter.PowerUnitVal
@@ -31,29 +32,15 @@ package object power {
   final val KILOWATTS = org.powerapi.core.power.PowerConverter.KILOWATTS
   final val MEGAWATTS = org.powerapi.core.power.PowerConverter.MEGAWATTS
 
-  def MAX(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).max match {
-    case Some(max) => max.mW
-    case None => 0.mW
-  }
-
-  def MIN(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).min match {
-    case Some(min) => min.mW
-    case None => 0.mW
-  }
-
-  def GEOMEAN(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).geomean.mW
-
-  def LOGSUM(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).logsum.mW
-
-  def MEAN(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).mean.mW
+  def MAX(s: Seq[Power]): Power = s.map(_.value).max.mW
 
-  def MEDIAN(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).median.mW
+  def MIN(s: Seq[Power]): Power = s.map(_.value).min.mW
 
-  def STDEV(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).stdev.mW
+  def SUM(s : Seq[Power]): Power = s.map(_.value).sum.mW
 
-  def SUM(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).sum.mW
+  def MEAN(s: Seq[Power]): Power = mean(s.map(_.value): _*).mW
 
-  def VARIANCE(s: Seq[Power]): Power = Vec(s.map(_.toMilliWatts): _*).variance.mW
+  def MEDIAN(s: Seq[Power]): Power = median(s.map(_.value): _*).mW
 
   implicit final class DoublePower(private val value: Double) extends AnyVal {
     def mW: Power = Power(value, MILLIWATTS)

powerapi-core/src/main/scala/org/powerapi/module/cpu/dvfs/CpuDvfsFormulaConfiguration.scala

@@ -22,7 +22,7 @@
  */
 package org.powerapi.module.cpu.dvfs
 
-import scala.collection.JavaConversions
+import scala.collection.JavaConverters
 
 import com.typesafe.config.Config
 import org.powerapi.core.ConfigValue
@@ -37,7 +37,7 @@ trait CpuDvfsFormulaConfiguration extends org.powerapi.module.cpu.simple.CpuSimp
     * Map of frequencies and their associated voltages.
     */
   lazy val frequencies = load { conf =>
-    (for (item <- JavaConversions.asScalaBuffer(conf.getConfigList("powerapi.cpu.frequencies")))
+    (for (item <- JavaConverters.asScalaBuffer(conf.getConfigList("powerapi.cpu.frequencies")))
       yield (item.asInstanceOf[Config].getInt("value"), item.asInstanceOf[Config].getDouble("voltage"))).toMap
   } match {
     case ConfigValue(freqs) => freqs