[
https://issues.apache.org/jira/browse/CAMEL-12004?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16263952#comment-16263952
]
ASF GitHub Bot commented on CAMEL-12004:
----------------------------------------
davsclaus closed pull request #2093: CAMEL-12004 Add isDebugEnabled() guard for
debug level logs
URL: https://github.com/apache/camel/pull/2093
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
b/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
index f341dbb8572..8aaf2b4bbc8 100644
--- a/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
@@ -94,8 +94,9 @@ protected Object evaluateExpression(String expressionText,
String expectedValue)
} else {
value = expression.evaluate(exchange, Object.class);
}
-
- log.debug("Evaluated expression: {} on exchange: {} result: {}",
expression, exchange, value);
+ if (log.isDebugEnabled()) {
+ log.debug("Evaluated expression: {} on exchange: {} result: {}",
expression, exchange, value);
+ }
return value;
}
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
index aa25245df31..746422b2e7c 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
@@ -60,7 +60,9 @@ public void process(Exchange exchange) throws Exception {
Message in = exchange.getIn();
RepositoryCommit commit = (RepositoryCommit) in.getBody();
User author = commit.getAuthor();
- log.debug("Got commit with author: " + author.getLogin() + ": " +
author.getHtmlUrl() + " SHA " + commit.getSha());
+ if (log.isDebugEnabled()) {
+ log.debug("Got commit with author: " + author.getLogin() + ":
" + author.getHtmlUrl() + " SHA " + commit.getSha());
+ }
}
}
}
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
index 02a648069e2..7d15be289e9 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
@@ -131,7 +131,9 @@ protected AbstractMessageListenerContainer
createListenerContainer() throws Exce
answer = new SharedQueueMessageListenerContainer(endpoint,
fixedMessageSelector);
// must use cache level consumer for fixed message selector
answer.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
- log.debug("Using shared queue: " + endpoint.getReplyTo() + "
with fixed message selector [" + fixedMessageSelector + "] as reply listener: "
+ answer);
+ if (log.isDebugEnabled()) {
+ log.debug("Using shared queue: " + endpoint.getReplyTo() +
" with fixed message selector [" + fixedMessageSelector + "] as reply listener:
" + answer);
+ }
} else {
// use a dynamic message selector which will select the
message we want to receive as reply
dynamicMessageSelector = new
MessageSelectorCreator(correlation);
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
index 653ea8426cc..f10aeef0ea9 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
@@ -154,7 +154,7 @@ protected void processInTransaction(final Exchange
exchange) throws Exception {
if (log.isDebugEnabled()) {
// log exception if there was a cause exception so we have the
stack trace
Exception cause = exchange.getException();
- if (cause != null) {
+ if (cause != null && log.isDebugEnabled()) {
log.debug("Transaction rollback (" + transactionKey + ")
redelivered(" + redelivered + ") for "
+ ids + " due exchange was marked for rollbackOnlyLast
and caught: ", cause);
} else {
diff --git
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
index 185a2c1642e..1b5e2369017 100644
---
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
+++
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
@@ -85,8 +85,9 @@ protected void assertExpression(String expressionText, String
expectedValue, Str
} else {
value = expression.evaluate(exchange, Object.class);
}
-
- log.debug("Evaluated expression: " + expression + " on exchange: " +
exchange + " result: " + value);
+ if (log.isDebugEnabled()) {
+ log.debug("Evaluated expression: " + expression + " on exchange: "
+ exchange + " result: " + value);
+ }
assertTrue("Expression: " + expression + " on Exchange: " + exchange,
expectedValue.equals(value) ||
orThisExpectedValue.equals(value));
diff --git
a/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java
b/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java
index 1b800367fa6..20f63b80809 100644
---
a/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java
+++
b/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java
@@ -85,8 +85,9 @@ protected void assertExpression(String expressionText, String
expectedValue, Str
} else {
value = expression.evaluate(exchange, Object.class);
}
-
- log.debug("Evaluated expression: " + expression + " on exchange: " +
exchange + " result: " + value);
+ if (log.isDebugEnabled()) {
+ log.debug("Evaluated expression: " + expression + " on exchange: "
+ exchange + " result: " + value);
+ }
assertTrue(expectedValue.equals(value) ||
orThisExpectedValue.equals(value), "Expression: " + expression + " on Exchange:
" + exchange);
}
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 79ca2e0e331..b2c75080779 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -697,8 +697,10 @@ private void terminateThreads(ThreadGroup threadGroup) {
// even log in future
Thread[] threadsArray = new Thread[1];
threadGroup.enumerate(threadsArray);
- getLog().debug("strange; " + activeCount + " thread(s) still
active in the group "
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("strange; " + activeCount + " thread(s)
still active in the group "
+ threadGroup + " such as " +
threadsArray[0]);
+ }
}
}
}
@@ -806,7 +808,9 @@ private void
addRelevantPluginDependenciesToClasspath(Set<URL> path) throws Mojo
// we must skip org.osgi.core, otherwise we get a
// java.lang.NoClassDefFoundError: org.osgi.vendor.framework
property not set
if (classPathElement.getArtifactId().equals("org.osgi.core")) {
- getLog().debug("Skipping org.osgi.core -> " +
classPathElement.getGroupId() + "/" + classPathElement.getArtifactId() + "/" +
classPathElement.getVersion());
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("Skipping org.osgi.core -> " +
classPathElement.getGroupId() + "/" + classPathElement.getArtifactId() + "/" +
classPathElement.getVersion());
+ }
continue;
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 1b8955d0198..8267a53dd8c 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -190,8 +190,9 @@ public static void prepareDataFormat(Log log, MavenProject
project, MavenProject
OutputStream fos =
buildContext.newFileOutputStream(out);
fos.write(schema.getBytes());
fos.close();
-
- log.debug("Generated " + out + " containing JSon
schema for " + name + " data format");
+ if (log.isDebugEnabled()) {
+ log.debug("Generated " + out + " containing
JSon schema for " + name + " data format");
+ }
}
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
index 5eb94c50ba4..36418a09d99 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
@@ -47,7 +47,9 @@ public static boolean haveResourcesChanged(Log log,
MavenProject project, BuildC
file = new File(r.getDirectory().substring(baseDir.length() +
1));
}
String path = file.getPath() + "/" + suffix;
- log.debug("checking if " + path + " (" + r.getDirectory() + "/" +
suffix + ") has changed.");
+ if (log.isDebugEnabled()) {
+ log.debug("checking if " + path + " (" + r.getDirectory() +
"/" + suffix + ") has changed.");
+ }
if (buildContext.hasDelta(path)) {
log.debug("Indeed " + suffix + " has changed.");
return true;
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 29c2fc22215..86c40052f41 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -224,8 +224,9 @@ public static void prepareLanguage(Log log, MavenProject
project, MavenProjectHe
fos.close();
buildContext.refresh(out);
-
- log.debug("Generated " + out + " containing JSon
schema for " + name + " language");
+ if (log.isDebugEnabled()) {
+ log.debug("Generated " + out + " containing
JSon schema for " + name + " language");
+ }
}
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index ac480d6880a..7b4bb84f987 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -395,9 +395,9 @@ private void fixExcludedDependencies(Document pom) throws
Exception {
List<DependencyNode> nodes = visitor.getNodes();
for (DependencyNode dependencyNode : nodes) {
Artifact artifact = dependencyNode.getArtifact();
-
- getLog().debug("Found dependency node: " + artifact.getGroupId() +
":" + artifact.getArtifactId() + ":" + artifact.getVersion() + " - scope=" +
artifact.getScope());
-
+ if (getLog().isDebugEnabled()) {
+ getLog().debug("Found dependency node: " +
artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" +
artifact.getVersion() + " - scope=" + artifact.getScope());
+ }
if (!Artifact.SCOPE_TEST.equals(artifact.getScope()) &&
!Artifact.SCOPE_PROVIDED.equals(artifact.getScope())) {
String canonicalName = artifact.getGroupId() + ":" +
artifact.getArtifactId();
if (artifacts.contains(canonicalName)) {
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index f092d055e51..97173665abc 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -513,8 +513,10 @@ private void terminateThreads(ThreadGroup threadGroup) {
// even log in future
Thread[] threadsArray = new Thread[1];
threadGroup.enumerate(threadsArray);
- getLog().debug("strange; " + activeCount + " thread(s) still
active in the group "
+ if (getLog().isDebugEnabled()){
+ getLog().debug("strange; " + activeCount + " thread(s)
still active in the group "
+ threadGroup + " such as " +
threadsArray[0]);
+ }
}
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Add LOG.isDebugEnabled() guard for LOG.debug()
> ----------------------------------------------
>
> Key: CAMEL-12004
> URL: https://issues.apache.org/jira/browse/CAMEL-12004
> Project: Camel
> Issue Type: Improvement
> Reporter: Mehran Hassani
> Priority: Minor
> Labels: beginner, help-wanted
>
> I am conducting research on log related bugs. I tried to make a tool to fix
> repetitive yet simple patterns of bugs that are related to logs. In these
> files, there are debug level logging statements containing multiple string
> concatenation or method calls without the if statement before them:
> camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java,
> log.debug("Evaluated expression: " + expression + " on exchange: " + exchange
> + " result: " + value);, 97
> components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java,
> log.debug("Got commit with author: " + author.getLogin() + ": " +
> author.getHtmlUrl() + " SHA " + commit.getSha());, 62
> components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java,
> log.debug("Using shared queue: " + endpoint.getReplyTo() + " with fixed
> message selector [" + fixedMessageSelector + "] as reply listener: " +
> answer);, 133
> components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java,
> log.debug("Transaction rollback (" + transactionKey + ") redelivered(" +
> redelivered + ") for "+ ids + " due exchange was marked for rollbackOnlyLast
> and caught: ", cause);, 157
> components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java,
> log.debug("Evaluated expression: " + expression + " on exchange: " +
> exchange + " result: " + value);, 88
> components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java,
> log.debug("Evaluated expression: " + expression + " on exchange: " +
> exchange + " result: " + value);, 88
> tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java,
> getLog().debug("strange; " + activeCount + " thread(s) still active in the
> group "+ threadGroup + " such as " + threadsArray[0]);, 652
> tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java,
> getLog().debug("Skipping org.osgi.core -> " + classPathElement.getGroupId()
> + "/" + classPathElement.getArtifactId() + "/" +
> classPathElement.getVersion());, 761
> tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java,
> log.debug("Generated " + out + " containing JSon schema for " + name + "
> data format");, 218
> tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java,
> log.debug("checking if " + path + " (" + r.getDirectory() + "/" + suffix +
> ") has changed.");, 48
> tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java,
> log.debug("Generated " + out + " containing JSon schema for " + name + "
> language");, 215
> tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java,
> getLog().debug("Found dependency node: " + artifact.getGroupId() + ":" +
> artifact.getArtifactId() + ":" + artifact.getVersion() + " - scope=" +
> artifact.getScope());, 401
> tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java,
> getLog().debug("strange; " + activeCount + " thread(s) still active in the
> group "+ threadGroup + " such as " + threadsArray[0]);, 515
> Would you be interested in adding the if before these logging statements?
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
