From 17a773ac61814c184bcfad5f04d657db5eec39f6 Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Thu, 26 May 2022 07:30:11 -0700
Subject: [PATCH] Fix breaking change introduced in the previous commit related
 to gh-2169

---
 .../sleuth/instrument/jdbc/TraceJdbcEventListener.java   | 9 +++++++++
 .../sleuth/instrument/jdbc/TraceListenerStrategy.java    | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceJdbcEventListener.java b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceJdbcEventListener.java
index b589a763d..a0627efc1 100644
--- a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceJdbcEventListener.java
+++ b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceJdbcEventListener.java
@@ -28,6 +28,7 @@ import com.p6spy.engine.common.StatementInformation;
 import com.p6spy.engine.event.SimpleJdbcEventListener;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.cloud.sleuth.Tracer;
 import org.springframework.core.Ordered;
 import org.springframework.util.StringUtils;
 
@@ -50,6 +51,14 @@ public class TraceJdbcEventListener extends SimpleJdbcEventListener implements O
 
 	private final boolean includeParameterValues;
 
+	public TraceJdbcEventListener(Tracer tracer, DataSourceNameResolver dataSourceNameResolver,
+			List<TraceType> traceTypes, boolean includeParameterValues,
+			List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers) {
+		this.dataSourceNameResolver = dataSourceNameResolver;
+		this.includeParameterValues = includeParameterValues;
+		this.strategy = new TraceListenerStrategy<>(tracer, traceTypes, customizers);
+	}
+
 	public TraceJdbcEventListener(BeanFactory beanFactory, DataSourceNameResolver dataSourceNameResolver,
 			List<TraceType> traceTypes, boolean includeParameterValues,
 			List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers) {
diff --git a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceListenerStrategy.java b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceListenerStrategy.java
index 3e0761122..21562bee7 100644
--- a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceListenerStrategy.java
+++ b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceListenerStrategy.java
@@ -83,10 +83,17 @@ class TraceListenerStrategy<CON, STMT, RS> {
 
 	private final List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers;
 
-	private final BeanFactory beanFactory;
+	private BeanFactory beanFactory;
 
 	private Tracer tracer;
 
+	TraceListenerStrategy(Tracer tracer, List<TraceType> traceTypes,
+			List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers) {
+		this.traceTypes = traceTypes;
+		this.customizers = customizers;
+		this.tracer = tracer;
+	}
+
 	TraceListenerStrategy(BeanFactory beanFactory, List<TraceType> traceTypes,
 			List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers) {
 		this.traceTypes = traceTypes;