Renamed graphql-12.x-plugin to graphql-12.x-15.x-plugin (#120)

.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

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.

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>

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;

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";
 

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

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

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

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>

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

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 &
+java -jar ${agent_opts} ${home}/../libs/graphql-12.x-15.x-scenario.jar &

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

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>

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>