Skip to content

[ISSUE-6491]: Fix Error assertion details for InfluxDB Backend Listener #6492

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

[ISSUE-6491]: Fix Error assertion details for InfluxDB Backend Listener #6492

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
13 changes: 10 additions & 3 deletions src/components/src/main/java/org/apache/jmeter/visualizers/backend/ErrorMetric.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

import java.util.Locale;

import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.report.utils.MetricUtils;
import org.apache.jmeter.samplers.SampleResult;

Expand All @@ -45,15 +47,20 @@ public ErrorMetric() {
public ErrorMetric(SampleResult result) {
if (MetricUtils.isSuccessCode(responseCode) ||
(StringUtils.isEmpty(responseCode) &&
!StringUtils.isEmpty(result.getFirstAssertionFailureMessage()))) {
responseCode = MetricUtils.ASSERTION_FAILED;
responseMessage = result.getFirstAssertionFailureMessage();
!StringUtils.isEmpty(result.getFirstAssertionFailureMessage().getLeft()))) {
responseCode = result.getFirstAssertionFailureMessage().getLeft();
responseMessage = result.getFirstAssertionFailureMessage().getRight();
} else {
responseCode = result.getResponseCode();
responseMessage = result.getResponseMessage();
}
}

public ErrorMetric(AssertionResult assertionResult) {
responseCode = ObjectUtils.isNotEmpty(assertionResult.getName()) ? assertionResult.getName() : "";
responseMessage = ObjectUtils.isNotEmpty(assertionResult.getFailureMessage()) ? assertionResult.getFailureMessage() : "";
}

/**
* @return the response code , '0' if the code is empty
*/
Expand Down
23 changes: 21 additions & 2 deletions src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
import java.util.List;
import java.util.Map;

import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.control.TransactionController;
import org.apache.jmeter.report.processor.DescriptiveStatisticsFactory;
import org.apache.jmeter.samplers.SampleResult;
Expand Down Expand Up @@ -123,8 +125,25 @@ private synchronized void add(SampleResult result, boolean isCumulated) {
successes+=result.getSampleCount()-result.getErrorCount();
} else {
failures+=result.getErrorCount();
ErrorMetric error = new ErrorMetric(result);
errors.put(error, errors.getOrDefault(error, 0) + result.getErrorCount() );
// Check if there are assertion failures
AssertionResult[] assertionResults = result.getAssertionResults();
boolean hasAssertionFailures = false;
// Process all failed assertions
if (ObjectUtils.isNotEmpty(assertionResults)) {
for (AssertionResult assertionResult : assertionResults) {
if (assertionResult.isFailure() || assertionResult.isError()) {
hasAssertionFailures = true;
// Create ErrorMetric for each failed assertion
ErrorMetric error = new ErrorMetric(assertionResult);
errors.put(error, errors.getOrDefault(error, 0) + 1);
}
}
}
// If no assertion failures, create ErrorMetric based on response code/message
if (!hasAssertionFailures) {
ErrorMetric error = new ErrorMetric(result);
errors.put(error, errors.getOrDefault(error, 0) + result.getErrorCount());
}
}
long time = result.getTime();
allResponsesStats.addValue((double) time);
Expand Down
9 changes: 6 additions & 3 deletions src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;

import org.apache.commons.lang3.tuple.Pair;
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.gui.Searchable;
import org.apache.jmeter.testelement.TestPlan;
Expand Down Expand Up @@ -1636,20 +1637,22 @@ public void setIgnore() {
/**
* @return String first non null assertion failure message if assertionResults is not null, null otherwise
*/
public String getFirstAssertionFailureMessage() {
public Pair<String, String> getFirstAssertionFailureMessage() {
String code = null;
String message = null;
AssertionResult[] results = getAssertionResults();

if (results != null) {
// Find the first non-null message
for (AssertionResult result : results) {
code = result.getName();
message = result.getFailureMessage();
if (message != null) {
if (code != null && message != null) {
break;
}
}
}
return message;
return Pair.of(code, message);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ public static String resultToDelimitedString(SampleEvent event,
}

if (saveConfig.saveAssertionResultsFailureMessage()) {
String message = sample.getFirstAssertionFailureMessage();
String message = sample.getFirstAssertionFailureMessage().getRight();
if (message != null) {
text.append(message);
} else {
Expand Down