diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml index 845272dea..5f68c296b 100644 --- a/.github/workflows/plugins-test.3.yaml +++ b/.github/workflows/plugins-test.3.yaml @@ -58,6 +58,7 @@ jobs: - { name: 'spring-scheduled-scenario', title: 'Spring Scheduled 3.1.x-5.2.x (9)' } - { name: 'elasticjob-2.x-scenario', title: 'elasticjob-2.x-scenario (2)' } - { name: 'quartz-scheduler-2.x-scenario', title: 'quartz-scheduler-2.x-scenario (5)' } + - { name: 'xxl-job-2.x-scenario', title: 'xxl-job-2.x-scenario (1)' } steps: - uses: actions/checkout@v2 with: diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java index 8c36bd5d4..7bab86e6f 100755 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java @@ -176,4 +176,6 @@ public class ComponentsDefine { public static final OfficialComponent SPRING_SCHEDULED = new OfficialComponent(96, "SpringScheduled"); public static final OfficialComponent QUARTZ_SCHEDULER = new OfficialComponent(97, "quartz-scheduler"); + + public static final OfficialComponent XXL_JOB = new OfficialComponent(98, "xxl-job"); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java index 59954eeed..100581cb8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java @@ -57,7 +57,7 @@ public class MultiClassNameMatch implements IndirectMatch { return matchClassNames.contains(typeDescription.getTypeName()); } - public static ClassMatch byMultiClassMatch(String... classNames) { + public static IndirectMatch byMultiClassMatch(String... classNames) { return new MultiClassNameMatch(classNames); } } diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index df55b991a..a28cc6334 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -98,6 +98,7 @@ baidu-brpc-plugin hbase-1.x-plugin graphql-plugin + xxl-job-2.x-plugin pom diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/pom.xml new file mode 100644 index 000000000..6867c4910 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/pom.xml @@ -0,0 +1,46 @@ + + + + + + apm-sdk-plugin + org.apache.skywalking + 8.2.0-SNAPSHOT + + 4.0.0 + + apm-xxl-job-2.x-plugin + jar + xxl-job-2.x-plugin + + + UTF-8 + + + + + com.xuxueli + xxl-job-core + 2.2.0 + provided + + + \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/Constants.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/Constants.java new file mode 100644 index 000000000..397fad060 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/Constants.java @@ -0,0 +1,32 @@ +/* + * 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.plugin.xxljob; + +import org.apache.skywalking.apm.agent.core.context.tag.AbstractTag; +import org.apache.skywalking.apm.agent.core.context.tag.Tags; + +public class Constants { + + public static final String XXL_IJOB_HANDLER = "com.xxl.job.core.handler.IJobHandler"; + public static final String XXL_GLUE_JOB_HANDLER = "com.xxl.job.core.handler.impl.GlueJobHandler"; + public static final String XXL_SCRIPT_JOB_HANDLER = "com.xxl.job.core.handler.impl.ScriptJobHandler"; + public static final String XXL_METHOD_JOB_HANDLER = "com.xxl.job.core.handler.impl.MethodJobHandler"; + + public static final AbstractTag JOB_PARAM = Tags.ofKey("jobParam"); +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/MethodJobHandlerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/MethodJobHandlerConstructorInterceptor.java new file mode 100644 index 000000000..8805c61d7 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/MethodJobHandlerConstructorInterceptor.java @@ -0,0 +1,46 @@ +/* + * 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.plugin.xxljob; + +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; + +import java.lang.reflect.Method; + +/** + * Intercept method of {@link com.xxl.job.core.handler.impl.MethodJobHandler#MethodJobHandler(java.lang.Object, java.lang.reflect.Method, java.lang.reflect.Method, java.lang.reflect.Method)}. + * cache the job target method details. + */ +public class MethodJobHandlerConstructorInterceptor implements InstanceConstructorInterceptor { + + @Override + public void onConstruct(EnhancedInstance objInst, Object[] allArguments) throws Throwable { + Method method = (Method) allArguments[1]; + String methodName = buildMethodName(method); + + objInst.setSkyWalkingDynamicField(methodName); + } + + protected String buildMethodName(Method method) { + String className = method.getDeclaringClass().getName(); + String methodName = method.getName(); + + return className + "." + methodName; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/MethodJobHandlerMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/MethodJobHandlerMethodInterceptor.java new file mode 100644 index 000000000..3c835d335 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/MethodJobHandlerMethodInterceptor.java @@ -0,0 +1,61 @@ +/* + * 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.plugin.xxljob; + +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.Tags; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; +import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; + +import java.lang.reflect.Method; + +import static org.apache.skywalking.apm.plugin.xxljob.Constants.JOB_PARAM; + +/** + * Intercept method of {@link com.xxl.job.core.handler.impl.MethodJobHandler#execute(String)}. + * record the xxl-job method job local span. + */ +public class MethodJobHandlerMethodInterceptor implements InstanceMethodsAroundInterceptor { + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + String methodName = (String) objInst.getSkyWalkingDynamicField(); + String jobParam = (String) allArguments[0]; + String operationName = ComponentsDefine.XXL_JOB.getName() + "/MethodJob/" + methodName; + + AbstractSpan span = ContextManager.createLocalSpan(operationName); + span.setComponent(ComponentsDefine.XXL_JOB); + Tags.LOGIC_ENDPOINT.set(span, Tags.VAL_LOCAL_SPAN_AS_LOGIC_ENDPOINT); + span.tag(JOB_PARAM, jobParam); + } + + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + ContextManager.stopSpan(); + return ret; + } + + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + ContextManager.activeSpan().log(t); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/ScriptJobHandlerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/ScriptJobHandlerConstructorInterceptor.java new file mode 100644 index 000000000..5e3fe19b0 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/ScriptJobHandlerConstructorInterceptor.java @@ -0,0 +1,39 @@ +/* + * 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.plugin.xxljob; + +import com.xxl.job.core.glue.GlueTypeEnum; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; + +/** + * Intercept method of {@link com.xxl.job.core.handler.impl.ScriptJobHandler#ScriptJobHandler(int, long, java.lang.String, com.xxl.job.core.glue.GlueTypeEnum)}. + * cache the script job details. + */ +public class ScriptJobHandlerConstructorInterceptor implements InstanceConstructorInterceptor { + + @Override + public void onConstruct(EnhancedInstance objInst, Object[] allArguments) throws Throwable { + int jobId = (int) allArguments[0]; + GlueTypeEnum glueType = (GlueTypeEnum) allArguments[3]; + + String jobName = glueType.name() + "/id/" + jobId; + objInst.setSkyWalkingDynamicField(jobName); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/ScriptJobHandlerMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/ScriptJobHandlerMethodInterceptor.java new file mode 100644 index 000000000..22c0d7932 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/ScriptJobHandlerMethodInterceptor.java @@ -0,0 +1,61 @@ +/* + * 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.plugin.xxljob; + +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.Tags; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; +import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; + +import java.lang.reflect.Method; + +import static org.apache.skywalking.apm.plugin.xxljob.Constants.JOB_PARAM; + +/** + * Intercept method of {@link com.xxl.job.core.handler.impl.ScriptJobHandler#execute(String)}. + * record the xxl-job script job local span. + */ +public class ScriptJobHandlerMethodInterceptor implements InstanceMethodsAroundInterceptor { + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + String jobTypeAndId = (String) objInst.getSkyWalkingDynamicField(); + String jobParam = (String) allArguments[0]; + String operationName = ComponentsDefine.XXL_JOB.getName() + "/ScriptJob/" + jobTypeAndId; + + AbstractSpan span = ContextManager.createLocalSpan(operationName); + span.setComponent(ComponentsDefine.XXL_JOB); + Tags.LOGIC_ENDPOINT.set(span, Tags.VAL_LOCAL_SPAN_AS_LOGIC_ENDPOINT); + span.tag(JOB_PARAM, jobParam); + } + + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + ContextManager.stopSpan(); + return ret; + } + + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + ContextManager.activeSpan().log(t); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/SimpleJobHandlerMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/SimpleJobHandlerMethodInterceptor.java new file mode 100644 index 000000000..30bfc58cf --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/SimpleJobHandlerMethodInterceptor.java @@ -0,0 +1,60 @@ +/* + * 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.plugin.xxljob; + +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.tag.Tags; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; +import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; + +import java.lang.reflect.Method; + +import static org.apache.skywalking.apm.plugin.xxljob.Constants.JOB_PARAM; + +/** + * Intercept execute(String) method on implement class of {@link com.xxl.job.core.handler.IJobHandler}. + * record the xxl-job simple job local span. + */ +public class SimpleJobHandlerMethodInterceptor implements InstanceMethodsAroundInterceptor { + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + String jobParam = (String) allArguments[0]; + String operationName = ComponentsDefine.XXL_JOB.getName() + "/SimpleJob/" + method.getDeclaringClass().getName(); + + AbstractSpan span = ContextManager.createLocalSpan(operationName); + span.setComponent(ComponentsDefine.XXL_JOB); + Tags.LOGIC_ENDPOINT.set(span, Tags.VAL_LOCAL_SPAN_AS_LOGIC_ENDPOINT); + span.tag(JOB_PARAM, jobParam); + } + + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + ContextManager.stopSpan(); + return ret; + } + + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + ContextManager.activeSpan().log(t); + } +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/MethodJobHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/MethodJobHandlerInstrumentation.java new file mode 100644 index 000000000..d224c44de --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/MethodJobHandlerInstrumentation.java @@ -0,0 +1,99 @@ +/* + * 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.plugin.xxljob.define; + +import net.bytebuddy.description.method.MethodDescription; +import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; +import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; + +import java.lang.reflect.Method; + +import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; +import static org.apache.skywalking.apm.plugin.xxljob.Constants.XXL_METHOD_JOB_HANDLER; + +/** + * Enhance {@link com.xxl.job.core.handler.impl.MethodJobHandler} instance and intercept {@link com.xxl.job.core.handler.impl.MethodJobHandler#execute(String)} method, + * this method is a entrance of execute method job. + * + * @see org.apache.skywalking.apm.plugin.xxljob.MethodJobHandlerConstructorInterceptor + * @see org.apache.skywalking.apm.plugin.xxljob.MethodJobHandlerMethodInterceptor + */ +public class MethodJobHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + public static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.xxljob.MethodJobHandlerConstructorInterceptor"; + public static final String METHOD_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.xxljob.MethodJobHandlerMethodInterceptor"; + + @Override + protected ClassMatch enhanceClass() { + return byName(XXL_METHOD_JOB_HANDLER); + } + + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArguments(4) + .and(takesArgument(0, Object.class)) + .and(takesArgument(1, Method.class)) + .and(takesArgument(2, Method.class)) + .and(takesArgument(3, Method.class)); + } + + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_INTERCEPTOR_CLASS; + } + } + }; + } + + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute") + .and(isPublic()) + .and(takesArguments(1)) + .and(takesArgument(0, String.class)); + } + + @Override + public String getMethodsInterceptor() { + return METHOD_INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/ScriptJobHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/ScriptJobHandlerInstrumentation.java new file mode 100644 index 000000000..6dcaa9d6c --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/ScriptJobHandlerInstrumentation.java @@ -0,0 +1,93 @@ +/* + * 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.plugin.xxljob.define; + +import net.bytebuddy.description.method.MethodDescription; +import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; +import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; + +import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; +import static org.apache.skywalking.apm.plugin.xxljob.Constants.XXL_SCRIPT_JOB_HANDLER; + +/** + * Enhance {@link com.xxl.job.core.handler.impl.ScriptJobHandler} instance and intercept {@link com.xxl.job.core.handler.impl.ScriptJobHandler#execute(String)} method, + * this method is a entrance of execute script job. + * + * @see org.apache.skywalking.apm.plugin.xxljob.ScriptJobHandlerConstructorInterceptor + * @see org.apache.skywalking.apm.plugin.xxljob.ScriptJobHandlerMethodInterceptor + */ +public class ScriptJobHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + public static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.xxljob.ScriptJobHandlerConstructorInterceptor"; + public static final String METHOD_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.xxljob.ScriptJobHandlerMethodInterceptor"; + + @Override + protected ClassMatch enhanceClass() { + return byName(XXL_SCRIPT_JOB_HANDLER); + } + + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArguments(4); + } + + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_INTERCEPTOR_CLASS; + } + } + }; + } + + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute") + .and(isPublic()) + .and(takesArguments(1)) + .and(takesArgument(0, String.class)); + } + + @Override + public String getMethodsInterceptor() { + return METHOD_INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/SimpleJobHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/SimpleJobHandlerInstrumentation.java new file mode 100644 index 000000000..c540c3af4 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xxljob/define/SimpleJobHandlerInstrumentation.java @@ -0,0 +1,92 @@ +/* + * 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.plugin.xxljob.define; + +import net.bytebuddy.description.method.MethodDescription; +import net.bytebuddy.matcher.ElementMatcher; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; +import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; +import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.IndirectMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; +import org.apache.skywalking.apm.agent.core.plugin.match.logical.LogicalMatchOperation; + +import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import static org.apache.skywalking.apm.plugin.xxljob.Constants.XXL_IJOB_HANDLER; +import static org.apache.skywalking.apm.plugin.xxljob.Constants.XXL_SCRIPT_JOB_HANDLER; +import static org.apache.skywalking.apm.plugin.xxljob.Constants.XXL_GLUE_JOB_HANDLER; +import static org.apache.skywalking.apm.plugin.xxljob.Constants.XXL_METHOD_JOB_HANDLER; + +/** + * Enhance the implement class of {@link com.xxl.job.core.handler.IJobHandler} and intercept execute(String) method, + * this method is a entrance of execute job. + * + * @see org.apache.skywalking.apm.plugin.xxljob.SimpleJobHandlerMethodInterceptor + */ +public class SimpleJobHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { + + public static final String METHOD_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.xxljob.SimpleJobHandlerMethodInterceptor"; + + @Override + protected ClassMatch enhanceClass() { + IndirectMatch excludeClass = LogicalMatchOperation.not( + MultiClassNameMatch.byMultiClassMatch( + XXL_SCRIPT_JOB_HANDLER, + XXL_GLUE_JOB_HANDLER, + XXL_METHOD_JOB_HANDLER)); + IndirectMatch parentType = HierarchyMatch.byHierarchyMatch(XXL_IJOB_HANDLER); + return LogicalMatchOperation.and(parentType, excludeClass); + + } + + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + return new ConstructorInterceptPoint[0]; + } + + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute") + .and(isPublic()) + .and(takesArguments(1)) + .and(takesArgument(0, String.class)); + } + + @Override + public String getMethodsInterceptor() { + return METHOD_INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + } + }; + } +} diff --git a/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/resources/skywalking-plugin.def new file mode 100644 index 000000000..e0d65e614 --- /dev/null +++ b/apm-sniffer/apm-sdk-plugin/xxl-job-2.x-plugin/src/main/resources/skywalking-plugin.def @@ -0,0 +1,19 @@ +# 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. + +xxl-job-2.x=org.apache.skywalking.apm.plugin.xxljob.define.SimpleJobHandlerInstrumentation +xxl-job-2.x=org.apache.skywalking.apm.plugin.xxljob.define.ScriptJobHandlerInstrumentation +xxl-job-2.x=org.apache.skywalking.apm.plugin.xxljob.define.MethodJobHandlerInstrumentation \ No newline at end of file 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 8a1289485..b8974e5fa 100644 --- a/docs/en/setup/service-agent/java-agent/Plugin-list.md +++ b/docs/en/setup/service-agent/java-agent/Plugin-list.md @@ -102,4 +102,5 @@ - toolkit-exception - undertow-2.x-plugin - vertx-core-3.x +- xxl-job-2.x - zookeeper-3.4.x \ No newline at end of file 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 b96544814..b37f853e3 100644 --- a/docs/en/setup/service-agent/java-agent/Supported-list.md +++ b/docs/en/setup/service-agent/java-agent/Supported-list.md @@ -87,6 +87,7 @@ * [Apache ShardingSphere-Elasticjob](https://github.com/apache/shardingsphere-elasticjob) 3.0.0-alpha * [Spring @Scheduled](https://github.com/spring-projects/spring-framework) 3.1+ * [Quartz Scheduler](https://github.com/quartz-scheduler/quartz) 2.x (Optional²) + * [XXL Job](https://github.com/xuxueli/xxl-job) 2.x * OpenTracing community supported * [Canal: Alibaba mysql database binlog incremental subscription & consumer components](https://github.com/alibaba/canal) 1.0.25 -> 1.1.2 * JSON diff --git a/oap-server/server-bootstrap/src/main/resources/component-libraries.yml b/oap-server/server-bootstrap/src/main/resources/component-libraries.yml index 75150fcc4..2db2ade9e 100755 --- a/oap-server/server-bootstrap/src/main/resources/component-libraries.yml +++ b/oap-server/server-bootstrap/src/main/resources/component-libraries.yml @@ -323,6 +323,9 @@ SpringScheduled: quartz-scheduler: id: 97 languages: Java +xxl-job: + id: 98 + languages: Java # .NET/.NET Core components # [3000, 4000) for C#/.NET only diff --git a/oap-server/server-core/src/test/resources/component-libraries.yml b/oap-server/server-core/src/test/resources/component-libraries.yml index 5bc888db4..83ee2010d 100755 --- a/oap-server/server-core/src/test/resources/component-libraries.yml +++ b/oap-server/server-core/src/test/resources/component-libraries.yml @@ -272,6 +272,9 @@ SpringScheduled: quartz-scheduler: id: 97 languages: Java +xxl-job: + id: 98 + languages: Java # .NET/.NET Core components # [3000, 4000) for C#/.NET only diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/bin/startup.sh b/test/plugin/scenarios/xxl-job-2.x-scenario/bin/startup.sh new file mode 100644 index 000000000..1bcf342f8 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/bin/startup.sh @@ -0,0 +1,21 @@ +#!/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/xxl-job-2.x-scenario.jar & \ No newline at end of file diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml new file mode 100644 index 000000000..61de47bae --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/config/expectedData.yaml @@ -0,0 +1,189 @@ +# 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: xxl-job-2.x-scenario + segmentSize: ge 7 + segments: + - segmentId: not null + spans: + - operationName: /xxl-job-2.x-scenario/case/simpleJob + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: Http + startTime: nq 0 + endTime: nq 0 + componentId: 1 + isError: false + spanType: Entry + peer: '' + skipAnalysis: false + tags: + - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/simpleJob'} + - {key: http.method, value: GET} + refs: + - {parentEndpoint: xxl-job/SimpleJob/test.org.apache.skywalking.apm.testcase.xxljob.job.BeanJob, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} + - segmentId: not null + spans: + - operationName: /xxl-job-2.x-scenario/case/simpleJob + operationId: 0 + parentSpanId: 0 + spanId: 1 + spanLayer: Http + startTime: not null + endTime: not null + componentId: 12 + isError: false + spanType: Exit + peer: localhost:8080 + skipAnalysis: false + tags: + - {key: http.method, value: GET} + - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/simpleJob'} + - operationName: xxl-job/SimpleJob/test.org.apache.skywalking.apm.testcase.xxljob.job.BeanJob + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: Unknown + startTime: not null + endTime: not null + componentId: 98 + isError: false + spanType: Local + peer: '' + skipAnalysis: false + tags: + - {key: x-le, value: '{"logic-span":true}'} + - {key: jobParam, value: 'k=1'} + - segmentId: not null + spans: + - operationName: /xxl-job-2.x-scenario/case/methodJob + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: Http + startTime: nq 0 + endTime: nq 0 + componentId: 1 + isError: false + spanType: Entry + peer: '' + skipAnalysis: false + tags: + - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/methodJob'} + - {key: http.method, value: GET} + refs: + - {parentEndpoint: xxl-job/MethodJob/org.apache.skywalking.apm.testcase.xxljob.job.MethodJob.work, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} + - segmentId: not null + spans: + - operationName: /xxl-job-2.x-scenario/case/methodJob + operationId: 0 + parentSpanId: 0 + spanId: 1 + spanLayer: Http + startTime: not null + endTime: not null + componentId: 12 + isError: false + spanType: Exit + peer: localhost:8080 + skipAnalysis: false + tags: + - {key: http.method, value: GET} + - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/methodJob'} + - operationName: xxl-job/MethodJob/org.apache.skywalking.apm.testcase.xxljob.job.MethodJob.work + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: Unknown + startTime: not null + endTime: not null + componentId: 98 + isError: false + spanType: Local + peer: '' + skipAnalysis: false + tags: + - {key: x-le, value: '{"logic-span":true}'} + - {key: jobParam, value: 'k=2'} + - segmentId: not null + spans: + - operationName: /xxl-job-2.x-scenario/case/glueJob + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: Http + startTime: nq 0 + endTime: nq 0 + componentId: 1 + isError: false + spanType: Entry + peer: '' + skipAnalysis: false + tags: + - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/glueJob'} + - {key: http.method, value: GET} + refs: + - {parentEndpoint: xxl-job/SimpleJob/com.xxl.job.service.handler.GlueJob, networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null, parentServiceInstance: not null, parentService: not null, traceId: not null} + - segmentId: not null + spans: + - operationName: /xxl-job-2.x-scenario/case/glueJob + operationId: 0 + parentSpanId: 0 + spanId: 1 + spanLayer: Http + startTime: not null + endTime: not null + componentId: 12 + isError: false + spanType: Exit + peer: localhost:8080 + skipAnalysis: false + tags: + - {key: http.method, value: GET} + - {key: url, value: 'http://localhost:8080/xxl-job-2.x-scenario/case/glueJob'} + - operationName: xxl-job/SimpleJob/com.xxl.job.service.handler.GlueJob + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: Unknown + startTime: not null + endTime: not null + componentId: 98 + isError: false + spanType: Local + peer: '' + skipAnalysis: false + tags: + - {key: x-le, value: '{"logic-span":true}'} + - {key: jobParam, value: 'k=3'} + - segmentId: not null + spans: + - operationName: xxl-job/ScriptJob/GLUE_SHELL/id/4 + operationId: 0 + parentSpanId: -1 + spanId: 0 + spanLayer: Unknown + startTime: not null + endTime: not null + componentId: 98 + isError: false + spanType: Local + peer: '' + skipAnalysis: false + tags: + - {key: x-le, value: '{"logic-span":true}'} + - {key: jobParam, value: 'k=4'} \ No newline at end of file diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/configuration.yml b/test/plugin/scenarios/xxl-job-2.x-scenario/configuration.yml new file mode 100644 index 000000000..e051d1233 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/configuration.yml @@ -0,0 +1,40 @@ +# 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/xxl-job-2.x-scenario/case/call +healthCheck: http://localhost:8080/xxl-job-2.x-scenario/case/healthCheck +startScript: ./bin/startup.sh +environment: + - MYSQL_ADDRESS=mysql-server:3306 + - MYSQL_ROOT_PASSWORD=123456 + - XXL_JOB_SERVER=http://xxl-job-server:8080/xxl-job-admin +depends_on: + - mysql-server + - xxl-job-server +dependencies: + mysql-server: + image: mysql:5.7 + hostname: mysql-server + environment: + - MYSQL_ROOT_PASSWORD=123456 + xxl-job-server: + image: xuxueli/xxl-job-admin:2.2.0 + hostname: xxl-job-server + environment: + - PARAMS=--spring.datasource.url=jdbc:mysql://mysql-server:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai --spring.datasource.username=root --spring.datasource.password=123456 + depends_on: + - mysql-server \ No newline at end of file diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml b/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml new file mode 100644 index 000000000..1ac45c8cb --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/pom.xml @@ -0,0 +1,143 @@ + + + + + org.apache.skywalking.apm.testcase + xxl-job-2.x-scenario + 1.0.0 + jar + + 4.0.0 + + + UTF-8 + 1.8 + + 2.2.0 + 2.1.6.RELEASE + 1.18.10 + + + skywalking-xxl-job-2.x-scenario + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot-version} + pom + import + + + + + + + net.bytebuddy + byte-buddy + 1.10.14 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + org.springframework + spring-jdbc + + + org.projectlombok + lombok + ${lombok.version} + provided + + + com.xuxueli + xxl-job-core + ${test.framework.version} + + + mysql + mysql-connector-java + 5.1.25 + + + com.squareup.okhttp3 + okhttp + 3.0.0 + + + + + xxl-job-2.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/ + + + + + + + \ No newline at end of file diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/assembly/assembly.xml new file mode 100644 index 000000000..c0b5cc138 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/assembly/assembly.xml @@ -0,0 +1,41 @@ + + + + + zip + + + + + ./bin + 0775 + + + + + + ${project.build.directory}/xxl-job-2.x-scenario.jar + ./libs + 0775 + + + diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/Application.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/Application.java new file mode 100644 index 000000000..2285017b5 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/Application.java @@ -0,0 +1,32 @@ +/* + * 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.xxljob; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@EnableAutoConfiguration +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/Utils.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/Utils.java new file mode 100644 index 000000000..8e2948889 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/Utils.java @@ -0,0 +1,33 @@ +/* + * 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.xxljob; + +import com.fasterxml.jackson.databind.ObjectMapper; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; + +public class Utils { + + public static final OkHttpClient OK_CLIENT = new OkHttpClient.Builder().build(); + + public static final ObjectMapper JSON = new ObjectMapper(); + + public static final MediaType FORM_DATA = MediaType.parse("application/x-www-form-urlencoded; charset=UTF-8"); + +} diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/controller/CaseController.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/controller/CaseController.java new file mode 100644 index 000000000..41935f1ff --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/controller/CaseController.java @@ -0,0 +1,70 @@ +/* + * 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.xxljob.controller; + +import lombok.extern.log4j.Log4j2; +import org.apache.skywalking.apm.testcase.xxljob.service.XXLJobServerControlService; +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") +@Log4j2 +public class CaseController { + + private static final String SUCCESS = "Success"; + + @Autowired + private XXLJobServerControlService xxlJobServerControlService; + + @RequestMapping("/simpleJob") + @ResponseBody + public String simpleJob() { + return SUCCESS; + } + + @RequestMapping("/methodJob") + @ResponseBody + public String methodJob() { + return SUCCESS; + } + + @RequestMapping("/glueJob") + @ResponseBody + public String glueJob() { + return SUCCESS; + } + + @RequestMapping("/healthCheck") + @ResponseBody + public String healthCheck() throws Exception { + + xxlJobServerControlService.checkCurrentExecutorRegistered(); + + return SUCCESS; + } + + @RequestMapping("/call") + @ResponseBody + public String call() { + return SUCCESS; + } +} diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/MethodJob.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/MethodJob.java new file mode 100644 index 000000000..585c233eb --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/MethodJob.java @@ -0,0 +1,46 @@ +/* + * 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.xxljob.job; + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.extern.slf4j.Slf4j; +import okhttp3.Request; +import okhttp3.Response; +import org.apache.skywalking.apm.testcase.xxljob.Utils; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Slf4j +@Component +public class MethodJob { + + @XxlJob("MethodJobHandler") + public ReturnT work(String param) throws IOException { + + log.info("MethodJobHandler execute. param: {}", param); + + Request request = new Request.Builder().url("http://localhost:8080/xxl-job-2.x-scenario/case/methodJob").build(); + Response response = Utils.OK_CLIENT.newCall(request).execute(); + response.body().close(); + + return ReturnT.SUCCESS; + } +} diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobConfig.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobConfig.java new file mode 100644 index 000000000..2eb322d0e --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobConfig.java @@ -0,0 +1,67 @@ +/* + * 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.xxljob.job; + +import com.xxl.job.core.executor.XxlJobExecutor; +import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import test.org.apache.skywalking.apm.testcase.xxljob.job.BeanJob; + +@Slf4j +@Configuration +public class XXLJobConfig { + + @Value("${xxl.job.admin.addresses}") + private String adminAddresses; + + @Value("${xxl.job.executor.appname}") + private String appName; + + @Value("${xxl.job.executor.ip}") + private String ip; + + @Value("${xxl.job.executor.port}") + private int port; + + @Value("${xxl.job.accessToken}") + private String accessToken; + + @Value("${xxl.job.executor.logpath}") + private String logPath; + + @Bean(initMethod = "start", destroyMethod = "destroy") + public XxlJobExecutor xxlJobExecutor() { + log.info(">>>>>>>>>>> xxl-job config init."); + + XxlJobSpringExecutor xxlJobExecutor = new XxlJobSpringExecutor(); + xxlJobExecutor.setAdminAddresses(adminAddresses); + xxlJobExecutor.setIp(ip); + xxlJobExecutor.setPort(port); + xxlJobExecutor.setAccessToken(accessToken); + xxlJobExecutor.setLogPath(logPath); + xxlJobExecutor.setAppname(appName); + + XxlJobExecutor.registJobHandler("BeanJobHandler", new BeanJob()); + + return xxlJobExecutor; + } +} \ No newline at end of file diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobInitializer.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobInitializer.java new file mode 100644 index 000000000..10a0fad66 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/job/XXLJobInitializer.java @@ -0,0 +1,56 @@ +/* + * 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.xxljob.job; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.ClassPathResource; +import org.springframework.jdbc.datasource.init.ScriptUtils; +import org.springframework.stereotype.Component; + +import java.sql.Connection; +import java.sql.DriverManager; + +@Slf4j +@Component +public class XXLJobInitializer implements InitializingBean { + + @Value("${xxl.mysql.address}") + private String mysqlAddress; + @Value("${xxl.mysql.root_password}") + private String mysqlRootPassword; + + @Override + public void afterPropertiesSet() throws Exception { + log.info("Initializer xxl-job"); + + initDatabase(); + } + + private void initDatabase() throws Exception { + Class.forName("com.mysql.jdbc.Driver"); + + String url = String.format("jdbc:mysql://%s", mysqlAddress); + try (Connection conn = DriverManager.getConnection(url, "root", mysqlRootPassword)) { + ClassPathResource classPathResource = new ClassPathResource("tables_xxl_job.sql"); + ScriptUtils.executeSqlScript(conn, classPathResource); + } + } +} diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/service/XXLJobServerControlService.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/service/XXLJobServerControlService.java new file mode 100644 index 000000000..97520ac43 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/xxljob/service/XXLJobServerControlService.java @@ -0,0 +1,116 @@ +/* + * 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.xxljob.service; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; +import org.apache.skywalking.apm.testcase.xxljob.Utils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +@Service +public class XXLJobServerControlService { + + @Value("${xxl.job.admin.addresses}") + private String xxlJobAdminAddresses; + @Value("${xxl.job.executor.appname}") + private String appName; + + private String cookie; + + private void login() throws Exception { + Request request = new Request.Builder() + .url(String.format("%s/login", xxlJobAdminAddresses)) + .method("POST", RequestBody.create(Utils.FORM_DATA, "userName=admin&password=123456")) + .build(); + Response response = Utils.OK_CLIENT.newCall(request).execute(); + + if (response.isSuccessful()) { + JobResult result = Utils.JSON.readValue(response.body().byteStream(), JobResult.class); + if (result.getCode() == 200) { + this.cookie = response.headers().get("Set-Cookie"); + return; + } + } + + throw new IllegalStateException("xxl-job login error!"); + } + + public void checkCurrentExecutorRegistered() throws Exception { + login(); + + Request request = new Request.Builder() + .url(String.format("%s/jobgroup/pageList", xxlJobAdminAddresses)) + .method("POST", RequestBody.create(Utils.FORM_DATA, String.format("appname=%s", appName))) + .header("Cookie", cookie) + .build(); + Response response = Utils.OK_CLIENT.newCall(request).execute(); + if (response.isSuccessful()) { + JobGroup jobGroup = Utils.JSON.readValue(response.body().byteStream(), JobGroup.class); + JobGroupData[] jobGroupDatas = jobGroup.getData(); + if (jobGroupDatas != null && jobGroupDatas.length == 1) { + JobGroupData jobGroupData = jobGroupDatas[0]; + if (!StringUtils.isEmpty(jobGroupData.getAddressList()) + && jobGroupData.getRegistryList() != null + && jobGroupData.getRegistryList().length > 0) { + return; + } + } + + } + + throw new IllegalStateException("current executor unregistered"); + } + + @Getter + @Setter + @JsonIgnoreProperties(ignoreUnknown = true) + private static class JobResult { + @JsonProperty + private int code; + } + + @Getter + @Setter + @JsonIgnoreProperties(ignoreUnknown = true) + private static class JobGroup { + @JsonProperty + private JobGroupData[] data; + } + + @Getter + @Setter + @JsonIgnoreProperties(ignoreUnknown = true) + private static class JobGroupData { + @JsonProperty + private int id; + @JsonProperty + private String appname; + @JsonProperty + private String addressList; + @JsonProperty + private String[] registryList; + } +} diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java new file mode 100644 index 000000000..e8a1ca02b --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java @@ -0,0 +1,42 @@ +/* + * 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.org.apache.skywalking.apm.testcase.xxljob.job; + +import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.handler.IJobHandler; +import lombok.extern.slf4j.Slf4j; +import okhttp3.Request; +import okhttp3.Response; +import org.apache.skywalking.apm.testcase.xxljob.Utils; + +@Slf4j +public class BeanJob extends IJobHandler { + + @Override + public ReturnT execute(String param) throws Exception { + + log.info("BeanJobHandler execute. param: {}", param); + + Request request = new Request.Builder().url("http://localhost:8080/xxl-job-2.x-scenario/case/simpleJob").build(); + Response response = Utils.OK_CLIENT.newCall(request).execute(); + response.body().close(); + + return new ReturnT("Success"); + } +} diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/application.yaml b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/application.yaml new file mode 100644 index 000000000..2aa0bfac6 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/application.yaml @@ -0,0 +1,35 @@ +# 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: /xxl-job-2.x-scenario +logging: + config: classpath:log4j2.xml + +xxl: + mysql: + address: ${MYSQL_ADDRESS} + root_password: ${MYSQL_ROOT_PASSWORD} + job: + accessToken: + admin: + addresses: ${XXL_JOB_SERVER} + executor: + ip: + port: 9999 + logpath: /data/applogs/xxl-job/jobhandler + appname: xxl-job-executor-demo \ No newline at end of file diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/log4j2.xml b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/log4j2.xml new file mode 100644 index 000000000..b16354bfa --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/log4j2.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/tables_xxl_job.sql b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/tables_xxl_job.sql new file mode 100644 index 000000000..738970f45 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/src/main/resources/tables_xxl_job.sql @@ -0,0 +1,133 @@ +/* + * 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. + * + */ + +CREATE database if NOT EXISTS `xxl_job` default character set utf8mb4 collate utf8mb4_unicode_ci; +use `xxl_job`; + +SET NAMES utf8mb4; + +CREATE TABLE if NOT EXISTS `xxl_job_info` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `job_group` int(11) NOT NULL, + `job_cron` varchar(128) NOT NULL, + `job_desc` varchar(255) NOT NULL, + `add_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + `author` varchar(64) DEFAULT NULL, + `alarm_email` varchar(255) DEFAULT NULL, + `executor_route_strategy` varchar(50) DEFAULT NULL, + `executor_handler` varchar(255) DEFAULT NULL, + `executor_param` varchar(512) DEFAULT NULL, + `executor_block_strategy` varchar(50) DEFAULT NULL, + `executor_timeout` int(11) NOT NULL DEFAULT '0', + `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0', + `glue_type` varchar(50) NOT NULL, + `glue_source` mediumtext, + `glue_remark` varchar(128) DEFAULT NULL, + `glue_updatetime` datetime DEFAULT NULL, + `child_jobid` varchar(255) DEFAULT NULL, + `trigger_status` tinyint(4) NOT NULL DEFAULT '0', + `trigger_last_time` bigint(13) NOT NULL DEFAULT '0', + `trigger_next_time` bigint(13) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE if NOT EXISTS `xxl_job_log` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `job_group` int(11) NOT NULL, + `job_id` int(11) NOT NULL, + `executor_address` varchar(255) DEFAULT NULL, + `executor_handler` varchar(255) DEFAULT NULL, + `executor_param` varchar(512) DEFAULT NULL, + `executor_sharding_param` varchar(20) DEFAULT NULL, + `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0', + `trigger_time` datetime DEFAULT NULL, + `trigger_code` int(11) NOT NULL, + `trigger_msg` text, + `handle_time` datetime DEFAULT NULL, + `handle_code` int(11) NOT NULL, + `handle_msg` text, + `alarm_status` tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `I_trigger_time` (`trigger_time`), + KEY `I_handle_code` (`handle_code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE if NOT EXISTS `xxl_job_log_report` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `trigger_day` datetime DEFAULT NULL, + `running_count` int(11) NOT NULL DEFAULT '0', + `suc_count` int(11) NOT NULL DEFAULT '0', + `fail_count` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE if NOT EXISTS `xxl_job_logglue` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `job_id` int(11) NOT NULL, + `glue_type` varchar(50) DEFAULT NULL, + `glue_source` mediumtext, + `glue_remark` varchar(128) NOT NULL, + `add_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE if NOT EXISTS `xxl_job_registry` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `registry_group` varchar(50) NOT NULL, + `registry_key` varchar(255) NOT NULL, + `registry_value` varchar(255) NOT NULL, + `update_time` datetime DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `i_g_k_v` (`registry_group`,`registry_key`,`registry_value`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE if NOT EXISTS `xxl_job_group` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `app_name` varchar(64) NOT NULL, + `title` varchar(12) NOT NULL, + `address_type` tinyint(4) NOT NULL DEFAULT '0', + `address_list` varchar(512) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE if NOT EXISTS `xxl_job_user` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `username` varchar(50) NOT NULL, + `password` varchar(50) NOT NULL, + `role` tinyint(4) NOT NULL, + `permission` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `i_username` (`username`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE if NOT EXISTS `xxl_job_lock` ( + `lock_name` varchar(50) NOT NULL, + PRIMARY KEY (`lock_name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + +INSERT INTO `xxl_job_group`(`id`, `app_name`, `title`, `address_type`, `address_list`) VALUES (1, 'xxl-job-executor-demo', 'my-executor', 0, NULL); +INSERT INTO `xxl_job`.`xxl_job_info`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`, `trigger_status`, `trigger_last_time`, `trigger_next_time`) VALUES (1, 1, '0/1 * * * * ?', 'demo-bean-job', '2020-09-09 23:32:46', '2020-09-11 22:01:15', 'XXL', '', 'FIRST', 'BeanJobHandler', 'k=1', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'init', '2018-11-03 22:21:31', '', 1, 0, 0); +INSERT INTO `xxl_job`.`xxl_job_info`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`, `trigger_status`, `trigger_last_time`, `trigger_next_time`) VALUES (2, 1, '0/1 * * * * ?', 'demo-method-job', '2020-09-09 23:32:46', '2020-09-11 22:01:12', 'XXL', '', 'FIRST', 'MethodJobHandler', 'k=2', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'init', '2020-09-09 23:32:46', '', 1, 0, 0); +INSERT INTO `xxl_job`.`xxl_job_info`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`, `trigger_status`, `trigger_last_time`, `trigger_next_time`) VALUES (3, 1, '0/1 * * * * ?', 'demo-glue-java-job', '2020-09-09 23:51:06', '2020-09-11 22:17:25', 'XXL', '', 'FIRST', '', 'k=3', 'SERIAL_EXECUTION', 0, 0, 'GLUE_GROOVY', 'package com.xxl.job.service.handler;\n\nimport com.xxl.job.core.log.XxlJobLogger;\nimport com.xxl.job.core.biz.model.ReturnT;\nimport com.xxl.job.core.handler.IJobHandler;\nimport okhttp3.OkHttpClient;\nimport okhttp3.Request;\nimport okhttp3.Response;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\npublic class GlueJob extends IJobHandler {\n\n private static final Logger log = LoggerFactory.getLogger(GlueJob.class);\n\n private static final OkHttpClient client = new OkHttpClient.Builder().build();\n\n @Override\n public ReturnT execute(String param) throws Exception {\n\n log.info(\"GlueJob execute. param: {}\", param);\n\n Request request = new Request.Builder().url(\"http://localhost:8080/xxl-job-2.x-scenario/case/glueJob\").build();\n Response response = client.newCall(request).execute();\n response.body().close();\n\n return ReturnT.SUCCESS;\n }\n}\n', 'init', '2020-09-11 22:17:25', '', 1, 0, 0); +INSERT INTO `xxl_job`.`xxl_job_info`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`, `trigger_status`, `trigger_last_time`, `trigger_next_time`) VALUES (4, 1, '0/1 * * * * ?', 'demo-glue-shell-job', '2020-09-09 23:53:32', '2020-09-11 22:01:04', 'XXL', '', 'FIRST', '', 'k=4', 'SERIAL_EXECUTION', 0, 0, 'GLUE_SHELL', '#!/bin/bash\necho \"xxl-job: hello shell\"\n\necho \"Good bye!\"\nexit 0\n', 'init', '2020-09-09 23:54:57', '', 1, 0, 0); +INSERT INTO `xxl_job_user`(`id`, `username`, `password`, `role`, `permission`) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL); +INSERT INTO `xxl_job_lock` ( `lock_name`) VALUES ( 'schedule_lock'); \ No newline at end of file diff --git a/test/plugin/scenarios/xxl-job-2.x-scenario/support-version.list b/test/plugin/scenarios/xxl-job-2.x-scenario/support-version.list new file mode 100644 index 000000000..d3fc25231 --- /dev/null +++ b/test/plugin/scenarios/xxl-job-2.x-scenario/support-version.list @@ -0,0 +1,18 @@ +# 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. + +# lists your version here +2.2.0 \ No newline at end of file