[dubbo-go] branch develop updated (c291d2c -> d654f3a)
This is an automated email from the ASF dual-hosted git repository. flycash pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. from c291d2c Merge pull request #344 from flycash/feature/dubbo-context new 55655d3 fix bug new 415d590 ptr zk.lock new cb9cc37 fix bug new d654f3a Merge pull request #346 from pantianying/zk_develop The 1344 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: remoting/zookeeper/client.go | 83 ++ remoting/zookeeper/listener.go | 7 +++- 2 files changed, 58 insertions(+), 32 deletions(-)
[dubbo] branch master updated: add comment for FutureAdapter, see #3979
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 3bc4508 add comment for FutureAdapter, see #3979
3bc4508 is described below
commit 3bc4508d09756a40c85ddf0c62b94aaf5d957d58
Author: ken.lj
AuthorDate: Sun Feb 2 12:36:28 2020 +0800
add comment for FutureAdapter, see #3979
---
.../main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
index 1e119f1..2dcebda 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
@@ -26,7 +26,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
/**
- * FutureAdapter
+ * This is the type of the Future instance users get in an async call:
+ * 1. unwrap AppResponse in appResponseFuture and convert to plain biz result
represented by FutureAdapter.
+ * 2. customized behaviors meaningful for RPC, for example, {@link
#cancel(boolean)}
*/
public class FutureAdapter extends CompletableFuture {
[dubbo] branch master updated: fix monitor filter: consumer side elapsed time is negative (#5705)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 67eecab fix monitor filter: consumer side elapsed time is negative
(#5705)
67eecab is described below
commit 67eecabf44d2a00ab95d9606dc3c34188c6c0d11
Author: ken.lj
AuthorDate: Sun Feb 2 12:15:14 2020 +0800
fix monitor filter: consumer side elapsed time is negative (#5705)
---
.../main/java/org/apache/dubbo/monitor/support/MonitorFilter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
index 036653c..6a4b899 100644
---
a/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
+++
b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
@@ -83,7 +83,7 @@ public class MonitorFilter implements Filter,
Filter.Listener2 {
@Override
public Result invoke(Invoker invoker, Invocation invocation) throws
RpcException {
if (invoker.getUrl().hasParameter(MONITOR_KEY)) {
-invocation.setAttachment(MONITOR_FILTER_START_TIME,
String.valueOf(System.currentTimeMillis()));
+invocation.put(MONITOR_FILTER_START_TIME,
System.currentTimeMillis());
getConcurrent(invoker, invocation).incrementAndGet(); // count up
}
return invoker.invoke(invocation); // proceed invocation chain
@@ -98,7 +98,7 @@ public class MonitorFilter implements Filter,
Filter.Listener2 {
@Override
public void onMessage(Result result, Invoker invoker, Invocation
invocation) {
if (invoker.getUrl().hasParameter(MONITOR_KEY)) {
-collect(invoker, invocation, result,
RpcContext.getContext().getRemoteHost(), Long.valueOf((String)
invocation.getAttachment(MONITOR_FILTER_START_TIME)), false);
+collect(invoker, invocation, result,
RpcContext.getContext().getRemoteHost(), (long)
invocation.get(MONITOR_FILTER_START_TIME), false);
getConcurrent(invoker, invocation).decrementAndGet(); // count down
}
}
@@ -106,7 +106,7 @@ public class MonitorFilter implements Filter,
Filter.Listener2 {
@Override
public void onError(Throwable t, Invoker invoker, Invocation
invocation) {
if (invoker.getUrl().hasParameter(MONITOR_KEY)) {
-collect(invoker, invocation, null,
RpcContext.getContext().getRemoteHost(), Long.valueOf((String)
invocation.getAttachment(MONITOR_FILTER_START_TIME)), true);
+collect(invoker, invocation, null,
RpcContext.getContext().getRemoteHost(), (long)
invocation.get(MONITOR_FILTER_START_TIME), true);
getConcurrent(invoker, invocation).decrementAndGet(); // count down
}
}
[dubbo-go] branch feature/rest updated (932e149 -> e899345)
This is an automated email from the ASF dual-hosted git repository. flycash pushed a change to branch feature/rest in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. from 932e149 Mod: upgrade hessian2 add cabd56a Fix: readme add c268f8f Fix: fix jsonprc about 'HTTP/1.1' add 2c5a4f6 fix zookeeper config center namespace default value invalid add cd37e52 Merge pull request #326 from zouyx/feature/fixConfigCenter add 979acb2 Merge pull request #305 from apache/develop add 35abd82 feat(grpc): 支持client grpc 调用 add c47b089 support grpc server add ae67fa1 stash for cli & server test add 4cd0a60 move some to internal add 1fb4d91 fmt add c7d140d stop for client test add ac47753 add new client test add 3e839f3 add invoker test add ddb3c64 use another port add 68fea4b change port add dd5273f add doc add 8f5c6c3 feat(client): add dubbo proto generate add 9617d26 feat(client): add dubbo proto generate add e9017cb fmt add ebcb9f6 fmt & tidy add 7a5be71 bug fix add 7fa1bbd fmt add 5029e32 Merge pull request #275 from xujianhai666/feature/grpc-client add 47131f2 resolve conflicts add 78818e8 Merge pull request #312 from flycash/grpc add d9d334a Mod: modidfy Refer params and add licence add 2d6f7f3 Fmt: package add 1c0e422 Merge pull request #317 from fangyincheng/feature/grpc add 3897328 Merge pull request #311 from apache/feature/grpc add 748ed1c Merge remote-tracking branch 'apache/develop' into develop add 0b74040 Fix: omitted param add 45363f2 Mod: README.md add 7c3178e modify add ff410ac Merge pull request #327 from fangyincheng/develop add 8d34495 Add: travis dingding add 5d1797b supplement rpc stats add df48230 fix unit test add 5bc05b9 fix ci add 436924f fix comment issue add ae41f5a fix comment issue add 3aa39fd fix some naming error add f8d1ecd Merge pull request #328 from CodingSinger/tolerance add 5212a3d GOLINT: add comment for exported (checked by golint) add e2dc717 Add: dingding robot in travis yml add f5c2390 Merge branch 'develop' of https://github.com/apache/dubbo-go into develop add da6d29a Context support add e945c66 format code add a81c012 Fix review: context.TODO => context.Backgroud add ab69968 Fix review: split imports add 29c195d Fix Review add 1fa4bf6 Merge pull request #330 from flycash/feature/context add adf366a update license and notice add bc23f7c Merge pull request #336 from zouyx/feature/UpdateLicense add d63631b Add opentracing dependency add a8e952e define TracingFilter add e556b01 Doing tracing filter add 833000b Doing tracing filter add 5c78245 tested tracing filter add 5216fb1 rearrnage imports add e07ca04 Move context to the invocation add 0c19b52 Using default context.Context. add cc7fc72 Merge origin develop add e071810 Pass Context from client add 37d517e Merge context add 70a7436 Merge develop add c48b3cb JsonRPC tracing chain add aec964d Split import add 0196c0e Remove TODO add d9075ad Merge pull request #335 from flycash/feature/Opentracing add c07e4e3 Merge commit 'd9075ad' into feature/add_comment_for_exported_by_golint add c8b6fdd Merge pull request #333 from weiwei-xiao/feature/add_comment_for_exported_by_golint add c9ab3f2 Update Changes.md add 0128e85 Merge pull request #338 from zouyx/feature/UpdateChanges add 351e1ae Imp: reduce lock scope add 93f865c Mod: gofmt add 5dd99c6 Merge pull request #318 from divebomb/develop add d7ff97b Merge branch 'develop' add c028651 Fix: by goreportcard.com add ddd70ee Fix: add type for var add e019139 Mod: go fmt add 6ec3894 Merge branch 'develop' add ea95e04 Fix: golint by goreportcard.com add deb9ea1 Merge branch 'develop' add 5a71b39 Add: log/comment rule add bd84cfa add unit_test add 6809d8d a add 82fe079 Merge remote-tracking branch 'apache/develop' into develop add 0804c09 modify zk ListenServiceEvent add ade85d6 modify zk ListenServiceEvent add 13ddacc Mod:rm chinese add 0d5e447 Mod:rm rather than comment add 4de49ef Merge pull request #343 from hxmhlt/modify_zk add df79a5c Extract add a283aeb Transfer context for dubbo protocol by attachment add d96c241 Rearrange imports add 3db2f4d Remove context key add 0e57187 Fix review add c291d2c Merge pull request #344 from flycash/feature/dubbo-context new e899345 Merge pull request #347 from apache/develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the
[dubbo-go] 01/01: Merge pull request #347 from apache/develop
This is an automated email from the ASF dual-hosted git repository. flycash pushed a commit to branch feature/rest in repository https://gitbox.apache.org/repos/asf/dubbo-go.git commit e899345e6482dab1c46bfa20751e1a41b2c3f840 Merge: 932e149 c291d2c Author: Ming Deng AuthorDate: Sun Feb 2 12:15:45 2020 +0800 Merge pull request #347 from apache/develop Develop to feature/rest .travis.yml| 3 + CHANGE.md | 38 +++ LICENSE| 13 + NOTICE | 2 +- README.md | 7 +- README_CN.md | 7 +- cluster/cluster.go | 1 + cluster/cluster_impl/available_cluster.go | 1 + cluster/cluster_impl/available_cluster_invoker.go | 6 +- .../cluster_impl/available_cluster_invoker_test.go | 4 +- cluster/cluster_impl/broadcast_cluster.go | 1 + cluster/cluster_impl/broadcast_cluster_invoker.go | 7 +- .../cluster_impl/broadcast_cluster_invoker_test.go | 4 +- cluster/cluster_impl/failback_cluster.go | 1 + cluster/cluster_impl/failback_cluster_invoker.go | 11 +- cluster/cluster_impl/failback_cluster_test.go | 12 +- cluster/cluster_impl/failfast_cluster.go | 1 + cluster/cluster_impl/failfast_cluster_invoker.go | 7 +- cluster/cluster_impl/failfast_cluster_test.go | 4 +- cluster/cluster_impl/failover_cluster.go | 1 + cluster/cluster_impl/failover_cluster_invoker.go | 5 +- cluster/cluster_impl/failover_cluster_test.go | 16 +- cluster/cluster_impl/failsafe_cluster.go | 1 + cluster/cluster_impl/failsafe_cluster_invoker.go | 7 +- cluster/cluster_impl/failsafe_cluster_test.go | 12 +- cluster/cluster_impl/forking_cluster.go| 1 + cluster/cluster_impl/forking_cluster_invoker.go| 17 +- cluster/cluster_impl/forking_cluster_test.go | 6 +- cluster/cluster_impl/mock_cluster.go | 1 + cluster/cluster_impl/registry_aware_cluster.go | 1 + .../cluster_impl/registry_aware_cluster_invoker.go | 9 +- .../cluster_impl/registry_aware_cluster_test.go| 8 +- cluster/directory.go | 3 +- cluster/directory/base_directory.go| 8 + cluster/directory/static_directory.go | 1 + cluster/loadbalance.go | 3 +- cluster/loadbalance/consistent_hash.go | 13 +- cluster/loadbalance/least_active.go| 16 +- cluster/loadbalance/random.go | 1 + cluster/loadbalance/round_robin.go | 10 +- cluster/loadbalance/util.go| 1 + cluster/router.go | 4 + cluster/router/condition_router.go | 21 +- cluster/router/condition_router_test.go| 10 +- cluster/router/router_factory.go | 4 + common/config/environment.go | 20 +- common/constant/env.go | 5 +- common/constant/key.go | 4 + common/constant/version.go | 7 +- common/extension/cluster.go| 2 + common/extension/config_center.go | 2 + common/extension/config_center_factory.go | 2 + common/extension/configurator.go | 12 +- common/extension/filter.go | 4 + common/extension/graceful_shutdown.go | 2 + common/extension/loadbalance.go| 2 + common/extension/protocol.go | 2 + common/extension/proxy_factory.go | 11 +- common/extension/registry.go | 2 + common/extension/router_factory.go | 2 + common/extension/tps_limit.go | 4 + common/logger/logger.go| 9 + common/logger/logging.go | 15 + common/node.go | 1 + common/proxy/proxy.go | 41 ++- common/proxy/proxy_factory.go | 2 + common/proxy/proxy_factory/default.go | 13 +- common/rpc_service.go | 39 ++- common/rpc_service_test.go | 5 +- common/url.go | 50 ++- config/application_config.go | 8 + config/base_config.go | 10 +- config/config_center_config.go | 5 +- config/config_loader.go| 8 +- config/consumer_config.go | 7 + config/generic_service.go | 4 +
