From a3e1a6a20996f8c64ed500aef4b433969058f8e6 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Wed, 8 Jan 2025 10:56:05 +0800 Subject: [PATCH] Optimized message gray plugin workflow test case Signed-off-by: chengyouling --- .../mq-grayscale/rocketmq/action.yml | 6 +- .../message_gray_integration_test.yml | 40 ++++----- .../integration/GrayscaleRocketmqTest.java | 90 ++++++++++--------- .../integration/support/KieClient.java | 21 ++--- 4 files changed, 79 insertions(+), 78 deletions(-) diff --git a/.github/actions/scenarios/mq-grayscale/rocketmq/action.yml b/.github/actions/scenarios/mq-grayscale/rocketmq/action.yml index 93e090d381..6b62eff07c 100644 --- a/.github/actions/scenarios/mq-grayscale/rocketmq/action.yml +++ b/.github/actions/scenarios/mq-grayscale/rocketmq/action.yml @@ -16,6 +16,7 @@ runs: dynamic.config.dynamicConfigType: KIE dynamic.config.serverAddress: 127.0.0.1:30110 SERVICE_META_ENVIRONMENT: development + SERVICE_META_SERVICE: ${{ matrix.test-model }} run: | nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=grayscale-rocketmq-producer -jar \ sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-producer-demo/target/grayscale-rocketmq-producer-demo.jar > ${{ env.logDir }}/${{ matrix.rocketMqClientVersion }}-rocketmq-producer-base.log 2>&1 & @@ -26,6 +27,7 @@ runs: dynamic.config.serverAddress: 127.0.0.1:30110 SERVICE_META_ENVIRONMENT: development SERVICE_META_VERSION: 1.0.1 + SERVICE_META_SERVICE: ${{ matrix.test-model }} run: | nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=grayscale-rocketmq-producer -Dserver.port=9040 -jar \ sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-producer-demo/target/grayscale-rocketmq-producer-demo.jar > ${{ env.logDir }}/${{ matrix.rocketMqClientVersion }}-rocketmq-producer-gray.log 2>&1 & @@ -35,6 +37,7 @@ runs: dynamic.config.dynamicConfigType: KIE dynamic.config.serverAddress: 127.0.0.1:30110 SERVICE_META_ENVIRONMENT: development + SERVICE_META_SERVICE: ${{ matrix.test-model }} run: | nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=grayscale-rocketmq-consumer -jar \ sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-consumer-demo/target/grayscale-rocketmq-consumer-demo.jar > ${{ env.logDir }}/${{ matrix.rocketMqClientVersion }}-rocketmq-consumer-base.log 2>&1 & @@ -46,6 +49,7 @@ runs: dynamic.config.serverAddress: 127.0.0.1:30110 SERVICE_META_ENVIRONMENT: development SERVICE_META_VERSION: 1.0.1 + SERVICE_META_SERVICE: ${{ matrix.test-model }} run: | nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=grayscale-rocketmq-consumer -Dserver.port=9010 -jar \ sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-consumer-demo/target/grayscale-rocketmq-consumer-demo.jar > ${{ env.logDir }}/${{ matrix.rocketMqClientVersion }}-rocketmq-consumer-gray.log 2>&1 & @@ -75,7 +79,7 @@ runs: with: processor-keyword: grayscale-rocketmq - name: if failure then upload error log - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ failure() || cancelled() }} with: name: (test-for-grayscale-rocketmq)-(${{ matrix.test-model }}})-logs diff --git a/.github/workflows/message_gray_integration_test.yml b/.github/workflows/message_gray_integration_test.yml index 97a0254123..ffadd2db9f 100644 --- a/.github/workflows/message_gray_integration_test.yml +++ b/.github/workflows/message_gray_integration_test.yml @@ -119,10 +119,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-auto-only-base: - name: Test for pull base only for auto rule + name: Test base only for auto rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-plugin-false] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['AUTO_ONLY_BASE'] @@ -140,10 +140,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-auto-exc-only-base: - name: Test for pull base only for auto exclude rule + name: Test base only for auto exclude rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-only-base] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['AUTO_EXC_ONLY_BASE'] @@ -161,10 +161,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-auto-base-gray: - name: Test for pull base gray for auto rule + name: Test pull base gray for auto rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-exc-only-base] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['AUTO_BASE_GRAY_PULL'] @@ -182,10 +182,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-auto-base-gray-lite: - name: Test for pull base gray for auto rule + name: Test lite pull base gray for auto rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-exc-only-base] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['AUTO_BASE_GRAY_LITE_PULL'] @@ -203,10 +203,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-auto-base-gray-push: - name: Test for pull base gray for auto rule + name: Test push base gray for auto rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-exc-only-base] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['AUTO_BASE_GRAY_PUSH'] @@ -224,10 +224,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-auto-exc-base-gray: - name: Test for pull base gray for auto exclude rule + name: Test base gray for auto exclude rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-base-gray] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['AUTO_EXC_BASE_GRAY'] @@ -245,10 +245,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-base-only-base: - name: Test for pull base only for base rule + name: Test base only for base rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-exc-base-gray] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['BASE_ONLY_BASE'] @@ -266,10 +266,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-base-exc-only-base: - name: Test for pull base only for base exclude rule + name: Test base only for base exclude rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-base-only-base] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['BASE_EXC_ONLY_BASE'] @@ -287,10 +287,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-base-base-gray: - name: Test for pull base gray for base rule + name: Test base gray for base rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-base-exc-only-base] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['BASE_BASE_GRAY'] @@ -308,10 +308,10 @@ jobs: - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }} uses: ./.github/actions/scenarios/mq-grayscale/rocketmq test-for-base-exc-base-gray: - name: Test for pull base gray for base exclude rule + name: Test base gray for base exclude rule runs-on: ubuntu-latest if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true' - needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-base-base-gray] + needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache] strategy: matrix: test-model: ['BASE_EXC_BASE_GRAY'] diff --git a/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java b/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java index fee26aa650..dcbafbafea 100644 --- a/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java +++ b/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java @@ -59,7 +59,7 @@ public void testPluginEnabledFalseConsumeMessage() throws InterruptedException { private void testPluginEnabledFalsePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String baseResult = getPullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -69,7 +69,7 @@ private void testPluginEnabledFalsePull() throws InterruptedException { private void testPluginEnabledFalseLitePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -79,7 +79,7 @@ private void testPluginEnabledFalseLitePull() throws InterruptedException { private void testPluginEnabledFalsePush() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -100,15 +100,15 @@ private int parseGrayMessageCount(String messageCount) { public void testAutoOnlyBaseConsumeMessage() throws InterruptedException { createGrayscaleConfig("AUTO", ""); testAutoOnlyBasePull(); - Thread.sleep(10000); + Thread.sleep(15000); testAutoOnlyBaseLitePull(); - Thread.sleep(10000); + Thread.sleep(15000); testAutoOnlyBasePush(); } private void testAutoOnlyBasePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String baseResult = getPullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -118,7 +118,7 @@ private void testAutoOnlyBasePull() throws InterruptedException { private void testAutoOnlyBaseLitePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -128,7 +128,7 @@ private void testAutoOnlyBaseLitePull() throws InterruptedException { private void testAutoOnlyBasePush() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -141,15 +141,15 @@ private void testAutoOnlyBasePush() throws InterruptedException { public void testAutoExcOnlyBaseConsumeMessage() throws InterruptedException { createGrayscaleConfig("AUTO", "gray"); testAutoExcOnlyBasePull(); - Thread.sleep(10000); + Thread.sleep(15000); testAutoExcOnlyBaseLitePull(); - Thread.sleep(10000); + Thread.sleep(15000); testAutoExcOnlyBasePush(); } private void testAutoExcOnlyBasePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String baseResult = getPullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -159,7 +159,7 @@ private void testAutoExcOnlyBasePull() throws InterruptedException { private void testAutoExcOnlyBaseLitePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -169,7 +169,7 @@ private void testAutoExcOnlyBaseLitePull() throws InterruptedException { private void testAutoExcOnlyBasePush() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -182,9 +182,9 @@ private void testAutoExcOnlyBasePush() throws InterruptedException { public void testAutoBaseGrayConsumeMessage() throws InterruptedException { createGrayscaleConfig("AUTO", ""); testAutoBaseGrayPull(); - Thread.sleep(10000); + Thread.sleep(15000); testAutoBaseGrayLitePull(); - Thread.sleep(10000); + Thread.sleep(15000); testAutoBaseGrayPush(); } @@ -193,7 +193,7 @@ public void testAutoBaseGrayConsumeMessage() throws InterruptedException { public void testAutoBaseGrayPull() throws InterruptedException { createGrayscaleConfig("AUTO", ""); initAndProduceMessage(true, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String grayResult = getPullGrayResult(); int grayGrayCount = parseGrayMessageCount(grayResult); String baseResult = getPullBaseResult(); @@ -206,7 +206,7 @@ public void testAutoBaseGrayPull() throws InterruptedException { public void testAutoBaseGrayLitePull() throws InterruptedException { createGrayscaleConfig("AUTO", ""); initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String grayResult = getLitePullGrayResult(); int grayBaseCount = parseBaseMessageCount(grayResult); int grayGrayCount = parseGrayMessageCount(grayResult); @@ -221,7 +221,7 @@ public void testAutoBaseGrayLitePull() throws InterruptedException { public void testAutoBaseGrayPush() throws InterruptedException { createGrayscaleConfig("AUTO", ""); initAndProduceMessage(true, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -236,15 +236,15 @@ public void testAutoBaseGrayPush() throws InterruptedException { public void testAutoExcBaseGrayConsumeMessage() throws InterruptedException { createGrayscaleConfig("AUTO", "gray"); testAutoExcBaseGrayPull(); - Thread.sleep(10000); + Thread.sleep(15000); testAutoExcBaseGrayLitePull(); - Thread.sleep(10000); + Thread.sleep(15000); testAutoExcBaseGrayPush(); } private void testAutoExcBaseGrayPull() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String grayResult = getPullGrayResult(); int grayBaseCount = parseBaseMessageCount(grayResult); int grayGrayCount = parseGrayMessageCount(grayResult); @@ -257,7 +257,7 @@ private void testAutoExcBaseGrayPull() throws InterruptedException { private void testAutoExcBaseGrayLitePull() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -270,7 +270,7 @@ private void testAutoExcBaseGrayLitePull() throws InterruptedException { private void testAutoExcBaseGrayPush() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -286,15 +286,15 @@ private void testAutoExcBaseGrayPush() throws InterruptedException { public void testBaseOnlyBaseConsumeMessage() throws InterruptedException { createGrayscaleConfig("BASE", ""); testBaseOnlyBasePull(); - Thread.sleep(10000); + Thread.sleep(15000); testBaseOnlyBaseLitePull(); - Thread.sleep(10000); + Thread.sleep(15000); testBaseOnlyBasePush(); } private void testBaseOnlyBasePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String baseResult = getPullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -304,7 +304,7 @@ private void testBaseOnlyBasePull() throws InterruptedException { private void testBaseOnlyBaseLitePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -314,7 +314,7 @@ private void testBaseOnlyBaseLitePull() throws InterruptedException { private void testBaseOnlyBasePush() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -327,15 +327,15 @@ private void testBaseOnlyBasePush() throws InterruptedException { public void testBaseExcOnlyBaseConsumeMessage() throws InterruptedException { createGrayscaleConfig("BASE", "gray"); testBaseExcOnlyBasePull(); - Thread.sleep(10000); + Thread.sleep(15000); testBaseExcOnlyBaseLitePull(); - Thread.sleep(10000); + Thread.sleep(15000); testBaseExcOnlyBasePush(); } private void testBaseExcOnlyBasePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String baseResult = getPullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -345,7 +345,7 @@ private void testBaseExcOnlyBasePull() throws InterruptedException { private void testBaseExcOnlyBaseLitePull() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -355,7 +355,7 @@ private void testBaseExcOnlyBaseLitePull() throws InterruptedException { private void testBaseExcOnlyBasePush() throws InterruptedException { initAndProduceMessage(false, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -368,15 +368,15 @@ private void testBaseExcOnlyBasePush() throws InterruptedException { public void testBaseBaseGrayConsumeMessage() throws InterruptedException { createGrayscaleConfig("BASE", ""); testBaseBaseGrayPull(); - Thread.sleep(10000); + Thread.sleep(15000); testBaseBaseGrayLitePull(); - Thread.sleep(10000); + Thread.sleep(15000); testBaseBaseGrayPush(); } private void testBaseBaseGrayPull() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String baseResult = getPullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -389,7 +389,7 @@ private void testBaseBaseGrayPull() throws InterruptedException { private void testBaseBaseGrayLitePull() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -402,7 +402,7 @@ private void testBaseBaseGrayLitePull() throws InterruptedException { private void testBaseBaseGrayPush() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -418,15 +418,15 @@ private void testBaseBaseGrayPush() throws InterruptedException { public void testBaseExcBaseGrayConsumeMessage() throws InterruptedException { createGrayscaleConfig("BASE", "gray"); testBaseExcBaseGrayPull(); - Thread.sleep(10000); + Thread.sleep(15000); testBaseExcBaseGrayLitePull(); - Thread.sleep(10000); + Thread.sleep(15000); testBaseExcBaseGrayPush(); } private void testBaseExcBaseGrayPull() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_PULL); - Thread.sleep(50000); + Thread.sleep(240000); String baseResult = getPullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -439,7 +439,7 @@ private void testBaseExcBaseGrayPull() throws InterruptedException { private void testBaseExcBaseGrayLitePull() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -452,7 +452,7 @@ private void testBaseExcBaseGrayLitePull() throws InterruptedException { private void testBaseExcBaseGrayPush() throws InterruptedException { initAndProduceMessage(true, CONSUMER_TYPE_PUSH); - Thread.sleep(180000); + Thread.sleep(240000); String baseResult = getPushBaseResult(); int baseBaseCount = parseBaseMessageCount(baseResult); int baseGrayCount = parseGrayMessageCount(baseResult); @@ -472,7 +472,7 @@ private void initAndProduceMessage(boolean isGrayInstanceInit, String consumerTy // Trigger start gray consumer. restTemplate.getForObject("http://127.0.0.1:9010/initConsumer?consumerType={1}", String.class, consumerType); - Thread.sleep(50000); + Thread.sleep(150000); } // Trigger start base consumer. @@ -532,6 +532,8 @@ private void clearCacheCount(boolean isGrayInstanceInit) { } private void createGrayscaleConfig(String consumeMode, String excludeTag) { + String testModel = System.getProperty("grayscale.rocketmq.integration.test.type"); + kieClient.updateServiceNameLabels(testModel); String CONTENT = "enabled: true\n" + "grayscale:\n" + " - consumerGroupTag: gray\n" diff --git a/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/support/KieClient.java b/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/support/KieClient.java index 76ea118248..b42d607587 100644 --- a/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/support/KieClient.java +++ b/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/support/KieClient.java @@ -47,7 +47,7 @@ public class KieClient { private final String url; - private final Map labels; + private Map labels; /** * 构造函数 @@ -65,20 +65,15 @@ public KieClient(RestTemplate restTemplate) { * @param url 地址 */ public KieClient(RestTemplate restTemplate, String url) { - this(restTemplate, url, null); - } - - /** - * 构造函数 - * - * @param restTemplate 请求器 - * @param url 地址 - * @param labels 标签 - */ - public KieClient(RestTemplate restTemplate, String url, Map labels) { this.restTemplate = restTemplate; this.url = url == null ? "http://127.0.0.1:30110/v1/default/kie/kv" : url; - this.labels = labels; + this.labels = new HashMap<>(); + labels.put("app", "default"); + labels.put("environment", "development"); + } + + public void updateServiceNameLabels(String serviceName) { + labels.put("service", serviceName); } /**