Polish up Pulsar plugins (#375)

Author: pg-yang

CHANGES.md

@@ -26,6 +26,7 @@ Release Notes.
 * Add RocketMQ test scenarios for version 4.3 - 4.9. No 4.0 - 4.2 release images for testing.
 * Support mannual propagation of tracing context to next operators for webflux.
 * Add MQ_TOPIC and MQ_BROKER tags for RocketMQ consumer's span. 
+* Polish up Pulsar plugins to remove unnecessary dynamic value , set peer at consumer side 
 
 #### Documentation
 

apm-sniffer/apm-sdk-plugin/pulsar-2.2-2.7-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptor.java

@@ -18,32 +18,13 @@
 
 package org.apache.skywalking.apm.plugin.pulsar;
 
-import org.apache.pulsar.client.impl.PulsarClientImpl;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
-import org.apache.skywalking.apm.plugin.pulsar.common.ProducerEnhanceRequiredInfo;
 
-/**
- * Interceptor of pulsar producer constructor.
- * <p>
- * The interceptor create {@link ProducerEnhanceRequiredInfo} which is required by instance method interceptor, So use
- * it to update the skywalking dynamic field of pulsar producer enhanced instance. So that the instance methods can get
- * the {@link ProducerEnhanceRequiredInfo}
- */
 public class ProducerConstructorInterceptor implements InstanceConstructorInterceptor {
 
     @Override
     public void onConstruct(EnhancedInstance objInst, Object[] allArguments) {
-        PulsarClientImpl pulsarClient = (PulsarClientImpl) allArguments[0];
-        String topic = (String) allArguments[1];
-        ProducerEnhanceRequiredInfo producerEnhanceRequiredInfo = new ProducerEnhanceRequiredInfo();
-        producerEnhanceRequiredInfo.setTopic(topic);
-        /*
-         * Pulsar url can specify with specific URL or a service url provider, use pulsarClient.getLookup().getServiceUrl()
-         * can handle the service url provider which use a dynamic service url
-         */
-        producerEnhanceRequiredInfo.setServiceUrl(pulsarClient.getLookup().getServiceUrl());
-        producerEnhanceRequiredInfo.setPropertiesInjector(new MessagePropertiesInjectorV27());
-        objInst.setSkyWalkingDynamicField(producerEnhanceRequiredInfo);
+        objInst.setSkyWalkingDynamicField(new MessagePropertiesInjectorV27());
     }
 }

apm-sniffer/apm-sdk-plugin/pulsar-2.2-2.7-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/MockMessage.java

@@ -18,32 +18,13 @@
 
 package org.apache.skywalking.apm.plugin.pulsar.v28x;
 
-import org.apache.pulsar.client.impl.PulsarClientImpl;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
-import org.apache.skywalking.apm.plugin.pulsar.common.ProducerEnhanceRequiredInfo;
 
-/**
- * Interceptor of pulsar producer constructor.
- * <p>
- * The interceptor create {@link ProducerEnhanceRequiredInfo} which is required by instance method interceptor, So use
- * it to update the skywalking dynamic field of pulsar producer enhanced instance. So that the instance methods can get
- * the {@link ProducerEnhanceRequiredInfo}
- */
 public class ProducerConstructorInterceptor implements InstanceConstructorInterceptor {
 
     @Override
     public void onConstruct(EnhancedInstance objInst, Object[] allArguments) {
-        PulsarClientImpl pulsarClient = (PulsarClientImpl) allArguments[0];
-        String topic = (String) allArguments[1];
-        ProducerEnhanceRequiredInfo producerEnhanceRequiredInfo = new ProducerEnhanceRequiredInfo();
-        producerEnhanceRequiredInfo.setTopic(topic);
-        /*
-         * Pulsar url can specify with specific URL or a service url provider, use pulsarClient.getLookup().getServiceUrl()
-         * can handle the service url provider which use a dynamic service url
-         */
-        producerEnhanceRequiredInfo.setServiceUrl(pulsarClient.getLookup().getServiceUrl());
-        producerEnhanceRequiredInfo.setPropertiesInjector(new MessagePropertiesInjectorV28());
-        objInst.setSkyWalkingDynamicField(producerEnhanceRequiredInfo);
+        objInst.setSkyWalkingDynamicField(new MessagePropertiesInjectorV28());
     }
 }

apm-sniffer/apm-sdk-plugin/pulsar-2.2-2.7-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptorTest.java

@@ -18,33 +18,15 @@
 
 package org.apache.skywalking.apm.plugin.pulsar.common;
 
-import org.apache.pulsar.client.impl.PulsarClientImpl;
 import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
 
-/**
- * Interceptor of pulsar consumer constructor.
- * <p>
- * The interceptor create {@link ConsumerEnhanceRequiredInfo} which is required by instance method interceptor, So use
- * it to update the skywalking dynamic field of pulsar consumer enhanced instance. So that the instance methods can get
- * the {@link ConsumerEnhanceRequiredInfo}
- */
 public class ConsumerConstructorInterceptor implements InstanceConstructorInterceptor {
 
     @Override
     public void onConstruct(EnhancedInstance objInst, Object[] allArguments) {
-        PulsarClientImpl pulsarClient = (PulsarClientImpl) allArguments[0];
-        String topic = (String) allArguments[1];
         ConsumerConfigurationData consumerConfigurationData = (ConsumerConfigurationData) allArguments[2];
-        ConsumerEnhanceRequiredInfo requireInfo = new ConsumerEnhanceRequiredInfo();
-        /*
-         * Pulsar url can specify with specific URL or a service url provider, use pulsarClient.getLookup().getServiceUrl()
-         * can handle the service url provider which use a dynamic service url
-         */
-        requireInfo.setServiceUrl(pulsarClient.getLookup().getServiceUrl());
-        requireInfo.setTopic(topic);
-        requireInfo.setSubscriptionName(consumerConfigurationData.getSubscriptionName());
-        objInst.setSkyWalkingDynamicField(requireInfo);
+        objInst.setSkyWalkingDynamicField(consumerConfigurationData.getSubscriptionName());
     }
 }