[Feature]Support configure heartbeat api path of dashboard - #515

Merged

sczyh30 merged 48 commits into

alibaba:masterfrom

nick-tan:feature/add-dashboard-heartbeat-api-path

Dec 10, 2019

nick-tan commented Feb 24, 2019 •

edited by sczyh30

Loading

Contributor

Describe what this PR does / why we need it

Sentinel transport module does not support configuring API path of dashboard heartbeat.

Does this pull request fix one issue?

Resolves #332

Describe how you did it

add a property item (-Dcsp.sentinel.heartbeat.api.path) to support this

Describe how to verify it

run the test case

Special notes for reviews

all4you and others added 30 commits

February 10, 2019 16:05


          doc: add blog with Sentinel in action (#392)

faac56d


          dashboard: make fallbackToLocalWhenFail be configurable in dashboard …

4c4cb34

…and fix edit rule issue when cancel (#370)

- Make fallbackToLocalWhenFail of cluster rules configurable in dashboard
- Fix edit rule when hit cancel button (object share problem solved by deep copy)
- Add metric table td header's title for friendly prompt info


          dashboard: add healthCount/total information in sidebar of Sentinel d…

d3b3d65

…ashboard (#376)


          dashboard: structure rearrangement and polish related code

471bdf7

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          dashboard: change text of p_qps and b_qps to be more intuitive in mon…

883565a

…itoring page (#398)


          dashboard: frontend refinement of monitoring page and flow rule dialo…

4118cae

…g description

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Add adapter support for Zuul 1.x (#188)

219877d

- implement `SentinelPreFilter`, `SentinelPostFilter` and `SentinelErrorFilter`
- support fallback


          Update document and pom for sentinel-zuul-adapter

95ca72c

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Update cluster demo README and remove unused demo

cca5849

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Remove redundant semicolon in MetricWriter (#412)


          Fix incorrect comment in NodeSelectorSlot javadoc (#419)

f089afd


          dashboard: when click the first-level menu of sidebar, don't jump to …

d352f41

…the home page (#422)


          Bug fix: fix 420, fix negative waitTime in RateLimiterController and …

aacb4d6

…WarmUpRateLimiterController

Signed-off-by: Carpenter Lee <hooleeucas@163.com>


          Improve cluster embedded demo

dd11dc3

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          doc: fix typo in README of Sentinel Dubbo Demo (#425)

9465fee


          Upgrade Dubbo version in sentinel-demo-dubbo (#436)

636ba05


          Rename dashboard package name from com.taobao to com.alibaba (#435)

829fde2

Signed-off-by: Carpenter Lee <hooleeucas@163.com>


          Add logback dependency in sentinel-demo-nacos-datasource to avoid log…

b760ad9

… ClassNotFoundException thrown by Nacos client (#438)


          dashboard: update WebConfig and improve token server list page

1f8236a

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Add catch throwable logic in ClusterStateManager to detect fatal erro…

9e62b68

…r when loading SPI

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Fixes #453: Support tracing exception count for specific entry or con…

b1238f8

…text in Tracer

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Remove slf4j dependency in sentinel-annotation-aspectj

c1c9367

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Fix error value type and rename variable in EntranceNode class (#457)

9e257f1


          Remove duplicate comment in WarmUpController (#464)

75eb58d


          Fix zero-count divide overflow bug in RateLimiterController (#461)


          HashMap init optimize when adding new ClusterNode to cluster node map (…

…#465)

- reuse old map size to avoid rearrange and rehash the map


          Code and javadoc refinement

146dee9

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Update dependency version of fastjson and jacoco-maven-plugin

abad82a

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Make build faster by reducing fixed waiting time in tests (#449)

45b4f97

- Apply awaitility to core tests
- Cache maven local repo in Travis


          Add some unit test for StatisticNode, ClusterNode and DefaultNodeBuil…

da5e1cd

…der class (#423)

sczyh30 and others added 15 commits

February 10, 2019 16:05


          Add back thread count metric type support for parameter flow control

cb2cb2f

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Add volatile in double-checked locking field in ClusterBuilderSlot (#466

c0d9318


          Improve ClusterServerConfigManager in sentinel-cluster-server-default…

5f98bf0

… and add basic test cases

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Update Nacos SDK version to 0.8 and update Nacos namespace demo (#474)

9ea2d7c


          Carry the triggered rule in subclasses of BlockException (#469)

* Extract getRule in BlockException and refine override methods in subclasses

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Fix NPE bug when creating connection group in ConnectionManager

7fb4ebf

- The NPE will occur when multiple threads are trying to create the connection group for the same namespace

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Improve and fix bugs for ConnectionManager and add test cases

9b9c502

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Merge pull request #2 from alibaba/master

04fc367

同步远程仓库最近代码


          Bug fix: NPE when adding event count in ParamMapBucket (#494)

5c7fb9f

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Fix bug of calculating param size and amount in ParamFlowRequestDataW…

6c496f7

…riter of Sentinel cluster (#495)

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Bump version to 1.4.2 (release)

c7cfb3a

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Fix incorrect resource name print in log in README.md (#506)

c8bf29a


          Bump version to 1.5.0-SNAPSHOT

4f04797

Signed-off-by: Eric Zhao <sczyh16@gmail.com>


          Change default value of avgUsedTokens to zero to be more meaningful i…

bc06947

…n DefaultController (#460)


          Fix concurrent error in InMemoryMetricsRepository of the dashboard (#488

ab2ab9f

)

- fix ConcurrentModificationException of listResourcesOfApp method

codecov-io commented Feb 24, 2019 •

edited

Loading

Codecov Report

Merging #515 into master will decrease coverage by 4.03%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master     #515      +/-   ##
============================================
- Coverage     41.71%   37.68%   -4.04%     
+ Complexity     1376     1100     -276     
============================================
  Files           304      259      -45     
  Lines          8764     8174     -590     
  Branches       1182     1113      -69     
============================================
- Hits           3656     3080     -576     
- Misses         4662     4700      +38     
+ Partials        446      394      -52

Impacted Files	Coverage Δ	Complexity Δ
...ain/java/com/alibaba/csp/sentinel/util/IdUtil.java	`0% <0%> (-100%)`	`0% <0%> (-6%)`
.../sentinel/adapter/dubbo/DubboAppContextFilter.java	`0% <0%> (-100%)`	`0% <0%> (-3%)`
...sp/sentinel/adapter/dubbo/AbstractDubboFilter.java	`0% <0%> (-100%)`	`0% <0%> (-4%)`
...alibaba/csp/sentinel/adapter/dubbo/DubboUtils.java	`0% <0%> (-66.67%)`	`0% <0%> (-2%)`
...nel/adapter/dubbo/SentinelDubboProviderFilter.java	`0% <0%> (-64%)`	`0% <0%> (-2%)`
...nel/adapter/dubbo/SentinelDubboConsumerFilter.java	`0% <0%> (-57.15%)`	`0% <0%> (-2%)`
...va/com/alibaba/csp/sentinel/init/InitExecutor.java	`12.82% <0%> (-47.71%)`	`2% <0%> (-4%)`
...java/com/alibaba/csp/sentinel/util/StringUtil.java	`15.38% <0%> (-32.7%)`	`10% <0%> (-18%)`
...src/main/java/com/alibaba/csp/sentinel/Tracer.java	`0% <0%> (-31.15%)`	`0% <0%> (-12%)`
...ntinel/slots/block/flow/param/ParameterMetric.java	`50% <0%> (-25%)`	`27% <0%> (-2%)`
... and 159 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 062385f...83af836. Read the comment docs.

sczyh30 added the to-review label

nick-tan added 2 commits

March 3, 2019 04:57


          Merge remote-tracking branch 'upstream/master'

440d8a0


          add dashboard heatbeat api path

83af836

CLAassistant commented Jun 28, 2019 •

edited

Loading

All committers have signed the CLA.

jasonjoo2010 commented Jun 28, 2019

Collaborator

May I ask that what's the scenario for add a prefix path? Kinds of virtual path?

sczyh30 added the kind/enhancement label

sczyh30 commented Dec 9, 2019

Member

May I ask that what's the scenario for add a prefix path? Kinds of virtual path?

See #332 (though it's rare). Maybe the property item could be used for the arbitrary registry URL path, not just for the prefix.

sczyh30 approved these changes

View reviewed changes

sczyh30 left a comment

Member

LGTM

sczyh30 merged commit 9beb655 into alibaba:master

sczyh30 commented Dec 10, 2019

Member

Thanks for contributing! I'll improve the related code later.

sczyh30 removed the to-review label

sczyh30 added this to the 1.7.1 milestone

sczyh30 mentioned this pull request

Suggestions for Sentinel dashboard #932

Open

hughpearse pushed a commit to hughpearse/Sentinel that referenced this pull request


          Support configuration for the heartbeat API path in transport module (a…

bb31498

…libaba#515)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/enhancement