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

Fixed NPE when parsing invalid URIs for database tracing; fixes gh-2186

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-07-12 13:38:12 +02:00
parent d38482519b
commit 28fba56212
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,13 +143,16 @@ class TraceListenerStrategy<CON, STMT, RS> {
parseAndSetServerIpAndPort(connectionInfo, connection, dataSourceName);
if (connectionSpan != null) {
connectionSpan.getSpan().remoteServiceName(connectionInfo.remoteServiceName);
connectionSpan.getSpan().remoteIpAndPort(connectionInfo.url.getHost(), connectionInfo.url.getPort());
if (connectionInfo.url != null) {
connectionSpan.getSpan().remoteIpAndPort(connectionInfo.url.getHost(),
connectionInfo.url.getPort());
}
}
}
else if (t != null) {
this.openConnections.remove(connectionKey);
if (isCurrent(connectionInfo)) {
this.currentConnection.set(null);
this.currentConnection.remove();
}
if (connectionSpan != null) {
if (log.isTraceEnabled()) {
@@ -408,7 +411,7 @@ class TraceListenerStrategy<CON, STMT, RS> {
}
ConnectionInfo connectionInfo = this.openConnections.remove(connectionKey);
if (isCurrent(connectionInfo)) {
this.currentConnection.set(null);
this.currentConnection.remove();
}
if (connectionInfo == null) {
// connection is already closed
@@ -498,8 +501,10 @@ class TraceListenerStrategy<CON, STMT, RS> {
final Map<RS, SpanAndScope> nestedResultSetSpans = new ConcurrentHashMap<>();
@Nullable
URI url;
@Nullable
String remoteServiceName;
ConnectionInfo(@Nullable SpanAndScope span) {