修改review意见

sermant-io · Feb 25, 2025 · 9cd4f22 · 9cd4f22
1 parent 81f34b1
commit 9cd4f22
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 41 deletions.
diff --git a/.github/actions/common/plugin-change-check/action.yml b/.github/actions/common/plugin-change-check/action.yml
@@ -687,7 +687,7 @@ runs:
           echo "enableDubbo3Lane=true" >> $GITHUB_ENV
         fi
         # ==========dubbo3 flow is needed to test?==========
-        if [ ${{ env.sermantAgentCoreChanged }} == 'true' -o ${{ env.sermantRouterChanged }} == 'true' -o \
+        if [ ${{ env.sermantAgentCoreChanged }} == 'true'  -o \
             ${{ env.enableDubbo3FlowActionChange }} == 'true' -o \
             ${{ steps.changed-common-action.outputs.changed }} == 'true' -o ${{ env.triggerPushEvent }} == 'true' -o \
             ${{ env.enableDubboTestChange }} == 'true' ];then

diff --git a/.github/actions/scenarios/dubbo/dubbo3-flow/action.yml b/.github/actions/scenarios/dubbo/dubbo3-flow/action.yml
@@ -70,7 +70,7 @@ runs:
       uses: actions/upload-artifact@v4
       if: ${{ failure() || cancelled() }}
       with:
-        name: (test-for-dubbo)-(${{ matrix.dubbo-version }}-${{ matrix.dubbo-versions }})-logs
+        name: (test-for-dubbo3-flow)-(${{ matrix.dubbo-version }}-${{ matrix.dubbo-versions }})-logs
         path: |
           ./*.log
           ./logs/**/*.log

diff --git a/...ration-provider/src/main/java/io/sermant/integration/Dubbo3ProviderApplication.java.banck b/...ration-provider/src/main/java/io/sermant/integration/Dubbo3ProviderApplication.java.banck
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2022-2022 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (C) 2025-2025 Sermant Authors. All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  */
 
 package io.sermant.integration;
@@ -31,10 +31,10 @@ import io.sermant.integration.controller.ConsumerController;
 import io.sermant.integration.controller.FlowController;
 
 /**
- * 启动类
+ * starter
  *
- * @author provenceee
- * @since 2022-04-27
+ * @author chengyouling
+ * @since 2025-042-25
  */
 @SpringBootApplication
 @ImportResource({"classpath:dubbo/provider.xml"})
@@ -45,9 +45,9 @@ public class Dubbo3ProviderApplication {
     private static final Logger LOGGER = LoggerFactory.getLogger(Dubbo3ProviderApplication.class);
 
     /**
-     * spring启动类
+     * spring starter
      *
-     * @param args 启动参数
+     * @param args args
      */
     public static void main(String[] args) {
         LOGGER.info("====================start=======================");

diff --git a/...vider/src/main/java/io/sermant/integration/configuration/FlowControlExceptionHandler.java b/...vider/src/main/java/io/sermant/integration/configuration/FlowControlExceptionHandler.java
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2025-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (C) 2024-2024 Sermant Authors. All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  */
 
 package io.sermant.integration.configuration;
@@ -25,7 +25,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
 /**
- * 流控全局异常处理
+ * global flow control exception handling
  *
  * @author chengyouling
  * @since 2025-02-22

diff --git a/...egration-test/src/test/java/io/sermant/integration/flow/dubbo3/Dubbo3FlowControlTest.java b/...egration-test/src/test/java/io/sermant/integration/flow/dubbo3/Dubbo3FlowControlTest.java
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2025-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (C) 2025-2025 Sermant Authors. All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  */
 
 package io.sermant.integration.flow.dubbo3;
@@ -30,7 +30,7 @@
 import io.sermant.integration.utils.RequestUtils;
 
 /**
- * 流控测试
+ * flow tests
  *
  * @author chengyouling
  * @since 2025-02-19

diff --git a/...ntrol-common/src/main/java/io/sermant/flowcontrol/common/util/DubboAttachmentsHelper.java b/...ntrol-common/src/main/java/io/sermant/flowcontrol/common/util/DubboAttachmentsHelper.java
@@ -40,7 +40,7 @@ public class DubboAttachmentsHelper {
 
     private static final String GET_CONTEXT_METHOD = "getContext";
 
-    private static final String GET_SERVER_ATT_METHOD = "getServerAttachment";
+    private static final String GET_SERVER_ATTACHMENT_METHOD = "getServerAttachment";
 
     private static final String DUBBO_3X_PREFIX = "3.";
 
@@ -65,7 +65,7 @@ public static Map<String, String> resolveAttachments(Object invocation, boolean
         final Map<String, String> attachments = new HashMap<>();
         if (isApache) {
             if (dubboVersion.startsWith(DUBBO_3X_PREFIX)) {
-                attachments.putAll(getAttachmentsFromContext(APACHE_RPC_CONTEXT, GET_SERVER_ATT_METHOD));
+                attachments.putAll(getAttachmentsFromContext(APACHE_RPC_CONTEXT, GET_SERVER_ATTACHMENT_METHOD));
             } else {
                 attachments.putAll(getAttachmentsFromContext(APACHE_RPC_CONTEXT, GET_CONTEXT_METHOD));
             }