Fixes #1321 新增Client IP 和 Remote Host的具体属性值 #1325
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #1325 +/- ##
=========================================
Coverage 43.05% 43.05%
- Complexity 1625 1626 +1
=========================================
Files 350 350
Lines 10295 10295
Branches 1389 1389
=========================================
Hits 4433 4433
+ Misses 5310 5309 -1
- Partials 552 553 +1
Continue to review full report at Codecov.
|
cdfive
reviewed
Mar 7, 2020
Comment on lines
162
to
163
| // 当参数属性为0-ClientIp 1-Host时，可以选择匹配 | ||
| }else if (Arrays.asList(PARAM_PARSE_STRATEGY_CLIENT_IP, PARAM_PARSE_STRATEGY_HOST).contains(parseStrategy)){ |
There was a problem hiding this comment.
已测试，功能上没问题，赞！
这里}else if建议再格式化下，else前面加个空格会更好看。
这个else if分支里的代码，跟上面的if里的有一些重复，它们的区别是parseStrategy为2-Header 3-URL参数 4-Cookie时，界面上要填写参数名称，其它逻辑是一样的。如果想消除重复代码，可以考虑重构一下。
拆分开也行，建议注释这里可以写更清楚些，比如// 当参数属性为0-ClientIp 1-Host时，不用填写参数名称，可以选择属性值匹配。
sczyh30
added
the
area/gateway-flow-control
|
请重新review |
cdfive
reviewed
Mar 9, 2020
Comment on lines
149
to
153
| } | ||
| String pattern = paramItem.getPattern(); | ||
|
|
||
| // 如果匹配串不为空，验证匹配模式 | ||
| if (StringUtil.isNotEmpty(pattern)) { |
There was a problem hiding this comment.
重复代码已消除，看着更清晰简洁了。
能否麻烦把这里再优化下：
String pattern = paramItem.getPattern();这句是属于下面的逻辑，空行应该在上面，下面是紧密相连的逻辑，空行可以删除，建议把这句放到下面的注释之后，if的上面。
因为空行为了区分逻辑块，增强可读性哈。
|
Thanks for contributing! |
linlinisme
added a commit
to linlinisme/Sentinel
that referenced
this pull request
Nov 24, 2020
* calculate process cpu usage to support application running in container environment * Enhance reliability and performance of InMemoryMetricsRepository (alibaba#1319) * Fix InMemoryMetricsRepository can't keep the last five minutes metrics data problem and Improve read-write performance * Use TimeUtil.currentTimeMillis() replace System.currentTimeMillis() for better performance * dashboard: Support setting value pattern for client IP and host in gateway flow rule dialog (alibaba#1325) * doc: Update JDK requirement of the dashboard in README.md (alibaba#1316) * Following discussions in alibaba#1315 * Add "web-context-unify" config in Spring WebMVC adapter to support "chain" relation flow strategy (alibaba#1328) * Fix the parsing issue in large post request for sentinel-transport-simple-http (alibaba#1255) * Add gateway adapter for Zuul 2.x (alibaba#1138) - also add demo for Zuul 2.x adapter * Polish code and demo of Sentinel Zuul 2.x adapter Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Polish code of transport command centers and heartbeat senders Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Polish logging SPI related code and add general JUL adapter for Logger SPI (alibaba#1338) * Move the legacy JUL methods from LogBase to BaseJulLogger. * Add a JavaLoggingAdapter as the general JUL adapter for the Logger SPI, which makes it convenient to use (as the default logger). * Add LoggerSpiProvider to resolve Logger SPI. * Polish the logback demo. Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Move CommandCenterLog to sentinel-transport-common and polish related code (alibaba#1341) Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Polish placeholders in logging content to slf4j convention (alibaba#1342) * Polish placeholders in logging content to "{}" Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Fix timezone problem of sentinel-block.log Signed-off-by: Eric Zhao <sczyh16@gmail.com> * dashboard: Fix NoNodeException problem of FlowRuleZookeeperProvider example (alibaba#1352) * Introduce logging extension: slf4j (alibaba#1344) * Regroup packages related to logging into a separate module and polish document (alibaba#1355) * Fix CI failure in JDK 11 environment (alibaba#1360) * Supplement missing javax.annotation-api to sentinel-cluster-server-envoy-rls and sentinel-demo-zuul2-gateway * Upgrade mockito-core to 2.28.2 (up to date) * Fix the bug that context was not released when blocked in Spring Web adapter (alibaba#1353) * Improve standard output message in LogBase (alibaba#1357) * Complete the unit tests for sentinel-logging-slf4j module (alibaba#1358) * refactor: Make the ProcessorSlot itself as SPI and deprecate legacy slot chain builder (alibaba#411) * Make slots loaded by SPI, mark all slots with @SpiOrder from -10000 to -1000, improve comment * Reserve gateway and param slot chain builder (just extends DefaultSlotChainBuilder) and mark them as @deprecated * Force modifyRule command handler to fail if an incompatible old fastjson found (alibaba#1377) * Note that this is only a temporary solution. * Set default log level of JDK logging to INFO and polish code of SpiLoader (alibaba#1365) * Improve log info in SpiLoader, improve comment and test case * Use error level in catch block, init ArrayList with capacity and improve add item to list * doc: Polish README.md of sentinel-cluster-server-envoy-rls module Signed-off-by: Eric Zhao <sczyh16@gmail.com> * dashboard: Hide advanced options in flow rule dialog when cluster mode is enabled (alibaba#1367) * doc: Update README.md Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Update fastjson to 1.2.68 Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Bump version to 1.7.2 Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Fix the bug of extracting request cookie in Spring Cloud Gateway adapter (alibaba#1400) * Bump version to 1.8.0-SNAPSHOT Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Add JAX-RS adapter (alibaba#1396) * Fix the bug of misplaced locks in ContextUtil and ClusterNode (alibaba#1429) - which may lead to IllegalMonitorStateException in unlock() when unchecked error occurs during lock() * fix: Tracer does not trace exception to DefaultNode (alibaba#1068) * Support setting project.name via the properties file and deprecate legacy config path (alibaba#1412) * Update resolving logic of project name and polish SentinelConfig (alibaba#1437) Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Refactor the mechanism of recording error in Entry and StatisticSlot * Also polish related complete callbacks Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Polish Tracer with entry.setError(ex) mechanism Signed-off-by: Eric Zhao <sczyh16@gmail.com> * dashboard: Remove duplicate code in MetricEntity (alibaba#1441) * dashboard: Fix the bug that cookie may have conflict with web applications under the same domain (alibaba#1443) * Improve deprecated ParameterMetric purge mechanism (alibaba#1372) * Clear useless data in ParameterMetric for all removed rules * Polish code comments of the fundamental Sph/SphO/SphU class Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Add OkHttp integration (alibaba#1456) * dashboard: Fix historical version compatibility problem for auth check via localStorage (alibaba#1473) * Add exceptionPredicate in Tracer for customized exception filtering logic (alibaba#1496) * test: Add test cases for Tuple2 (alibaba#1501) Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Add support for extracting param from complex object (alibaba#1491) * This could enable specified parameter flow control for customized objects. * Support setting class-level defaultFallback for annotation extension (alibaba#1493) * Add unit test for logging/TokenBucket (alibaba#1504) Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Fix sentinel-apache-dubbo-adapter full GC bug (alibaba#1431) * Polish RocketMQ PullConsumerDemo to make code clear (alibaba#1528) * Add unit test for cluster/FlowResponseDataDecoder (alibaba#1514) Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Improve consumer filter of Dubbo 2.6.x and 2.7.x adapter (alibaba#1532) * entry and exit with params in consumer filter * Polish sentinel-opensource-eco-landscape-en.png Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Add annotation extension for Java EE CDI (alibaba#1541) * Add Sentinel annotation and JAX-RS plugins for Quarkus (alibaba#1542) * Add sentinel-quarkus-adapter module, which provides sentinel-annotation-quarkus-adapter and sentinel-jax-rs-quarkus-adapter to adapt sentinel-annotation-cdi-interceptor and sentinel-jax-rs-adapter for Quarkus. It also provides sentinel-native-image-quarkus-adapter to support running Sentinel with Quarkus in native image mode. * Polish document and code of Sentinel annotation CDI extension Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Upgrade fastjson to 1.2.71 (alibaba#1545) * Add file.encoding JVM args in maven-surefire-plugin to avoid charset problem (alibaba#1550) * Add annotation CDI demo and Quarkus adapter demo (alibaba#1543) * Polish document and rearrange package for Quarkus and JAX-RS adapter Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Support customized origin parser in legacy Dubbo 2.6.x adapter (alibaba#1555) * Add Eureka data-source extension (alibaba#1502) * Upgrade nacos-client version to 1.3.0 in sentinel-datasource-nacos (alibaba#1576) * demo: Update slot chain SPI demo (alibaba#1581) Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Add explicit null checking for charset in SimpleHttpClient#encodeRequestParams (alibaba#1589) * Adapter: Support Apache HttpClient (alibaba#1455) Introduce support through a customized client builder `SentinelApacheHttpClientBuilder`. * doc: Fix mistakes in README.md of sentinel-zuul-adapter (alibaba#1593) * Fix incorrect protocol description in FlowRequestData writer/decoder (alibaba#1607) Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Refactor config mechanism for OkHttp adapter and polish related code - One config per interceptor instead of the global config - Polish document and demo Signed-off-by: Eric Zhao <sczyh16@gmail.com> * test: Add unit test for sentinel-cluster-server and polish code (alibaba#1529) Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Refactor degrade hierarchy with new circuit breaker mechanism and improve strategy * Add `CircuitBreaker` abstraction (with half-open state) and add circuit breaker state change event observer support. * Improve circuit breaking strategy (avg RT → slow request ratio) and make statistics of each rule dependent (to support arbitrary statistic interval). * Add simple "trial" mechanism (aka. half-open). * Refactor mechanism of metric recording and state change handling for circuit breakers: record RT and error when requests have completed (i.e. `onExit`, based on alibaba#1420). Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Update test cases for circuit breaking Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Update demo for circuit breaking (DegradeRule) Signed-off-by: Eric Zhao <sczyh16@gmail.com> * test: Update test cases with new degrade mechanism in sentinel-demo-quarkus Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Remove deprecated passCheck() in Rule and polish interface Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Polish cluster flow control demo: add port in Nacos address (alibaba#1655) Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Polish boolean checking in test cases and dashboard (alibaba#1664) * Remove unused code in TokenServerHandler#channelActive (alibaba#1667) Signed-off-by: cj <power4j@outlook.com> * Optimize the order of slots in ProcessorSlot SPI config (alibaba#1649) * Fix the bug of circuit breaker half-open state transformation when request is blocked by upcoming rules (alibaba#1645) * Refactor the workflow to fix the bug that circuit breaker may remain half-open state forever when the request is blocked by upcoming rules: revert the state change in exit handler (as a temporary workaround) * Add exit handler in Entry as a per-invocation hook. * Polish CircuitBreaker interface and update comments - Only carry context in tryPass/onComplete method (this might be generic in upcoming versions) Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Refactor exit handler mechanism of Entry - Rename: whenComplete -> whenTerminate - Execute the exit handler directly after the onExit hook of all slots Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Add extended interface for metric extension hook to support distinguishing traffic type (alibaba#1665) - Add EntryType args to all hook methods * dashboard: Refactor degrade service/controller and adapt to new features Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Polish Dubbo 2.6.x adapter and unify callback registry into DubboAdapterGlobalConfig (alibaba#1572) * Unify Dubbo callback registry (for fallback and origin parser) into DubboAdapterGlobalConfig * Polish default fallback implementation (wrap exception with RpcResult rather than directly throw it out) Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Refactor extended MetricExtension interface (matching events in Sentinel) - Unify the extended interface as a few event handlers: onPass, onBlocked, onComplete and onError - Polish related code Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Support customized origin parser in Apache Dubbo 2.7.x adapter and unify config (alibaba#1617) * Support customized origin parser in Apache Dubbo 2.7.x adapter * Unify Dubbo callback registry (for fallback and origin parser) into DubboAdapterGlobalConfig * Polish default fallback implementation (wrap exception with RpcResult rather than directly throw it out) * Polish code and README.md of sentinel-datasource-eureka Signed-off-by: Eric Zhao <sczyh16@gmail.com> * webmvc-adapter: improve to avoid ErrorEntryFreeException (alibaba#1533) If entry already exists in request just skip creation. * adapter: Add test cases for Spring WebFlux HandlerFunction (alibaba#1678) * Add RuntimeException converting method in BlockException and polish logic for validation Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Fix NPE bug and improve default fallback in Dubbo 2.7.x adapter - Fix NPE bug in consumer filter (when non-biz error occurred) - Improve default fallback in Dubbo 2.7.x adapter: convert the BlockException to a simple RuntimeException (with necessary message) - Polish code and comments Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Improve compatibility for dispatched servlet request in Spring Web adapter (alibaba#1681) * Bump version to 1.8.0 Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Update README.md Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Bump version to 1.8.1-SNAPSHOT Signed-off-by: Eric Zhao <sczyh16@gmail.com> * Fix typo in CircuitBreakingIntegrationTest (alibaba#1688) Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Pre-calculate intervalInSecond in LeapArray to reduce redundant calculation (alibaba#1700) * doc: Fix typo in code comments (alibaba#1721) * Solve the URI fetching bug in sentinel-zuul-adapter alibaba#1109 (alibaba#1605) Use `getRequestURI` instead of `getServletPath` to get URI of current request(Both in prefix and regex matching). * Fix NPE bug when updating gateway flow rules before the route/API has been requested once (alibaba#1729) * Make NettyTransportClient.getCurrentId() thread safe (alibaba#1707) Fix issue alibaba#1705. - Use CAS to make it thread safe and limited in the declared range. Signed-off-by: cj <power4j@outlook.com> * Add attributes of cluster concurrency limiting in ClusterFlowConfig Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Add concurrency token request/release operation in TokenService Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Add basic cluster concurrency limiting impl in token server module Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * Add unit tests for cluster concurrent limiting checker Signed-off-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> * doc: Fix content in README.md of sentinel-dashboard (alibaba#1737) * Fix the dependency conflict issue * Optimize logging statements using placeholder (alibaba#1736) * Optimize logging statements using placeholder to avoid unnecessary concatenation (issue alibaba#1735) * Polish document and name of parameter (alibaba#1738) - doc: Fix a typo in description of booting options for sentinel-dashboard - Fix mismatched name of parameter to its comment for VersionUtils.parseVersion() * Fix potential concurrency issue when updating flow rules (alibaba#1783) * test: Fix overrunning test `FlowRuleManagerTest.testLoadAndGetRules` (alibaba#1823) Signed-off-by: Jason Joo <hblzxsj@163.com> * Improve default block fallback logic in Dubbo 2.6.x adapter to avoid serialization problem (alibaba#1794) - convert BlockException to a simple RuntimeException (with necessary message) * Fix the problem that requests will never be blocked when slowRatioThreshold = 100% (alibaba#1779) * CI: Polish dependencies for ARM64 and add ARM64 job to Travis CI (alibaba#1765) 1. Added ARM64 architecture in .travis.yml 2. Updated 'embedded-consul' version to 2.2.0, 'consul-api' version to 1.4.5 for ARM64 support. 3. Updated grpc.version for 'io.grpc:protoc-gen-grpc-java' to 1.30.2, for ARM64 support. Signed-off-by: odidev <odidev@puresoftware.com> * [feat alibaba#1839]: Make dashboard support deploying under subpath (alibaba#1851) * dashboard: Add statIntervalMs field in DegradeRule dialog (alibaba#1781) Co-authored-by: tianhao <tianhao@kuaishou.com> Co-authored-by: jy2156121 <zry11@163.com> Co-authored-by: Olof <olof.nord@tutanota.com> Co-authored-by: cdfive <31885791+cdfive@users.noreply.github.com> Co-authored-by: Jason Joo <hblzxsj@163.com> Co-authored-by: tao.zhang <waves_Max@163.com> Co-authored-by: Eric Zhao <sczyh16@gmail.com> Co-authored-by: WongTheo <61610981+WongTheo@users.noreply.github.com> Co-authored-by: 于玉桔 <zhaoyuguang@apache.org> Co-authored-by: Zhiguo.Chen <chenzhiguo@live.com> Co-authored-by: seasidesky <62706379+seasidesky@users.noreply.github.com> Co-authored-by: haifeng <haifeng_yang@163.com> Co-authored-by: johnli <joooohnli@gmail.com> Co-authored-by: zhenxianyimeng <1920405993@qq.com> Co-authored-by: pleasecheckhere2016 <707748808@qq.com> Co-authored-by: ZhiQiang Gu <43897640+yunfeiyanggzq@users.noreply.github.com> Co-authored-by: zechao zheng <15869103363@163.com> Co-authored-by: yangy <root@jcod3r.com> Co-authored-by: xiby <15555438336@163.com> Co-authored-by: iron_city <55343460+DogBaoBao@users.noreply.github.com> Co-authored-by: Bo <15528330581@163.com> Co-authored-by: HupJ <576811031@qq.com> Co-authored-by: Peine <peineliang@163.com> Co-authored-by: cj <jclazz@outlook.com> Co-authored-by: Bill Yip <yezaifei@163.com> Co-authored-by: liqiangz <liqiang.zjhz@gmail.com> Co-authored-by: mikawudi <mikawudi@qq.com> Co-authored-by: dani3lWong <danielw0ng@foxmail.com> Co-authored-by: cj <power4j@outlook.com> Co-authored-by: yunfeiyanggzq <yunfeiyang@buaa.edu.cn> Co-authored-by: Luke <gdjiegz@gmail.com> Co-authored-by: HelloCoCooo <46306510+HelloCoCooo@users.noreply.github.com> Co-authored-by: nickChenyx <nickChenyx@gmail.com> Co-authored-by: Weihua <vip_wangweihua@163.com> Co-authored-by: 王振广 <wzg923@126.com> Co-authored-by: Lynx <65679911+xierunzi@users.noreply.github.com> Co-authored-by: odidev <odidev@puresoftware.com> Co-authored-by: Brent <xuande@inspur.com>
hughpearse
pushed a commit
to hughpearse/Sentinel
that referenced
this pull request
Jun 2, 2021
…teway flow rule dialog (alibaba#1325)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe what this PR does / why we need it
在编辑网关流控规则中
参数属性中的Client IP 和 Remote Host不能设置具体的属性值，Hearder、URL参数、Cookie中可以设置
Does this pull request fix one issue?
Fixes #1321
Describe how you did it
Describe how to verify it
Special notes for reviews