From a4a0baccfd68050bd3657de2b5cbde5553f8eebb Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Tue, 12 Mar 2024 13:58:13 +0800 Subject: [PATCH 1/8] Add github collaborators --- .asf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index cb1d0d1037..cc1dcf46a4 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -55,3 +55,5 @@ github: - http - grpc - web + collaborators: + - oxsean From 8d1a10f1ad7402cccb681478916b5b0ab5a9ad59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:22:08 +0800 Subject: [PATCH 2/8] Bump jackson_version from 2.16.1 to 2.16.2 (#13896) Bumps `jackson_version` from 2.16.1 to 2.16.2. Updates `com.fasterxml.jackson.core:jackson-core` from 2.16.1 to 2.16.2 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.16.1...jackson-core-2.16.2) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.16.1 to 2.16.2 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.16.1 to 2.16.2 Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.16.1 to 2.16.2 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 92f13e2b17..fca8b1265e 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -161,7 +161,7 @@ 1.70 2.0.6 2.10.1 - 2.16.1 + 2.16.2 6.1.26 2.0 1.6.0 From 7edd760ecb3fb41f876959dbfc0b43be00ca5dc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:22:15 +0800 Subject: [PATCH 3/8] Bump ch.qos.logback:logback-core from 1.5.2 to 1.5.3 (#13899) Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.5.2 to 1.5.3. - [Commits](https://github.com/qos-ch/logback/commits/v_1.5.3) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml index 239a0a93ea..8baaf48520 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml @@ -184,7 +184,7 @@ ch.qos.logback logback-core - 1.5.2 + 1.5.3 compile diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml index a6f47e833c..c2d67c5986 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml @@ -181,7 +181,7 @@ ch.qos.logback logback-core - 1.5.2 + 1.5.3 compile From 0cbefb1e33e5d3099077a516dcba5fd6babea8b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:22:25 +0800 Subject: [PATCH 4/8] Bump log4j2_version from 2.23.0 to 2.23.1 (#13897) Bumps `log4j2_version` from 2.23.0 to 2.23.1. Updates `org.apache.logging.log4j:log4j-api` from 2.23.0 to 2.23.1 Updates `org.apache.logging.log4j:log4j-core` from 2.23.0 to 2.23.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-spring-boot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index fca8b1265e..1b5b064782 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -143,7 +143,7 @@ 1.2.17 1.2.13 - 2.23.0 + 2.23.1 2.15.1 0.13.0 diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml index 3dbe3891d5..eb08c5fa8c 100644 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@ -41,7 +41,7 @@ 2.7.18 ${revision} - 2.23.0 + 2.23.1 1.14.12 From a1995ee8d297f65713249c24e9e3c50290d31e07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:22:34 +0800 Subject: [PATCH 5/8] Bump org.apache.commons:commons-compress from 1.26.0 to 1.26.1 (#13900) Bumps org.apache.commons:commons-compress from 1.26.0 to 1.26.1. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-test/dubbo-test-check/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 1b5b064782..7a6df90154 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -165,7 +165,7 @@ 6.1.26 2.0 1.6.0 - 1.26.0 + 1.26.1 2.43.0 check 1.0.0 diff --git a/dubbo-test/dubbo-test-check/pom.xml b/dubbo-test/dubbo-test-check/pom.xml index 2d0866fece..fd047232c8 100644 --- a/dubbo-test/dubbo-test-check/pom.xml +++ b/dubbo-test/dubbo-test-check/pom.xml @@ -33,7 +33,7 @@ 4.2.0 3.7.2 4.2.0 - 1.26.0 + 1.26.1 1.9.3 1.4.0 2.12.3 From 6ca6f66fd4d64d216d97ebb01e2ca46799a5a271 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:22:42 +0800 Subject: [PATCH 6/8] Bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.0 (#13894) Bumps [org.apache.maven.plugins:maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) from 3.6.0 to 3.7.0. - [Commits](https://github.com/apache/maven-assembly-plugin/compare/maven-assembly-plugin-3.6.0...maven-assembly-plugin-3.7.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-assembly-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-distribution/dubbo-apache-release/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-distribution/dubbo-apache-release/pom.xml b/dubbo-distribution/dubbo-apache-release/pom.xml index e0a301d6db..fcd2ca4ac5 100644 --- a/dubbo-distribution/dubbo-apache-release/pom.xml +++ b/dubbo-distribution/dubbo-apache-release/pom.xml @@ -52,7 +52,7 @@ maven-assembly-plugin - 3.6.0 + 3.7.0 bin From b2c66a6d9962badad689f4ac47425ee50b3c9075 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:23:34 +0800 Subject: [PATCH 7/8] Bump org.testcontainers:testcontainers from 1.19.6 to 1.19.7 (#13898) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.19.6 to 1.19.7. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.6...1.19.7) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index b941bd80da..01d5abadd9 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -236,7 +236,7 @@ org.testcontainers testcontainers - 1.19.6 + 1.19.7 test diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 7a6df90154..b30413ef74 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -153,7 +153,7 @@ 2.2.7 1.2.0 - 1.19.6 + 1.19.7 3.2.13 1.6.13 From 0553d70899253519bd6fab00fb647eababf1c911 Mon Sep 17 00:00:00 2001 From: kaze <50894526+kazetyan@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:26:18 +0800 Subject: [PATCH 8/8] Add condition to match serviceKey. (#13869) --- .../dubbo/qos/command/impl/ChangeTelnet.java | 3 ++- .../dubbo/qos/command/impl/CountTelnet.java | 3 ++- .../qos/command/impl/ChangeTelnetTest.java | 11 +++++++- .../qos/command/impl/CountTelnetTest.java | 26 ++++++++++++++++++- 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/ChangeTelnet.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/ChangeTelnet.java index e16d7e41b6..4eac865f2c 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/ChangeTelnet.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/ChangeTelnet.java @@ -58,7 +58,8 @@ public class ChangeTelnet implements BaseCommand { for (Exporter exporter : dubboProtocol.getExporters()) { if (message.equals(exporter.getInvoker().getInterface().getSimpleName()) || message.equals(exporter.getInvoker().getInterface().getName()) - || message.equals(exporter.getInvoker().getUrl().getPath())) { + || message.equals(exporter.getInvoker().getUrl().getPath()) + || message.equals(exporter.getInvoker().getUrl().getServiceKey())) { found = true; break; } diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/CountTelnet.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/CountTelnet.java index 9d89c98306..425f4706b3 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/CountTelnet.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/CountTelnet.java @@ -85,7 +85,8 @@ public class CountTelnet implements BaseCommand { for (Exporter exporter : dubboProtocol.getExporters()) { if (service.equals(exporter.getInvoker().getInterface().getSimpleName()) || service.equals(exporter.getInvoker().getInterface().getName()) - || service.equals(exporter.getInvoker().getUrl().getPath())) { + || service.equals(exporter.getInvoker().getUrl().getPath()) + || service.equals(exporter.getInvoker().getUrl().getServiceKey())) { invoker = exporter.getInvoker(); break; } diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ChangeTelnetTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ChangeTelnetTest.java index 6a8b67531d..a182a5e168 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ChangeTelnetTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ChangeTelnetTest.java @@ -71,7 +71,7 @@ class ChangeTelnetTest { mockChannel.attr(ChangeTelnet.SERVICE_KEY).set("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); given(mockCommandContext.getRemote()).willReturn(mockChannel); given(mockInvoker.getInterface()).willReturn(DemoService.class); - given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20884/demo")); + given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20884/demo?group=g&version=1.0.0")); } @AfterEach @@ -110,6 +110,15 @@ class ChangeTelnetTest { assertEquals("Used the demo as default.\r\nYou can cancel default service by command: cd /", result); } + @Test + void testChangeServiceKey() { + ExtensionLoader.getExtensionLoader(Protocol.class) + .getExtension(DubboProtocol.NAME) + .export(mockInvoker); + String result = change.execute(mockCommandContext, new String[] {"g/demo:1.0.0"}); + assertEquals("Used the g/demo:1.0.0 as default.\r\nYou can cancel default service by command: cd /", result); + } + @Test void testChangeMessageNull() { String result = change.execute(mockCommandContext, null); diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/CountTelnetTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/CountTelnetTest.java index 0777e39546..a1eafa4daa 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/CountTelnetTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/CountTelnetTest.java @@ -52,7 +52,7 @@ class CountTelnetTest { private CommandContext mockCommandContext; private CountDownLatch latch; - private final URL url = URL.valueOf("dubbo://127.0.0.1:20884/demo"); + private final URL url = URL.valueOf("dubbo://127.0.0.1:20884/demo?group=g&version=1.0.0"); @BeforeEach public void setUp() { @@ -70,12 +70,14 @@ class CountTelnetTest { public void tearDown() { FrameworkModel.destroyAll(); mockChannel.close(); + RpcStatus.removeStatus(url); reset(mockInvoker, mockCommandContext); } @Test void test() throws Exception { String methodName = "sayHello"; + RpcStatus.removeStatus(url, methodName); String[] args = new String[] {"org.apache.dubbo.qos.legacy.service.DemoService", "sayHello", "1"}; ExtensionLoader.getExtensionLoader(Protocol.class) @@ -94,6 +96,28 @@ class CountTelnetTest { assertThat(sb.toString(), containsString(buildTable(methodName, 10, 10, "1", "0", "0"))); } + @Test + void testCountByServiceKey() throws Exception { + String methodName = "sayHello"; + RpcStatus.removeStatus(url, methodName); + String[] args = new String[] {"g/demo:1.0.0", "sayHello", "1"}; + + ExtensionLoader.getExtensionLoader(Protocol.class) + .getExtension(DubboProtocol.NAME) + .export(mockInvoker); + RpcStatus.beginCount(url, methodName); + RpcStatus.endCount(url, methodName, 10L, true); + count.execute(mockCommandContext, args); + latch.await(); + + StringBuilder sb = new StringBuilder(); + for (Object o : mockChannel.getReceivedObjects()) { + sb.append(o.toString()); + } + + assertThat(sb.toString(), containsString(buildTable(methodName, 10, 10, "1", "0", "0"))); + } + public static String buildTable( String methodName, long averageElapsed, long maxElapsed, String total, String failed, String active) { List header = new LinkedList<>();