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 b14201f393648eb57cdbe4841b9b057823e21d47 Merge: c96a06eba1 f28c2fec72 Author: Albumen Kevin <[email protected]> AuthorDate: Thu Jun 22 10:18:31 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryScopeModelInitializer.java # dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java README.md | 2 +- .../rpc/cluster/directory/AbstractDirectory.java | 10 +- .../rpc/cluster/directory/StaticDirectory.java | 4 +- .../filter/support/ConsumerContextFilter.java | 2 +- .../DefaultGovernanceRuleRepositoryImpl.java | 2 +- .../cluster/loadbalance/AbstractLoadBalance.java | 3 +- .../loadbalance/ConsistentHashLoadBalance.java | 6 +- .../loadbalance/LeastActiveLoadBalance.java | 5 +- .../rpc/cluster/loadbalance/RandomLoadBalance.java | 3 +- .../cluster/loadbalance/RoundRobinLoadBalance.java | 5 +- .../loadbalance/ShortestResponseLoadBalance.java | 5 +- .../matcher/AbstractConditionMatcher.java | 3 +- .../virtualservice/match/DubboMethodMatch.java | 3 +- .../cluster/router/script/ScriptStateRouter.java | 3 +- .../cluster/support/AbstractClusterInvoker.java | 4 +- .../cluster/support/FailbackClusterInvoker.java | 9 +- .../cluster/support/FailfastClusterInvoker.java | 3 +- .../support/wrapper/MockClusterInvoker.java | 8 +- .../support/wrapper/ScopeClusterInvoker.java | 23 +- .../filter/AbstractObservationFilterTest.java | 3 +- .../filter/ObservationSenderFilterTest.java | 9 +- .../dubbo/common/config/ConfigurationUtils.java | 19 +- .../dubbo/common/config/ModuleEnvironment.java | 2 +- .../dubbo/common/extension/ExtensionLoader.java | 5 +- .../common/threadpool/ThreadlessExecutor.java | 39 +- .../apache/dubbo/common/utils/ToStringUtils.java | 63 +++ .../org/apache/dubbo/config/AbstractConfig.java | 5 +- .../dubbo/config/AbstractInterfaceConfig.java | 2 +- .../dubbo/config/AbstractReferenceConfig.java | 3 + .../java/org/apache/dubbo/config/MethodConfig.java | 2 +- .../java/org/apache/dubbo/config/ModuleConfig.java | 3 + .../apache/dubbo/config/ReferenceConfigBase.java | 1 + .../org/apache/dubbo/config/ServiceConfigBase.java | 21 +- .../config/context/AbstractConfigManager.java | 4 +- .../apache/dubbo/config/nested/ExporterConfig.java | 4 +- .../apache/dubbo/rpc/model/ApplicationModel.java | 6 +- .../org/apache/dubbo/rpc/model/FrameworkModel.java | 2 +- .../org/apache/dubbo/rpc/model/ModuleModel.java | 2 +- .../org/apache/dubbo/rpc/model/ScopeModel.java | 23 +- .../common/config/ConfigurationUtilsTest.java | 4 +- .../dubbo/common/config/EnvironmentTest.java | 4 +- .../common/extension/ExtensionLoaderTest.java | 29 +- .../apache/dubbo/rpc/model/ModuleModelTest.java | 2 +- .../apache/dubbo/rpc/model/ScopeModelUtilTest.java | 2 +- .../java/com/alibaba/dubbo/common/Constants.java | 541 ++++++++++++++++++++- .../java/com/alibaba/dubbo/rpc/Invocation.java | 6 +- .../java/com/alibaba/dubbo/rpc/RpcContext.java | 20 + .../java/com/alibaba/dubbo/rpc/RpcException.java | 6 +- .../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 8 +- .../cluster/loadbalance/AbstractLoadBalance.java | 4 +- .../org/apache/dubbo/config/ReferenceConfig.java | 6 +- .../org/apache/dubbo/config/ServiceConfig.java | 14 +- .../dubbo/config/bootstrap/DubboBootstrap.java | 2 +- .../builders/InternalServiceConfigBuilder.java | 1 + .../config/deploy/DefaultApplicationDeployer.java | 2 +- .../dubbo/config/deploy/DefaultModuleDeployer.java | 2 +- .../dubbo/config/utils/ConfigValidationUtils.java | 5 +- .../apache/dubbo/config/AbstractConfigTest.java | 63 ++- .../dubbo/config/ConfigCenterConfigTest.java | 14 +- .../apache/dubbo/config/ConsumerConfigTest.java | 8 +- .../org/apache/dubbo/config/ServiceConfigTest.java | 16 + .../dubbo/config/bootstrap/DubboBootstrapTest.java | 6 +- .../deploy/DefaultApplicationDeployerTest.java | 3 +- .../AbstractRegistryCenterExporterListener.java | 9 +- ...egistryCenterExportProviderIntegrationTest.java | 2 +- ...MultipleRegistryCenterInjvmIntegrationTest.java | 4 +- ...egistryCenterExportProviderIntegrationTest.java | 4 +- .../SingleRegistryCenterInjvmIntegrationTest.java | 4 +- .../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 | 14 +- .../apache/dubbo/metrics/data/RtStatComposite.java | 3 +- .../apache/dubbo/metrics/model/MethodMetric.java | 3 +- .../apache/dubbo/metrics/model/MetricsSupport.java | 13 - .../AbstractDefaultDubboObservationConvention.java | 8 +- .../metrics/observation/DubboClientContext.java | 7 +- .../metrics/observation/DubboServerContext.java | 3 +- ...efaultDubboClientObservationConventionTest.java | 3 +- ...efaultDubboServerObservationConventionTest.java | 3 +- .../utils/ObservationConventionUtils.java | 5 +- .../observation/AbstractObservationFilterTest.java | 3 +- .../observation/ObservationReceiverFilterTest.java | 11 +- .../dubbo/monitor/support/MonitorFilter.java | 2 +- .../apache/dubbo/auth/AccessKeyAuthenticator.java | 5 +- .../AuthenticationExceptionTranslatorFilter.java | 6 +- .../ContextHolderAuthenticationPrepareFilter.java | 8 +- .../ContextHolderAuthenticationResolverFilter.java | 6 +- .../model/SecurityScopeModelInitializer.java | 6 +- .../dubbo/spring/security/utils/SecurityNames.java | 2 + .../java/org/apache/dubbo/registry/Constants.java | 1 + .../apache/dubbo/registry/RegistryNotifier.java | 8 + .../registry/RegistryScopeModelInitializer.java | 4 +- .../client/ServiceDiscoveryRegistryDirectory.java | 6 +- .../dubbo/registry/client/ServiceInstance.java | 1 + .../client/migration/MigrationRuleListener.java | 4 +- .../registry/integration/ExporterFactory.java | 42 ++ .../integration/ReferenceCountExporter.java | 62 +++ .../registry/integration/RegistryDirectory.java | 8 +- .../registry/integration/RegistryProtocol.java | 25 +- .../dubbo/registry/support/AbstractRegistry.java | 6 +- .../migration/MigrationRuleListenerTest.java | 12 +- .../java/org/apache/dubbo/remoting/Constants.java | 2 +- .../remoting/exchange/support/DefaultFuture.java | 12 +- .../exchange/support/DefaultFutureTest.java | 12 +- .../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 4 +- .../main/java/org/apache/dubbo/rpc/Invocation.java | 12 +- .../java/org/apache/dubbo/rpc/PathResolver.java | 4 +- .../apache/dubbo/rpc/filter/AccessLogFilter.java | 3 +- .../apache/dubbo/rpc/filter/ActiveLimitFilter.java | 13 +- .../apache/dubbo/rpc/filter/DeprecatedFilter.java | 7 +- .../apache/dubbo/rpc/filter/ExceptionFilter.java | 18 +- .../dubbo/rpc/filter/ExecuteLimitFilter.java | 7 +- .../org/apache/dubbo/rpc/filter/GenericFilter.java | 2 +- .../dubbo/rpc/filter/ProfilerServerFilter.java | 4 +- .../org/apache/dubbo/rpc/filter/TimeoutFilter.java | 3 +- .../org/apache/dubbo/rpc/filter/TokenFilter.java | 3 +- .../apache/dubbo/rpc/filter/TokenHeaderFilter.java | 3 +- .../apache/dubbo/rpc/filter/TpsLimitFilter.java | 3 +- .../dubbo/rpc/filter/tps/DefaultTPSLimiter.java | 5 +- .../apache/dubbo/rpc/support/AccessLogData.java | 2 +- .../rpc/protocol/dubbo/CallbackServiceCodec.java | 9 +- .../rpc/protocol/dubbo/ChannelWrappedInvoker.java | 2 +- .../protocol/dubbo/DecodeableRpcInvocation.java | 4 + .../rpc/protocol/dubbo/DecodeableRpcResult.java | 4 + .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 8 +- .../rpc/protocol/dubbo/filter/FutureFilter.java | 11 +- .../rpc/protocol/dubbo/filter/TraceFilter.java | 5 +- .../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 37 +- .../dubbo/rpc/protocol/injvm/DemoService.java | 4 + .../dubbo/rpc/protocol/injvm/DemoServiceImpl.java | 9 + .../rpc/protocol/injvm/InjvmProtocolTest.java | 40 +- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 4 +- .../dubbo/rpc/protocol/tri/TriplePathResolver.java | 9 +- .../dubbo/rpc/protocol/tri/TripleProtocol.java | 28 +- .../rpc/protocol/tri/call/AbstractServerCall.java | 4 +- .../tri/call/BiStreamServerCallListener.java | 2 +- .../dubbo/rpc/protocol/tri/call/ClientCall.java | 3 +- .../call/ObserverToClientCallListenerAdapter.java | 2 +- .../dubbo/rpc/protocol/tri/call/ServerCall.java | 3 +- .../tri/call/ServerStreamServerCallListener.java | 2 +- .../rpc/protocol/tri/call/TripleClientCall.java | 6 +- .../protocol/tri/call/UnaryClientCallListener.java | 6 +- .../protocol/tri/call/UnaryServerCallListener.java | 4 +- .../observability/pom.xml | 4 +- .../dubbo/rpc/cluster/router/xds/XdsRouter.java | 21 +- 146 files changed, 1394 insertions(+), 364 deletions(-) diff --cc dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryScopeModelInitializer.java index e2de1cbf86,40c788985c..a33ab61ecd --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryScopeModelInitializer.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryScopeModelInitializer.java @@@ -17,7 -17,7 +17,8 @@@ package org.apache.dubbo.registry; import org.apache.dubbo.common.beans.factory.ScopeBeanFactory; +import org.apache.dubbo.registry.client.metadata.MetadataServiceDelegation; + import org.apache.dubbo.registry.integration.ExporterFactory; import org.apache.dubbo.registry.support.RegistryManager; import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.model.FrameworkModel; diff --cc dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Constants.java index 3fd883d0aa,e3dfee7da7..6a4c67da84 --- 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 @@@ -166,8 -163,7 +166,8 @@@ 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"; - }
