Skip to content

Fix global instance singleton resolver #138

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
kuzaxak wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix global instance singleton resolver #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
083a5fe
Fix global instance singleton resolver
Oct 16, 2023
9b9a4e9
Fix global instance singleton resolver
Oct 16, 2023
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
3 changes: 2 additions & 1 deletion src/main/java/jenkins/plugins/logstash/LogstashConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import edu.umd.cs.findbugs.annotations.CheckForNull;

import hudson.ExtensionList;
import hudson.util.Secret;
import org.kohsuke.stapler.StaplerRequest;

Expand Down Expand Up @@ -286,7 +287,7 @@ public boolean configure(StaplerRequest staplerRequest, JSONObject json) throws

public static LogstashConfiguration getInstance()
{
return GlobalConfiguration.all().get(LogstashConfiguration.class);
return ExtensionList.lookupSingleton(LogstashConfiguration.class);
}

}
4 changes: 4 additions & 0 deletions src/main/java/jenkins/plugins/logstash/LogstashWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ public boolean isConnectionBroken() {

// Method to encapsulate calls for unit-testing
LogstashIndexerDao getIndexerDao() {
if (Jenkins.getInstanceOrNull() == null) {
return null;
}

return LogstashConfiguration.getInstance().getIndexerInstance();
}

Expand Down
31 changes: 31 additions & 0 deletions src/test/java/jenkins/plugins/logstash/LogstashIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@
import java.util.ArrayList;
import java.util.List;

import hudson.model.labels.LabelAtom;
import org.jenkinsci.plugins.envinject.EnvInjectBuildWrapper;
import org.jenkinsci.plugins.envinject.EnvInjectJobPropertyInfo;
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -62,6 +66,8 @@ public void setup() throws Exception

slave = jenkins.createSlave();
slave.setLabelString("myLabel");
jenkins.createOnlineSlave(new LabelAtom("test"));

project = jenkins.createFreeStyleProject();
}

Expand Down Expand Up @@ -221,6 +227,31 @@ public void enableGlobally() throws Exception
assertThat(lastLine.getJSONArray("message").get(0).toString(),equalTo("Finished: SUCCESS"));
}

@Test
public void enableGloballyOnRemote() throws Exception
{
LogstashConfiguration.getInstance().setEnableGlobally(true);

WorkflowJob p = jenkins.jenkins.createProject(WorkflowJob.class, "pipelineOnWorkerNode");
p.setDefinition(new CpsFlowDefinition("node('test') {echo 'foo'}\n", true));
WorkflowRun build = p.scheduleBuild2(0).get();

assertThat(build.getResult(), equalTo(Result.SUCCESS));
List<JSONObject> dataLines = memoryDao.getOutput();

assertThat(dataLines.size(), greaterThan(10));
boolean containsFoo = dataLines.stream()
.anyMatch(line -> line.getString("message").contains("foo"));
assertThat("Expected at least one line to contain 'foo'", containsFoo, is(true));
JSONObject firstLine = dataLines.get(0);
JSONObject lastLine = dataLines.get(dataLines.size()-1);
JSONObject data = firstLine.getJSONObject("data");

assertThat(data.getString("buildHost"),equalTo("Jenkins"));
assertThat(data.getString("buildLabel"),equalTo("master"));
assertThat(lastLine.getJSONArray("message").get(0).toString(),equalTo("Finished: SUCCESS"));
}

@Test
public void milliSecondTimestamps() throws Exception
{
Expand Down