Skip to content

Fix streaming partial lines in overallLog #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
das7pad wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix streaming partial lines in overallLog #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2a545f
Fix streaming partial lines in overallLog
das7pad Jun 2, 2026
c125d5c
Use incremental from Jenkins core PR 26871
das7pad Jun 3, 2026
eb2ee4b
Bump Jenkins baseline to 2.555
das7pad Jun 4, 2026
09f4c3a
Fix consuming the incremental core PR
das7pad Jun 6, 2026
aa8ccef
Use Jenkins weekly release with the PR changes
das7pad Jun 16, 2026
0d771c2
Bump BOM again
das7pad Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.528</jenkins.baseline>
<jenkins.version>2.532</jenkins.version>
<jenkins.baseline>2.555</jenkins.baseline>
<jenkins.version>2.569</jenkins.version>
<no-test-jar>false</no-test-jar>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
Expand All @@ -75,7 +75,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>5577.vea_979d35b_b_ff</version>
<version>6585.va_085f4d47c41</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/jenkinsci/plugins/workflow/log/ConsoleAnnotators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,15 @@
import jenkins.model.Jenkins;
import jenkins.security.CryptoConfidentialKey;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.Beta;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;

/**
* Some utility code extracted from {@link AnnotatedLargeText} which probably belongs in {@link ConsoleAnnotator} or {@link ConsoleAnnotationOutputStream}.
* @deprecated Use {@link AnnotatedLargeText#writeHtmlToFilter}.
*/
@Restricted(Beta.class)
@Deprecated
public class ConsoleAnnotators {

private static final CryptoConfidentialKey PASSING_ANNOTATOR = new CryptoConfidentialKey(ConsoleAnnotators.class, "consoleAnnotator");
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/org/jenkinsci/plugins/workflow/log/FileLogStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ private void maybeFlush() {
@Override public AnnotatedLargeText<FlowExecutionOwner.Executable> overallLog(@NonNull FlowExecutionOwner.Executable build, boolean complete) {
maybeFlush();
return new AnnotatedLargeText<FlowExecutionOwner.Executable>(log, StandardCharsets.UTF_8, complete, build) {
@Override public long writeHtmlTo(long start, Writer w) throws IOException {
@Override
protected long writeHtmlToFilter(long start, Writer w, ConsoleAnnotationOutputStream<FlowExecutionOwner.Executable> caos) throws IOException {
try (BufferedReader indexBR = index.isFile() ? Files.newBufferedReader(index.toPath(), StandardCharsets.UTF_8) : new BufferedReader(new NullReader(0))) {
ConsoleAnnotationOutputStream<FlowExecutionOwner.Executable> caos = new ConsoleAnnotationOutputStream<>(w, ConsoleAnnotators.createAnnotator(build), build, StandardCharsets.UTF_8);
long r = this.writeRawLogTo(start, new FilterOutputStream(caos) {
return super.writeRawLogTo(start, new FilterOutputStream(caos) {
// To insert startStep/endStep annotations into the overall log, we need to simultaneously read index-log.
// We use the standard LargeText.FileSession to get the raw log text (we need not think about ConsoleNote here), having seeked to the start position.
// Then we read index-log in order, looking for transitions from one step to the next (or to or from non-step overall output).
Expand Down Expand Up @@ -261,8 +261,6 @@ private void maybeFlush() {
super.flush();
}
});
ConsoleAnnotators.setAnnotator(caos.getConsoleAnnotator());
return r;
}
}
};
Expand Down
Loading