Upgrade dependencies (#28)

seglo · Jun 5, 2019 · d4dcf94 · d4dcf94
1 parent 2d82899
commit d4dcf94
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 27 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,9 +2,9 @@ import sbt._
 
 object Version {
   val Scala      = "2.12.8"
-  val Akka       = "2.5.20"
-  val Prometheus = "0.5.0"
-  val Fabric8    = "4.1.0"
+  val Akka       = "2.5.23"
+  val Prometheus = "0.6.0"
+  val Fabric8    = "4.2.2"
 }
 
 object Dependencies {
@@ -21,7 +21,7 @@ object Dependencies {
   private val slf4jExclusionRule = ExclusionRule("org.slf4j")
 
   val LightbendConfig       = "com.typesafe"           %  "config"                    % "1.3.2"
-  val Kafka                 = "org.apache.kafka"       %% "kafka"                     % "2.1.0" excludeAll (jacksonExclusionRule, log4jExclusionRule, slf4jExclusionRule)
+  val Kafka                 = "org.apache.kafka"       %% "kafka"                     % "2.2.1" excludeAll (jacksonExclusionRule, log4jExclusionRule, slf4jExclusionRule)
   val AkkaTyped             = "com.typesafe.akka"      %% "akka-actor-typed"          % Version.Akka
   val AkkaSlf4j             = "com.typesafe.akka"      %% "akka-slf4j"                % Version.Akka
   val Logback               = "ch.qos.logback"         %  "logback-classic"           % "1.2.3"

diff --git a/src/main/scala/com/lightbend/kafkalagexporter/ConsumerGroupCollector.scala b/src/main/scala/com/lightbend/kafkalagexporter/ConsumerGroupCollector.scala
@@ -138,13 +138,9 @@ object ConsumerGroupCollector {
         collector(config, client, reporter, newState)
       case (context, _: Stop) =>
         state.scheduledCollect.cancel()
-        Behaviors.stopped {
-          Behaviors.receiveSignal {
-            case (_, PostStop) =>
-              client.close()
-              context.log.info("Gracefully stopped polling and Kafka client for cluster: {}", config.cluster.name)
-              Behaviors.same
-          }
+        Behaviors.stopped { () =>
+          client.close()
+          context.log.info("Gracefully stopped polling and Kafka client for cluster: {}", config.cluster.name)
         }
       case (_, StopWithError(t)) =>
         state.scheduledCollect.cancel()

diff --git a/src/main/scala/com/lightbend/kafkalagexporter/MetricsReporter.scala b/src/main/scala/com/lightbend/kafkalagexporter/MetricsReporter.scala
@@ -22,14 +22,10 @@ object MetricsReporter {
       metricsSink.remove(rm)
       Behaviors.same
     case (context, Stop(sender)) =>
-      Behaviors.stopped {
-        Behaviors.receiveSignal {
-          case (_, PostStop) =>
-            metricsSink.stop()
-            context.log.info("Gracefully stopped Prometheus metrics endpoint HTTP server")
-            sender ! KafkaClusterManager.Done
-            Behaviors.same
-        }
+      Behaviors.stopped { () =>
+        metricsSink.stop()
+        context.log.info("Gracefully stopped Prometheus metrics endpoint HTTP server")
+        sender ! KafkaClusterManager.Done
       }
     case (context, m) =>
       context.log.error(s"Unhandled metric message: $m")

diff --git a/src/main/scala/com/lightbend/kafkalagexporter/watchers/StrimziClusterWatcher.scala b/src/main/scala/com/lightbend/kafkalagexporter/watchers/StrimziClusterWatcher.scala
@@ -24,13 +24,9 @@ object StrimziClusterWatcher {
 
   def watch(client: Watcher.Client): Behaviors.Receive[Watcher.Message] = Behaviors.receive {
     case (context, _: Watcher.Stop) =>
-      Behaviors.stopped {
-        Behaviors.receiveSignal {
-          case (_, PostStop) =>
-            client.close()
-            context.log.info("Gracefully stopped StrimziKafkaWatcher")
-            Behaviors.same
-        }
+      Behaviors.stopped { () =>
+        client.close()
+        context.log.info("Gracefully stopped StrimziKafkaWatcher")
       }
   }
 }
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
@@ -1,6 +1,6 @@
 <configuration>
     <variable name="ROOT_LOG_LEVEL" value="${ROOT_LOG_LEVEL:-ERROR}" />
-    <variable name="KAFKA_LAG_EXPORTER_LOG_LEVEL" value="${KAFKA_LAG_EXPORTER_LOG_LEVEL:-INFO}" />
+    <variable name="KAFKA_LAG_EXPORTER_LOG_LEVEL" value="${KAFKA_LAG_EXPORTER_LOG_LEVEL:-ERROR}" />
     <!--Turn on DEBUG logging to troubleshoot tests-->
     <!--<variable name="KAFKA_LAG_EXPORTER_LOG_LEVEL" value="${KAFKA_LAG_EXPORTER_LOG_LEVEL:-DEBUG}" />-->
     <variable name="KAFKA_LAG_EXPORTER_KAFKA_LOG_LEVEL" value="${KAFKA_LAG_EXPORTER_KAFKA_LOG_LEVEL:-ERROR}" />