Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)}.
Comment thread
wu-sheng marked this conversation as resolved.
*/
private static final String PROVIDER_INVOKE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.motan.MotanConsumerInterceptor";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,7 +30,7 @@
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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -30,7 +29,7 @@
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
Expand Down
32 changes: 32 additions & 0 deletions tools/check/agent/plugin/PluginImportedCheck.sh
Original file line number Diff line number Diff line change
@@ -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
Comment thread
wu-sheng marked this conversation as resolved.
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