wu-sheng closed pull request #792: [Agent] fix kafka plugin don't works
URL: https://github.com/apache/incubator-skywalking/pull/792
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/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java
index e478d6204..1744ce702 100644
---
a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java
@@ -39,7 +39,7 @@
public static final String ENHANCE_CLASS =
"org.apache.kafka.clients.producer.Callback";
public static final String ENHANCE_METHOD = "onCompletion";
- public static final String INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v11.CallbackInterceptor";
+ public static final String INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v1.CallbackInterceptor";
@Override protected ConstructorInterceptPoint[]
getConstructorsInterceptPoints() {
return new ConstructorInterceptPoint[0];
diff --git
a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java
index e4e1445f6..878a8302c 100644
---
a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java
@@ -48,12 +48,13 @@
public class KafkaConsumerInstrumentation extends
ClassInstanceMethodsEnhancePluginDefine {
public static final String CONSTRUCTOR_INTERCEPT_TYPE =
"org.apache.kafka.clients.consumer.ConsumerConfig";
- public static final String CONSTRUCTOR_INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v11.ConsumerConstructorInterceptor";
- public static final String INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v11.KafkaConsumerInterceptor";
+ public static final String CONSTRUCTOR_INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v1.ConsumerConstructorInterceptor";
+ public static final String INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v1.KafkaConsumerInterceptor";
public static final String ENHANCE_METHOD = "pollOnce";
public static final String ENHANCE_CLASS =
"org.apache.kafka.clients.consumer.KafkaConsumer";
public static final String SUBSCRIBE_METHOD = "subscribe";
public static final String SUBSCRIBE_INTERCEPT_TYPE =
"org.apache.kafka.clients.consumer.ConsumerRebalanceListener";
+ public static final String SUBSCRIBE_INTERCEPT_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v1.SubscribeMethodInterceptor";
@Override protected ConstructorInterceptPoint[]
getConstructorsInterceptPoints() {
return new ConstructorInterceptPoint[] {
@@ -90,7 +91,7 @@
}
@Override public String getMethodsInterceptor() {
- return
"org.apache.skywalking.apm.plugin.kafka.v11.SubscribeMethodInterceptor";
+ return SUBSCRIBE_INTERCEPT_CLASS;
}
@Override public boolean isOverrideArgs() {
diff --git
a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java
index 54932a8af..f93e936c6 100644
---
a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java
@@ -48,9 +48,9 @@
*/
public class KafkaProducerInstrumentation extends
ClassInstanceMethodsEnhancePluginDefine {
- public static final String INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v11.KafkaProducerInterceptor";
+ public static final String INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v1.KafkaProducerInterceptor";
public static final String ENHANCE_CLASS =
"org.apache.kafka.clients.producer.KafkaProducer";
- public static final String CONSTRUCTOR_INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v11.ProducerConstructorInterceptor";
+ public static final String CONSTRUCTOR_INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v1.ProducerConstructorInterceptor";
public static final String CONSTRUCTOR_INTERCEPTOR_FLAG =
"org.apache.kafka.clients.producer.ProducerConfig";
@Override protected ConstructorInterceptPoint[]
getConstructorsInterceptPoints() {
diff --git
a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
index fe4d8b203..e2035b29f 100644
---
a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java
@@ -39,7 +39,7 @@
*/
public class ProducerRecordInstrumentation extends
ClassInstanceMethodsEnhancePluginDefine {
- public static final String CONSTRUCTOR_INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v11.ProducerRecordConstructorInterceptor";
+ public static final String CONSTRUCTOR_INTERCEPTOR_CLASS =
"org.apache.skywalking.apm.plugin.kafka.v1.ProducerRecordConstructorInterceptor";
public static final String ENHANCE_CLASS =
"org.apache.kafka.clients.producer.ProducerRecord";
@Override protected ConstructorInterceptPoint[]
getConstructorsInterceptPoints() {
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
