diff --git a/Jenkinsfile-Agent-Test-3 b/Jenkinsfile-Agent-Test-3 index 24db4da73..d8e5798b0 100755 --- a/Jenkinsfile-Agent-Test-3 +++ b/Jenkinsfile-Agent-Test-3 @@ -56,7 +56,8 @@ pipeline { sh './mvnw -f test/plugin/pom.xml clean package -DskipTests -Dbuild_id=wl3_${BUILD_ID} docker:build' } } - stage('Test Cases Report (106)') { + + stage('Test Cases Report (129)') { steps { echo "reserve." } @@ -75,6 +76,11 @@ pipeline { sh 'bash test/plugin/run.sh --build_id=wl3_${BUILD_ID} canal-scenario' } } + stage('sofarpc 5.4.0-5.6.2 (23)') { + steps { + sh 'bash test/plugin/run.sh --build_id=wl3_${BUILD_ID} sofarpc-scenario' + } + } } } stage('Group2') { @@ -101,4 +107,4 @@ pipeline { deleteDir() } } -} +} \ No newline at end of file diff --git a/test/plugin/scenarios/sofarpc-scenario/bin/startup.sh b/test/plugin/scenarios/sofarpc-scenario/bin/startup.sh new file mode 100644 index 000000000..f35e7f6f0 --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/bin/startup.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + +home="$(cd "$(dirname $0)"; pwd)" + +java -jar ${agent_opts} ${home}/../libs/sofarpc-scenario.jar & \ No newline at end of file diff --git a/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml b/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml new file mode 100644 index 000000000..08b15f6b6 --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/config/expectedData.yaml @@ -0,0 +1,89 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + +registryItems: + applications: + - {sofarpc-scenario: 2} + instances: + - {sofarpc-scenario: 1} + operationNames: + - sofarpc-scenario: [org.apache.skywalking.apm.testcase.sofarpc.interfaces.SofaRpcDemoService.hello(java.lang.String), + /sofarpc-scenario/case/sofarpc] + heartbeat: [] +segmentItems: + - applicationCode: sofarpc-scenario + segmentSize: gt 2 + segments: + - segmentId: not null + spans: + - operationName: org.apache.skywalking.apm.testcase.sofarpc.interfaces.SofaRpcDemoService.hello(java.lang.String) + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: RPCFramework + startTime: nq 0 + endTime: nq 0 + componentId: 43 + componentName: '' + isError: false + spanType: Entry + peer: '' + peerId: 0 + refs: + - {parentEndpointId: 0, parentEndpoint: /sofarpc-scenario/case/sofarpc, networkAddressId: 0, + entryEndpointId: 0, refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, + parentServiceInstanceId: 1, networkAddress: '127.0.0.1:12200', entryEndpoint: /sofarpc-scenario/case/sofarpc, + entryServiceInstanceId: 1} + - segmentId: not null + spans: + - operationName: org.apache.skywalking.apm.testcase.sofarpc.interfaces.SofaRpcDemoService.hello(java.lang.String) + operationId: 0 + parentSpanId: 0 + spanId: 1 + spanLayer: RPCFramework + startTime: nq 0 + endTime: nq 0 + componentId: 43 + componentName: '' + isError: false + spanType: Exit + peer: 127.0.0.1:12200 + peerId: 0 + tags: + - {key: url, value: 'bolt://127.0.0.1:12200/org.apache.skywalking.apm.testcase.sofarpc.interfaces.SofaRpcDemoService.hello(java.lang.String)'} + - operationName: /sofarpc-scenario/case/sofarpc + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: Http + startTime: nq 0 + endTime: nq 0 + componentId: 1 + componentName: '' + isError: false + spanType: Entry + peer: '' + peerId: 0 + tags: + - {key: url, value: 'http://localhost:8080/sofarpc-scenario/case/sofarpc'} + - {key: http.method, value: GET} + + + + + + + diff --git a/test/plugin/scenarios/sofarpc-scenario/configuration.yml b/test/plugin/scenarios/sofarpc-scenario/configuration.yml new file mode 100644 index 000000000..9f6ae6e5a --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/configuration.yml @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + +type: jvm +entryService: http://localhost:8080/sofarpc-scenario/case/sofarpc +healthCheck: http://localhost:8080/sofarpc-scenario/case/healthCheck +startScript: ./bin/startup.sh +framework: sofarpc \ No newline at end of file diff --git a/test/plugin/scenarios/sofarpc-scenario/pom.xml b/test/plugin/scenarios/sofarpc-scenario/pom.xml new file mode 100644 index 000000000..559767348 --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/pom.xml @@ -0,0 +1,119 @@ + + + + 4.0.0 + + org.apache.skywalking + sofarpc-scenario + jar + 5.0.0 + + + UTF-8 + 1.8 + + 2.1.6.RELEASE + sofarpc + 5.4.0 + + + skywalking-sofarpc-scenario + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + + + + com.alipay.sofa + sofa-rpc-all + ${test.framework.version} + + + + org.springframework.boot + spring-boot-starter-web + + + + + sofarpc-scenario + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + maven-compiler-plugin + + ${compiler.version} + ${compiler.version} + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + + src/main/assembly/assembly.xml + + ./target/ + + + + + + + + + + spring-snapshots + http://repo.spring.io/snapshot + + + spring-milestones + http://repo.spring.io/milestone + + + \ No newline at end of file diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/sofarpc-scenario/src/main/assembly/assembly.xml new file mode 100644 index 000000000..de1691f5c --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/assembly/assembly.xml @@ -0,0 +1,41 @@ + + + + + zip + + + + + ./bin + 0775 + + + + + + ${project.build.directory}/sofarpc-scenario.jar + ./libs + 0775 + + + diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/SofaRpcApplication.java b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/SofaRpcApplication.java new file mode 100644 index 000000000..9d2754948 --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/SofaRpcApplication.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * 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 org.apache.skywalking.apm.testcase.sofarpc; + +import com.alipay.sofa.rpc.config.ConsumerConfig; +import com.alipay.sofa.rpc.config.ProviderConfig; +import com.alipay.sofa.rpc.config.ServerConfig; +import org.apache.skywalking.apm.testcase.sofarpc.interfaces.SofaRpcDemoService; +import org.apache.skywalking.apm.testcase.sofarpc.service.SofaRpcDemoServiceImpl; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @author zhangwei + */ +@SpringBootApplication +public class SofaRpcApplication { + + public static void main(String[] args) { + SpringApplication.run(SofaRpcApplication.class, args); + } + + + @Configuration + public static class SofaRpcConfiguration { + + @Bean(destroyMethod = "unExport") + public ProviderConfig provider() { + ServerConfig config = new ServerConfig() + .setProtocol("bolt") + .setPort(12200) + .setDaemon(true); + + ProviderConfig providerConfig = new ProviderConfig() + .setInterfaceId(SofaRpcDemoService.class.getName()) + .setRef(new SofaRpcDemoServiceImpl()) + .setServer(config); + + providerConfig.export(); + return providerConfig; + } + + @Bean + public ConsumerConfig consumer(){ + return new ConsumerConfig() + .setInterfaceId(SofaRpcDemoService.class.getName()) + .setProtocol("bolt") + .setDirectUrl("bolt://127.0.0.1:12200"); + } + } +} diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java new file mode 100644 index 000000000..0ff32987a --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * 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 org.apache.skywalking.apm.testcase.sofarpc.controller; + +import com.alipay.sofa.rpc.config.ConsumerConfig; +import org.apache.skywalking.apm.testcase.sofarpc.interfaces.SofaRpcDemoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author zhangwei + */ +@RestController +@RequestMapping("/case") +public class CaseController { + + private static final String SUCCESS = "Success"; + + @Autowired + private ConsumerConfig consumerConfig; + + @RequestMapping("/healthCheck") + @ResponseBody + public String healthCheck() { + return SUCCESS; + } + + @RequestMapping("/sofarpc") + @ResponseBody + public String sofarpc() { + SofaRpcDemoService service = consumerConfig.refer(); + System.out.println(service.hello("sofarpc")); + return SUCCESS; + } +} diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/interfaces/SofaRpcDemoService.java b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/interfaces/SofaRpcDemoService.java new file mode 100644 index 000000000..cd541109b --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/interfaces/SofaRpcDemoService.java @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * 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 org.apache.skywalking.apm.testcase.sofarpc.interfaces; + +public interface SofaRpcDemoService { + + String hello(String name); +} diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/service/SofaRpcDemoServiceImpl.java b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/service/SofaRpcDemoServiceImpl.java new file mode 100644 index 000000000..9fed6ddc3 --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/service/SofaRpcDemoServiceImpl.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * 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 org.apache.skywalking.apm.testcase.sofarpc.service; + +import org.apache.skywalking.apm.testcase.sofarpc.interfaces.SofaRpcDemoService; + +public class SofaRpcDemoServiceImpl implements SofaRpcDemoService { + @Override + public String hello(String name) { + return "hello, " + name; + } +} diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/resources/application.yml b/test/plugin/scenarios/sofarpc-scenario/src/main/resources/application.yml new file mode 100644 index 000000000..cba158caa --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/resources/application.yml @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# 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. + +server: + port: 8080 + servlet: + context-path: /sofarpc-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/sofarpc-scenario/support-version.list b/test/plugin/scenarios/sofarpc-scenario/support-version.list new file mode 100644 index 000000000..e114fb135 --- /dev/null +++ b/test/plugin/scenarios/sofarpc-scenario/support-version.list @@ -0,0 +1,39 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version +# "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 +# +# 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. + +5.4.0 +5.4.1 +5.4.2 +5.4.3 +5.4.4 +5.4.5 +5.4.6 +5.4.7 +5.4.8 +5.5.0 +5.5.1 +5.5.2 +5.5.3 +5.5.4 +5.5.5 +5.5.6 +5.5.6.1 +5.5.7 +5.5.8 +5.5.9 +5.6.0 +5.6.1 +5.6.2