Format scala files
MODIFY
benchmark-integration/play-perftest/app/controllers/HomeController.scala
benchmark-integration/play-perftest/app/controllers/HomeController.scala
@@ -26,8 +26,7 @@ import play.api.mvc._
* This controller creates an `Action` to handle HTTP requests to the
* application's work page which does busy wait to simulate some work
*/
-class HomeController @Inject()(cc: ControllerComponents)
- extends AbstractController(cc) {
+class HomeController @Inject()(cc: ControllerComponents) extends AbstractController(cc) {
val TRACER: Tracer =
OpenTelemetry.getTracerProvider.get("io.opentelemetry.auto")

MODIFY
instrumentation/akka-actor-2.5/javaagent/src/test/scala/AkkaActors.scala
instrumentation/akka-actor-2.5/javaagent/src/test/scala/AkkaActors.scala
import akka.actor.{Actor, ActorLogging, ActorRef, ActorSystem, Props}
import akka.pattern.ask
import akka.util.Timeout
-import io.opentelemetry.api.OpenTelemetry
-import io.opentelemetry.context.Context
-import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge
import io.opentelemetry.api.trace.Tracer
+import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge
import scala.concurrent.duration._

MODIFY
instrumentation/scala-executors/javaagent/src/slickTest/scala/SlickUtils.scala
instrumentation/scala-executors/javaagent/src/slickTest/scala/SlickUtils.scala
* SPDX-License-Identifier: Apache-2.0
*/
-import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge
import io.opentelemetry.api.trace.Tracer
+import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge
import slick.jdbc.H2Profile.api._
import scala.concurrent.duration.Duration

MODIFY
instrumentation/scala-executors/javaagent/src/test/scala/ScalaConcurrentTests.scala
instrumentation/scala-executors/javaagent/src/test/scala/ScalaConcurrentTests.scala
import java.util.concurrent.CountDownLatch
-import io.opentelemetry.api.OpenTelemetry
-import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge
import io.opentelemetry.api.trace.Tracer
+import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration._
@@ -18,9 +17,7 @@ class ScalaConcurrentTests {
val tracer: Tracer =
Java8BytecodeBridge.getGlobalTracer("io.opentelemetry.auto")
- /**
- * @return Number of expected spans in the trace
- */
+ /** @return Number of expected spans in the trace */
def traceWithFutureAndCallbacks() {
val parentSpan = tracer.spanBuilder("parent").startSpan()
val parentScope =
@@ -83,9 +80,7 @@ class ScalaConcurrentTests {
}
}
- /**
- * @return Number of expected spans in the trace
- */
+ /** @return Number of expected spans in the trace */
def traceWithPromises() {
val parentSpan = tracer.spanBuilder("parent").startSpan()
val parentScope =
@@ -132,9 +127,7 @@ class ScalaConcurrentTests {
}
}
- /**
- * @return Number of expected spans in the trace
- */
+ /** @return Number of expected spans in the trace */
def tracedWithFutureFirstCompletions() {
val parentSpan = tracer.spanBuilder("parent").startSpan()
val parentScope =
@@ -157,9 +150,7 @@ class ScalaConcurrentTests {
}
}
- /**
- * @return Number of expected spans in the trace
- */
+ /** @return Number of expected spans in the trace */
def tracedTimeout(): Integer = {
val parentSpan = tracer.spanBuilder("parent").startSpan()
val parentScope =

MODIFY
smoke-tests/play/app/controllers/HomeController.scala
smoke-tests/play/app/controllers/HomeController.scala
@@ -20,16 +20,10 @@ import javax.inject.Inject
import play.api.mvc._
-/**
- * This controller creates an `Action` to handle HTTP requests to the
- * application's welcome greeting
- */
-class HomeController @Inject()(cc: ControllerComponents)
- extends AbstractController(cc) {
+/** Creates an `Action` to handle HTTP requests to the application's welcome greeting */
+class HomeController @Inject()(cc: ControllerComponents) extends AbstractController(cc) {
- /**
- * Create an Action to return a greeting
- */
+ /** Create an Action to return a greeting */
def doGet(id: Option[Int]) = Action { implicit request: Request[AnyContent] =>
val idVal = id.getOrElse(-1)
if (idVal > 0) {

Format scala files (#1800)