You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by "misaya295 (via GitHub)" <gi...@apache.org> on 2023/04/03 07:59:49 UTC
[GitHub] [shenyu] misaya295 opened a new pull request, #4532: Issuse 4466 apollo
misaya295 opened a new pull request, #4532:
URL: https://github.com/apache/shenyu/pull/4532
<!-- Describe your PR here; eg. Fixes #issueNo -->
<!--
Thank you for proposing a pull request. This template will guide you through the essential steps necessary for a pull request.
-->
Make sure that:
- [ ] You have read the [contribution guidelines](https://shenyu.apache.org/community/contributor-guide).
- [ ] You submit test cases (unit or integration tests) that back your changes.
- [ ] Your local test passed `./mvnw clean install -Dmaven.javadoc.skip=true`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] codecov-commenter commented on pull request #4532: Issuse 4466 apollo
Posted by "codecov-commenter (via GitHub)" <gi...@apache.org>.
codecov-commenter commented on PR #4532:
URL: https://github.com/apache/shenyu/pull/4532#issuecomment-1495303697
## [Codecov](https://codecov.io/gh/apache/shenyu/pull/4532?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#4532](https://codecov.io/gh/apache/shenyu/pull/4532?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (01e52db) into [master](https://codecov.io/gh/apache/shenyu/commit/df6d9c7f684f73d33521dfec906c5bc2659122f9?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (df6d9c7) will **decrease** coverage by `0.23%`.
> The diff coverage is `0.00%`.
> :exclamation: Current head 01e52db differs from pull request most recent head 937e167. Consider uploading reports for the commit 937e167 to get more accurate results
```diff
@@ Coverage Diff @@
## master #4532 +/- ##
============================================
- Coverage 68.53% 68.31% -0.23%
+ Complexity 7632 7629 -3
============================================
Files 1028 1032 +4
Lines 29441 29488 +47
Branches 2666 2664 -2
============================================
- Hits 20178 20145 -33
- Misses 7666 7743 +77
- Partials 1597 1600 +3
```
| [Impacted Files](https://codecov.io/gh/apache/shenyu/pull/4532?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...che/shenyu/admin/config/DataSyncConfiguration.java](https://codecov.io/gh/apache/shenyu/pull/4532?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hlbnl1LWFkbWluL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGVueXUvYWRtaW4vY29uZmlnL0RhdGFTeW5jQ29uZmlndXJhdGlvbi5qYXZh) | `71.92% <0.00%> (-17.21%)` | :arrow_down: |
| [...enyu/admin/config/properties/ApolloProperties.java](https://codecov.io/gh/apache/shenyu/pull/4532?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hlbnl1LWFkbWluL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGVueXUvYWRtaW4vY29uZmlnL3Byb3BlcnRpZXMvQXBvbGxvUHJvcGVydGllcy5qYXZh) | `0.00% <0.00%> (ø)` | |
| [...u/admin/listener/apollo/ApolloDataChangedInit.java](https://codecov.io/gh/apache/shenyu/pull/4532?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hlbnl1LWFkbWluL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGVueXUvYWRtaW4vbGlzdGVuZXIvYXBvbGxvL0Fwb2xsb0RhdGFDaGFuZ2VkSW5pdC5qYXZh) | `0.00% <0.00%> (ø)` | |
| [...min/listener/apollo/ApolloDataChangedListener.java](https://codecov.io/gh/apache/shenyu/pull/4532?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hlbnl1LWFkbWluL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGVueXUvYWRtaW4vbGlzdGVuZXIvYXBvbGxvL0Fwb2xsb0RhdGFDaGFuZ2VkTGlzdGVuZXIuamF2YQ==) | `0.00% <0.00%> (ø)` | |
| [...he/shenyu/common/constant/ApolloPathConstants.java](https://codecov.io/gh/apache/shenyu/pull/4532?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hlbnl1LWNvbW1vbi9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hlbnl1L2NvbW1vbi9jb25zdGFudC9BcG9sbG9QYXRoQ29uc3RhbnRzLmphdmE=) | `0.00% <0.00%> (ø)` | |
... and [11 files with indirect coverage changes](https://codecov.io/gh/apache/shenyu/pull/4532/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] yu199195 commented on a diff in pull request #4532: Issuse 4466 apollo
Posted by "yu199195 (via GitHub)" <gi...@apache.org>.
yu199195 commented on code in PR #4532:
URL: https://github.com/apache/shenyu/pull/4532#discussion_r1155773910
##########
shenyu-bootstrap/src/main/resources/application.yml:
##########
@@ -193,31 +193,37 @@ shenyu:
websocket:
urls: ws://localhost:9095/websocket
allowOrigin: ws://localhost:9195
-# zookeeper:
-# url: localhost:2181
-# sessionTimeout: 5000
-# connectionTimeout: 2000
-# http:
-# url: http://localhost:9095
-# username:
-# password:
-# nacos:
-# url: localhost:8848
-# namespace: 1c10d748-af86-43b9-8265-75f487d20c6c
-# username:
-# password:
-# acm:
-# enabled: false
-# endpoint: acm.aliyun.com
-# namespace:
-# accessKey:
-# secretKey:
-# etcd:
-# url: http://localhost:2379
-# consul:
-# url: http://localhost:8500
-# waitTime: 1000
-# watchDelay: 1000
+ # apollo:
Review Comment:
this fomat is erro
##########
shenyu-bootstrap/src/main/resources/application.yml:
##########
@@ -193,31 +193,37 @@ shenyu:
websocket:
urls: ws://localhost:9095/websocket
allowOrigin: ws://localhost:9195
-# zookeeper:
-# url: localhost:2181
-# sessionTimeout: 5000
-# connectionTimeout: 2000
-# http:
-# url: http://localhost:9095
-# username:
-# password:
-# nacos:
-# url: localhost:8848
-# namespace: 1c10d748-af86-43b9-8265-75f487d20c6c
-# username:
-# password:
-# acm:
-# enabled: false
-# endpoint: acm.aliyun.com
-# namespace:
-# accessKey:
-# secretKey:
-# etcd:
-# url: http://localhost:2379
-# consul:
-# url: http://localhost:8500
-# waitTime: 1000
-# watchDelay: 1000
+ # apollo:
Review Comment:
this fomat is error
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] yu199195 commented on a diff in pull request #4532: Issuse 4466 apollo
Posted by "yu199195 (via GitHub)" <gi...@apache.org>.
yu199195 commented on code in PR #4532:
URL: https://github.com/apache/shenyu/pull/4532#discussion_r1155773085
##########
shenyu-bootstrap/src/main/resources/application.yml:
##########
@@ -116,47 +116,47 @@ shenyu:
allocType: "pooled"
messageSizeEstimator: 8
singleEventExecutorPerGroup: true
-# httpclient:
-# strategy: webClient
-# connectTimeout: 45000
-# responseTimeout: 3000
-# readerIdleTime: 3000
-# writerIdleTime: 3000
-# allIdleTime: 3000
-# readTimeout: 3000
-# writeTimeout: 3000
-# wiretap: false
-# keepAlive: false
-# maxInMemorySize: 1 #1mb
-# pool:
-# type: ELASTIC
-# name: proxy
-# maxConnections: 16
-# acquireTimeout: 45000
-# maxIdleTime: 3000
-# proxy:
-# host:
-# port:
-# username:
-# password:
-# nonProxyHostsPattern:
-# ssl:
-# useInsecureTrustManager: true
-# keyStoreType: PKCS12
-# keyStorePath: classpath:keystore.p12
-# keyStorePassword: 123456
-# keyStoreProvider:
-# keyPassword: 123456
-# trustedX509Certificates:
-# handshakeTimeout:
-# closeNotifyFlushTimeout:
-# closeNotifyReadTimeout:
-# defaultConfigurationType:
-# threadPool:
-# prefix: shenyu
-# selectCount: 1
-# workerCount: 8
-# daemon: true
+ # httpclient:
Review Comment:
not modify this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] yu199195 commented on a diff in pull request #4532: Issuse 4466 apollo
Posted by "yu199195 (via GitHub)" <gi...@apache.org>.
yu199195 commented on code in PR #4532:
URL: https://github.com/apache/shenyu/pull/4532#discussion_r1155778324
##########
shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyService.java:
##########
@@ -91,11 +91,10 @@ public Mono<Object> genericInvoker(final String body, final MetaData metaData, f
})).onErrorMap(exception -> exception instanceof GenericException ? new ShenyuException(((GenericException) exception).getExceptionMessage()) : new ShenyuException(exception));
}
- @SuppressWarnings("unchecked")
private CompletableFuture<Object> invokeAsync(final GenericService genericService, final String method, final String[] parameterTypes, final Object[] args) throws GenericException {
//Compatible with asynchronous calls of lower Dubbo versions
genericService.$invoke(method, parameterTypes, args);
- Object resultFromFuture = RpcContext.getContext().getFuture();
- return resultFromFuture instanceof CompletableFuture ? (CompletableFuture<Object>) resultFromFuture : CompletableFuture.completedFuture(resultFromFuture);
+ CompletableFuture<Object> future = RpcContext.getServiceContext().getCompletableFuture();
Review Comment:
All apache dubbo version have this method？
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] yu199195 merged pull request #4532: [Issuse#4466] sync data support apollo
Posted by "yu199195 (via GitHub)" <gi...@apache.org>.
yu199195 merged PR #4532:
URL: https://github.com/apache/shenyu/pull/4532
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] yu199195 commented on a diff in pull request #4532: Issuse 4466 apollo
Posted by "yu199195 (via GitHub)" <gi...@apache.org>.
yu199195 commented on code in PR #4532:
URL: https://github.com/apache/shenyu/pull/4532#discussion_r1155773457
##########
shenyu-bootstrap/src/main/resources/application.yml:
##########
@@ -167,19 +167,19 @@ shenyu:
allowedHeaders:
allowedMethods: "*"
allowedAnyOrigin: true # the same of Access-Control-Allow-Origin: "*"
-# allowedOrigin:
+ # allowedOrigin:
Review Comment:
not modify this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] misaya295 commented on a diff in pull request #4532: Issuse 4466 apollo
Posted by "misaya295 (via GitHub)" <gi...@apache.org>.
misaya295 commented on code in PR #4532:
URL: https://github.com/apache/shenyu/pull/4532#discussion_r1156628827
##########
shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/ApacheDubboPlugin.java:
##########
@@ -63,15 +63,15 @@ protected Mono<Void> doDubboInvoker(final ServerWebExchange exchange,
final RuleData rule,
final MetaData metaData,
final String param) {
- RpcContext.getContext().setAttachment(Constants.DUBBO_SELECTOR_ID, selector.getId());
- RpcContext.getContext().setAttachment(Constants.DUBBO_RULE_ID, rule.getId());
- RpcContext.getContext().setAttachment(Constants.DUBBO_REMOTE_ADDRESS, Objects.requireNonNull(exchange.getRequest().getRemoteAddress()).getAddress().getHostAddress());
+ RpcContext.getClientAttachment().setAttachment(Constants.DUBBO_SELECTOR_ID, selector.getId());
Review Comment:
It should be submitted incorrectly. this pr does not involve changes to dubbo. I will fix it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] yu199195 commented on a diff in pull request #4532: Issuse 4466 apollo
Posted by "yu199195 (via GitHub)" <gi...@apache.org>.
yu199195 commented on code in PR #4532:
URL: https://github.com/apache/shenyu/pull/4532#discussion_r1155776792
##########
shenyu-examples/shenyu-examples-http/src/main/resources/application.yml:
##########
@@ -20,12 +20,37 @@ server:
max-http-form-post-size: 100MB
shenyu:
+# register:
+# registerType: nacos #http #zookeeper #etcd #nacos #consul
+# serverLists: 192.168.1.220:8848 #localhost:2181 #http://localhost:2379 #localhost:8848
+# props:
+# sessionTimeout: 5000
+# connectionTimeout: 2000
+# checked: true
+# zombieCheckThreads: 10
+# zombieCheckTimes: 5
+# scheduledTime: 10
+# nacosNameSpace: cab5cbe-d9d4-4a65-81f0-89d7511fdc7c
register:
- registerType: http #zookeeper #etcd #nacos #consul
- serverLists: http://localhost:9095 #localhost:2181 #http://localhost:2379 #localhost:8848
+ registerType: apollo #http #zookeeper #etcd #nacos #consul
Review Comment:
not modify this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shenyu] yu199195 commented on a diff in pull request #4532: Issuse 4466 apollo
Posted by "yu199195 (via GitHub)" <gi...@apache.org>.
yu199195 commented on code in PR #4532:
URL: https://github.com/apache/shenyu/pull/4532#discussion_r1155778597
##########
shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/main/java/org/apache/shenyu/plugin/apache/dubbo/ApacheDubboPlugin.java:
##########
@@ -63,15 +63,15 @@ protected Mono<Void> doDubboInvoker(final ServerWebExchange exchange,
final RuleData rule,
final MetaData metaData,
final String param) {
- RpcContext.getContext().setAttachment(Constants.DUBBO_SELECTOR_ID, selector.getId());
- RpcContext.getContext().setAttachment(Constants.DUBBO_RULE_ID, rule.getId());
- RpcContext.getContext().setAttachment(Constants.DUBBO_REMOTE_ADDRESS, Objects.requireNonNull(exchange.getRequest().getRemoteAddress()).getAddress().getHostAddress());
+ RpcContext.getClientAttachment().setAttachment(Constants.DUBBO_SELECTOR_ID, selector.getId());
Review Comment:
All apache dubbo version have this method？
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@shenyu.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org