Add timeout for resolving semanticDbVersion (#2322)

VirtusLab · Aug 1, 2023 · cdffc3f · cdffc3f
1 parent 475c4bf
commit cdffc3f
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 23 deletions.
diff --git a/modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala
@@ -364,7 +364,7 @@ class BuildOptionsTests extends munit.FunSuite {
     val buildOptions = BuildOptions()
     val scalaVersion = "2.13.3"
 
-    val semanticDbVersion = buildOptions.findSemanticDbVersion(scalaVersion)
+    val semanticDbVersion = buildOptions.findSemanticDbVersion(scalaVersion, TestLogger())
     expect(semanticDbVersion == "4.8.4")
   }
 

diff --git a/modules/options/src/main/scala/scala/build/internals/Util.scala b/modules/options/src/main/scala/scala/build/internals/Util.scala
@@ -18,6 +18,13 @@ object Util {
         out.println(s"  $l")
       printException(t.getCause, out)
     }
+  def printException(t: Throwable, out: => String => Unit): Unit =
+    if (t != null) {
+      out(t.toString)
+      for (l <- t.getStackTrace)
+        out(s"  $l")
+      printException(t.getCause, out)
+    }
 
   def daemonThreadFactory(prefix: String): ThreadFactory =
     new ThreadFactory {

diff --git a/modules/options/src/main/scala/scala/build/options/BuildOptions.scala b/modules/options/src/main/scala/scala/build/options/BuildOptions.scala
@@ -20,13 +20,15 @@ import scala.build.interactive.Interactive.*
 import scala.build.internal.Constants.*
 import scala.build.internal.CsLoggerUtil.*
 import scala.build.internal.Regexes.scala3NightlyNicknameRegex
-import scala.build.internal.{Constants, OsLibc, StableScalaVersion}
+import scala.build.internal.{Constants, OsLibc, StableScalaVersion, Util}
 import scala.build.options.BuildRequirements.ScopeRequirement
 import scala.build.options.validation.BuildOptionsRule
 import scala.build.{Artifacts, Logger, Os, Position, Positioned}
 import scala.collection.immutable.Seq
+import scala.concurrent.Await
 import scala.concurrent.duration.*
 import scala.util.Properties
+import scala.util.control.NonFatal
 
 final case class BuildOptions(
   suppressWarningOptions: SuppressWarningOptions = SuppressWarningOptions(),
@@ -123,30 +125,41 @@ final case class BuildOptions(
       classPathOptions.extraDependencies.toSeq
   }
 
-  private def semanticDbPlugins: Either[BuildException, Seq[AnyDependency]] = either {
-    val scalaVersion: Option[String] = value(scalaParams).map(_.scalaVersion)
-    val generateSemDbs               = scalaOptions.generateSemanticDbs.getOrElse(false)
-    scalaVersion match {
-      case Some(sv) if sv.startsWith("2.") && generateSemDbs =>
-        val semanticDbVersion = findSemanticDbVersion(sv)
-        Seq(
-          dep"$semanticDbPluginOrganization:::$semanticDbPluginModuleName:$semanticDbVersion"
-        )
-      case _ => Nil
+  private def semanticDbPlugins(logger: Logger): Either[BuildException, Seq[AnyDependency]] =
+    either {
+      val scalaVersion: Option[String] = value(scalaParams).map(_.scalaVersion)
+      val generateSemDbs               = scalaOptions.generateSemanticDbs.getOrElse(false)
+      scalaVersion match {
+        case Some(sv) if sv.startsWith("2.") && generateSemDbs =>
+          val semanticDbVersion = findSemanticDbVersion(sv, logger)
+          Seq(
+            dep"$semanticDbPluginOrganization:::$semanticDbPluginModuleName:$semanticDbVersion"
+          )
+        case _ => Nil
+      }
     }
-  }
 
   /** Find the latest supported semanticdb version for @scalaVersion
     */
-  def findSemanticDbVersion(scalaVersion: String): String = {
-    val (_, versions) =
+  def findSemanticDbVersion(scalaVersion: String, logger: Logger): String = {
+    val versionsFuture =
       finalCache.logger.use {
         coursier.complete.Complete(finalCache)
           .withScalaVersion(scalaVersion)
           .withScalaBinaryVersion(scalaVersion.split('.').take(2).mkString("."))
           .withInput(s"org.scalameta:semanticdb-scalac_$scalaVersion:")
           .complete()
-          .unsafeRun()(finalCache.ec)
+          .future()(finalCache.ec)
+      }
+
+    val versions =
+      try
+        Await.result(versionsFuture, FiniteDuration(10, "s"))._2
+      catch {
+        case NonFatal(e) =>
+          logger.debug(s"Error while looking up semanticdb versions for scala $scalaVersion")
+          Util.printException(e, logger.debug(_: String))
+          Nil
       }
 
     versions.lastOption.getOrElse(semanticDbPluginVersion)
@@ -162,12 +175,13 @@ final case class BuildOptions(
   private def maybeNativeCompilerPlugins: Seq[AnyDependency] =
     if (platform.value == Platform.Native) scalaNativeOptions.compilerPlugins
     else Nil
-  def compilerPlugins: Either[BuildException, Seq[Positioned[AnyDependency]]] = either {
-    value(maybeJsCompilerPlugins).map(Positioned.none) ++
-      maybeNativeCompilerPlugins.map(Positioned.none) ++
-      value(semanticDbPlugins).map(Positioned.none) ++
-      scalaOptions.compilerPlugins
-  }
+  def compilerPlugins(logger: Logger): Either[BuildException, Seq[Positioned[AnyDependency]]] =
+    either {
+      value(maybeJsCompilerPlugins).map(Positioned.none) ++
+        maybeNativeCompilerPlugins.map(Positioned.none) ++
+        value(semanticDbPlugins(logger)).map(Positioned.none) ++
+        scalaOptions.compilerPlugins
+    }
 
   private def semanticDbJavacPlugins: Either[BuildException, Seq[AnyDependency]] = either {
     val generateSemDbs = scalaOptions.generateSemanticDbs.getOrElse(false)
@@ -371,7 +385,7 @@ final case class BuildOptions(
       case Some(scalaParams0) =>
         val params = Artifacts.ScalaArtifactsParams(
           params = scalaParams0,
-          compilerPlugins = value(compilerPlugins),
+          compilerPlugins = value(compilerPlugins(logger)),
           addJsTestBridge = addJsTestBridge.filter(_ => isTests),
           addNativeTestInterface = addNativeTestInterface.filter(_ => isTests),
           scalaJsVersion =