This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 0562b648280471a90b1426106baa6939ec88743d Merge: 7696e1b42c fa11b68a16 Author: Albumen Kevin <[email protected]> AuthorDate: Wed Oct 18 19:02:54 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-cluster/pom.xml # dubbo-dependencies-bom/pom.xml # dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java dubbo-cluster/pom.xml | 7 ++ .../threadpool/serial/SerializingExecutor.java | 7 +- .../support/cached/CachedThreadPool.java | 17 +++-- .../support/limited/LimitedThreadPool.java | 17 +++-- .../apache/dubbo/common/utils/ExecutorUtil.java | 15 +++-- .../executor/AbstractIsolationExecutorSupport.java | 1 + .../dubbo/rpc/executor/DefaultExecutorSupport.java | 1 + .../spring/util/LazyTargetInvocationHandler.java | 6 +- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 12 ++-- .../apache/dubbo/metrics/model/MetricsSupport.java | 8 ++- .../dubbo/qos/protocol/QosProtocolWrapper.java | 23 ++++--- .../java/org/apache/dubbo/remoting/Constants.java | 2 + .../dubbo/remoting/transport/AbstractClient.java | 3 +- .../transport/netty4/NettyConnectionClient.java | 25 +++---- .../dubbo-remoting-zookeeper-curator5/pom.xml | 2 +- .../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 4 +- .../apache/dubbo/rpc/filter/EchoFilterTest.java | 34 +++++----- .../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 33 +++++----- .../rest/filter/ServiceInvokeRestFilter.java | 2 + .../dubbo/rpc/protocol/tri/DeadlineFuture.java | 14 ++-- .../rpc/protocol/tri/ReflectionPackableMethod.java | 19 ++---- .../rpc/protocol/tri/TripleHttp2Protocol.java | 29 +++++---- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 25 ++++--- .../rpc/protocol/tri/TriplePingPongHandler.java | 76 ++++++++++++++++++++++ .../dubbo/rpc/protocol/tri/TripleProtocol.java | 16 +++-- .../tri/call/ReflectionAbstractServerCall.java | 29 ++++++--- ...ClientHandler.java => TripleGoAwayHandler.java} | 18 ++--- .../tri/call/ReflectionServerCallTest.java | 4 ++ .../pom.xml | 2 +- .../observability/pom.xml | 4 +- dubbo-spring-boot/pom.xml | 2 +- dubbo-test/dubbo-test-check/pom.xml | 2 +- pom.xml | 2 +- 36 files changed, 303 insertions(+), 164 deletions(-) diff --cc dubbo-cluster/pom.xml index 08b83b8cca,2013b81c99..1f0173e6df --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@@ -86,5 -87,16 +87,11 @@@ <version>${project.parent.version}</version> <optional>true</optional> </dependency> - <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-tracing-integration-test</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.openjdk.nashorn</groupId> + <artifactId>nashorn-core</artifactId> + <version>${nashorn-core.version}</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --cc dubbo-dependencies-bom/pom.xml index 6ac87dfb4d,50f6cccd14..89719f7cb6 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -133,10 -133,9 +133,10 @@@ <commons_lang3_version>3.12.0</commons_lang3_version> <protostuff_version>1.8.0</protostuff_version> <envoy_api_version>0.1.35</envoy_api_version> - <micrometer.version>1.11.4</micrometer.version> + <micrometer.version>1.11.5</micrometer.version> - + <opentelemetry.version>1.26.0</opentelemetry.version> + <zipkin-reporter.version>2.16.4</zipkin-reporter.version> - <micrometer-tracing.version>1.1.5</micrometer-tracing.version> + <micrometer-tracing.version>1.1.6</micrometer-tracing.version> <t_digest.version>3.3</t_digest.version> <prometheus_client.version>0.16.0</prometheus_client.version> <reactive.version>1.0.4</reactive.version> diff --cc dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java index ab75d2b183,4ffe4b0b17..d6969e7731 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java @@@ -177,10 -174,11 +177,12 @@@ public interface Constants String OK_HTTP = "ok-http"; String URL_CONNECTION = "url-connection"; String APACHE_HTTP_CLIENT = "apache-http-client"; + String PORT_UNIFICATION_NETTY4_SERVER = "netty4"; + List<String> REST_SERVER = Arrays.asList("jetty", "tomcat", "netty"); String CONTENT_LENGTH_KEY = "content-length"; - String USE_SECURE_RANDOM_ID = "dubbo.application.use-secure-random-request-id"; + String CONNECTION_HANDLER_NAME = "connectionHandler"; + }
