SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added missing method for AOP wrapping (#1924)

Browse Source 
fixes gh-1922
This commit is contained in:
Marcin Grzejszczak
2021-04-22 11:27:08 +02:00
committed by GitHub
parent 10c67d64e5
commit 1bcccbae6e
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/instrument/messaging/SleuthKafkaAspect.java
View File

@@ -64,6 +64,10 @@ public class SleuthKafkaAspect {
private void anyProducerFactory() {
} // NOSONAR
@Pointcut("execution(public * org.springframework.kafka.core.ProducerFactory.createNonTransactionalProducer(..))")
private void anyNonTransactionalProducerFactory() {
} // NOSONAR
@Pointcut("execution(public * org.springframework.kafka.core.ConsumerFactory.createConsumer(..))")
private void anyConsumerFactory() {
} // NOSONAR
@@ -76,7 +80,7 @@ public class SleuthKafkaAspect {
private void anyCreateContainer() {
} // NOSONAR
@Around("anyProducerFactory()")
@Around("anyProducerFactory() || anyNonTransactionalProducerFactory()")
public Object wrapProducerFactory(ProceedingJoinPoint pjp) throws Throwable {
Producer producer = (Producer) pjp.proceed();
return this.kafkaTracing.producer(producer);

4
tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/BraveMessagingAutoConfigurationTests.java
View File

@@ -96,6 +96,10 @@ public class BraveMessagingAutoConfigurationTests {
public void should_wrap_kafka() {
this.producerFactory.createProducer();
then(this.mySleuthKafkaAspect.producerWrapped).isTrue();
this.mySleuthKafkaAspect.producerWrapped = false;
this.producerFactory.createNonTransactionalProducer();
then(this.mySleuthKafkaAspect.producerWrapped).isTrue();
this.consumerFactory.createConsumer();
then(this.mySleuthKafkaAspect.consumerWrapped).isTrue();