From b28980cef83ffcaffa74448330226ccaeae32831 Mon Sep 17 00:00:00 2001 From: HzjNeverStop <441627022@qq.com> Date: Mon, 9 Jan 2023 10:20:22 +0800 Subject: [PATCH] update_tracer_configuration (#1051) --- .../autoconfigure/tracer/SofaTracerKafkaAutoConfiguration.java | 3 ++- .../autoconfigure/tracer/SofaTracerMongoAutoConfiguration.java | 2 +- .../tracer/SofaTracerRabbitMqAutoConfiguration.java | 3 ++- .../tracer/SofaTracerRestTemplateAutoConfiguration.java | 3 ++- .../tracer/SofaTracerRocketMqAutoConfiguration.java | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerKafkaAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerKafkaAutoConfiguration.java index 45965e8de..47b474559 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerKafkaAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerKafkaAutoConfiguration.java @@ -36,7 +36,8 @@ */ @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(KafkaAutoConfiguration.class) -@ConditionalOnClass({ ProducerFactory.class, ConsumerFactory.class }) +@ConditionalOnClass({ ProducerFactory.class, ConsumerFactory.class, + KafkaConsumerFactoryPostProcessor.class }) @EnableAspectJAutoProxy(proxyTargetClass = true) @ConditionalOnProperty(name = "com.alipay.tracer.kafka.enabled", havingValue = "true", matchIfMissing = true) public class SofaTracerKafkaAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerMongoAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerMongoAutoConfiguration.java index 1dec9fb52..07318af59 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerMongoAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerMongoAutoConfiguration.java @@ -34,7 +34,7 @@ **/ @Configuration(proxyBeanMethods = false) @AutoConfigureBefore({ MongoAutoConfiguration.class }) -@ConditionalOnClass({ MongoClient.class }) +@ConditionalOnClass({ MongoClient.class, SofaTracerMongoClientSettingsBuilderCustomizer.class }) @ConditionalOnProperty(name = "com.alipay.tracer.mongodb.enabled", havingValue = "true", matchIfMissing = true) public class SofaTracerMongoAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRabbitMqAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRabbitMqAutoConfiguration.java index d62568bb0..b4b2bace1 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRabbitMqAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRabbitMqAutoConfiguration.java @@ -38,7 +38,8 @@ */ @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(RabbitAutoConfiguration.class) -@ConditionalOnClass({ Message.class, RabbitTemplate.class }) +@ConditionalOnClass({ Message.class, RabbitTemplate.class, SofaTracerSendMessageAspect.class, + SofaTracerRabbitMqBeanPostProcessor.class }) @ConditionalOnProperty(prefix = "com.alipay.sofa.tracer.rabbitmq", value = "enable", matchIfMissing = true) @EnableAspectJAutoProxy(proxyTargetClass = true) public class SofaTracerRabbitMqAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java index 80c792918..720d41e4e 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java @@ -31,7 +31,8 @@ @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @ConditionalOnProperty(prefix = "com.alipay.sofa.tracer.resttemplate", value = "enable", matchIfMissing = true) -@ConditionalOnClass({ RestTemplateTracer.class, SofaTracerRestTemplateEnhance.class }) +@ConditionalOnClass({ RestTemplateTracer.class, SofaTracerRestTemplateEnhance.class, + SofaTracerRestTemplateBeanPostProcessor.class }) public class SofaTracerRestTemplateAutoConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRocketMqAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRocketMqAutoConfiguration.java index 199a1d007..c9a8ff602 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRocketMqAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRocketMqAutoConfiguration.java @@ -36,7 +36,8 @@ */ @Configuration(proxyBeanMethods = false) @AutoConfigureBefore(RocketMQAutoConfiguration.class) -@ConditionalOnClass({ MQProducer.class, RocketMQListenerContainer.class }) +@ConditionalOnClass({ MQProducer.class, RocketMQListenerContainer.class, + SofaTracerRocketMqProducerPostProcessor.class }) @ConditionalOnProperty(prefix = "com.alipay.sofa.tracer.rocketmq", value = "enable", matchIfMissing = true) public class SofaTracerRocketMqAutoConfiguration {