This is an automated email from the ASF dual-hosted git repository. vladimirsitnikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 389390c664d9612ffc905f6c9504f2e40a9c99b2 Author: KingRabbid <[email protected]> AuthorDate: Mon Oct 6 23:30:03 2025 +0300 Unify the JSR223 logging error statements --- .../java/org/apache/jmeter/assertions/BSFAssertion.java | 2 +- .../org/apache/jmeter/assertions/JSR223Assertion.java | 2 +- .../org/apache/jmeter/extractor/BSFPostProcessor.java | 2 +- .../org/apache/jmeter/extractor/JSR223PostProcessor.java | 2 +- .../org/apache/jmeter/modifiers/BSFPreProcessor.java | 2 +- .../apache/jmeter/modifiers/BeanShellPreProcessor.java | 2 +- .../org/apache/jmeter/modifiers/JSR223PreProcessor.java | 2 +- .../src/main/java/org/apache/jmeter/timers/BSFTimer.java | 2 +- .../java/org/apache/jmeter/timers/BeanShellTimer.java | 2 +- .../main/java/org/apache/jmeter/timers/JSR223Timer.java | 2 +- .../org/apache/jmeter/visualizers/JSR223Listener.java | 2 +- .../jmeter/gui/action/CompileJSR223TestElements.java | 6 +++--- .../java/org/apache/jmeter/util/JSR223TestElement.java | 16 ++++++++-------- .../main/java/org/apache/jmeter/functions/Groovy.java | 2 +- .../jmeter/protocol/java/sampler/JSR223Sampler.java | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java index 57ea8ae84c..0358c6179c 100644 --- a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java +++ b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java @@ -42,7 +42,7 @@ public class BSFAssertion extends BSFTestElement implements Cloneable, Assertion processFileOrScript(mgr); result.setError(false); } catch (BSFException e) { - log.warn("Problem in BSF script", e); + log.warn("Problem in BSF element named: '{}'", getName(), e); result.setFailure(true); result.setError(true); result.setFailureMessage(e.toString()); diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java index ffffe0de72..7ffb8acdba 100644 --- a/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java +++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSR223Assertion.java @@ -50,7 +50,7 @@ public class JSR223Assertion extends JSR223TestElement implements Cloneable, Ass processFileOrScript(scriptEngine, bindings); result.setError(false); } catch (IOException | ScriptException e) { - log.error("Problem in JSR223 script: {}", getName(), e); + log.error("Problem in JSR223 element named: '{}'", getName(), e); result.setError(true); result.setFailureMessage(e.toString()); } diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java index 323c01daeb..1fe97de592 100644 --- a/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java +++ b/src/components/src/main/java/org/apache/jmeter/extractor/BSFPostProcessor.java @@ -39,7 +39,7 @@ public class BSFPostProcessor extends BSFTestElement implements Cloneable, PostP processFileOrScript(mgr); } catch (BSFException e) { if (log.isWarnEnabled()) { - log.warn("Problem in BSF script: {}", e.toString()); + log.warn("Problem in BSF element named: '{}'", getName(), e); } } finally { if (mgr != null) { diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java index 1f3d51ae66..2eadc59f1f 100644 --- a/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java +++ b/src/components/src/main/java/org/apache/jmeter/extractor/JSR223PostProcessor.java @@ -44,7 +44,7 @@ public class JSR223PostProcessor extends JSR223TestElement implements Cloneable, ScriptEngine scriptEngine = getScriptEngine(); processFileOrScript(scriptEngine, null); } catch (ScriptException | IOException e) { - log.error("Problem in JSR223 script, {}", getName(), e); + log.error("Problem in JSR223 element named: '{}'", getName(), e); } } diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java index 0e8a4a7e1c..0c9d8b2115 100644 --- a/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java +++ b/src/components/src/main/java/org/apache/jmeter/modifiers/BSFPreProcessor.java @@ -42,7 +42,7 @@ public class BSFPreProcessor extends BSFTestElement implements Cloneable, PrePro processFileOrScript(mgr); } catch (BSFException e) { if (log.isWarnEnabled()) { - log.warn("Problem in BSF script. {}", e.toString()); + log.warn("Problem in BSF element named: '{}'", getName(), e); } } finally { if (mgr != null) { diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java index f01991dd65..1a56a4d223 100644 --- a/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java +++ b/src/components/src/main/java/org/apache/jmeter/modifiers/BeanShellPreProcessor.java @@ -62,7 +62,7 @@ public class BeanShellPreProcessor extends BeanShellTestElement processFileOrScript(bshInterpreter); } catch (JMeterException e) { if (log.isWarnEnabled()) { - log.warn("Problem in BeanShell script. {}", e.toString()); + log.warn("Problem in BeanShell element named: '{}'", getName(), e); } } } diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java b/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java index 1d2b5132ce..690ebede48 100644 --- a/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java +++ b/src/components/src/main/java/org/apache/jmeter/modifiers/JSR223PreProcessor.java @@ -44,7 +44,7 @@ public class JSR223PreProcessor extends JSR223TestElement implements Cloneable, ScriptEngine scriptEngine = getScriptEngine(); processFileOrScript(scriptEngine, null); } catch (ScriptException | IOException e) { - log.error("Problem in JSR223 script, {}", getName(), e); + log.error("Problem in JSR223 element named: '{}'", getName(), e); } } diff --git a/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java index ae324dba7b..c4abd9a16a 100644 --- a/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java +++ b/src/components/src/main/java/org/apache/jmeter/timers/BSFTimer.java @@ -44,7 +44,7 @@ public class BSFTimer extends BSFTestElement implements Cloneable, Timer, TestBe delay = Long.parseLong(o.toString()); } catch (NumberFormatException | BSFException e) { if (log.isWarnEnabled()) { - log.warn("Problem in BSF script. {}", e.toString()); + log.warn("Problem in BSF element named: '{}'", getName(), e); } } finally { if(mgr != null) { diff --git a/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java index c383f2c49b..9da5a2fa45 100644 --- a/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java +++ b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java @@ -59,7 +59,7 @@ public class BeanShellTimer extends BeanShellTestElement implements Cloneable, T } } catch (JMeterException e) { if (log.isWarnEnabled()) { - log.warn("Problem in BeanShell script. {}", e.toString()); + log.warn("Problem in BeanShell element named: '{}'", getName(), e); } } try { diff --git a/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java b/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java index 6ae5ef2fd4..36455d575d 100644 --- a/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java +++ b/src/components/src/main/java/org/apache/jmeter/timers/JSR223Timer.java @@ -47,7 +47,7 @@ public class JSR223Timer extends JSR223TestElement implements Cloneable, Timer, } delay = Long.parseLong(o.toString()); } catch (NumberFormatException | IOException | ScriptException e) { - log.error("Problem in JSR223 script, {}", getName(), e); + log.error("Problem in JSR223 element named: '{}'", getName(), e); } return delay; } diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java b/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java index ac066f6d7b..3d795ac8eb 100644 --- a/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java +++ b/src/components/src/main/java/org/apache/jmeter/visualizers/JSR223Listener.java @@ -53,7 +53,7 @@ public class JSR223Listener extends JSR223TestElement bindings.put("sampleResult", event.getResult()); processFileOrScript(scriptEngine, bindings); } catch (ScriptException | IOException e) { - log.error("Problem in JSR223 script, {}", getName(), e); + log.error("Problem in JSR223 element named: '{}'", getName(), e); } } diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java index 7539d09d6d..0c7b599542 100644 --- a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java +++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java @@ -70,16 +70,16 @@ public class CompileJSR223TestElements extends AbstractAction implements MenuCre JSR223TestElement element = (JSR223TestElement) userObject; TestBeanHelper.prepare(element); try { - log.info("Compiling {}", element.getName()); + log.info("Compiling JSR223 element named: '{}'", element.getName()); if(!element.compile()) { elementsWithCompilationErrors++; treeNode.setMarkedBySearch(true); } else { - log.info("Compilation succeeded for {}", element.getName()); + log.info("Compilation succeeded for JSR223 element named: '{}'", element.getName()); } } catch (Exception e) { treeNode.setMarkedBySearch(true); - log.error("Error compiling test element {}", element.getName(), e); + log.error("Error compiling JSR223 element named: '{}'", element.getName(), e); } } } diff --git a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java index b46b555d15..19cc910da2 100644 --- a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java +++ b/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java @@ -114,7 +114,7 @@ public abstract class JSR223TestElement extends ScriptingTestElement String lang = getScriptLanguageWithDefault(); ScriptEngine scriptEngine = getInstance().getEngineByName(lang); if (scriptEngine == null) { - throw new ScriptException("Cannot find engine named: '"+lang+"', ensure you set language field in JSR223 Test Element: "+getName()); + throw new ScriptException("Cannot find engine named: '"+lang+"', ensure you set language field in JSR223 element named: " + getName()); } return scriptEngine; @@ -192,11 +192,11 @@ public abstract class JSR223TestElement extends ScriptingTestElement if (!StringUtils.isEmpty(filename)) { if (!scriptFile.isFile()) { throw new ScriptException("Script file '" + scriptFile.getAbsolutePath() - + "' is not a file for element: " + getName()); + + "' is not a file for JSR223 element named: " + getName()); } if (!scriptFile.canRead()) { throw new ScriptException("Script file '" + scriptFile.getAbsolutePath() - + "' is not readable for element:" + getName()); + + "' is not readable for JSR223 element named: " + getName()); } if (!supportsCompilable) { try (BufferedReader fileReader = Files.newBufferedReader(scriptFile.toPath())) { @@ -232,7 +232,7 @@ public abstract class JSR223TestElement extends ScriptingTestElement return scriptEngine.eval(script, bindings); } } else { - throw new ScriptException("Both script file and script text are empty for element:" + getName()); + throw new ScriptException("Both script file and script text are empty for JSR223 element named: " + getName()); } } catch (ScriptException ex) { Throwable rootCause = ex.getCause(); @@ -257,11 +257,11 @@ public abstract class JSR223TestElement extends ScriptingTestElement } catch (ScriptCompilationInvocationTargetException e) { Throwable cause = e.getCause(); if (cause instanceof IOException) { - cause.addSuppressed(new IllegalStateException("Unable to compile script " + newCacheKey)); + cause.addSuppressed(new IllegalStateException("Unable to compile JSR223 script: " + newCacheKey)); throw (IOException) cause; } if (cause instanceof ScriptException) { - cause.addSuppressed(new IllegalStateException("Unable to compile script " + newCacheKey)); + cause.addSuppressed(new IllegalStateException("Unable to compile JSR223 script: " + newCacheKey)); throw (ScriptException) cause; } throw e; @@ -287,7 +287,7 @@ public abstract class JSR223TestElement extends ScriptingTestElement ((Compilable) scriptEngine).compile(getScript()); return true; } catch (ScriptException e) { // NOSONAR - logger.error("Error compiling script for test element {}, error:{}", getName(), e.getMessage()); + logger.error("Error compiling script for JSR223 element named: '{}', error: {}", getName(), e.getMessage()); return false; } } else { @@ -297,7 +297,7 @@ public abstract class JSR223TestElement extends ScriptingTestElement ((Compilable) scriptEngine).compile(fileReader); return true; } catch (ScriptException e) { // NOSONAR - logger.error("Error compiling script for test element {}, error:{}", getName(), e.getMessage()); + logger.error("Error compiling script for JSR223 element named: '{}', error: {}", getName(), e.getMessage()); return false; } } diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java index 23612d0eb2..aad80d35f4 100644 --- a/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java +++ b/src/functions/src/main/java/org/apache/jmeter/functions/Groovy.java @@ -130,7 +130,7 @@ public class Groovy extends AbstractFunction { } } catch (Exception ex) // Mainly for bsh.EvalError { - log.warn("Error running groovy script", ex); + log.warn("Error running Groovy script in element named: {}", currentSampler.getName(), ex); } log.debug("__groovy({},{})={}",script, varName, resultStr); return resultStr; diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java index 22ffd43dee..b8a540c959 100644 --- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java +++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java @@ -74,7 +74,7 @@ public class JSR223Sampler extends JSR223TestElement implements Cloneable, Sampl result.setResponseData(ret.toString(), null); } } catch (IOException | ScriptException e) { - log.error("Problem in JSR223 script {}, message: {}", getName(), e, e); + log.error("Problem in JSR223 element named: '{}'", getName(), e); result.setSuccessful(false); result.setResponseCode("500"); // $NON-NLS-1$ result.setResponseMessage(e.toString());
