From 5c7c677825801e28ac6c57a1dcfa924eb6e913a2 Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 21 Nov 2024 17:24:03 +0000 Subject: [PATCH 1/4] increase connection and read timeouts --- .../scala/com/codacy/analysis/core/git/Repository.scala | 6 +++++- .../scala/com/codacy/analysis/core/utils/HttpHelper.scala | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala b/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala index 7a18be464..3fb1d56e3 100644 --- a/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala +++ b/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala @@ -2,6 +2,7 @@ package com.codacy.analysis.core.git import org.eclipse.jgit.api.{Git => JGit} import org.eclipse.jgit.lib.{Repository => JGitRepository} +import org.eclipse.jgit.api.errors.GitAPIException; import scala.collection.JavaConverters._ import scala.util.Try @@ -11,13 +12,16 @@ class Repository(repository: JGitRepository) { val jGit: JGit = new JGit(repository) def latestCommit: Try[Commit] = { - Try { + try { val gitLog = jGit.log().setMaxCount(1).call() val revCommit = gitLog.iterator().next() new Commit(repository, revCommit) } + catch (GitAPIException | IOException e) { + System.err.println("An error occurred while getting the latest commit: " + e.getMessage()); + e.printStackTrace(); } def uncommitedFiles: Try[Set[String]] = { diff --git a/core/src/main/scala/com/codacy/analysis/core/utils/HttpHelper.scala b/core/src/main/scala/com/codacy/analysis/core/utils/HttpHelper.scala index d65065388..0d0aa4c81 100644 --- a/core/src/main/scala/com/codacy/analysis/core/utils/HttpHelper.scala +++ b/core/src/main/scala/com/codacy/analysis/core/utils/HttpHelper.scala @@ -7,8 +7,8 @@ import scalaj.http.{Http, HttpOptions, HttpRequest, HttpResponse} class HttpHelper(apiUrl: String, extraHeaders: Map[String, String], allowUnsafeSSL: Boolean) { - private lazy val connectionTimeoutMs = 2000 - private lazy val readTimeoutMs = 5000 + private lazy val connectionTimeoutMs = 5000 + private lazy val readTimeoutMs = 15000 private val remoteUrl = apiUrl + "/2.0" From 3978c416ad1f2b5b7830c6bc35ad548a3096cf48 Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Thu, 21 Nov 2024 18:06:27 +0000 Subject: [PATCH 2/4] fix end-of-file issue and run scalafmt --- .../scala/com/codacy/analysis/core/git/Repository.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala b/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala index 3fb1d56e3..9ec8b0edd 100644 --- a/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala +++ b/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala @@ -18,10 +18,10 @@ class Repository(repository: JGitRepository) { val revCommit = gitLog.iterator().next() new Commit(repository, revCommit) + } catch (GitAPIException | IOException e) { + System.err.println("An error occurred while getting the latest commit: " + e.getMessage()); + e.printStackTrace(); } - catch (GitAPIException | IOException e) { - System.err.println("An error occurred while getting the latest commit: " + e.getMessage()); - e.printStackTrace(); } def uncommitedFiles: Try[Set[String]] = { @@ -32,5 +32,4 @@ class Repository(repository: JGitRepository) { javaSet.asScala.toSet } } - } From 2c928bc7cec8ca49e815f18e5d6ddc102f30b842 Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Fri, 22 Nov 2024 11:46:18 +0000 Subject: [PATCH 3/4] revert file to default --- .../scala/com/codacy/analysis/core/git/Repository.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala b/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala index 9ec8b0edd..7a18be464 100644 --- a/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala +++ b/core/src/main/scala/com/codacy/analysis/core/git/Repository.scala @@ -2,7 +2,6 @@ package com.codacy.analysis.core.git import org.eclipse.jgit.api.{Git => JGit} import org.eclipse.jgit.lib.{Repository => JGitRepository} -import org.eclipse.jgit.api.errors.GitAPIException; import scala.collection.JavaConverters._ import scala.util.Try @@ -12,15 +11,12 @@ class Repository(repository: JGitRepository) { val jGit: JGit = new JGit(repository) def latestCommit: Try[Commit] = { - try { + Try { val gitLog = jGit.log().setMaxCount(1).call() val revCommit = gitLog.iterator().next() new Commit(repository, revCommit) - } catch (GitAPIException | IOException e) { - System.err.println("An error occurred while getting the latest commit: " + e.getMessage()); - e.printStackTrace(); } } @@ -32,4 +28,5 @@ class Repository(repository: JGitRepository) { javaSet.asScala.toSet } } + } From aeb089eea7c5c01fc372c415db87fc26a5d6abd6 Mon Sep 17 00:00:00 2001 From: "david.marinho@codacy.com" Date: Fri, 22 Nov 2024 14:56:17 +0000 Subject: [PATCH 4/4] increase timeout test --- .../com.codacy.analysis.core/upload/ResultsUploaderSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/scala/com.codacy.analysis.core/upload/ResultsUploaderSpec.scala b/core/src/test/scala/com.codacy.analysis.core/upload/ResultsUploaderSpec.scala index 0e917e075..dbdb25ada 100644 --- a/core/src/test/scala/com.codacy.analysis.core/upload/ResultsUploaderSpec.scala +++ b/core/src/test/scala/com.codacy.analysis.core/upload/ResultsUploaderSpec.scala @@ -155,7 +155,7 @@ class ResultsUploaderSpec extends Specification with NoLanguageFeatures with Moc val testDuplication = Seq(DuplicationResult(language, DuplicationAnalysis.Success(Set.empty, Set(testClone(1), testClone(2))))) - uploader.sendResults(Seq.empty, Seq.empty, testDuplication) must beRight.awaitFor(10.seconds) + uploader.sendResults(Seq.empty, Seq.empty, testDuplication) must beRight.awaitFor(30.seconds) there were no(codacyClient).sendRemoteIssues( ArgumentMatchers.any[String],