apply scalafmt to a few more files and ensure lint is against all lan…

…guage versions

.github/workflows/ci.yml

@@ -24,5 +24,5 @@ jobs:
       - uses: actions/checkout@v1
       - uses: coursier/cache-action@v6
       - name: Test
-        run: sbt -v "scalafmtCheckAll"
+        run: sbt -v "+scalafmtCheckAll"
 

instrumentation/kamon-akka-http/src/main/scala-2.11/kamon/instrumentation/akka/http/AkkaHttpServerInstrumentation.scala

@@ -29,7 +29,6 @@ import kanela.agent.libs.net.bytebuddy.matcher.ElementMatchers.isPublic
 
 import scala.collection.immutable
 
-
 class AkkaHttpServerInstrumentation extends InstrumentationBuilder {
 
   /**
@@ -69,7 +68,10 @@ class AkkaHttpServerInstrumentation extends InstrumentationBuilder {
   onType("akka.http.scaladsl.server.directives.FutureDirectives$class")
     .intercept(method("onComplete"), classOf[ResolveOperationNameOnRouteInterceptor])
 
-  onTypes("akka.http.scaladsl.server.directives.OnSuccessMagnet$", "akka.http.scaladsl.server.directives.CompleteOrRecoverWithMagnet$")
+  onTypes(
+    "akka.http.scaladsl.server.directives.OnSuccessMagnet$",
+    "akka.http.scaladsl.server.directives.CompleteOrRecoverWithMagnet$"
+  )
     .intercept(method("apply"), classOf[ResolveOperationNameOnRouteInterceptor])
 
   onType("akka.http.scaladsl.server.directives.RouteDirectives$class")
@@ -97,12 +99,13 @@ trait HasMatchingContext {
 
 object HasMatchingContext {
 
-  case class PathMatchingContext (
+  case class PathMatchingContext(
     fullPath: String,
     matched: Matched[_]
   )
 
-  class Mixin(var matchingContext: Seq[PathMatchingContext], var defaultOperationName: String) extends HasMatchingContext {
+  class Mixin(var matchingContext: Seq[PathMatchingContext], var defaultOperationName: String)
+      extends HasMatchingContext {
 
     override def setMatchingContext(matchingContext: Seq[PathMatchingContext]): Unit =
       this.matchingContext = matchingContext
@@ -136,7 +139,9 @@ object ResolveOperationNameOnRouteInterceptor {
   def complete[T](status: StatusCode, v: => T)(implicit m: ToEntityMarshaller[T]): StandardRoute =
     StandardRoute(resolveOperationName(_).complete((status, v)))
 
-  def complete[T](status: StatusCode, headers: immutable.Seq[HttpHeader], v: => T)(implicit m: ToEntityMarshaller[T]): StandardRoute =
+  def complete[T](status: StatusCode, headers: immutable.Seq[HttpHeader], v: => T)(implicit
+    m: ToEntityMarshaller[T]
+  ): StandardRoute =
     complete((status, headers, v))
 
   def redirect(@Argument(1) uri: Uri, @Argument(2) redirectionType: Redirection): StandardRoute =
@@ -185,18 +190,18 @@ object ResolveOperationNameOnRouteInterceptor {
     Kamon.currentContext().get(LastAutomaticOperationNameEdit.Key).foreach(lastEdit => {
       val currentSpan = Kamon.currentSpan()
 
-      if(lastEdit.allowAutomaticChanges) {
-        if(currentSpan.operationName() == lastEdit.operationName) {
-        val allMatches = requestContext.asInstanceOf[HasMatchingContext].matchingContext.reverse.map(singleMatch)
-        val operationName = allMatches.mkString("")
+      if (lastEdit.allowAutomaticChanges) {
+        if (currentSpan.operationName() == lastEdit.operationName) {
+          val allMatches = requestContext.asInstanceOf[HasMatchingContext].matchingContext.reverse.map(singleMatch)
+          val operationName = allMatches.mkString("")
 
-        if(operationName.nonEmpty) {
+          if (operationName.nonEmpty) {
             currentSpan
-            .name(operationName)
-            .takeSamplingDecision()
+              .name(operationName)
+              .takeSamplingDecision()
 
-          lastEdit.operationName = operationName
-        }
+            lastEdit.operationName = operationName
+          }
         } else {
           lastEdit.allowAutomaticChanges = false
         }
@@ -214,7 +219,7 @@ object ResolveOperationNameOnRouteInterceptor {
     val consumedSegment = matching.fullPath.substring(0, consumedCount)
 
     matching.matched.extractions match {
-      case () => //string segment matched
+      case () => // string segment matched
         consumedSegment
       case tuple: Product =>
         val values = tuple.productIterator.toList map {
@@ -260,7 +265,9 @@ object RequestContextCopyInterceptor {
   @RuntimeType
   def copy(@This context: RequestContext, @SuperCall copyCall: Callable[RequestContext]): RequestContext = {
     val copiedRequestContext = copyCall.call()
-    copiedRequestContext.asInstanceOf[HasMatchingContext].setMatchingContext(context.asInstanceOf[HasMatchingContext].matchingContext)
+    copiedRequestContext.asInstanceOf[HasMatchingContext].setMatchingContext(
+      context.asInstanceOf[HasMatchingContext].matchingContext
+    )
     copiedRequestContext
   }
 }
@@ -288,8 +295,7 @@ object PathDirectivesRawPathPrefixInterceptor {
     } flatMap {
       case (ctx, Matched(rest, values)) =>
         tprovide(values) & mapRequestContext(_ withUnmatchedPath rest) & mapRouteResult { routeResult =>
-
-          if(routeResult.isInstanceOf[Rejected])
+          if (routeResult.isInstanceOf[Rejected])
             ctx.asInstanceOf[HasMatchingContext].popOneMatchingContext()
 
           routeResult
@@ -300,7 +306,6 @@ object PathDirectivesRawPathPrefixInterceptor {
   }
 }
 
-
 object Http2BlueprintInterceptor {
 
   case class HandlerWithEndpoint(interface: String, port: Int, handler: HttpRequest => Future[HttpResponse])
@@ -310,8 +315,10 @@ object Http2BlueprintInterceptor {
   }
 
   @RuntimeType
-  def handleWithStreamIdHeader(@Argument(1) handler: HttpRequest => Future[HttpResponse],
-    @SuperCall zuper: Callable[Flow[HttpRequest, HttpResponse, NotUsed]]): Flow[HttpRequest, HttpResponse, NotUsed] = {
+  def handleWithStreamIdHeader(
+    @Argument(1) handler: HttpRequest => Future[HttpResponse],
+    @SuperCall zuper: Callable[Flow[HttpRequest, HttpResponse, NotUsed]]
+  ): Flow[HttpRequest, HttpResponse, NotUsed] = {
 
     handler match {
       case HandlerWithEndpoint(interface, port, _) =>

instrumentation/kamon-executors/src/main/scala-2.11/kamon/instrumentation/package.scala

@@ -1,4 +1,4 @@
 package kamon.instrumentation
 package object executor {
-    type ScalaForkJoinPool = scala.concurrent.forkjoin.ForkJoinPool
+  type ScalaForkJoinPool = scala.concurrent.forkjoin.ForkJoinPool
 }

instrumentation/kamon-executors/src/main/scala-3/kamon/instrumentation/package.scala

@@ -1,4 +1,4 @@
 package kamon.instrumentation
 package object executor {
-    type ScalaForkJoinPool = java.util.concurrent.ForkJoinPool
+  type ScalaForkJoinPool = java.util.concurrent.ForkJoinPool
 }

instrumentation/kamon-instrumentation-common/src/main/scala-2.11/scala/annotation/static.scala

@@ -1,4 +1,4 @@
 package scala.annotation
 
 import scala.annotation.meta._
-final class static extends StaticAnnotation
+final class static extends StaticAnnotation

instrumentation/kamon-scala-future/src/main/scala-2.11/kamon/instrumentation/futures/scala/FutureChainingInstrumentation.scala

@@ -71,7 +71,7 @@ object CallbackRunnableRunInstrumentation {
   def enter(@Advice.This runnable: HasContext with HasTimestamp with InternalState): Scope = {
     val timestamp = runnable.timestamp
     val valueContext = runnable.valueBridge().asInstanceOf[HasContext].context
-    val context = if(valueContext.nonEmpty()) valueContext else runnable.context
+    val context = if (valueContext.nonEmpty()) valueContext else runnable.context
 
     storeCurrentRunnableTimestamp(timestamp)
     Kamon.storeContext(context)
@@ -127,4 +127,4 @@ object CopyCurrentContextToArgument {
   @Advice.OnMethodEnter(suppress = classOf[Throwable])
   def enter(@Advice.Argument(0) arg: Any): Unit =
     arg.asInstanceOf[HasContext].setContext(Kamon.currentContext())
-}
+}