issue #184: remove instrumentation stuff and testkit 🚑 (#185)

Author: Tochemey

build.sbt

@@ -18,7 +18,7 @@ lazy val `lagompb-core` = project
   .settings(
     name := "lagompb-core",
     unmanagedResources / excludeFilter := HiddenFileFilter || "*tests*",
-    coverageExcludedPackages := CoverageWhitelist.whitelist.mkString(";"),
+    coverageExcludedPackages := CoverageExclusionList.whitelist.mkString(";"),
     PB.protoSources in Compile ++= Seq(file("submodules/protobuf"), file("core/lagompb-core/src/test/protobuf")),
     PB.includePaths in Compile ++= Seq(file("submodules/protobuf")),
     PB.targets in Compile := Seq(
@@ -31,7 +31,7 @@ lazy val `lagompb-readside` = project
   .enablePlugins(LagomScala)
   .enablePlugins(BuildSettings)
   .enablePlugins(Publish)
-  .settings(name := "lagompb-readside", coverageExcludedPackages := CoverageWhitelist.whitelist.mkString(";"))
+  .settings(name := "lagompb-readside", coverageExcludedPackages := CoverageExclusionList.whitelist.mkString(";"))
   .dependsOn(`lagompb-core`)
 
 lazy val `lagompb-plugin` = project
@@ -40,7 +40,7 @@ lazy val `lagompb-plugin` = project
   .enablePlugins(Publish)
   .settings(
     name := "lagompb-plugin",
-    coverageExcludedPackages := CoverageWhitelist.whitelist.mkString(";"),
+    coverageExcludedPackages := CoverageExclusionList.whitelist.mkString(";"),
     crossScalaVersions := Dependencies.Versions.CrossScalaForPlugin,
     scalaVersion := Dependencies.Versions.Scala212,
     resolvers += Resolver.bintrayRepo("playframework", "maven"),

core/lagompb-core/src/main/resources/lagompb.conf

@@ -459,20 +459,4 @@ lagompb {
     tagname: ${lagompb.service-name}
     tagname: ${?EVENTS_TAG_NAME}
   }
-
-  instrumentation {
-    enabled = true
-    enabled = ${?ENABLE_INSTRUMENTATION}
-  }
-}
-
-kamon {
-  trace {
-    tick-interval = 1 millisecond
-    sampler = always
-  }
-
-  propagation.http.default.tags.mappings {
-    request-id = "x-request-id"
-  }
 }

core/lagompb-core/src/main/scala/io/superflat/lagompb/BaseApplication.scala

@@ -8,7 +8,6 @@ import com.lightbend.lagom.scaladsl.persistence.slick.SlickPersistenceComponents
 import com.lightbend.lagom.scaladsl.playjson.{EmptyJsonSerializerRegistry, JsonSerializerRegistry}
 import com.lightbend.lagom.scaladsl.server.{LagomApplication, LagomApplicationContext, LagomServer}
 import io.superflat.lagompb.encryption.{EncryptionAdapter, ProtoEncryption}
-import kamon.Kamon
 import play.api.db.HikariCPComponents
 import play.api.libs.ws.ahc.AhcWSComponents
 import play.api.mvc.EssentialFilter
@@ -41,11 +40,6 @@ abstract class BaseApplication(context: LagomApplicationContext)
     with PostgresPersistenceComponents
     with BaseApplicationComponents {
 
-  // $COVERAGE-OFF$
-  // initialize instrumentation and tracing if it is enabled
-  if (ConfigReader.isInstrumentationEnabled)
-    Kamon.init()
-
   ProtosRegistry.load()
 
   // Json Serializer registry not needed
@@ -101,8 +95,6 @@ abstract class BaseApplication(context: LagomApplicationContext)
       selectShard(ConfigReader.eventsConfig.numShards, entityContext.entityId)
     aggregateRoot.create(entityContext, shardIndex)
   })
-
-  // $COVERAGE-ON$
 }
 
 /**
@@ -115,8 +107,6 @@ abstract class BaseStatelessApplication(context: LagomApplicationContext)
     extends LagomApplication(context)
     with BaseApplicationComponents {
 
-  // $COVERAGE-OFF$
-
   // lagomServer is set by the server definition in the implementation class
   override lazy val lagomServer: LagomServer = server
 
@@ -133,6 +123,4 @@ abstract class BaseStatelessApplication(context: LagomApplicationContext)
    * @return ServiceLocator
    */
   override def serviceLocator: ServiceLocator
-
-  // $COVERAGE-ON$
 }

core/lagompb-core/src/main/scala/io/superflat/lagompb/ConfigReader.scala

@@ -38,7 +38,4 @@ object ConfigReader {
 
   def createOffsetStore: Boolean =
     config.getBoolean("lagompb.projection.create-tables.auto")
-
-  def isInstrumentationEnabled: Boolean =
-    config.getBoolean(s"$LP.instrumentation.enabled")
 }

core/lagompb-core/src/main/scala/io/superflat/lagompb/testkit/BaseActorTestKit.scala renamed to core/lagompb-core/src/test/scala/io/superflat/lagompb/testkit/BaseActorTestKit.scala

@@ -36,13 +36,8 @@ object BuildSettings extends AutoPlugin {
         Compile.AkkaManagementClusterBootstrap,
         Compile.AkkaManagementClusterHttp,
         Compile.AkkaKubernetesDiscoveryApi,
-        Compile.JwtPlayJson,
         Compile.ScalapbJson4s,
         Compile.Reflections,
-        Compile.KamonBundle,
-        Compile.KamonPrometheus,
-        Compile.KamonJaeger,
-        Compile.ApacheCommonValidator,
         Compile.ScalapbCommonProtos,
         Compile.AkkaProjectionCore,
         Compile.AkkaProjectionKafka,

core/lagompb-core/src/main/scala/io/superflat/lagompb/testkit/BaseSpec.scala renamed to core/lagompb-core/src/test/scala/io/superflat/lagompb/testkit/BaseSpec.scala

@@ -1,4 +1,4 @@
-object CoverageWhitelist {
+object CoverageExclusionList {
 
   val whitelist = Seq(
     "<empty>",
@@ -7,6 +7,8 @@ object CoverageWhitelist {
     "io.superflat.lagompb.testkit.*",
     "io.superflat.lagompb.readside.*",
     "io.superflat.lagompb.BaseServiceImpl",
+    "io.superflat.lagompb.BaseApplication",
+    "io.superflat.lagompb.BaseStatelessApplication",
     "io.superflat.lagompb.BaseGrpcServiceImpl",
     "io.superflat.lagompb.BaseServiceImpl",
     "io.superflat.lagompb.InternalServerError",

project/BuildSettings.scala

@@ -22,18 +22,13 @@ object Dependencies {
     val AkkaManagementVersion = "1.0.8"
     val AkkaManagementClusterBootstrapVersion = "1.0.8"
     val AkkaManagementClusterHttpVersion = "1.0.8"
-    val JwtPlayJsonVersion = "4.3.0"
-    val SlickMigrationApiVersion = "0.7.0"
     val ScalaMockVersion = "5.0.0"
-    val KamonVersion = "2.1.6"
-    val KanelaVersion = "1.0.6"
     val SilencerVersion = "1.6.0"
     val AkkaGrpcVersion = "1.0.0"
     val H2Version = "1.4.200"
     val ScalapbJson4sVersion = "0.10.1"
     val PlayGrpcVersion = "0.9.0"
     val ReflectionsVersion = "0.9.12"
-    val ApacheCommonValidatorVersion = "1.7"
     val ScalapbCommonProtoVersion = "1.18.0-0"
     val EmbeddedPostgresVersion = "0.13.3"
     val EmbeddedKafkaVersion = "2.6.0"
@@ -67,19 +62,10 @@ object Dependencies {
 
     val AkkaManagementClusterHttp: ModuleID =
       "com.lightbend.akka.management" %% "akka-management-cluster-http" % Versions.AkkaManagementClusterHttpVersion
-    val JwtPlayJson: ModuleID = "com.pauldijou" %% "jwt-play-json" % Versions.JwtPlayJsonVersion
-    val SlickMigrationApi: ModuleID = "io.github.nafg" %% "slick-migration-api" % Versions.SlickMigrationApiVersion
-    val KamonBundle: ModuleID = "io.kamon" %% "kamon-bundle" % Versions.KamonVersion
-    val KamonPrometheus: ModuleID = "io.kamon" %% "kamon-prometheus" % Versions.KamonVersion
-    val KamonZipkin: ModuleID = "io.kamon" %% "kamon-zipkin" % Versions.KamonVersion
-    val KamonJaeger: ModuleID = "io.kamon" %% "kamon-jaeger" % Versions.KamonVersion
-    val Kanela: ModuleID = "io.kamon" % "kanela-agent" % Versions.KanelaVersion
 
     val H2Driver: ModuleID = "com.h2database" % "h2" % Versions.H2Version
     val ScalapbJson4s: ModuleID = "com.thesamet.scalapb" %% "scalapb-json4s" % Versions.ScalapbJson4sVersion
     val Reflections: ModuleID = "org.reflections" % "reflections" % Versions.ReflectionsVersion
-    val ApacheCommonValidator: ModuleID =
-      "commons-validator" % "commons-validator" % Versions.ApacheCommonValidatorVersion
 
     val ScalapbCommonProtos: ModuleID =
       "com.thesamet.scalapb.common-protos" %% "proto-google-common-protos-scalapb_0.10" % Versions.ScalapbCommonProtoVersion

project/CoverageWhitelist.scala renamed to project/CoverageExclusionList.scala

@@ -18,7 +18,6 @@ object TestSettings extends AutoPlugin {
         Dependencies.Test.AkkaTestkit,
         Dependencies.Test.AkkaStreamTestkit,
         Dependencies.Test.AkkaActorTestkitTyped,
-        Dependencies.Compile.SlickMigrationApi,
         Dependencies.Compile.postgresDriver,
         Dependencies.Compile.H2Driver
       )