TS-38628 Apply last PR to migrated codebase

Author: Avanatiker

agent/src/main/kotlin/com/teamscale/jacoco/agent/Agent.kt

@@ -30,26 +30,16 @@ import kotlin.time.toDuration
  * interval.
  */
 class Agent(options: AgentOptions, instrumentation: Instrumentation?) : AgentBase(options) {
-	/** Converts binary data to XML.  */
-	private val generator: JaCoCoXmlReportGenerator
 
 	/** Regular dump task.  */
 	private var timer: Timer? = null
 
 	/** Stores the XML files.  */
 	private val uploader = options.createUploader(instrumentation)
 
-	/** Constructor.  */
 	init {
 		logger.info("Upload method: {}", uploader.describe())
 		retryUnsuccessfulUploads(options, uploader)
-		generator = JaCoCoXmlReportGenerator(
-			options.classDirectoriesOrZips,
-			options.locationIncludeFilter,
-			options.duplicateClassFileBehavior,
-			options.ignoreUncoveredClasses,
-			LoggingUtils.wrap(logger)
-		)
 
 		if (options.shouldDumpInIntervals()) {
 			val period = options.dumpIntervalInMinutes.toDuration(DurationUnit.MINUTES).inWholeMilliseconds
@@ -131,9 +121,12 @@ class Agent(options: AgentOptions, instrumentation: Instrumentation?) : AgentBas
 	}
 
 	/**
-	 * Dumps the current execution data, converts it, writes it to the output directory defined in [.options] and
+	 * Dumps the current execution data, converts it, writes it to the output directory defined in [options] and
 	 * uploads it if an uploader is configured. Logs any errors, never throws an exception.
+	 *
+	 * Synchronized because this can be triggered concurrently by the timer and by the HTTP /dump endpoint.
 	 */
+	@Synchronized
 	override fun dumpReport() {
 		logger.debug("Starting dump")
 
@@ -155,6 +148,14 @@ class Agent(options: AgentOptions, instrumentation: Instrumentation?) : AgentBas
 			return
 		}
 
+		val generator = JaCoCoXmlReportGenerator(
+			options.classDirectoriesOrZips,
+			options.locationIncludeFilter,
+			options.duplicateClassFileBehavior,
+			options.ignoreUncoveredClasses,
+			LoggingUtils.wrap(logger)
+		)
+
 		try {
 			benchmark("Generating the XML report") {
 				val outputFile = options.createNewFileInOutputDirectory("jacoco", "xml")

agent/src/main/kotlin/com/teamscale/jacoco/agent/options/JacocoAgentOptionsBuilder.kt

@@ -3,11 +3,9 @@ package com.teamscale.jacoco.agent.options
 import com.teamscale.jacoco.agent.logging.LoggingUtils.getLogger
 import com.teamscale.jacoco.agent.util.AgentUtils.agentDirectory
 import com.teamscale.jacoco.agent.util.AgentUtils.mainTempDirectory
-import java.io.File
 import java.io.IOException
 import java.nio.file.Files
 import java.nio.file.Path
-import java.util.function.Consumer
 
 /** Builder for the JaCoCo agent options string.  */
 class JacocoAgentOptionsBuilder(private val agentOptions: AgentOptions) {
@@ -30,11 +28,11 @@ class JacocoAgentOptionsBuilder(private val agentOptions: AgentOptions) {
 		val needsClassFiles =
 			agentOptions.mode == EMode.NORMAL || agentOptions.testwiseCoverageMode != ETestwiseCoverageMode.EXEC_FILE
 		if (agentOptions.classDirectoriesOrZips.isEmpty() && needsClassFiles) {
-			val tempDir = createTemporaryDumpDirectory()
-			tempDir.toFile().deleteOnExit()
-			builder.append(",classdumpdir=").append(tempDir.toAbsolutePath())
+			val classDumpDirectory = createTemporaryDumpDirectory()
+			classDumpDirectory.toFile().deleteOnExit()
+			builder.append(",classdumpdir=").append(classDumpDirectory.toAbsolutePath())
 
-			agentOptions.classDirectoriesOrZips = mutableListOf(tempDir.toFile())
+			agentOptions.classDirectoriesOrZips = mutableListOf(classDumpDirectory.toFile())
 		}
 
 		agentOptions.additionalJacocoOptions.forEach { pair ->
@@ -59,7 +57,7 @@ class JacocoAgentOptionsBuilder(private val agentOptions: AgentOptions) {
 		}
 
 		try {
-			return Files.createTempDirectory(agentOptions.outputDirectory, "jacoco-class-dump")
+			return Files.createTempDirectory(agentOptions.outputDirectory!!, "jacoco-class-dump")
 		} catch (_: IOException) {
 			logger.warn("Unable to create temporary directory in output directory. Trying in agent's directory.")
 		}