From 54807c982cc2bc181dcca147dd65074da91ba1d4 Mon Sep 17 00:00:00 2001 From: Luis Bianchin Date: Thu, 2 Aug 2018 16:47:40 +0200 Subject: [PATCH] Beam 2.5.0 --- build.sbt | 2 +- .../scala/com/spotify/dbeam/MetricsHelper.scala | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index b83d5a0c..f62eb168 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ import sbt._ import sbt.Keys._ import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._ -val beamVersion = "2.4.0" +val beamVersion = "2.5.0" val autoValueVersion = "1.5.3" val slf4jVersion = "1.7.25" diff --git a/dbeam-core/src/main/scala/com/spotify/dbeam/MetricsHelper.scala b/dbeam-core/src/main/scala/com/spotify/dbeam/MetricsHelper.scala index f987ab1e..84c6a9e0 100644 --- a/dbeam-core/src/main/scala/com/spotify/dbeam/MetricsHelper.scala +++ b/dbeam-core/src/main/scala/com/spotify/dbeam/MetricsHelper.scala @@ -31,27 +31,27 @@ object MetricsHelper { def getMetrics(result: PipelineResult): Map[String, Long] = { val metrics: MetricQueryResults = result.metrics().queryMetrics(MetricsFilter.builder().build()) - val gauges = metricsAtSteps(metrics.gauges().asScala) - .map{ case (k: MetricName, v: Map[String, MetricValue[GaugeResult]]) => (k.name(), + val gauges = metricsAtSteps(metrics.getGauges.asScala) + .map{ case (k: MetricName, v: Map[String, MetricValue[GaugeResult]]) => (k.getName(), v.values.map(_.committed.getOrElse(GaugeResult.empty())).reduce( (x: GaugeResult, y: GaugeResult) => - if (x.timestamp() isAfter y.timestamp()) x else y).value() + if (x.getTimestamp isAfter y.getTimestamp) x else y).getValue )} val counters = metricsAtSteps( - metrics.counters().asScala.asInstanceOf[Iterable[MetricResult[Long]]]) + metrics.getCounters.asScala.asInstanceOf[Iterable[MetricResult[Long]]]) .map{ case (k: MetricName, v: Map[String, MetricValue[Long]]) => - (k.name(), reduceMetricValues(v))} + (k.getName(), reduceMetricValues(v))} (gauges.toSeq ++ counters.toSeq).toMap } private def metricsAtSteps[T](results: Iterable[MetricResult[T]]) : Map[MetricName, Map[String, MetricValue[T]]] = results - .groupBy(_.name()) + .groupBy(_.getName()) .mapValues { xs => val m: Map[String, MetricValue[T]] = xs.map { r => - r.step() -> MetricValue(r.attempted(), Try(r.committed()).toOption) + r.getStep -> MetricValue(r.getAttempted, Try(r.getCommitted).toOption) } (scala.collection.breakOut) m }