From 0c4827d056655e3237efaf9d61edd9a9f19846c4 Mon Sep 17 00:00:00 2001 From: Daming Date: Thu, 29 Oct 2020 07:50:57 +0800 Subject: [PATCH] remove finagle-6.25.0-scenario (#5747) --- .github/workflows/plugins-test.0.yaml | 1 - .../java-agent/Supported-list.md | 2 +- .../finagle-6.25.x-scenario/bin/startup.sh | 21 --- .../config/expectedData.yaml | 66 ------- .../finagle-6.25.x-scenario/configuration.yml | 20 -- .../scenarios/finagle-6.25.x-scenario/pom.xml | 177 ------------------ .../src/main/assembly/assembly.xml | 41 ---- .../finagle/FinagleRpcApplication.java | 55 ------ .../finagle/controller/CaseController.java | 50 ----- .../service/FinagleRpcDemoServiceImpl.java | 30 --- .../src/main/resources/application.yml | 20 -- .../src/main/thrift/service.thrift | 23 --- .../support-version.list | 34 ---- 13 files changed, 1 insertion(+), 539 deletions(-) delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/bin/startup.sh delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/config/expectedData.yaml delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/configuration.yml delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/pom.xml delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/src/main/assembly/assembly.xml delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/src/main/resources/application.yml delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/src/main/thrift/service.thrift delete mode 100644 test/plugin/scenarios/finagle-6.25.x-scenario/support-version.list diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml index ef145577b3..725241dd24 100644 --- a/.github/workflows/plugins-test.0.yaml +++ b/.github/workflows/plugins-test.0.yaml @@ -46,7 +46,6 @@ jobs: - exception-checker-tomcat-scenario - feign-scenario - finagle-17.10.x-scenario - - finagle-6.25.x-scenario - finagle-6.44.x-scenario - gateway-2.1.x-scenario - gateway-2.0.x-scenario diff --git a/docs/en/setup/service-agent/java-agent/Supported-list.md b/docs/en/setup/service-agent/java-agent/Supported-list.md index e5d12272d8..1d74374cb9 100644 --- a/docs/en/setup/service-agent/java-agent/Supported-list.md +++ b/docs/en/setup/service-agent/java-agent/Supported-list.md @@ -44,7 +44,7 @@ * [SOFARPC](https://github.com/alipay/sofa-rpc) 5.4.0 * [Armeria](https://github.com/line/armeria) 0.63.0 -> 0.98.0 * [Apache Avro](http://avro.apache.org) 1.7.0 - 1.8.x - * [Finagle](https://github.com/twitter/finagle) 6.25.0 -> 20.1.0 + * [Finagle](https://github.com/twitter/finagle) 6.44.0 -> 20.1.0 (6.25.0 -> 6.44.0 not tested) * [Brpc-Java](https://github.com/baidu/brpc-java) 2.3.7 -> 2.5.3 * [Thrift](https://github.com/apache/thrift/tree/master/lib/java) 0.10.0 -> 0.12.0 * MQ diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/bin/startup.sh b/test/plugin/scenarios/finagle-6.25.x-scenario/bin/startup.sh deleted file mode 100644 index 14e577efd3..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/bin/startup.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/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/finagle-6.25.x-scenario.jar & \ No newline at end of file diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/finagle-6.25.x-scenario/config/expectedData.yaml deleted file mode 100644 index 26ab6586d1..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/config/expectedData.yaml +++ /dev/null @@ -1,66 +0,0 @@ -# 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. -segmentItems: -- serviceName: finagle-6.25.x-scenario - segmentSize: gt 2 - segments: - - segmentId: not null - spans: - - operationName: hello - operationId: 0 - parentSpanId: -1 - spanId: 0 - spanLayer: RPCFramework - startTime: nq 0 - endTime: nq 0 - componentId: 85 - isError: false - spanType: Entry - peer: '' - refs: - - {parentEndpoint: /finagle-6.25.x-scenario/case/finagle, networkAddress: '127.0.0.1:12220', - refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not - null, parentService: 'finagle-6.25.x-scenario', traceId: not null} - skipAnalysis: 'false' - - segmentId: not null - spans: - - operationName: hello - operationId: 0 - parentSpanId: 0 - spanId: 1 - spanLayer: RPCFramework - startTime: nq 0 - endTime: nq 0 - componentId: 85 - isError: false - spanType: Exit - peer: '127.0.0.1:12220' - skipAnalysis: 'false' - - operationName: /finagle-6.25.x-scenario/case/finagle - operationId: 0 - parentSpanId: -1 - spanId: 0 - spanLayer: Http - startTime: nq 0 - endTime: nq 0 - componentId: 1 - isError: false - spanType: Entry - peer: '' - tags: - - {key: url, value: 'http://localhost:8080/finagle-6.25.x-scenario/case/finagle'} - - {key: http.method, value: GET} - skipAnalysis: 'false' diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/configuration.yml b/test/plugin/scenarios/finagle-6.25.x-scenario/configuration.yml deleted file mode 100644 index 6f6271d1de..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/configuration.yml +++ /dev/null @@ -1,20 +0,0 @@ -# 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/finagle-6.25.x-scenario/case/finagle -healthCheck: http://localhost:8080/finagle-6.25.x-scenario/case/healthCheck -startScript: ./bin/startup.sh diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/pom.xml b/test/plugin/scenarios/finagle-6.25.x-scenario/pom.xml deleted file mode 100644 index 34a102e2ff..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/pom.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - 4.0.0 - - org.apache.skywalking - finagle-6.25.x-scenario - jar - 5.0.0 - - - UTF-8 - 1.8 - - 2.1.6.RELEASE - finagle - 6.25.0 - - - skywalking-finagle-6.25.x-scenario - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - - - com.twitter - finagle-core_2.11 - ${test.framework.version} - - - - com.twitter - finagle-thrift_2.11 - ${test.framework.version} - - - servlet-api - javax.servlet - - - - - - org.apache.thrift - libthrift - 0.9.3 - - - - com.twitter - scrooge-core_2.11 - 4.7.0 - - - - com.twitter - scrooge-runtime_2.11 - 4.5.0 - - - - org.springframework.boot - spring-boot-starter-web - - - - - finagle-6.25.x-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/ - - - - - - com.twitter - scrooge-maven-plugin - 4.5.0 - - experimental-java - - --finagle - - false - - - - generate-thrift-sources - generate-sources - - compile - - - - thrift-test-sources - generate-test-sources - - testCompile - - - - - - - - - - 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/finagle-6.25.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/assembly/assembly.xml deleted file mode 100644 index c0ab4d3b8f..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/assembly/assembly.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - zip - - - - - ./bin - 0775 - - - - - - ${project.build.directory}/finagle-6.25.x-scenario.jar - ./libs - 0775 - - - diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java b/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java deleted file mode 100644 index c172b8b6b1..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/FinagleRpcApplication.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.finagle; - - -import com.twitter.finagle.ListeningServer; -import com.twitter.finagle.Thrift; -import org.apache.skywalking.apm.testcase.finagle.interfaces.FinagleRpcDemoService; -import org.apache.skywalking.apm.testcase.finagle.service.FinagleRpcDemoServiceImpl; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@SpringBootApplication -public class FinagleRpcApplication { - - public static void main(String[] args) { - SpringApplication.run(FinagleRpcApplication.class, args); - } - - - @Configuration - public static class FinagleRpcConfiguration { - - @Bean(destroyMethod = "close") - public ListeningServer server() { - ListeningServer server = Thrift.server() - .serveIface(":12220", new FinagleRpcDemoServiceImpl()); - return server; - } - - @Bean - public FinagleRpcDemoService.FutureIface client() { - return Thrift.client() - .newIface("localhost:12220", FinagleRpcDemoService.FutureIface.class); - } - } -} diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java b/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java deleted file mode 100644 index 7f698c692f..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/controller/CaseController.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.finagle.controller; - -import com.twitter.util.Await; -import org.apache.skywalking.apm.testcase.finagle.interfaces.FinagleRpcDemoService; -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; - - -@RestController -@RequestMapping("/case") -public class CaseController { - - private static final String SUCCESS = "Success"; - - @Autowired - private FinagleRpcDemoService.FutureIface finagleRpcDemoService; - - @RequestMapping("/healthCheck") - @ResponseBody - public String healthCheck() { - return SUCCESS; - } - - @RequestMapping("/finagle") - @ResponseBody - public String finagle() throws Exception { - System.out.println(Await.result(finagleRpcDemoService.hello("finagle"))); - return SUCCESS; - } -} diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java b/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java deleted file mode 100644 index 91b6f8a9e2..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/finagle/service/FinagleRpcDemoServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.finagle.service; - -import com.twitter.util.Future; -import org.apache.skywalking.apm.testcase.finagle.interfaces.FinagleRpcDemoService; - - -public class FinagleRpcDemoServiceImpl implements FinagleRpcDemoService.FutureIface { - - public Future hello(String name) { - return Future.value("hello, " + name); - } -} diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/resources/application.yml b/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/resources/application.yml deleted file mode 100644 index b8c30e9397..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/resources/application.yml +++ /dev/null @@ -1,20 +0,0 @@ -# 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: /finagle-6.25.x-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/thrift/service.thrift b/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/thrift/service.thrift deleted file mode 100644 index f37d915e1d..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/src/main/thrift/service.thrift +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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. - * - */ - -namespace java org.apache.skywalking.apm.testcase.finagle.interfaces - -service FinagleRpcDemoService { - string hello(string name); -} \ No newline at end of file diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/support-version.list b/test/plugin/scenarios/finagle-6.25.x-scenario/support-version.list deleted file mode 100644 index ae96648f2c..0000000000 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/support-version.list +++ /dev/null @@ -1,34 +0,0 @@ -# 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. - -6.25.0 -6.26.0 -6.27.0 -6.28.0 -6.29.0 -6.30.0 -6.31.0 -6.33.0 -6.34.0 -6.35.0 -6.36.0 -6.37.0 -6.38.0 -6.39.0 -6.40.0 -6.41.0 -6.42.0 -6.43.0 -- GitLab