From faa2c0fa5378c260c323a9a9910653cb512b3d2d Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Tue, 7 Dec 2021 09:52:46 +0100
Subject: [PATCH] Polish

---
 .../tx/AbstractTransactionManagerInstrumenter.java    | 11 +----------
 ...cePlatformTransactionManagerBeanPostProcessor.java |  2 +-
 ...ceReactiveTransactionManagerBeanPostProcessor.java |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/AbstractTransactionManagerInstrumenter.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/AbstractTransactionManagerInstrumenter.java
index f07c5910c..19dff7851 100644
--- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/AbstractTransactionManagerInstrumenter.java
+++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/AbstractTransactionManagerInstrumenter.java
@@ -82,17 +82,8 @@ abstract class AbstractTransactionManagerInstrumenter<T extends TransactionManag
 
 	abstract T wrap(T transactionManager);
 
-	/**
-	 * Wraps an {@link Executor} bean in its trace representation.
-	 * @param bean a bean (might be of {@link Executor} type
-	 * @param beanName name of the bean
-	 * @return wrapped bean or just bean if not {@link Executor} or already instrumented
-	 */
-	Object instrument(Object bean, String beanName) {
+	Object instrument(Object bean) {
 		if (!isApplicableForInstrumentation(bean)) {
-			if (log.isTraceEnabled()) {
-				log.trace("Bean is already instrumented or is not applicable for instrumentation " + beanName);
-			}
 			return bean;
 		}
 		return wrapManager(bean);
diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/TracePlatformTransactionManagerBeanPostProcessor.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/TracePlatformTransactionManagerBeanPostProcessor.java
index 89bf8c653..bf668a123 100644
--- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/TracePlatformTransactionManagerBeanPostProcessor.java
+++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/TracePlatformTransactionManagerBeanPostProcessor.java
@@ -37,7 +37,7 @@ public class TracePlatformTransactionManagerBeanPostProcessor implements BeanPos
 
 	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-		return this.platformTransactionManagerInstrumenter.instrument(bean, beanName);
+		return this.platformTransactionManagerInstrumenter.instrument(bean);
 	}
 
 }
diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/TraceReactiveTransactionManagerBeanPostProcessor.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/TraceReactiveTransactionManagerBeanPostProcessor.java
index d8bb51fd0..7b867ceaa 100644
--- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/TraceReactiveTransactionManagerBeanPostProcessor.java
+++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/tx/TraceReactiveTransactionManagerBeanPostProcessor.java
@@ -37,7 +37,7 @@ public class TraceReactiveTransactionManagerBeanPostProcessor implements BeanPos
 
 	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-		return this.reactiveTransactionManagerInstrumenter.instrument(bean, beanName);
+		return this.reactiveTransactionManagerInstrumenter.instrument(bean);
 	}
 
 }