diff --git a/.github/workflows/dubbo_integration_test.yml b/.github/workflows/dubbo_integration_test.yml index c134571618..3dafb6fd4f 100644 --- a/.github/workflows/dubbo_integration_test.yml +++ b/.github/workflows/dubbo_integration_test.yml @@ -154,9 +154,7 @@ jobs: uses: ./.github/actions/scenarios/dubbo/removal test-for-dubbo3: name: Test for dubbo3.x - if: needs.set-execution-conditions.outputs.enableDubbo3Router == 'true' - || needs.set-execution-conditions.outputs.enableDubbo3Lane == 'true' - || needs.set-execution-conditions.outputs.enableDubbo3Flow == 'true' + if: needs.set-execution-conditions.outputs.enableDubbo3Router == 'true' || needs.set-execution-conditions.outputs.enableDubbo3Lane == 'true' || needs.set-execution-conditions.outputs.enableDubbo3Flow == 'true' runs-on: ubuntu-latest needs: [set-execution-conditions, download-midwares-and-cache, build-agent-and-cache ] strategy: @@ -245,6 +243,6 @@ jobs: - name: (dubbo3.x lane) test for ${{ matrix.dubbo-version }}-${{ matrix.dubbo-versions }} if: needs.set-execution-conditions.outputs.enableDubbo3Lane == 'true' uses: ./.github/actions/scenarios/dubbo/lane-dubbo3 - - name: (dubbo common) test for ${{ matrix.dubbo-version }}-${{ matrix.dubbo-versions }} + - name: (dubbo3.x flow) test for ${{ matrix.dubbo-version }}-${{ matrix.dubbo-versions }} if: needs.set-execution-conditions.outputs.enableDubbo3Flow == 'true' uses: ./.github/actions/scenarios/dubbo/dubbo3-flow diff --git a/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/io/sermant/flowcontrol/common/util/DubboAttachmentsHelper.java b/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/io/sermant/flowcontrol/common/util/DubboAttachmentsHelper.java index 6144ad5919..a0460c4e0f 100644 --- a/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/io/sermant/flowcontrol/common/util/DubboAttachmentsHelper.java +++ b/sermant-plugins/sermant-flowcontrol/flowcontrol-common/src/main/java/io/sermant/flowcontrol/common/util/DubboAttachmentsHelper.java @@ -23,6 +23,8 @@ import java.util.Map; import java.util.Optional; +import org.apache.dubbo.common.Version; + /** * Request body conversion tool class, mainly based on reflection * @@ -57,6 +59,9 @@ public static Map resolveAttachments(Object invocation, boolean return Collections.emptyMap(); } String dubboVersion = invocation.getClass().getPackage().getImplementationVersion(); + if (dubboVersion == null) { + dubboVersion = Version.getVersion(); + } final Map attachments = new HashMap<>(); if (isApache) { if (dubboVersion.startsWith(DUBBO_3X_PREFIX)) {