kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove imported classes and add ci scripts for plugin import check. (#2881) 

Add CI scripts for plugin import check.
This commit is contained in:
daming 2019-06-16 22:05:37 +08:00 committed by 吴晟 Wu Sheng
parent f414d72dd5
commit dbe7da4e77
5 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jenkinsfile vendored
View File

@ -56,7 +56,15 @@ pipeline {
sh 'ls'
sh 'git status'
}
}
}
stage('Check agent plugin instrumentation imports') {
steps {
sh './tools/check/agent/plugin/PluginImportedCheck.sh apm-sdk-plugin'
sh './tools/check/agent/plugin/PluginImportedCheck.sh apm-toolkit-activation'
sh './tools/check/agent/plugin/PluginImportedCheck.sh optional-plugins'
}
}
stage('Test & Report') {
steps {

3
apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
View File

@ -18,7 +18,6 @@
package org.apache.skywalking.apm.plugin.motan.define;
import com.weibo.api.motan.rpc.Request;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
@ -41,7 +40,7 @@ public class MotanConsumerInstrumentation extends ClassInstanceMethodsEnhancePlu
*/
private static final String CONSTRUCTOR_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.motan.MotanConsumerInterceptor";
/**
* Class that intercept {@link com.weibo.api.motan.rpc.AbstractProvider#call(Request)}.
* Class that intercept {@link com.weibo.api.motan.rpc.AbstractProvider#call(com.weibo.api.motan.rpc.Request)}.
*/
private static final String PROVIDER_INVOKE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.motan.MotanConsumerInterceptor";

3
apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionImplCreateInstrumentation.java
View File

@ -19,7 +19,6 @@
package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define;
import com.mysql.cj.conf.HostInfo;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint;
@ -31,7 +30,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
/**
* interceptor the method {@link com.mysql.cj.jdbc.ConnectionImpl#getInstance(HostInfo)}
* interceptor the method {@link com.mysql.cj.jdbc.ConnectionImpl#getInstance(com.mysql.cj.conf.HostInfo)}
* instead of {@link com.mysql.cj.jdbc.Driver#connect(String, Properties)}
* @author: dingshaocheng
*/

3
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java
View File

@ -18,7 +18,6 @@
package org.apache.skywalking.apm.plugin.servicecomb.define;
import io.servicecomb.core.handler.impl.TransportClientHandler;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
@ -30,7 +29,7 @@ import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
import static net.bytebuddy.matcher.ElementMatchers.named;
/**
* {@link TransportClientHandlerInstrumentation} represents that skywalking intercept {@link TransportClientHandler} by
* {@link TransportClientHandlerInstrumentation} represents that skywalking intercept {@link io.servicecomb.core.handler.impl.TransportClientHandler} by
* using linkTransportClientHandlerInterceptor
*
* @author lytscu

32
tools/check/agent/plugin/PluginImportedCheck.sh Executable file
View File

@ -0,0 +1,32 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# 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.
# ----------------------------------------------------------------------------
plugin_dir=$1
for dir in `ls "./apm-sniffer/$plugin_dir/"`; do
echo "Scanning $dir"
for f in `find ./apm-sniffer/$plugin_dir/$dir -name *Instrumentation.java `; do
NUM=`head -400 $f | grep ^import |grep -Ev "^import\s+(static\s+)*net.bytebuddy\\." \
| grep -Ev "^import\s+(static\s+)*org.apache.skywalking\\." |grep -Ev "^import\s+(static\s+)*java\\." | wc -l`
if [ $NUM -gt 0 ] ; then
echo "Plugin: $dir($f), only allow to import JDK and ByteBuddy classes in Instrumentation definition.";
exit 1;
fi
done
done