Installer windows

.github/workflows/actions.yml

@@ -8,18 +8,15 @@ on:
     branches: '**'
 
 jobs:
-  build:
-    name: Build & Deploy
+  build-linux:
+    name: Build Linux & Deploy
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up GraalVM
-      uses: graalvm/setup-graalvm@v1
+    - uses: actions/setup-java@v4
       with:
-        java-version: '17.0.8'
-        distribution: 'graalvm-community'
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        set-java-home: true
+        distribution: 'temurin'
+        java-version: '17'
     - name: Build with Gradle
       run: ./gradlew build
     - name: Upload Release Assets
@@ -71,7 +68,31 @@ jobs:
         accesskey: ${{ secrets.CQSE_TEAMSCALE_IO_ACCESSKEY }}
         partition: 'Coverage'
         format: 'JACOCO'
-        message: 'Coverage'
+        message: 'Linux Coverage'
+        files: '**/jacocoTestReport.xml'
+
+  test-windows:
+    name: Test on Windows
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+    - name: Build with Gradle
+      run: ./gradlew build
+    - name: Upload coverage to Teamscale
+      if: always() && github.event_name == 'push'
+      uses: cqse/teamscale-upload-action@v2.8.2
+      with:
+        server: 'https://cqse.teamscale.io'
+        project: 'teamscale-jacoco-agent'
+        user: ${{ secrets.CQSE_TEAMSCALE_IO_USER }}
+        accesskey: ${{ secrets.CQSE_TEAMSCALE_IO_ACCESSKEY }}
+        partition: 'Coverage Windows'
+        format: 'JACOCO'
+        message: 'Coverage Windows'
         files: '**/jacocoTestReport.xml'
 
   docker:

CHANGELOG.md

@@ -5,6 +5,7 @@ We use [semantic versioning](http://semver.org/):
 - PATCH version when you make backwards compatible bug fixes.
 
 # Next Release
+- [feature] add installer for Windows
 
 # 33.1.2
 - [fix] _teamscale-maven-plugin_: Revision and end commit could not be set via command line (user property)

agent/build.gradle.kts

@@ -84,8 +84,8 @@ distributions {
 	named("shadow") {
 		distributionBaseName.set("teamscale-jacoco-agent")
 		contents {
-			from(project(":installer").tasks["nativeCompile"]) {
-				include("installer")
+			from(project(":installer").tasks["jlink"]) {
+				into("installer")
 			}
 
 			from(tasks.readmeToPdf) {

agent/src/dist/installer.bat

@@ -0,0 +1,9 @@
+@echo off
+set DIR="%~dp0"
+set BAT_EXEC="%DIR:"=%\installer\installer-windows-x86_64\bin\installer.bat"
+
+rem ensure that we don't accidentally profile the uninstaller
+set JAVA_TOOL_OPTIONS=
+set _JAVA_OPTIONS=
+
+pushd %DIR% & %BAT_EXEC% %* & popd

agent/src/dist/installer.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+DIR="${0%/*}"
+
+# ensure that we don't accidentally profile the uninstaller
+unset JAVA_TOOL_OPTIONS
+unset _JAVA_OPTIONS
+
+exec "$DIR/installer/installer-linux-x86_64/bin/installer" "$@"

agent/src/docker/Dockerfile

@@ -1,6 +1,7 @@
 # --- build image ---
 
-FROM openjdk:8 as build
+FROM openjdk:17 as build
+RUN microdnf install findutils
 ADD . /src
 WORKDIR /src
 RUN ./gradlew :agent:shadowJar

agent/src/test/java/com/teamscale/jacoco/agent/options/TeamscalePropertiesUtilsTest.java

@@ -3,6 +3,8 @@
 import okhttp3.HttpUrl;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
@@ -45,36 +47,44 @@ void successfulParsing() throws AgentOptionParseException, IOException {
 	void missingUsername() throws IOException {
 		Files.write(teamscalePropertiesPath, "url=http://test\naccesskey=key".getBytes(StandardCharsets.UTF_8));
 		assertThatThrownBy(
-				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining("missing the username");
+				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining(
+				"missing the username");
 	}
 
 	@Test
 	void missingAccessKey() throws IOException {
 		Files.write(teamscalePropertiesPath, "url=http://test\nusername=user".getBytes(StandardCharsets.UTF_8));
 		assertThatThrownBy(
-				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining("missing the accesskey");
+				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining(
+				"missing the accesskey");
 	}
 
 	@Test
 	void missingUrl() throws IOException {
 		Files.write(teamscalePropertiesPath, "username=user\nusername=user".getBytes(StandardCharsets.UTF_8));
 		assertThatThrownBy(
-				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining("missing the url");
+				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining(
+				"missing the url");
 	}
 
 	@Test
 	void malformedUrl() throws IOException {
 		Files.write(teamscalePropertiesPath, "url=$$**\nusername=user\nusername=user".getBytes(StandardCharsets.UTF_8));
 		assertThatThrownBy(
-				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining("malformed URL");
+				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining(
+				"malformed URL");
 	}
 
+	/** This test doesn't work on Windows since {@link java.io.File#setReadable(boolean)} does not work there. */
+	@DisabledOnOs(OS.WINDOWS)
 	@Test
 	void fileNotReadable() throws IOException {
-		Files.write(teamscalePropertiesPath, "url=http://test\nusername=user\nusername=user".getBytes(StandardCharsets.UTF_8));
+		Files.write(teamscalePropertiesPath,
+				"url=http://test\nusername=user\nusername=user".getBytes(StandardCharsets.UTF_8));
 		assertThat(teamscalePropertiesPath.toFile().setReadable(false)).isTrue();
 		assertThatThrownBy(
-				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining("Failed to read");
+				() -> TeamscalePropertiesUtils.parseCredentials(teamscalePropertiesPath)).hasMessageContaining(
+				"Failed to read");
 	}
 
 }

agent/src/test/java/com/teamscale/jacoco/agent/util/TestUtils.java

@@ -3,6 +3,9 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test Utilities
@@ -11,12 +14,15 @@ public class TestUtils {
 	/**
 	 * Deletes all contents inside the coverage folder inside the agent directory
 	 */
-	@SuppressWarnings("ResultOfMethodCallIgnored")
 	public static void cleanAgentCoverageDirectory() throws IOException {
 		Path coverageDir = AgentUtils.getAgentDirectory().resolve("coverage");
 		if (Files.exists(coverageDir)) {
-			Files.list(coverageDir).forEach(path -> path.toFile().delete());
+			try (Stream<Path> stream = Files.list(coverageDir)) {
+				stream.forEach(path ->
+						assertThat(path.toFile().delete()).withFailMessage("Failed to delete " + path).isTrue());
+			}
 			Files.delete(coverageDir);
 		}
 	}
+
 }

common-system-test/src/main/java/com/teamscale/test/commons/SystemTestUtils.java

@@ -12,6 +12,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -54,12 +56,17 @@ public static void runMavenTests(String mavenProjectPath) throws IOException {
 
 		ProcessUtils.ExecutionResult result;
 		try {
-			String executable = "./mvnw";
+			List<String> arguments = new ArrayList<>();
 			if (SystemUtils.isWindows()) {
-				executable = Paths.get(mavenProjectPath, "mvnw.cmd").toUri().getPath();
+				Collections.addAll(arguments, "cmd", "/c", "mvnw.cmd");
+			} else {
+				arguments.add("./mvnw");
 			}
-			result = ProcessUtils.execute(
-					new ProcessBuilder(executable, "clean", "verify").directory(workingDirectory));
+
+			arguments.add("clean");
+			arguments.add("verify");
+
+			result = ProcessUtils.execute(new ProcessBuilder(arguments).directory(workingDirectory));
 		} catch (IOException e) {
 			throw new IOException(
 					"Failed to run ./mvnw clean verify in directory " + workingDirectory.getAbsolutePath(),

gradle/libs.versions.toml

@@ -50,6 +50,8 @@ spark = { module = "com.sparkjava:spark-core", version = "2.9.4" }
 jcommander = { module = "com.beust:jcommander", version = "1.82" }
 teamscaleLibCommons = { module = "com.teamscale:teamscale-lib-commons", version = "9.4.1" }
 commonsCodec = { module = "commons-codec:commons-codec", version = "1.16.1" }
+commonsLang = { module="org.apache.commons:commons-lang3", version="3.14.0" }
+commonsIo = { module="commons-io:commons-io", version="2.15.1" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version = "2.0.12" }
 jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version = "6.9.0.202403050737-r" }
 okio = { module = "com.squareup.okio:okio", version = "3.8.0" }

installer/build.gradle.kts

@@ -1,28 +1,78 @@
+import org.beryx.jlink.util.JdkUtil
+
 plugins {
 	application
 	com.teamscale.`java-convention`
 	com.teamscale.coverage
-	id("org.graalvm.buildtools.native") version "0.9.5"
+	id("org.beryx.jlink") version ("3.0.1")
 }
 
 tasks.jar {
 	manifest {
-		attributes["Main-Class"] = "com.teamscale.profiler.installer.RootCommand"
+		attributes(
+			//"Automatic-Module-Name" to "com.teamscale.profiler.installer",
+			"Main-Class" to "com.teamscale.profiler.installer.RootCommand",
+		)
+	}
+}
+
+java {
+	toolchain {
+		languageVersion.set(JavaLanguageVersion.of(17))
 	}
 }
 
 application {
 	applicationName = "installer"
-	mainClass.set("com.teamscale.profiler.installer.RootCommand")
+	mainClass = "com.teamscale.profiler.installer.RootCommand"
+	mainModule = "com.teamscale.profiler.installer"
+	applicationDefaultJvmArgs = listOf(
+		// Ensure that no stack traces are lost.
+		// See <https://stackoverflow.com/questions/2411487/nullpointerexception-in-java-with-no-stacktrace>
+		"-XX:-OmitStackTraceInFastThrow",
+	)
+}
+
+val ADOPTIUM_BINARY_REPOSITORY = "https://api.adoptium.net/v3/binary"
+val RUNTIME_JDK_VERSION = "17.0.5+8"
+jlink {
+	options = listOf(
+		"--compress", "2",
+		"--no-header-files",
+		"--no-man-pages",
+		"--dedup-legal-notices", "error-if-not-same-content"
+	)
+	launcher {
+		name = "installer"
+	}
+
+	targetPlatform("linux-x86_64") {
+		setJdkHome(
+			jdkDownload(
+				"$ADOPTIUM_BINARY_REPOSITORY/version/jdk-${RUNTIME_JDK_VERSION}/linux/x64/jdk/hotspot/normal/eclipse",
+				closureOf<JdkUtil.JdkDownloadOptions> {
+					archiveExtension = "tar.gz"
+				})
+		)
+	}
+	targetPlatform("windows-x86_64") {
+		setJdkHome(
+			jdkDownload(
+				"$ADOPTIUM_BINARY_REPOSITORY/version/jdk-${RUNTIME_JDK_VERSION}/windows/x64/jdk/hotspot/normal/eclipse",
+				closureOf<JdkUtil.JdkDownloadOptions> {
+					archiveExtension = "zip"
+				})
+		)
+	}
 }
 
 dependencies {
-	// we need this older version since newer versions are Kotlin-implemented and don't play nice with GraalVM
-	// okhttp 5 will add official GraalVM support but is currently still alpha https://square.github.io/okhttp/changelogs/changelog/
-	implementation("com.squareup.okhttp3:okhttp:3.14.9")
-	implementation(libs.teamscaleLibCommons)
+	implementation(libs.okhttp.core)
+	implementation(libs.commonsLang)
+	implementation(libs.commonsIo)
 	implementation(libs.picocli.core)
 	annotationProcessor(libs.picocli.codegen)
+	implementation("net.java.dev.jna:jna-platform:5.14.0")
 
 	testImplementation(libs.spark)
 }
@@ -34,22 +84,3 @@ tasks.processResources {
 		}
 	}
 }
-
-graalvmNative {
-	binaries {
-		named("main") {
-			imageName.set("installer")
-			fallback.set(false)
-			// build an executable instead of a shared library
-			sharedLibrary.set(false)
-			buildArgs(
-				// Required for reading files from the filesystem. See https://github.com/oracle/graal/issues/1294
-				"-H:+AddAllCharsets",
-				// Required for HTTP requests
-				"--enable-http", "--enable-https",
-				// Required to include the app.properties file
-				"-H:IncludeResourceBundles=com.teamscale.profiler.installer.app"
-			)
-		}
-	}
-}