Skip to content

Refactor/decouple load balance metrics collection from divide plugin #6429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dengliming merged 10 commits into from
Sep 15, 2026
Merged

Refactor/decouple load balance metrics collection from divide plugin #6429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d2894b1
refactor: Decouple load balance metrics collection from DividePlugin
hengyuss Jul 15, 2026
d3d2683
test: add tests
hengyuss Jul 15, 2026
e9a70cc
fix: fix ci
hengyuss Jul 30, 2026
936dec0
Merge branch 'master' into refactor/decouple_load_balance_metrics_col…
hengyuss Jul 30, 2026
1eb12eb
fix: revert code
hengyuss Jul 31, 2026
52b4275
Merge remote-tracking branch 'hengyu/refactor/decouple_load_balance_m…
hengyuss Jul 31, 2026
be4fc12
Merge branch 'master' into refactor/decouple_load_balance_metrics_col…
hengyuss Jul 31, 2026
7573ca1
Merge branch 'master' into refactor/decouple_load_balance_metrics_col…
hengyuss Aug 1, 2026
5602e04
Merge branch 'master' into refactor/decouple_load_balance_metrics_col…
hengyuss Aug 5, 2026
16dacac
Merge branch 'master' into refactor/decouple_load_balance_metrics_col…
dengliming Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ...roxy/shenyu-plugin-divide/src/main/java/org/apache/shenyu/plugin/divide/DividePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ public class DividePlugin extends AbstractShenyuPlugin {

private static final String SHORTEST_RESPONSE = "shortestResponse";

private Long beginTime;

@Override
protected String getRawPath(final ServerWebExchange exchange) {
return RequestUrlUtils.getRewrittenRawPath(exchange);
Expand Down Expand Up @@ -134,8 +132,8 @@ protected Mono<Void> doExecute(final ServerWebExchange exchange, final ShenyuPlu
return chain.execute(exchange).doOnSuccess(e -> responseTrigger(upstream
)).doOnError(throwable -> responseTrigger(upstream));
} else if (ruleHandle.getLoadBalance().equals(SHORTEST_RESPONSE)) {
beginTime = System.currentTimeMillis();
return chain.execute(exchange).doOnSuccess(e -> successResponseTrigger(upstream
long beginTime = System.currentTimeMillis();
return chain.execute(exchange).doOnSuccess(e -> successResponseTrigger(upstream, beginTime
));
}
return chain.execute(exchange);
Expand Down Expand Up @@ -193,7 +191,7 @@ private void responseTrigger(final Upstream upstream) {
upstream.setLag(lag);
}

private void successResponseTrigger(final Upstream upstream) {
private void successResponseTrigger(final Upstream upstream, final long beginTime) {
upstream.getSucceededElapsed().addAndGet(System.currentTimeMillis() - beginTime);
upstream.getSucceeded().incrementAndGet();
}
Expand Down
9 changes: 3 additions & 6 deletions .../shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/DividePluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;

import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.InetSocketAddress;
Expand Down Expand Up @@ -163,6 +162,7 @@ public void doExecuteTest() {
loadBalancerFactoryMockedStatic.when(() -> LoadBalancerFactory.selector(any(), any(), any()))
.thenReturn(null);
dividePlugin.doExecute(exchange, chain, selectorData, ruleData);
loadBalancerFactoryMockedStatic.close();
// hit `Objects.requireNonNull(shenyuContext)`
exchange.getAttributes().remove(Constants.CONTEXT);
assertThrows(NullPointerException.class, () -> dividePlugin.doExecute(exchange, chain, selectorData, ruleData));
Expand Down Expand Up @@ -233,15 +233,12 @@ public void responseTriggerTest() throws NoSuchMethodException, InstantiationExc
@Test
public void successResponseTriggerTest() throws Exception {
dividePlugin = DividePlugin.class.newInstance();
Field field = DividePlugin.class.getDeclaredField("beginTime");
field.setAccessible(true);
field.set(dividePlugin, 0L);
Method method = DividePlugin.class.getDeclaredMethod("successResponseTrigger", Upstream.class);
Method method = DividePlugin.class.getDeclaredMethod("successResponseTrigger", Upstream.class, long.class);
method.setAccessible(true);
Upstream upstream = Upstream.builder()
.url("upstream")
.build();
method.invoke(dividePlugin, upstream);
method.invoke(dividePlugin, upstream, 0L);
assertEquals(1, upstream.getSucceeded().get());
}

Expand Down
Loading