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

Improve the instrument of spring-rabbit components. (#2154)

Browse Source
This commit is contained in:
zysaaa
2022-05-09 22:21:01 +08:00
committed by GitHub
parent 46f61dac86
commit 273cf39f5d
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -73,7 +73,7 @@
<spring-cloud-openfeign.version>3.1.3-SNAPSHOT</spring-cloud-openfeign.version>
<spring-cloud-task.version>2.4.2-SNAPSHOT</spring-cloud-task.version>
<spring-cloud-deployer.version>2.5.1</spring-cloud-deployer.version>
<brave.version>5.13.7</brave.version>
<brave.version>5.13.9</brave.version>
<opentracing.version>0.32.0</opentracing.version>
<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>
<spring-security-oauth2.version>2.2.0.RELEASE</spring-security-oauth2.version>

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

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2021 the original author or authors.
* Copyright 2013-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,14 +18,18 @@ package org.springframework.cloud.sleuth.brave.instrument.messaging;
import brave.spring.rabbit.SpringRabbitTracing;
import org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFactory;
import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.BeanPostProcessor;
/**
*
* Instruments spring-rabbit related components.
*/
public class SleuthRabbitBeanPostProcessor implements BeanPostProcessor {
@@ -46,6 +50,14 @@ public class SleuthRabbitBeanPostProcessor implements BeanPostProcessor {
return rabbitTracing()
.decorateSimpleRabbitListenerContainerFactory((SimpleRabbitListenerContainerFactory) bean);
}
else if (bean instanceof DirectRabbitListenerContainerFactory) {
return rabbitTracing()
.decorateDirectRabbitListenerContainerFactory((DirectRabbitListenerContainerFactory) bean);
}
else if (bean instanceof SimpleMessageListenerContainer || bean instanceof DirectMessageListenerContainer) {
return rabbitTracing()
.decorateMessageListenerContainer((AbstractMessageListenerContainer) bean);
}
return bean;
}

2
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -42,7 +42,7 @@
</scm>
<properties>
<brave.version>5.13.7</brave.version>
<brave.version>5.13.9</brave.version>
<brave.opentracing.version>0.37.4</brave.opentracing.version>
<grpc.spring.boot.version>4.2.2</grpc.spring.boot.version>
</properties>