You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/09/05 13:14:37 UTC
[GitHub] wu-sheng closed pull request #1629: Fix wrong interceptor class
names.
wu-sheng closed pull request #1629: Fix wrong interceptor class names.
URL: https://github.com/apache/incubator-skywalking/pull/1629
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
index 21328955a..6d953a835 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java
@@ -18,6 +18,7 @@
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;
@@ -26,13 +27,23 @@
import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
+import static net.bytebuddy.matcher.ElementMatchers.any;
import static net.bytebuddy.matcher.ElementMatchers.named;
public class MotanConsumerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
- private static final String ENHANCE_CLASS = "com.weibo.api.motan.transport.ProviderMessageRouter";
-
- private static final String INVOKE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.motan.MotanProviderInterceptor";
+ /**
+ * Enhance class.
+ */
+ private static final String ENHANCE_CLASS = "com.weibo.api.motan.rpc.AbstractReferer";
+ /**
+ * Class that intercept all constructor of ${@link com.weibo.api.motan.rpc.AbstractProvider}.
+ */
+ 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)}.
+ */
+ private static final String PROVIDER_INVOKE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.motan.MotanConsumerInterceptor";
@Override
protected ClassMatch enhanceClass() {
@@ -41,7 +52,19 @@ protected ClassMatch enhanceClass() {
@Override
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
- return new ConstructorInterceptPoint[0];
+ return new ConstructorInterceptPoint[] {
+ new ConstructorInterceptPoint() {
+ @Override
+ public ElementMatcher<MethodDescription> getConstructorMatcher() {
+ return any();
+ }
+
+ @Override
+ public String getConstructorInterceptor() {
+ return CONSTRUCTOR_INTERCEPT_CLASS;
+ }
+ }
+ };
}
@Override
@@ -55,7 +78,7 @@ protected ClassMatch enhanceClass() {
@Override
public String getMethodsInterceptor() {
- return INVOKE_INTERCEPT_CLASS;
+ return PROVIDER_INVOKE_INTERCEPT_CLASS;
}
@Override public boolean isOverrideArgs() {
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
index 36159da97..dcc38e678 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java
@@ -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;
@@ -27,23 +26,13 @@
import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch;
-import static net.bytebuddy.matcher.ElementMatchers.any;
import static net.bytebuddy.matcher.ElementMatchers.named;
public class MotanProviderInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
- /**
- * Enhance class.
- */
- private static final String ENHANCE_CLASS = "com.weibo.api.motan.rpc.AbstractReferer";
- /**
- * Class that intercept all constructor of ${@link com.weibo.api.motan.rpc.AbstractProvider}.
- */
- 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)}.
- */
- private static final String PROVIDER_INVOKE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.motan.MotanConsumerInterceptor";
+ private static final String ENHANCE_CLASS = "com.weibo.api.motan.transport.ProviderMessageRouter";
+
+ private static final String INVOKE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.motan.MotanProviderInterceptor";
@Override
protected ClassMatch enhanceClass() {
@@ -52,19 +41,7 @@ protected ClassMatch enhanceClass() {
@Override
protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
- return new ConstructorInterceptPoint[] {
- new ConstructorInterceptPoint() {
- @Override
- public ElementMatcher<MethodDescription> getConstructorMatcher() {
- return any();
- }
-
- @Override
- public String getConstructorInterceptor() {
- return CONSTRUCTOR_INTERCEPT_CLASS;
- }
- }
- };
+ return new ConstructorInterceptPoint[0];
}
@Override
@@ -78,7 +55,7 @@ public String getConstructorInterceptor() {
@Override
public String getMethodsInterceptor() {
- return PROVIDER_INVOKE_INTERCEPT_CLASS;
+ return INVOKE_INTERCEPT_CLASS;
}
@Override public boolean isOverrideArgs() {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services