diff --git a/test/plugin/run.sh b/test/plugin/run.sh index 0075772295f84ddf9bb3e653f4ea709d385025d9..52ebb4d6360090d8387b9ee11496ac4a34ead372 100644 --- a/test/plugin/run.sh +++ b/test/plugin/run.sh @@ -123,7 +123,7 @@ agent_home_selector() { target_agent_home=${workspace}/${target_agent_dir} mkdir -p ${target_agent_home} - cp -fur ${agent_home}/* ${target_agent_home} + cp -fr ${agent_home}/* ${target_agent_home} with_plugins=`echo $with_plugins |sed -e "s/;/ /g"` for plugin in ${with_plugins}; diff --git a/test/plugin/scenarios/gateway-scenario/configuration.yml b/test/plugin/scenarios/gateway-scenario/configuration.yml index f73a1e8ad8858427c69a5efabbca9b124985e6d5..40409eb2622b42f0d286d8c722697dc22ef76397 100644 --- a/test/plugin/scenarios/gateway-scenario/configuration.yml +++ b/test/plugin/scenarios/gateway-scenario/configuration.yml @@ -20,3 +20,4 @@ healthCheck: http://localhost:8080/provider/b/healthCheck startScript: ./bin/startup.sh framework: spring-cloud-gateway runningMode: with_optional +withPlugins: apm-spring-cloud-gateway-2.x-plugin-*.jar diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java index e7ca68fb63711ca2a1231c4b8db65e57a628b31d..1e46378d4d5511974a38fafc694831ea34f33cef 100644 --- a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java +++ b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java @@ -18,7 +18,9 @@ package org.apache.skywalking.apm.testcase.sc.gateway.projectA; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +@Configuration public class TestFilterConfig { @Bean diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml index 07d1fb1108c78c8e22d8bc43995240954254b48e..51774a6b5488f4667399e09b5377d29d1c10533e 100644 --- a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml +++ b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml @@ -24,7 +24,4 @@ spring: - id: provider_route uri: http://localhost:18070 predicates: - - Path=/provider/b/* -endpoints: - refresh: - sensitive: false \ No newline at end of file + - Path=/provider/b/* \ No newline at end of file