From 94132a974f27a88676b15063e9be84b8f9d95940 Mon Sep 17 00:00:00 2001 From: Florian Dreier Date: Thu, 23 Mar 2023 14:07:30 +0100 Subject: [PATCH] TS-33618 Added debug logging --- .../main/java/com/teamscale/jacoco/agent/ResourceBase.java | 2 +- .../com/teamscale/jacoco/agent/options}/RevisionInfo.java | 3 ++- .../jacoco/agent/testimpact/CoverageToTeamscaleStrategy.java | 5 +++-- .../jacoco/agent/testimpact/TestExecutionWriter.java | 5 +++-- sample-app/build.gradle | 4 ++++ 5 files changed, 13 insertions(+), 6 deletions(-) rename {report-generator/src/main/java/com/teamscale/report/testwise/model => agent/src/main/java/com/teamscale/jacoco/agent/options}/RevisionInfo.java (92%) diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/ResourceBase.java b/agent/src/main/java/com/teamscale/jacoco/agent/ResourceBase.java index 751c25835..c6edb0191 100644 --- a/agent/src/main/java/com/teamscale/jacoco/agent/ResourceBase.java +++ b/agent/src/main/java/com/teamscale/jacoco/agent/ResourceBase.java @@ -4,7 +4,7 @@ import com.teamscale.client.TeamscaleServer; import com.teamscale.jacoco.agent.testimpact.TestwiseCoverageAgent; import com.teamscale.jacoco.agent.util.LoggingUtils; -import com.teamscale.report.testwise.model.RevisionInfo; +import com.teamscale.jacoco.agent.options.RevisionInfo; import org.conqat.lib.commons.string.StringUtils; import org.slf4j.Logger; diff --git a/report-generator/src/main/java/com/teamscale/report/testwise/model/RevisionInfo.java b/agent/src/main/java/com/teamscale/jacoco/agent/options/RevisionInfo.java similarity index 92% rename from report-generator/src/main/java/com/teamscale/report/testwise/model/RevisionInfo.java rename to agent/src/main/java/com/teamscale/jacoco/agent/options/RevisionInfo.java index 0d2b049a3..62cb45274 100644 --- a/report-generator/src/main/java/com/teamscale/report/testwise/model/RevisionInfo.java +++ b/agent/src/main/java/com/teamscale/jacoco/agent/options/RevisionInfo.java @@ -1,8 +1,9 @@ -package com.teamscale.report.testwise.model; +package com.teamscale.jacoco.agent.options; import java.io.Serializable; import com.teamscale.client.CommitDescriptor; +import com.teamscale.report.testwise.model.ERevisionType; /** Revision information necessary for uploading reports to Teamscale. */ public class RevisionInfo implements Serializable { diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/CoverageToTeamscaleStrategy.java b/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/CoverageToTeamscaleStrategy.java index 62c8c3077..8fd5db25c 100644 --- a/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/CoverageToTeamscaleStrategy.java +++ b/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/CoverageToTeamscaleStrategy.java @@ -35,8 +35,7 @@ public class CoverageToTeamscaleStrategy extends TestEventHandlerStrategyBase { private final Logger logger = LoggingUtils.getLogger(this); - private final JsonAdapter testwiseCoverageReportJsonAdapter = new Moshi.Builder().build() - .adapter(TestwiseCoverageReport.class); + private final JsonAdapter testwiseCoverageReportJsonAdapter; /** * The path to the exec file into which the coverage of the current test run is appended to. Will be null if there @@ -51,6 +50,8 @@ public class CoverageToTeamscaleStrategy extends TestEventHandlerStrategyBase { public CoverageToTeamscaleStrategy(JacocoRuntimeController controller, AgentOptions agentOptions, JaCoCoTestwiseReportGenerator reportGenerator) { super(agentOptions, controller); + testwiseCoverageReportJsonAdapter = new Moshi.Builder().build() + .adapter(TestwiseCoverageReport.class); this.reportGenerator = reportGenerator; if (!agentOptions.getTeamscaleServerOptions().hasCommitOrRevision()) { diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestExecutionWriter.java b/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestExecutionWriter.java index a17f59458..b4956be6e 100644 --- a/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestExecutionWriter.java +++ b/agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestExecutionWriter.java @@ -20,13 +20,14 @@ public class TestExecutionWriter { private final Logger logger = LoggingUtils.getLogger(this); - private final JsonAdapter testExecutionAdapter = new Moshi.Builder().build() - .adapter(TestExecution.class); + private final JsonAdapter testExecutionAdapter; private final File testExecutionFile; private boolean hasWrittenAtLeastOneExecution = false; public TestExecutionWriter(File testExecutionFile) { + testExecutionAdapter = new Moshi.Builder().build() + .adapter(TestExecution.class); this.testExecutionFile = testExecutionFile; logger.debug("Writing test executions to {}", testExecutionFile); } diff --git a/sample-app/build.gradle b/sample-app/build.gradle index ec8c23221..74f77fca4 100644 --- a/sample-app/build.gradle +++ b/sample-app/build.gradle @@ -29,6 +29,10 @@ jar { } } +application { + mainClass = 'Main' +} + dependencies { // this logback version is the oldest one available that I could get to work and possibly incompatible // with the one used in the agent. This way, we can test if the shadowing works correctly