Skip to content
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

make the plugin see data stream last by adjusting decorator order, to avoid logging unmasked data #115

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make the plugin see data stream last by adjusting decorator order, to avoid logging unmasked data #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.40</version>
<version>4.42</version>
</parent>

<artifactId>logstash</artifactId>
Expand Down Expand Up @@ -64,17 +64,18 @@
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/logstash-plugin</gitHubRepo>
<skipIntegrationTests>true</skipIntegrationTests>
<jenkins.version>2.249.1</jenkins.version>
<jenkins.version>2.346.1</jenkins.version>
<hpi.compatibleSinceVersion>2.0</hpi.compatibleSinceVersion>
<mockito.version>3.12.4</mockito.version>
<useBeta>true</useBeta>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.249.x</artifactId>
<version>984.vb5eaac999a7e</version>
<artifactId>bom-2.346.x</artifactId>
<version>1478.v81d3dc4f9a_43</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/jenkins/plugins/logstash/pipeline/GlobalDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ public OutputStream decorate(OutputStream logger) throws IOException, Interrupte
@Extension
public static final class Factory implements TaskListenerDecorator.Factory {

@Override
/*
Data stream is passed to this decorator first (it actually sees data in the last)
*/
public boolean isAppliedBeforeMainDecorator() {
return true;
}

@Override
public TaskListenerDecorator of(FlowExecutionOwner owner) {
if (!LogstashConfiguration.getInstance().isEnableGlobally()) {
Expand Down