From 4a41a6e90998ea6470388d122b1d57a81aa31f6f Mon Sep 17 00:00:00 2001 From: yangjj-iso <3202137046@qq.com> Date: Fri, 30 Oct 2026 23:58:15 +0800 Subject: [PATCH 1/2] fix(logging): restore RabbitMQ selector client after global fallback (#7454) --- .../LoggingRabbitmqPluginDataHandler.java | 1 + .../LoggingRabbitmqPluginDataHandlerTest.java | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/main/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/main/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandler.java index 93c1780..866665b 100644 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/main/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandler.java +++ b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/main/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandler.java @@ -94,6 +94,7 @@ public void handlerSelector(final SelectorData selectorData) { Object hostObj = Objects.isNull(rabbitmqJsonMap) ? null : rabbitmqJsonMap.get("host"); if (Objects.isNull(hostObj) || !(hostObj instanceof String) || ((String) hostObj).trim().isEmpty()) { RabbitmqClientCache.getInstance().invalidate(selectorData.getId()); + getSelectApiConfigMap().remove(selectorData.getId()); Optional.ofNullable(RabbitmqClientCache.getInstance().getClientCache()) .filter(Map::isEmpty) .ifPresent(map -> MULTI_CLIENT.set(false)); diff --git a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java index a656936..d402231 100644 --- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java +++ b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java @@ -31,6 +31,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.mockito.MockedConstruction; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; @@ -49,6 +52,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.mockConstruction; /** * The Test Case For LoggingRabbitmqPluginDataHandler. @@ -120,6 +124,7 @@ public void testHandlerPluginUpdateSameConfig() { PluginData pluginData = createPluginData(); pluginData.setConfig(GsonUtils.getGson().toJson(existingConfig)); + LoggingRabbitmqPluginDataHandler.getPluginGlobalConfigMap().put(pluginData.getId(), existingConfig); loggingRabbitmqPluginDataHandler.handlerPlugin(pluginData); @@ -179,6 +184,40 @@ public void testHandlerSelectorWithEmptyHandle() { Assertions.assertNull(RabbitmqClientCache.getInstance().getClientCache().get(selectorData.getId())); } + @ParameterizedTest + @ValueSource(strings = {"{}", "", "null", "{\"host\":\" \"}", "{\"host\":1}"}) + public void testRestoreSameSelectorConfigAfterUsingGlobal(final String globalHandle) { + RabbitmqClientCache cache = RabbitmqClientCache.getInstance(); + cache.invalidateAll(); + LoggingRabbitmqPluginDataHandler.getSelectApiConfigMap().clear(); + String customHandle = GsonUtils.getGson().toJson(createValidConfig()); + selectorData.setHandle(customHandle); + try (MockedConstruction clients = mockConstruction(RabbitmqLogCollectClient.class)) { + loggingRabbitmqPluginDataHandler.handlerSelector(selectorData); + final RabbitmqLogCollectClient first = cache.getRabbitmqClient(selectorData.getId()); + loggingRabbitmqPluginDataHandler.handlerSelector(selectorData); + Assertions.assertEquals(1, clients.constructed().size()); + selectorData.setHandle(globalHandle); + loggingRabbitmqPluginDataHandler.handlerSelector(selectorData); + verify(first).close(); + Assertions.assertNull(cache.getRabbitmqClient(selectorData.getId())); + Assertions.assertFalse(LoggingRabbitmqPluginDataHandler.getMultiClient()); + selectorData.setHandle(customHandle); + loggingRabbitmqPluginDataHandler.handlerSelector(selectorData); + Assertions.assertEquals(2, clients.constructed().size()); + Assertions.assertSame(clients.constructed().get(1), cache.getRabbitmqClient(selectorData.getId())); + Assertions.assertTrue(LoggingRabbitmqPluginDataHandler.getMultiClient()); + selectorData.setHandle(customHandle.replace("topic.logging", "topic.changed")); + loggingRabbitmqPluginDataHandler.handlerSelector(selectorData); + Assertions.assertEquals(3, clients.constructed().size()); + verify(clients.constructed().get(1)).close(); + } finally { + selectorData.setHandle("{}"); + loggingRabbitmqPluginDataHandler.handlerSelector(selectorData); + LoggingRabbitmqPluginDataHandler.getSelectApiConfigMap().clear(); + } + } + private PluginData createPluginData() { PluginData pluginData = new PluginData(); pluginData.setEnabled(true); From 6710411a5594455cc9ee8a52dffb7bc3440c75c5 Mon Sep 17 00:00:00 2001 From: yangjj-iso <3202137046@qq.com> Date: Sun, 1 Nov 2026 23:46:09 +0800 Subject: [PATCH 2/2] test: align shared fixture builder with the pinned core API --- .../shenyu/plugin/store/test/support/GatewayFixtures.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shenyu-plugin/shenyu-plugin-store-test-support/src/main/java/org/apache/shenyu/plugin/store/test/support/GatewayFixtures.java b/shenyu-plugin/shenyu-plugin-store-test-support/src/main/java/org/apache/shenyu/plugin/store/test/support/GatewayFixtures.java index a8441c2..d28c8cd 100644 --- a/shenyu-plugin/shenyu-plugin-store-test-support/src/main/java/org/apache/shenyu/plugin/store/test/support/GatewayFixtures.java +++ b/shenyu-plugin/shenyu-plugin-store-test-support/src/main/java/org/apache/shenyu/plugin/store/test/support/GatewayFixtures.java @@ -113,7 +113,7 @@ public static RuleData cacheRule(final String pluginName, final String selectorI .selectorId(selectorId) .name(pluginName + "-rule") .enabled(true) - .loged(true) + .logged(true) .sort(1) .matchMode(MatchModeEnum.AND.getCode()) .matchRestful(false)