Skip to content

Commit

Permalink
Upgrade rpc all version to 5.13.2 (#1356)
Browse files Browse the repository at this point in the history
Signed-off-by: JermaineHua <[email protected]>
  • Loading branch information
CrazyHZM authored Dec 26, 2024
1 parent d8bbf84 commit edfaacd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,9 @@ public SofaBootRpcStartListener sofaBootRpcStartListener(SofaBootRpcProperties s
ObjectProvider<FaultToleranceConfigurator> faultToleranceConfigurator,
ServerConfigContainer serverConfigContainer,
RegistryConfigContainer registryConfigContainer) {
SofaBootRpcStartListener rpcStartListener = new SofaBootRpcStartListener(
providerConfigContainer, faultToleranceConfigurator.getIfUnique(),
serverConfigContainer, registryConfigContainer);
rpcStartListener.setLookoutCollectDisable(sofaBootRpcProperties.getLookoutCollectDisable());
return rpcStartListener;
return new SofaBootRpcStartListener(providerConfigContainer,
faultToleranceConfigurator.getIfUnique(), serverConfigContainer,
registryConfigContainer);
}

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@
*/
package com.alipay.sofa.rpc.boot.context;

import com.alipay.sofa.rpc.boot.common.SofaBootRpcParserUtil;
import com.alipay.sofa.rpc.boot.config.FaultToleranceConfigurator;
import com.alipay.sofa.rpc.boot.container.ProviderConfigContainer;
import com.alipay.sofa.rpc.boot.container.RegistryConfigContainer;
import com.alipay.sofa.rpc.boot.container.ServerConfigContainer;
import com.alipay.sofa.rpc.boot.context.event.SofaBootRpcStartEvent;
import com.alipay.sofa.rpc.config.ProviderConfig;
import com.alipay.sofa.rpc.event.LookoutSubscriber;
import org.springframework.context.ApplicationListener;
import org.springframework.util.CollectionUtils;

Expand All @@ -46,8 +44,6 @@ public class SofaBootRpcStartListener implements ApplicationListener<SofaBootRpc

protected final RegistryConfigContainer registryConfigContainer;

private String lookoutCollectDisable;

public SofaBootRpcStartListener(ProviderConfigContainer providerConfigContainer,
FaultToleranceConfigurator faultToleranceConfigurator,
ServerConfigContainer serverConfigContainer,
Expand All @@ -60,8 +56,6 @@ public SofaBootRpcStartListener(ProviderConfigContainer providerConfigContainer,

@Override
public void onApplicationEvent(SofaBootRpcStartEvent event) {
//choose disable metrics lookout
disableLookout();

//extra info
processExtra(event);
Expand Down Expand Up @@ -91,16 +85,4 @@ public void onApplicationEvent(SofaBootRpcStartEvent event) {
protected void processExtra(SofaBootRpcStartEvent event) {

}

protected void disableLookout() {
Boolean disable = SofaBootRpcParserUtil.parseBoolean(lookoutCollectDisable);

if (disable != null) {
LookoutSubscriber.setLookoutCollectDisable(disable);
}
}

public void setLookoutCollectDisable(String lookoutCollectDisable) {
this.lookoutCollectDisable = lookoutCollectDisable;
}
}
2 changes: 1 addition & 1 deletion sofa-boot-project/sofaboot-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- sofa stack lib-->
<sofa.registry.version>6.1.8</sofa.registry.version>
<tracer.core.version>4.0.1</tracer.core.version>
<rpc.core.version>5.13.0</rpc.core.version>
<rpc.core.version>5.13.2</rpc.core.version>
<sofa.common.tools.version>2.1.1</sofa.common.tools.version>
<sofa.bolt.version>1.6.10</sofa.bolt.version>
<sofa.hessian.version>3.5.5</sofa.hessian.version>
Expand Down

0 comments on commit edfaacd

Please sign in to comment.