Merge pull request #1327 from kamon-io/scalafmt

Added and applied scalafmt

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Initial scalafmtAll was applied
+022216d6b1ebe4dd0c00aef204625f7f3372fc90

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: Test all the things
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   ci:
@@ -18,3 +18,11 @@ jobs:
           apps: sbt
       - name: Test
         run: sbt -v ";+core/test;+instrumentation/test;+reporters/test"
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: coursier/cache-action@v6
+      - name: Test
+        run: sbt -v "scalafmtCheckAll"
+

.scalafmt.conf

@@ -0,0 +1,20 @@
+version = "3.8.0"
+
+runner.dialect = "scala213"
+
+maxColumn = 120
+
+align.preset = some
+
+binPack.parentConstructors = source
+
+docstrings.style = keep
+
+indent.defnSite = 2
+
+indentOperator.excludeRegex = "^.+$"
+indentOperator.exemptScope = all
+
+newlines {
+  source = keep
+}

bundle/kamon-runtime-attacher/src/main/scala/kamon/runtime/Attacher.scala

@@ -58,11 +58,12 @@ object Attacher {
     */
   private def isKanelaLoaded(): Boolean = {
     val isLoadedProperty = java.lang.Boolean.parseBoolean(System.getProperty("kanela.loaded"))
-    val hasKanelaClasses = try {
-      Class.forName("kanela.agent.Kanela", false, ClassLoader.getSystemClassLoader) != null
-    } catch {
-      case _: Throwable => false
-    }
+    val hasKanelaClasses =
+      try {
+        Class.forName("kanela.agent.Kanela", false, ClassLoader.getSystemClassLoader) != null
+      } catch {
+        case _: Throwable => false
+      }
 
     hasKanelaClasses && isLoadedProperty
   }
@@ -78,7 +79,6 @@ object Attacher {
       .filter(cl => cl.getClass.getName == "org.springframework.boot.loader.LaunchedURLClassLoader")
   }
 
-
   /**
     * Reloads the Kanela agent. This will cause all instrumentation definitions to be dropped and re-initialized.
     */

core/kamon-core-bench/src/main/scala/kamon/bench/TagSetCreationBenchmark.scala

@@ -34,11 +34,11 @@ class TagSetCreationBenchmark {
   def createTagSetFromIndividualKeys(): TagSet = {
     var tags = TagSet.Empty
     tags = tags.withTag("http.method", "POST")
-    if(tagCount > 1) tags = tags.withTag("http.url", "http://localhost:8080/test")
-    if(tagCount > 2) tags = tags.withTag("http.status_code", 200L)
-    if(tagCount > 3) tags = tags.withTag("error", false)
-    if(tagCount > 4) tags = tags.withTag("userID", "abcdef")
-    if(tagCount > 5) tags = tags.withTag("correlationID", "0123456")
+    if (tagCount > 1) tags = tags.withTag("http.url", "http://localhost:8080/test")
+    if (tagCount > 2) tags = tags.withTag("http.status_code", 200L)
+    if (tagCount > 3) tags = tags.withTag("error", false)
+    if (tagCount > 4) tags = tags.withTag("userID", "abcdef")
+    if (tagCount > 5) tags = tags.withTag("correlationID", "0123456")
 
     tags
   }
@@ -47,11 +47,11 @@ class TagSetCreationBenchmark {
   def createTagSetFromBuilder(): TagSet = {
     val tags = TagSet.builder()
     tags.add("http.method", "POST")
-    if(tagCount > 1) tags.add("http.url", "http://localhost:8080/test")
-    if(tagCount > 2) tags.add("http.status_code", 200L)
-    if(tagCount > 3) tags.add("error", false)
-    if(tagCount > 4) tags.add("userID", "abcdef")
-    if(tagCount > 5) tags.add("correlationID", "0123456")
+    if (tagCount > 1) tags.add("http.url", "http://localhost:8080/test")
+    if (tagCount > 2) tags.add("http.status_code", 200L)
+    if (tagCount > 3) tags.add("error", false)
+    if (tagCount > 4) tags.add("userID", "abcdef")
+    if (tagCount > 5) tags.add("correlationID", "0123456")
 
     tags.build()
   }

core/kamon-core-bench/src/main/scala/kamon/bench/TagSetLookupBenchmark.scala

@@ -43,7 +43,6 @@ class TagSetLookupBenchmark {
     .withTag("userID", "abcdef")
     .withTag("correlationID", "0123456")
 
-
   val builderLeft = builderTags()
   val builderRight = builderTags()
   val keyByKeyLeft = keyByKeyTags()

core/kamon-core-bench/src/main/scala/kamon/bench/ThreadLocalStorageBenchmark.scala

@@ -28,9 +28,8 @@ class ThreadLocalStorageBenchmark {
   val TestKey: Context.Key[Int] = Context.key("test-key", 0)
   val ContextWithKey: Context = Context.of(TestKey, 43)
 
-  val CrossTLS: Storage =  new CrossThreadLocal
-  val FTLS: Storage =  new Storage.ThreadLocal
-
+  val CrossTLS: Storage = new CrossThreadLocal
+  val FTLS: Storage = new Storage.ThreadLocal
 
   @Benchmark
   @BenchmarkMode(Array(Mode.AverageTime))

core/kamon-core-tests/src/test/scala/kamon/InitialConfigLoadingSpec.scala

@@ -15,15 +15,16 @@ class InitialConfigLoadingSpec extends AnyWordSpec with Matchers with Eventually
 
   "the initial config loading" should {
     "fallback to using reference configuration only when application.conf files are malformed" in {
-      val process = Runtime.getRuntime.exec(createProcessWithConfig("kamon.KamonWithCustomConfig", "{This is a bad config}"))
+      val process =
+        Runtime.getRuntime.exec(createProcessWithConfig("kamon.KamonWithCustomConfig", "{This is a bad config}"))
       val processOutputReader = new BufferedReader(new InputStreamReader(process.getInputStream()))
 
       eventually(timeout(10 seconds)) {
         val outputLine = processOutputReader.readLine()
         outputLine shouldBe "All Good"
       }
 
-      if(process.isAlive) {
+      if (process.isAlive) {
         process.destroyForcibly().waitFor(5, TimeUnit.SECONDS)
       }
     }
@@ -50,4 +51,4 @@ object KamonWithCustomConfig extends App {
     case Failure(_) => println("All Bad")
   }
 
-}
+}

core/kamon-core-tests/src/test/scala/kamon/KamonLifecycleSpec.scala

@@ -52,7 +52,6 @@ class KamonLifecycleSpec extends AnyWordSpec with Matchers with Eventually {
     }
   }
 
-
   def createProcessCommand(mainClass: String): String = {
     System.getProperty("java.home") + File.separator + "bin" + File.separator + "java" +
     " -cp " + System.getProperty("java.class.path") + " " + mainClass
@@ -95,7 +94,7 @@ object UsingKamonApisWithoutInit extends App {
     .asScala
     .filter(_.getName.startsWith("kamon"))
 
-  if(allKamonThreadNames.nonEmpty)
+  if (allKamonThreadNames.nonEmpty)
     sys.error("Kamon shouldn't start or create threads until init is called")
 }
 

core/kamon-core-tests/src/test/scala/kamon/UtilsOnConfigSpec.scala

@@ -37,15 +37,15 @@ class UtilsOnConfigSpec extends AnyWordSpec with Matchers {
 
   "the utils on config syntax" should {
     "list all top level keys with a configuration" in {
-      config.getConfig("kamon.test").topLevelKeys should contain only("configuration-one", "config.two")
+      config.getConfig("kamon.test").topLevelKeys should contain only ("configuration-one", "config.two")
     }
 
-    "create a map from top level keys to the inner configuration objects"in {
+    "create a map from top level keys to the inner configuration objects" in {
       val extractedConfigurations = config.getConfig("kamon.test").configurations
 
-      extractedConfigurations.keys should contain only("configuration-one", "config.two")
-      extractedConfigurations("configuration-one").topLevelKeys should contain only("setting", "other-setting")
-      extractedConfigurations("config.two").topLevelKeys should contain only("setting")
+      extractedConfigurations.keys should contain only ("configuration-one", "config.two")
+      extractedConfigurations("configuration-one").topLevelKeys should contain only ("setting", "other-setting")
+      extractedConfigurations("config.two").topLevelKeys should contain only ("setting")
     }
   }
 

core/kamon-core-tests/src/test/scala/kamon/context/BinaryPropagationSpec.scala

@@ -36,8 +36,10 @@ class BinaryPropagationSpec extends AnyWordSpec with Matchers with OptionValues
 
     "handle read failures in an entry reader" in {
       val context = Context.of(
-        BinaryPropagationSpec.StringKey, "string-value",
-        BinaryPropagationSpec.FailStringKey, "fail-read"
+        BinaryPropagationSpec.StringKey,
+        "string-value",
+        BinaryPropagationSpec.FailStringKey,
+        "fail-read"
       )
       val writer = inspectableByteStreamWriter()
       binaryPropagation.write(context, writer)
@@ -50,8 +52,10 @@ class BinaryPropagationSpec extends AnyWordSpec with Matchers with OptionValues
 
     "handle write failures in an entry writer" in {
       val context = Context.of(
-        BinaryPropagationSpec.StringKey, "string-value",
-        BinaryPropagationSpec.FailStringKey, "fail-write"
+        BinaryPropagationSpec.StringKey,
+        "string-value",
+        BinaryPropagationSpec.FailStringKey,
+        "fail-write"
       )
       val writer = inspectableByteStreamWriter()
       binaryPropagation.write(context, writer)
@@ -120,8 +124,8 @@ class BinaryPropagationSpec extends AnyWordSpec with Matchers with OptionValues
         |entries.outgoing.failString = "kamon.context.BinaryPropagationSpec$FailStringEntryCodec"
         |
       """.stripMargin
-    ).withFallback(ConfigFactory.load().getConfig("kamon.propagation")))
-
+    ).withFallback(ConfigFactory.load().getConfig("kamon.propagation"))
+  )
 
   def inspectableByteStreamWriter() = new ByteArrayOutputStream(32) with ByteStreamWriter
 
@@ -138,14 +142,14 @@ object BinaryPropagationSpec {
     override def read(medium: ByteStreamReader, context: Context): Context = {
       val valueData = medium.readAll()
 
-      if(valueData.length > 0) {
+      if (valueData.length > 0) {
         context.withEntry(StringKey, new String(valueData))
       } else context
     }
 
     override def write(context: Context, medium: ByteStreamWriter): Unit = {
       val value = context.get(StringKey)
-      if(value != null) {
+      if (value != null) {
         medium.write(value.getBytes)
       }
     }
@@ -156,9 +160,9 @@ object BinaryPropagationSpec {
     override def read(medium: ByteStreamReader, context: Context): Context = {
       val valueData = medium.readAll()
 
-      if(valueData.length > 0) {
+      if (valueData.length > 0) {
         val stringValue = new String(valueData)
-        if(stringValue == "fail-read") {
+        if (stringValue == "fail-read") {
           sys.error("The fail string entry reader has triggered")
         }
 
@@ -168,12 +172,12 @@ object BinaryPropagationSpec {
 
     override def write(context: Context, medium: ByteStreamWriter): Unit = {
       val value = context.get(FailStringKey)
-      if(value != null && value != "fail-write") {
+      if (value != null && value != "fail-write") {
         medium.write(value.getBytes)
       } else {
         medium.write(42) // malformed data on purpose
         sys.error("The fail string entry writer has triggered")
       }
     }
   }
-}
+}

core/kamon-core-tests/src/test/scala/kamon/context/HttpPropagationSpec.scala

@@ -69,17 +69,16 @@ class HttpPropagationSpec extends AnyWordSpec with Matchers with OptionValues {
         context.getTag(plain("hello")) shouldBe "world"
         context.getTag(option("correlation")).value shouldBe "1234"
         context.getTag(option("unknown")) shouldBe empty
-        context.getTag(option("myLocalTag")) shouldBe empty //should be removed by the filter
-        context.getTag(option("privateMappedTag")) shouldBe empty //should be removed by the filter
+        context.getTag(option("myLocalTag")) shouldBe empty // should be removed by the filter
+        context.getTag(option("privateMappedTag")) shouldBe empty // should be removed by the filter
       }
     }
 
-
     "writing to outgoing requests" should {
       "at least write the upstream name when the context is empty" in {
         val headers = mutable.Map.empty[String, String]
         httpPropagation.write(Context.Empty, headerWriterFromMap(headers))
-        headers should contain only(
+        headers should contain only (
           "x-content-tags" -> "upstream.name=kamon-application;"
         )
       }
@@ -92,7 +91,7 @@ class HttpPropagationSpec extends AnyWordSpec with Matchers with OptionValues {
         )))
 
         httpPropagation.write(context, headerWriterFromMap(headers))
-        headers should contain only(
+        headers should contain only (
           "x-content-tags" -> "hello=world;upstream.name=kamon-application;",
           "x-mapped-tag" -> "value"
         )
@@ -101,29 +100,31 @@ class HttpPropagationSpec extends AnyWordSpec with Matchers with OptionValues {
       "write context entries when available" in {
         val headers = mutable.Map.empty[String, String]
         val context = Context.of(
-          HttpPropagationSpec.StringKey, "out-we-go",
-          HttpPropagationSpec.IntegerKey, 42
+          HttpPropagationSpec.StringKey,
+          "out-we-go",
+          HttpPropagationSpec.IntegerKey,
+          42
         )
 
         httpPropagation.write(context, headerWriterFromMap(headers))
-        headers should contain only(
+        headers should contain only (
           "x-content-tags" -> "upstream.name=kamon-application;",
           "string-header" -> "out-we-go"
-          )
+        )
       }
 
       "not write filtered context tags" in {
         val headers = mutable.Map.empty[String, String]
         val context = Context.of(TagSet.from(Map(
           "hello" -> "world",
           "mappedTag" -> "value",
-          "privateHello" -> "world", //should be filtered
-          "privateMappedTag" -> "value", //should be filtered
-          "myLocalTag" -> "value" //should be filtered
+          "privateHello" -> "world", // should be filtered
+          "privateMappedTag" -> "value", // should be filtered
+          "myLocalTag" -> "value" // should be filtered
         )))
 
         httpPropagation.write(context, headerWriterFromMap(headers))
-        headers should contain only(
+        headers should contain only (
           "x-content-tags" -> "hello=world;upstream.name=kamon-application;",
           "x-mapped-tag" -> "value"
         )
@@ -132,7 +133,6 @@ class HttpPropagationSpec extends AnyWordSpec with Matchers with OptionValues {
     }
   }
 
-
   val httpPropagation = HttpPropagation.from(
     ConfigFactory.parseString(
       """
@@ -150,12 +150,13 @@ class HttpPropagationSpec extends AnyWordSpec with Matchers with OptionValues {
         |entries.outgoing.string = "kamon.context.HttpPropagationSpec$StringEntryCodec"
         |
       """.stripMargin
-    ).withFallback(ConfigFactory.load().getConfig("kamon.propagation")), identifierScheme = "single")
-
+    ).withFallback(ConfigFactory.load().getConfig("kamon.propagation")),
+    identifierScheme = "single"
+  )
 
   def headerReaderFromMap(map: Map[String, String]): HttpPropagation.HeaderReader = new HttpPropagation.HeaderReader {
     override def read(header: String): Option[String] = {
-      if(map.get("fail").nonEmpty)
+      if (map.get("fail").nonEmpty)
         sys.error("failing on purpose")
 
       map.get(header)
@@ -164,9 +165,10 @@ class HttpPropagationSpec extends AnyWordSpec with Matchers with OptionValues {
     override def readAll(): Map[String, String] = map
   }
 
-  def headerWriterFromMap(map: mutable.Map[String, String]): HttpPropagation.HeaderWriter = new HttpPropagation.HeaderWriter {
-    override def write(header: String, value: String): Unit = map.put(header, value)
-  }
+  def headerWriterFromMap(map: mutable.Map[String, String]): HttpPropagation.HeaderWriter =
+    new HttpPropagation.HeaderWriter {
+      override def write(header: String, value: String): Unit = map.put(header, value)
+    }
 }
 
 object HttpPropagationSpec {
@@ -175,7 +177,6 @@ object HttpPropagationSpec {
   val IntegerKey = Context.key[Int]("integer", 0)
   val OptionalKey = Context.key[Option[String]]("optional", None)
 
-
   class StringEntryCodec extends EntryReader[HeaderReader] with EntryWriter[HeaderWriter] {
     private val HeaderName = "string-header"
 
@@ -198,4 +199,4 @@ object HttpPropagationSpec {
 
     }
   }
-}
+}