From d48236a45a52793bf51255c4a5af5cac63d1b608 Mon Sep 17 00:00:00 2001
From: Kexin Xie <kexin.xie@salesforce.com>
Date: Wed, 27 Jan 2021 11:22:48 -0800
Subject: [PATCH] add error logging and update dependencies (#68)

---
 build.sbt                                     | 20 +++++++++++++------
 project/build.properties                      |  2 +-
 .../starport/system/DispatcherActor.scala     |  3 ++-
 version.sbt                                   |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/build.sbt b/build.sbt
index 60c6d5c..d8bd44b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,8 +1,8 @@
-val awsSdkVersion = "1.11.887"
+val awsSdkVersion = "1.11.943"
 val slickVersion = "3.3.3"
-val akkaVersion = "2.6.10"
+val akkaVersion = "2.6.11"
 
-val scalaTestArtifact      = "org.scalatest"          %% "scalatest"            % "3.2.2" % Test
+val scalaTestArtifact      = "org.scalatest"          %% "scalatest"            % "3.2.3" % Test
 val slickArtifact          = "com.typesafe.slick"     %% "slick"                % slickVersion
 val slickHikaricpArtifact  = "com.typesafe.slick"     %% "slick-hikaricp"       % slickVersion
 val scoptArtifact          = "com.github.scopt"       %% "scopt"                % "3.7.1"
@@ -16,18 +16,26 @@ val awsSdkSES              = "com.amazonaws"          %  "aws-java-sdk-ses"
 val awsSdkSSM              = "com.amazonaws"          %  "aws-java-sdk-ssm"     % awsSdkVersion
 val awsSdkSNS              = "com.amazonaws"          %  "aws-java-sdk-sns"     % awsSdkVersion
 val awsSdkCloudWatch       = "com.amazonaws"          %  "aws-java-sdk-cloudwatch"     % awsSdkVersion
-val metricsGraphite        = "io.dropwizard.metrics"  %  "metrics-graphite"     % "4.1.14"
+val metricsGraphite        = "io.dropwizard.metrics"  %  "metrics-graphite"     % "4.1.17"
 val postgreSqlJdbc         = "org.postgresql"         %  "postgresql"           % "42.2.18"
-val awsLambdaEvents        = "com.amazonaws"          %  "aws-lambda-java-events" % "3.4.0"
+val awsLambdaEvents        = "com.amazonaws"          %  "aws-lambda-java-events" % "3.7.0"
 val awsLambdaCore          = "com.amazonaws"          %  "aws-lambda-java-core"   % "1.2.1"
 val akkaActorArtifact      = "com.typesafe.akka"      %% "akka-actor-typed" % akkaVersion
 
 lazy val commonSettings = Seq(
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint", "-Xfatal-warnings"),
-  scalaVersion := "2.12.12",
+  scalaVersion := "2.12.13",
   libraryDependencies += scalaTestArtifact,
   organization := "com.krux",
   test in assembly := {},  // skip test during assembly
+  assemblyMergeStrategy in assembly := {
+    // scala 2.12.13 also introduces the nowarn.class in scala-compat
+    case PathList(ps @ _*) if Set("nowarn$.class", "nowarn.class").contains(ps.last) =>
+      MergeStrategy.first
+    case x =>
+      val oldStrategy = (assemblyMergeStrategy in assembly).value
+      oldStrategy(x)
+  },
   publishMavenStyle := true
 )
 
diff --git a/project/build.properties b/project/build.properties
index 6db9842..d91c272 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.0
+sbt.version=1.4.6
diff --git a/starport-core/src/main/scala/com/krux/starport/system/DispatcherActor.scala b/starport-core/src/main/scala/com/krux/starport/system/DispatcherActor.scala
index 4a0f0f6..84c0825 100644
--- a/starport-core/src/main/scala/com/krux/starport/system/DispatcherActor.scala
+++ b/starport-core/src/main/scala/com/krux/starport/system/DispatcherActor.scala
@@ -70,8 +70,9 @@ class DispatcherActor(context: ActorContext[DispatcherActor.Msg], starportSettin
       // TODO it would be more moduler if this is done in a separate actor
       result match {
         case Left(ex) =>
+          context.log.warn(s"failed to deploy pipeline ${pipeline.name} error: ${ex.getMessage()}")
           context.log.warn(s"failed to deploy pipeline ${pipeline.name}, handling error...")
-          ErrorHandler.pipelineScheduleFailed(pipeline, ex.getMessage)(
+          ErrorHandler.pipelineScheduleFailed(pipeline, ex.getMessage())(
             starportSetting,
             context.executionContext
           )
diff --git a/version.sbt b/version.sbt
index 1a21a60..7bd9d79 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "7.4.1"
+version in ThisBuild := "7.4.2"