This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/wu-sheng-patch-1 by this push:
new 6dd90a087 Remove jdk14-with-gson test.
6dd90a087 is described below
commit 6dd90a0879f85a487caea10b9ea3dab2b85d9eba
Author: Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Mon May 30 16:00:29 2022 +0800
Remove jdk14-with-gson test.
---
.../jdk14-with-gson-scenario/bin/startup.sh | 21 ---
.../config/expectedData.yaml | 73 ----------
.../jdk14-with-gson-scenario/configuration.yml | 24 ----
.../scenarios/jdk14-with-gson-scenario/pom.xml | 150 ---------------------
.../src/main/assembly/assembly.xml | 41 ------
.../skywalking/apm/testcase/gson/Application.java | 34 -----
.../testcase/gson/controller/CaseController.java | 56 --------
.../src/main/resources/application.yaml | 23 ----
.../src/main/resources/log4j2.xml | 30 -----
.../jdk14-with-gson-scenario/support-version.list | 17 ---
10 files changed, 469 deletions(-)
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <groupId>org.apache.skywalking.apm.testcase</groupId>
- <artifactId>jdk14-with-gson-scenario</artifactId>
- <version>1.0.0</version>
- <packaging>jar</packaging>
-
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <compiler.version>14</compiler.version>
- <spring.boot.version>2.2.6.RELEASE</spring.boot.version>
- <test.framework.version>2.8.5</test.framework.version>
- <docker.image.version>${test.framework.version}</docker.image.version>
- <log4j.version>2.6.2</log4j.version>
- <spring.version>4.3.8.RELEASE</spring.version>
- <apm-toolkit-trace.version>8.1.0</apm-toolkit-trace.version>
- </properties>
-
- <name>skywalking-jdk14-scenario</name>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-toolkit-trace</artifactId>
- <version>${apm-toolkit-trace.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${test.framework.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>jdk14-with-gson-scenario</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgs>--enable-preview</compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--enable-preview</argLine>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <argLine>--enable-preview</argLine>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${compiler.version}</source>
- <target>${compiler.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- <outputDirectory>./target/</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-<assembly
-
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>./bin</directory>
- <fileMode>0775</fileMode>
- </fileSet>
- </fileSets>
-
- <files>
- <file>
-
<source>${project.build.directory}/jdk14-with-gson-scenario.jar</source>
- <outputDirectory>./libs</outputDirectory>
- <fileMode>0775</fileMode>
- </file>
- </files>
-</assembly>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-<Configuration status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_ERR">
- <PatternLayout charset="UTF-8" pattern="[%d{yyyy-MM-dd
HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
- </Console>
- </Appenders>
- <Loggers>
- <Root level="WARN">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-</Configuration>
\ 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
