diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml
index e26c10857..8851c7266 100644
--- a/.github/workflows/plugins-test.3.yaml
+++ b/.github/workflows/plugins-test.3.yaml
@@ -74,7 +74,7 @@ jobs:
           - retransform-class-tomcat-scenario
           - graphql-8.x-scenario
           - graphql-9.x-scenario
-          - graphql-12.x-scenario
+          - graphql-12.x-15.x-scenario
           - hbase-scenario
           - spring-kafka-1.3.x-scenario
           - spring-kafka-2.2.x-scenario
diff --git a/CHANGES.md b/CHANGES.md
index 44d13b5f2..532ad62c8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Release Notes.
 * Add witness class for vertx-core-3.x plugin.
 * Add witness class for graphql plugin.
 * Add vertx-core-4.x plugin.
+* Renamed graphql-12.x-plugin to graphql-12.x-15.x-plugin and graphql-12.x-scenario to graphql-12.x-15.x-scenario.
 
 #### Documentation
 * Add link about java agent injector.
diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/pom.xml
similarity index 95%
rename from apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/pom.xml
rename to apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/pom.xml
index dc20872b4..9c3491ef2 100644
--- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/pom.xml
@@ -25,7 +25,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>graphql-12.x-plugin</artifactId>
+    <artifactId>graphql-12.x-15.x-plugin</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/GraphqlInterceptor.java b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12tov15/GraphqlInterceptor.java
similarity index 98%
rename from apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/GraphqlInterceptor.java
rename to apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12tov15/GraphqlInterceptor.java
index bbc704522..ce80397b5 100644
--- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/GraphqlInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12tov15/GraphqlInterceptor.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.skywalking.apm.plugin.graphql.v12;
+package org.apache.skywalking.apm.plugin.graphql.v12tov15;
 
 import graphql.execution.ExecutionPath;
 import graphql.execution.ExecutionStrategyParameters;
diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/define/GraphqlInstrumentation.java b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12tov15/define/GraphqlInstrumentation.java
similarity index 95%
rename from apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/define/GraphqlInstrumentation.java
rename to apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12tov15/define/GraphqlInstrumentation.java
index 1521cc673..c66e99af8 100644
--- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12/define/GraphqlInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/graphql/v12tov15/define/GraphqlInstrumentation.java
@@ -16,7 +16,7 @@
  *
  */
 
- package org.apache.skywalking.apm.plugin.graphql.v12.define;
+ package org.apache.skywalking.apm.plugin.graphql.v12tov15.define;
 
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -29,7 +29,7 @@ import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 public class GraphqlInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
-    public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.graphql.v12.GraphqlInterceptor";
+    public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.graphql.v12tov15.GraphqlInterceptor";
     public static final String ENHANCE_CLASS = "graphql.execution.ExecutionStrategy";
     public static final String ENHANCE_METHOD_DISPATCH = "resolveFieldWithInfo";
 
diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/resources/skywalking-plugin.def
similarity index 88%
rename from apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/resources/skywalking-plugin.def
rename to apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/resources/skywalking-plugin.def
index f0f63a34c..f81470df2 100644
--- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-12.x-15.x-plugin/src/main/resources/skywalking-plugin.def
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-graphql=org.apache.skywalking.apm.plugin.graphql.v12.define.GraphqlInstrumentation
+graphql-12.x-15.x=org.apache.skywalking.apm.plugin.graphql.v12tov15.define.GraphqlInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-8.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-8.x-plugin/src/main/resources/skywalking-plugin.def
index f896362d4..961345aa1 100644
--- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-8.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-8.x-plugin/src/main/resources/skywalking-plugin.def
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-graphql=org.apache.skywalking.apm.plugin.graphql.v8.define.GraphqlInstrumentation
+graphql-8.x=org.apache.skywalking.apm.plugin.graphql.v8.define.GraphqlInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-9.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-9.x-plugin/src/main/resources/skywalking-plugin.def
index 81e23a51f..49ec7aa29 100644
--- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-9.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/graphql-9.x-plugin/src/main/resources/skywalking-plugin.def
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-graphql=org.apache.skywalking.apm.plugin.graphql.v9.define.GraphqlInstrumentation
+graphql-9.x=org.apache.skywalking.apm.plugin.graphql.v9.define.GraphqlInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/graphql-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/graphql-plugin/pom.xml
index 9a4262a77..7339431a3 100644
--- a/apm-sniffer/apm-sdk-plugin/graphql-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/graphql-plugin/pom.xml
@@ -31,7 +31,7 @@
     <modules>
         <module>graphql-8.x-plugin</module>
         <module>graphql-9.x-plugin</module>
-        <module>graphql-12.x-plugin</module>
+        <module>graphql-12.x-15.x-plugin</module>
     </modules>
 
     <properties>
diff --git a/docs/en/setup/service-agent/java-agent/Plugin-list.md b/docs/en/setup/service-agent/java-agent/Plugin-list.md
index dc238ec5b..0b7da557b 100644
--- a/docs/en/setup/service-agent/java-agent/Plugin-list.md
+++ b/docs/en/setup/service-agent/java-agent/Plugin-list.md
@@ -24,7 +24,9 @@
 - feign-default-http-9.x
 - feign-pathvar-9.x
 - finagle
-- graphql
+- graphql-8.x
+- graphql-9.x
+- graphql-12.x-15.x
 - grpc-1.x
 - gson-2.8.x
 - guava-cache
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/bin/startup.sh b/test/plugin/scenarios/graphql-12.x-15.x-scenario/bin/startup.sh
similarity index 92%
rename from test/plugin/scenarios/graphql-12.x-scenario/bin/startup.sh
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/bin/startup.sh
index 979ab75db..66bf93ec6 100644
--- a/test/plugin/scenarios/graphql-12.x-scenario/bin/startup.sh
+++ b/test/plugin/scenarios/graphql-12.x-15.x-scenario/bin/startup.sh
@@ -18,4 +18,4 @@
 
 home="$(cd "$(dirname $0)"; pwd)"
 
-java -jar ${agent_opts} ${home}/../libs/graphql-12.x-scenario.jar &
\ No newline at end of file
+java -jar ${agent_opts} ${home}/../libs/graphql-12.x-15.x-scenario.jar &
\ No newline at end of file
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/graphql-12.x-15.x-scenario/config/expectedData.yaml
similarity index 98%
rename from test/plugin/scenarios/graphql-12.x-scenario/config/expectedData.yaml
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/config/expectedData.yaml
index 66a577fe0..88114dd57 100644
--- a/test/plugin/scenarios/graphql-12.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/graphql-12.x-15.x-scenario/config/expectedData.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 segmentItems:
-- serviceName: graphql-12.x-scenario
+- serviceName: graphql-12.x-15.x-scenario
   segmentSize: gt 1
   segments:
   - segmentId: not null
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/configuration.yml b/test/plugin/scenarios/graphql-12.x-15.x-scenario/configuration.yml
similarity index 100%
rename from test/plugin/scenarios/graphql-12.x-scenario/configuration.yml
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/configuration.yml
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/pom.xml b/test/plugin/scenarios/graphql-12.x-15.x-scenario/pom.xml
similarity index 94%
rename from test/plugin/scenarios/graphql-12.x-scenario/pom.xml
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/pom.xml
index 1e11b1043..ce812f43b 100644
--- a/test/plugin/scenarios/graphql-12.x-scenario/pom.xml
+++ b/test/plugin/scenarios/graphql-12.x-15.x-scenario/pom.xml
@@ -21,19 +21,19 @@
          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>graphql-12.x-scenario</artifactId>
+    <artifactId>graphql-12.x-15.x-scenario</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <name>skywalking-graphql-12.x-scenario</name>
+    <name>skywalking-graphql-12.x-15.x-scenario</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler.version>1.8</compiler.version>
         <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
-        <test.framework.version>9.0</test.framework.version>
+        <test.framework.version>12.0</test.framework.version>
         <lombok.version>1.18.20</lombok.version>
         <test.framework>graphql</test.framework>
     </properties>
@@ -55,7 +55,6 @@
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
             <version>${test.framework.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -70,7 +69,7 @@
     </dependencies>
 
     <build>
-        <finalName>graphql-12.x-scenario</finalName>
+        <finalName>graphql-12.x-15.x-scenario</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/assembly/assembly.xml
similarity index 94%
rename from test/plugin/scenarios/graphql-12.x-scenario/src/main/assembly/assembly.xml
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/assembly/assembly.xml
index 2dde7cc7c..05d5edf82 100644
--- a/test/plugin/scenarios/graphql-12.x-scenario/src/main/assembly/assembly.xml
+++ b/test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/assembly/assembly.xml
@@ -33,7 +33,7 @@
 
     <files>
         <file>
-            <source>${project.build.directory}/graphql-12.x-scenario.jar</source>
+            <source>${project.build.directory}/graphql-12.x-15.x-scenario.jar</source>
             <outputDirectory>./libs</outputDirectory>
             <fileMode>0775</fileMode>
         </file>
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/Application.java b/test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/Application.java
similarity index 100%
rename from test/plugin/scenarios/graphql-12.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/Application.java
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/Application.java
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/configuration/GraphSchema.java b/test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/configuration/GraphSchema.java
similarity index 100%
rename from test/plugin/scenarios/graphql-12.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/configuration/GraphSchema.java
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/configuration/GraphSchema.java
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/controller/CaseController.java b/test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/controller/CaseController.java
similarity index 100%
rename from test/plugin/scenarios/graphql-12.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/controller/CaseController.java
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/controller/CaseController.java
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/data/User.java b/test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/data/User.java
similarity index 100%
rename from test/plugin/scenarios/graphql-12.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/data/User.java
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/graphql/data/User.java
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/src/main/resources/application.yml b/test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/resources/application.yml
similarity index 100%
rename from test/plugin/scenarios/graphql-12.x-scenario/src/main/resources/application.yml
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/src/main/resources/application.yml
diff --git a/test/plugin/scenarios/graphql-12.x-scenario/support-version.list b/test/plugin/scenarios/graphql-12.x-15.x-scenario/support-version.list
similarity index 100%
rename from test/plugin/scenarios/graphql-12.x-scenario/support-version.list
rename to test/plugin/scenarios/graphql-12.x-15.x-scenario/support-version.list