diff --git a/.github/workflows/plugins-jdk14-test.0.yaml b/.github/workflows/plugins-jdk14-test.0.yaml deleted file mode 100644 index 90ab78d0c..000000000 --- a/.github/workflows/plugins-jdk14-test.0.yaml +++ /dev/null @@ -1,74 +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. - -name: Test - -on: - pull_request: - paths: - - '.github/workflows/plugins-*.yaml' - - 'apm-application-toolkit/**' - - 'apm-commons/**' - - 'apm-protocol/**' - - 'apm-sniffer/**' - - 'test/plugin/**' - - '**/pom.xml' - - '!**.md' - push: - branches: - - test/ci/* - -concurrency: - group: plugins-jdk14-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - build: - name: Build - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Build - uses: ./.github/actions/build - with: - base_image_java: adoptopenjdk/openjdk14:alpine - base_image_tomcat: tomcat:8.5-jdk14-openjdk - - test: - needs: [ build ] - name: ${{ matrix.case }} - runs-on: ubuntu-latest - timeout-minutes: 90 - strategy: - matrix: - case: - - jdk14-with-gson-scenario - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: actions/setup-java@v2 - with: - distribution: adopt - java-version: 14 - - name: Run Test - uses: ./.github/actions/run - with: - test_case: ${{ matrix.case }} - diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/bin/startup.sh b/test/plugin/scenarios/jdk14-with-gson-scenario/bin/startup.sh deleted file mode 100644 index 761c94eb1..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-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 --enable-preview ${agent_opts} ${home}/../libs/jdk14-with-gson-scenario.jar & \ No newline at end of file diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/config/expectedData.yaml b/test/plugin/scenarios/jdk14-with-gson-scenario/config/expectedData.yaml deleted file mode 100644 index 879bc4579..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/config/expectedData.yaml +++ /dev/null @@ -1,73 +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: jdk14-with-gson-scenario - segmentSize: ge 2 - segments: - - segmentId: nq 0 - spans: - - operationName: Gson/ToJson - parentSpanId: 0 - spanId: 1 - spanLayer: Unknown - tags: - - {key: length, value: not null} - startTime: nq 0 - endTime: nq 0 - componentId: 55 - isError: false - spanType: Local - peer: ' ' - skipAnalysis: 'false' - - operationName: Gson/FromJson - parentSpanId: 0 - spanId: 2 - spanLayer: Unknown - tags: - - {key: length, value: not null} - startTime: nq 0 - endTime: nq 0 - componentId: 55 - isError: false - spanType: Local - peer: '' - skipAnalysis: 'false' - - operationName: /person/action - parentSpanId: 0 - spanId: 3 - spanLayer: Unknown - startTime: nq 0 - endTime: nq 0 - componentId: 0 - isError: false - spanType: Local - peer: '' - skipAnalysis: 'false' - tags: - - {key: key, value: value} - - operationName: GET:/case/gson-scenario - spanId: 0 - spanLayer: Http - startTime: nq 0 - endTime: nq 0 - componentId: 14 - isError: false - spanType: Entry - peer: '' - tags: - - {key: url, value: 'http://localhost:8080/gson-scenario/case/gson-scenario'} - - {key: http.method, value: GET} - skipAnalysis: 'false' diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/configuration.yml b/test/plugin/scenarios/jdk14-with-gson-scenario/configuration.yml deleted file mode 100644 index 39e3a2b73..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/configuration.yml +++ /dev/null @@ -1,24 +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/gson-scenario/case/gson-scenario -healthCheck: http://localhost:8080/gson-scenario/case/healthCheck -startScript: ./bin/startup.sh -runningMode: with_optional -withPlugins: apm-gson-2.x-plugin-*.jar -environment: -dependencies: diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml b/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml deleted file mode 100644 index 6275e0689..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - org.apache.skywalking.apm.testcase - jdk14-with-gson-scenario - 1.0.0 - jar - - 4.0.0 - - - UTF-8 - 14 - 2.2.6.RELEASE - 2.8.5 - ${test.framework.version} - 2.6.2 - 4.3.8.RELEASE - 8.1.0 - - - skywalking-jdk14-scenario - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-logging - - - - - org.springframework.boot - spring-boot-starter-log4j2 - - - - org.apache.skywalking - apm-toolkit-trace - ${apm-toolkit-trace.version} - - - - com.google.code.gson - gson - ${test.framework.version} - - - - - jdk14-with-gson-scenario - - - - maven-compiler-plugin - - --enable-preview - - - - maven-surefire-plugin - - --enable-preview - - - - maven-failsafe-plugin - - --enable-preview - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - 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/ - - - - - - - \ No newline at end of file diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/assembly/assembly.xml deleted file mode 100644 index e0d864e25..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/assembly/assembly.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - zip - - - - - ./bin - 0775 - - - - - - ${project.build.directory}/jdk14-with-gson-scenario.jar - ./libs - 0775 - - - diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/java/test/apache/skywalking/apm/testcase/gson/Application.java b/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/java/test/apache/skywalking/apm/testcase/gson/Application.java deleted file mode 100644 index 00341933b..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/java/test/apache/skywalking/apm/testcase/gson/Application.java +++ /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 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 test.apache.skywalking.apm.testcase.gson; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Application { - - public static void main(String[] args) { - try { - SpringApplication.run(Application.class, args); - } catch (Exception e) { - // Never do this - } - } -} diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/java/test/apache/skywalking/apm/testcase/gson/controller/CaseController.java b/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/java/test/apache/skywalking/apm/testcase/gson/controller/CaseController.java deleted file mode 100644 index 966409fc4..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/java/test/apache/skywalking/apm/testcase/gson/controller/CaseController.java +++ /dev/null @@ -1,56 +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 test.apache.skywalking.apm.testcase.gson.controller; - -import com.google.gson.Gson; -import org.apache.skywalking.apm.toolkit.trace.ActiveSpan; -import org.apache.skywalking.apm.toolkit.trace.Trace; -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"; - - @RequestMapping("/gson-scenario") - @ResponseBody - public String gsonCase() { - Gson gson = new Gson(); - Person person = new Person("skywalking", "jdk14"); - gson.fromJson(gson.toJson(person), Person.class); - person.action(); - return SUCCESS; - } - - @RequestMapping("/healthCheck") - @ResponseBody - public String healthCheck() { - return SUCCESS; - } - - public record Person(String name, String uuid) { - @Trace(operationName = "/person/action") - public void action() { - ActiveSpan.tag("key", "value"); - } - } -} diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/resources/application.yaml b/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/resources/application.yaml deleted file mode 100644 index 9c7f5df3a..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/resources/application.yaml +++ /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. -# -# -server: - port: 8080 - servlet: - context-path: /gson-scenario -logging: - config: classpath:log4j2.xml \ No newline at end of file diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/resources/log4j2.xml b/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/resources/log4j2.xml deleted file mode 100644 index 9849ed5a8..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/src/main/resources/log4j2.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/plugin/scenarios/jdk14-with-gson-scenario/support-version.list b/test/plugin/scenarios/jdk14-with-gson-scenario/support-version.list deleted file mode 100644 index 03d0f449e..000000000 --- a/test/plugin/scenarios/jdk14-with-gson-scenario/support-version.list +++ /dev/null @@ -1,17 +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. - -2.8.6