TS-38628 Rework

Author: Avanatiker

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

@@ -82,7 +82,7 @@ class Agent(options: AgentOptions, instrumentation: Instrumentation?) : AgentBas
 		try {
 			val properties = FileSystemUtils.readProperties(file)
 			val coverageFile = CoverageFile(
-				File(StringUtils.stripSuffix(file.absolutePath, TeamscaleUploader.RETRY_UPLOAD_FILE_SUFFIX))
+				File(file.absolutePath.removeSuffix(TeamscaleUploader.RETRY_UPLOAD_FILE_SUFFIX))
 			)
 
 			if (uploader is IUploadRetry) {

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

@@ -22,13 +22,12 @@ import java.lang.management.ManagementFactory
  */
 abstract class AgentBase(
 	/** The agent options.  */
-	@JvmField var options: AgentOptions
+	var options: AgentOptions
 ) {
 	/** The logger.  */
 	val logger: Logger = LoggingUtils.getLogger(this)
 
-	/** Controls the JaCoCo runtime.  */
-	@JvmField
+	/** Controls the JaCoCo runtime. */
 	val controller: JacocoRuntimeController
 
 	private lateinit var server: Server

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

@@ -76,6 +76,6 @@ object Main {
 	private class DefaultArguments {
 		/** Shows the help message.  */
 		@Parameter(names = ["--help"], help = true, description = "Shows all available command line arguments.")
-		val help = false
+		var help = false
 	}
 }

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

@@ -46,15 +46,15 @@ object PreMain {
 	/**
 	 * Entry point for the agent, called by the JVM.
 	 */
-	@JvmStatic
 	@Throws(Exception::class)
-	fun premain(options: String, instrumentation: Instrumentation?) {
+	@JvmStatic
+	fun premain(options: String?, instrumentation: Instrumentation?) {
 		if (System.getProperty(LOCKING_SYSTEM_PROPERTY) != null) return
 		System.setProperty(LOCKING_SYSTEM_PROPERTY, "true")
 
 		val environmentConfigId = System.getenv(CONFIG_ID_ENVIRONMENT_VARIABLE)
 		val environmentConfigFile = System.getenv(CONFIG_FILE_ENVIRONMENT_VARIABLE)
-		if (StringUtils.isEmpty(options) && environmentConfigId == null && environmentConfigFile == null) {
+		if (options.isNullOrEmpty() && environmentConfigId == null && environmentConfigFile == null) {
 			// profiler was registered globally, and no config was set explicitly by the user, thus ignore this process
 			// and don't profile anything
 			return
@@ -81,8 +81,9 @@ object PreMain {
 			// Unregister the profiler from Teamscale.
 			agentOptions?.configurationViaTeamscale?.unregisterProfiler()
 
-			// Configuration errors must be visible to the user; let the JVM report them.
-			throw e
+			// Don't crash the profiled application due to a configuration error
+			// (see TS-43260). The error has already been logged in getAndApplyAgentOptions.
+			return
 		} catch (_: AgentOptionReceiveException) {
 			// When Teamscale is not available, we don't want to fail hard to still allow for testing even if no
 			// coverage is collected (see TS-33237)
@@ -131,7 +132,7 @@ object PreMain {
 
 	@Throws(AgentOptionParseException::class, IOException::class, AgentOptionReceiveException::class)
 	private fun getAndApplyAgentOptions(
-		options: String,
+		options: String?,
 		environmentConfigId: String?,
 		environmentConfigFile: String?
 	): Pair<AgentOptions, List<Exception>> {
@@ -291,7 +292,7 @@ object PreMain {
 						val configFile = FilePatternResolver(delayedLogger).parsePath(
 							AgentOptionsParser.CONFIG_FILE_OPTION, configFileValue
 						).toFile()
-						loggingConfigLine = FileSystemUtils.readLinesUTF8(configFile)
+						loggingConfigLine = configFile.readLines()
 							.firstOrNull { it.startsWith(AgentOptionsParser.LOGGING_CONFIG_OPTION + "=") }
 					} catch (e: IOException) {
 						delayedLogger.error("Failed to load configuration from $configFileValue: ${e.message}", e)

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

@@ -15,7 +15,6 @@ import javax.ws.rs.core.Response
  */
 abstract class ResourceBase {
 	/** The logger.  */
-	@JvmField
 	protected val logger: Logger = LoggingUtils.getLogger(this)
 
 	companion object {

agent/src/main/kotlin/com/teamscale/jacoco/agent/commandline/Validator.kt

@@ -15,9 +15,9 @@ class Validator {
 		try {
 			validation.validate()
 		} catch (e: Exception) {
-			e.message?.let { messages.add(it) }
+			messages.add(e.message ?: "No error message")
 		} catch (e: AssertionError) {
-			e.message?.let { messages.add(it) }
+			messages.add(e.message ?: "No error message")
 		}
 	}
 

agent/src/main/kotlin/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitPropertiesLocatingTransformer.kt

@@ -20,7 +20,7 @@ class GitPropertiesLocatingTransformer(
 
 	override fun transform(
 		classLoader: ClassLoader?,
-		className: String,
+		className: String?,
 		aClass: Class<*>?,
 		protectionDomain: ProtectionDomain?,
 		classFileContent: ByteArray?
@@ -30,7 +30,7 @@ class GitPropertiesLocatingTransformer(
 			return null
 		}
 
-		if (className.isEmpty() || !locationIncludeFilter.isIncluded(className)) {
+		if (className.isNullOrEmpty() || !locationIncludeFilter.isIncluded(className)) {
 			// only search in jar files of included classes
 			return null
 		}

agent/src/main/kotlin/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitPropertiesLocatorUtils.kt

@@ -82,7 +82,6 @@ object GitPropertiesLocatorUtils {
 	 * @throws IOException                   If reading the jar file fails.
 	 * @throws InvalidGitPropertiesException If a git.properties file is found but it is malformed.
 	 */
-	@JvmStatic
 	@Throws(IOException::class, InvalidGitPropertiesException::class)
 	fun getCommitInfoFromGitProperties(
 		file: File,
@@ -103,7 +102,6 @@ object GitPropertiesLocatorUtils {
 	 * @throws URISyntaxException under certain circumstances if parsing the URL fails. This should be treated the same
 	 * as a null search result but the exception is preserved so it can be logged.
 	 */
-	@JvmStatic
 	@Throws(
 		URISyntaxException::class,
 		IOException::class,
@@ -167,7 +165,8 @@ object GitPropertiesLocatorUtils {
 		// vfs:/content/helloworld.war/WEB-INF/classes
 		// Next, we try to extract the artefact URL from it, e.g., vfs:/content/helloworld.war
 		val artefactUrl = extractArtefactUrl(jarOrClassFolderUrl)
-		val virtualFile = URI.create(artefactUrl).toURL().openConnection().getContent()
+		val path = artefactUrl.substringAfter(':')
+		val virtualFile = URI("vfs", null, path, null).toURL().openConnection().getContent()
 		// obtain the physical location of the class file. It is created on demand in <jboss-installation-dir>/standalone/tmp/vfs
 		val getPhysicalFileMethod = virtualFile.javaClass.getMethod("getPhysicalFile")
 		val file = getPhysicalFileMethod.invoke(virtualFile) as File
@@ -209,7 +208,6 @@ object GitPropertiesLocatorUtils {
 	 * @throws IOException                   If reading the jar file fails.
 	 * @throws InvalidGitPropertiesException If a git.properties file is found but it is malformed.
 	 */
-	@JvmStatic
 	@Throws(IOException::class, InvalidGitPropertiesException::class)
 	fun getProjectRevisionsFromGitProperties(
 		file: File,
@@ -237,7 +235,6 @@ object GitPropertiesLocatorUtils {
 	 * Returns pairs of paths to git.properties files and their parsed properties found in the provided folder or
 	 * archive file. Nested jar files will also be searched recursively if specified.
 	 */
-	@JvmStatic
 	@Throws(IOException::class)
 	fun findGitPropertiesInFile(
 		file: File, isJarFile: Boolean, recursiveSearch: Boolean
@@ -328,8 +325,6 @@ object GitPropertiesLocatorUtils {
 	 * Returns pairs of paths to git.properties files and their parsed properties found in the provided JarInputStream.
 	 * Nested jar files will also be searched recursively if specified.
 	 */
-	@JvmStatic
-	@JvmOverloads
 	@Throws(IOException::class)
 	fun findGitPropertiesInArchive(
 		inputStream: JarInputStream,
@@ -379,7 +374,6 @@ object GitPropertiesLocatorUtils {
 	 * [GIT_PROPERTIES_DEFAULT_MAVEN_DATE_FORMAT]. An additional format can be given with
 	 * `dateTimeFormatter`
 	 */
-	@JvmStatic
 	@Throws(InvalidGitPropertiesException::class)
 	fun getCommitInfoFromGitProperties(
 		gitProperties: Properties, entryName: String?, jarFile: File?,

agent/src/main/kotlin/com/teamscale/jacoco/agent/configuration/ConfigurationViaTeamscale.kt

@@ -97,7 +97,6 @@ class ConfigurationViaTeamscale(
 		 * Tries to retrieve the profiler configuration from Teamscale. In case retrieval fails the method throws a
 		 * [AgentOptionReceiveException].
 		 */
-		@JvmStatic
 		@Throws(AgentOptionReceiveException::class)
 		fun retrieve(
 			logger: ILogger,

agent/src/main/kotlin/com/teamscale/jacoco/agent/convert/ConvertCommand.kt

@@ -102,7 +102,7 @@ class ConvertCommand : ICommand {
 		names = ["--split-after", "-s"], required = false, arity = 1, description = "After how many tests " +
 				"testwise coverage should be split into multiple reports (Default is 5000)."
 	)
-	val splitAfter = 5000
+	var splitAfter = 5000
 
 	@Throws(IOException::class)
 	fun getClassDirectoriesOrZips(): List<File> = ClasspathUtils