Skip to content

Commit 17a773a

Browse files
Fix breaking change introduced in the previous commit
related to gh-2169
1 parent f3f949b commit 17a773a

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceJdbcEventListener.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.p6spy.engine.event.SimpleJdbcEventListener;
2929

3030
import org.springframework.beans.factory.BeanFactory;
31+
import org.springframework.cloud.sleuth.Tracer;
3132
import org.springframework.core.Ordered;
3233
import org.springframework.util.StringUtils;
3334

@@ -50,6 +51,14 @@ public class TraceJdbcEventListener extends SimpleJdbcEventListener implements O
5051

5152
private final boolean includeParameterValues;
5253

54+
public TraceJdbcEventListener(Tracer tracer, DataSourceNameResolver dataSourceNameResolver,
55+
List<TraceType> traceTypes, boolean includeParameterValues,
56+
List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers) {
57+
this.dataSourceNameResolver = dataSourceNameResolver;
58+
this.includeParameterValues = includeParameterValues;
59+
this.strategy = new TraceListenerStrategy<>(tracer, traceTypes, customizers);
60+
}
61+
5362
public TraceJdbcEventListener(BeanFactory beanFactory, DataSourceNameResolver dataSourceNameResolver,
5463
List<TraceType> traceTypes, boolean includeParameterValues,
5564
List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers) {

spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/jdbc/TraceListenerStrategy.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,17 @@ class TraceListenerStrategy<CON, STMT, RS> {
8383

8484
private final List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers;
8585

86-
private final BeanFactory beanFactory;
86+
private BeanFactory beanFactory;
8787

8888
private Tracer tracer;
8989

90+
TraceListenerStrategy(Tracer tracer, List<TraceType> traceTypes,
91+
List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers) {
92+
this.traceTypes = traceTypes;
93+
this.customizers = customizers;
94+
this.tracer = tracer;
95+
}
96+
9097
TraceListenerStrategy(BeanFactory beanFactory, List<TraceType> traceTypes,
9198
List<TraceListenerStrategySpanCustomizer<? super CommonDataSource>> customizers) {
9299
this.traceTypes = traceTypes;

0 commit comments

Comments
 (0)