* Fix the bugs mentioned in issue #3562 and #3563.
Fix the issue in the spring-webmvc-v6x-adapter where, after configuring http-method-specify:true, the prefixes for different request methods were not concatenated.
Fix incorrect time unit in the tooltip when adding a new circuit breaker rule with statistical window duration.
* Fix the bugs mentioned in issue #3562 and #3563.
Fix the issue in the spring-webmvc-v6x-adapter where, after configuring http-method-specify:true, the prefixes for different request methods were not concatenated.
Fix incorrect time unit in the tooltip when adding a new circuit breaker rule with statistical window duration.
* Fixed the issue where the original test class was affected by the concatenation of resource names after adding the logic for the HTTP prefix concatenation.
* remove mseHttpMethodSpecify field and update the unit test as suggested.
* retrigger CI
* Simple rules should have higher priority than regular expression rules
* Add optional switch to skip regex matching when simple rules already match, default: false, keeps backward compatibility.
* fix RuleManagerTest unit test failure
* Improved Date formatter
* change in naming conv
* change in datetime format
* Apply suggestions from code review
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* fix issue 2485 which occur oom when using async servlet request.
* optimize imports
* 1. fix the same issue in the webmvc-v6x
2. improve based on review comments
* fix test case SentinelDubboConsumerFilterTest#testDegradeSync
* When test is run slow, count bucket will count on next time span, causing failed test.
* dos2unix ParamFlowDefaultCheckerTest.java
* fix testParamFlowDefaultCheckSingleValueCheckQpsMultipleThreads by rule.setDurationInSec(2)
* set threshold as count in 2 seconds to prevent the failure of the unit test when the unit test runs longer than 1 second.
* fix quarkus test by set /txt sleep 300
* If /txt sleep 500 ms, in testSentinelJaxRsQuarkusAdapter, may cause 2 request intervals of more than 1 s, which cause rate limit policy is not effective.
* fix testDegradeAsync
* When test is run slow, count bucket will count on next time span, causing failed test.
* use testcontainers to fix testConsulDataSourceWhenInit
* Project embedded-consul has been deprecated in favour of org.testcontainers:consul
* use consul testcontainers to fix testConsulDataSourceWhenInit, which means docker is required to run tests.
```
Error: com.alibaba.csp.sentinel.datasource.consul.ConsulDataSourceTest.testConsulDataSourceWhenInit -- Time elapsed: 34.47 s <<< ERROR!
com.pszymczyk.consul.EmbeddedConsulException: Could not start Consul process in 30 seconds
at java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)
at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)
at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:486)
at org.codehaus.groovy.reflection.CachedConstructor.invoke(CachedConstructor.java:72)
```
* introduce intermediate node to avoid ABA problem
* fix ParamFlowPartialIntegrationTest
mock TimeUtil to avoid time changed, and bucket moved to next.
* remove csp.sentinel.log.output.type
remove sysprop csp.sentinel.log.output.type in TimeUtilTest,
to avoid a few outputs.
* try fix testConcurrentAcquireAndRelease
* remove stdout
remove sout in ParamFlowThrottleRateLimitingCheckerTest,
to avoid a few outputs.
* ConcurrentClusterFlowCheckerTest,djust the flowId to prevent conflicts
* CurrentConcurrencyManagerTest,adjust the flowId to prevent conflicts
* update year
mshe