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

Removed the workaround since it got fixed in kafka; fixes gh-1515

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-01-09 09:24:55 +01:00
parent 73f762285e
commit 5a44385448
2 changed files with 0 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java
View File

@@ -72,7 +72,6 @@ import org.springframework.kafka.listener.AbstractMessageListenerContainer;
import org.springframework.kafka.listener.MessageListener;
import org.springframework.kafka.listener.MessageListenerContainer;
import org.springframework.kafka.listener.adapter.MessagingMessageListenerAdapter;
import org.springframework.kafka.support.DefaultKafkaHeaderMapper;
import org.springframework.lang.Nullable;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessagingException;
@@ -161,21 +160,6 @@ public class TraceMessagingAutoConfiguration {
.build();
}
@Bean(name = SleuthDefaultKafkaHeaderMapper.BEAN_NAME)
@ConditionalOnMissingBean
DefaultKafkaHeaderMapper sleuthDefaultKafkaHeaderMapper() {
return new SleuthDefaultKafkaHeaderMapper();
}
@Bean
@ConditionalOnProperty(value = "spring.sleuth.messaging.kafka.mapper.enabled",
matchIfMissing = true)
// for tests
@ConditionalOnMissingBean
SleuthKafkaHeaderMapperBeanPostProcessor sleuthDefaultKafkaHeaderMapperBeanPostProcessor() {
return new SleuthKafkaHeaderMapperBeanPostProcessor();
}
@Bean
// for tests
@ConditionalOnMissingBean
@@ -457,37 +441,6 @@ class TracingJmsBeanPostProcessor implements BeanPostProcessor {
}
class SleuthDefaultKafkaHeaderMapper extends DefaultKafkaHeaderMapper {
// related to #1430
static final String BEAN_NAME = "kafkaBinderHeaderMapper";
SleuthDefaultKafkaHeaderMapper() {
setMapAllStringsOut(true);
}
}
class SleuthKafkaHeaderMapperBeanPostProcessor implements BeanPostProcessor {
@Override
public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
if (bean instanceof SleuthDefaultKafkaHeaderMapper) {
return sleuthDefaultKafkaHeaderMapper(bean);
}
else if (bean instanceof DefaultKafkaHeaderMapper) {
((DefaultKafkaHeaderMapper) bean).setMapAllStringsOut(true);
}
return bean;
}
Object sleuthDefaultKafkaHeaderMapper(Object bean) {
return bean;
}
}
class SqsQueueMessageHandlerFactory extends QueueMessageHandlerFactory {
private TracingMethodMessageHandlerAdapter handlerAdapter;