Refactored TraceListenerStrategy to better track current scope in case multiple connections are used #2053
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactored
remoteServiceName
resolution logic to be easier to followFixed
TraceQueryExecutionListener#getConnection
that leaks connection by acquiring (and not closing) additional connection from aDataSource
The main idea is to track current connection and only put it and statements/resultSets it creates into the scope. For most applications there will be only one connection and all resources are closed properly, but if it's not the case we'll not mess up the scope.
The only change that I'm not sure about is that I changed
SpanAndScope
to have optionalScope
, if that's not okay we can always track spans/scopes insideConnectionInfo
/StatementInfo
/ResultSetInfo
.I have also removed getters from inner classes, as it seems more in line with other inner classes in Sleuth.