This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new d2331afd4d7 Refactor PipelineLoggerFilter for extension (#36838)
d2331afd4d7 is described below
commit d2331afd4d77977dbcdd1533f901523d7fcb539f
Author: Hongsheng Zhong <[email protected]>
AuthorDate: Fri Oct 10 16:40:27 2025 +0800
Refactor PipelineLoggerFilter for extension (#36838)
* Extract static methods for PipelineLoggerFilter
* Fix proxy container name
* Replace List to Set for ignoredLoggerNames
---
.../pipeline/logger/PipelineLoggerFilter.java | 37 +++++++++++++++++-----
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/logger/PipelineLoggerFilter.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/logger/PipelineLoggerFilter.java
index d7ec2528cad..a8f601de2ea 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/logger/PipelineLoggerFilter.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/logger/PipelineLoggerFilter.java
@@ -21,30 +21,51 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
import com.google.common.base.Strings;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
import java.util.Arrays;
-import java.util.List;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
public final class PipelineLoggerFilter extends Filter<ILoggingEvent> {
- private static final List<String> IGNORE_LOGGER_NAMES =
Arrays.asList(":mysql", ":zookeeper", ":postgresql", ":opengauss");
+ private static final Set<String> IGNORED_LOGGER_NAMES =
getIgnoredLoggerNames();
- private static final String[] IGNORE_ATOMIKOS_ARGS = new String[]{"- tips
& advice", "- working demos", "- access to the full documentation",
- "- special exclusive bonus offers not available to others"};
+ private static final Map<String, String[]> IGNORED_PROXY_LOG_ARGS =
getIgnoredProxyLogArgs();
+
+ private static Set<String> getIgnoredLoggerNames() {
+ Set<String> result = new HashSet<>();
+ result.add(":zookeeper");
+ result.add(":mysql");
+ result.add(":postgresql");
+ result.add(":opengauss");
+ return result;
+ }
+
+ private static Map<String, String[]> getIgnoredProxyLogArgs() {
+ Map<String, String[]> result = new LinkedHashMap<>();
+ result.put("atomikos", new String[]{"- tips & advice", "- working
demos", "- access to the full documentation", "- special exclusive bonus offers
not available to others"});
+ return result;
+ }
@Override
public FilterReply decide(final ILoggingEvent event) {
- if (IGNORE_LOGGER_NAMES.contains(event.getLoggerName())) {
+ if (IGNORED_LOGGER_NAMES.contains(event.getLoggerName())) {
return FilterReply.DENY;
}
- if (":Pipeline-Proxy".equals(event.getLoggerName())) {
+ if ((":" +
ProxyContainerConstants.PROXY_CONTAINER_NAME_PREFIX).equals(event.getLoggerName()))
{
for (Object each : event.getArgumentArray()) {
String arg = each.toString();
if (Strings.isNullOrEmpty(arg)) {
continue;
}
- if ("atomikos".equalsIgnoreCase(arg) ||
Arrays.stream(IGNORE_ATOMIKOS_ARGS).anyMatch(arg::contains)) {
- return FilterReply.DENY;
+ for (Entry<String, String[]> entry :
IGNORED_PROXY_LOG_ARGS.entrySet()) {
+ if (entry.getKey().equalsIgnoreCase(arg) ||
Arrays.stream(entry.getValue()).anyMatch(arg::contains)) {
+ return FilterReply.DENY;
+ }
}
}
}