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

Fix breaking change introduced in the previous commit

Browse Source 
related to gh-2169
This commit is contained in:
Jonatan Ivanov
2022-05-26 07:30:11 -07:00
parent f3f949b3fc
commit 17a773ac61
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

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

@@ -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;