Fix duplicate query counting when a DataSource bean delegates to another DataSource bean - #264
Open
jjh75607 wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Hi @jeanbisutti
QuickPerfProxyBeanPostProcessornow marks every proxy it builds withQuickPerfProxiedDataSource, and walks the delegation chain before wrapping so a DataSourcethat already carries the mark is skipped. The delegate is reached by reflection, since
spring-jdbcisn't a dependency of these modules.That's ~30 lines, applied to both
sql-spring4andsql-spring5. Tests for the delegatingand non-delegating cases go into the Spring Boot 1, 2 and 3 test modules.
Fixes #263
One risk that isn't visible in the diff:
LazyConnectionDataSourceProxyalso holds areadOnlyDataSource, whichgetTargetDataSourcedoesn't reach. If it's set to a DataSourcethat isn't itself a bean, read-only queries go from counted once to not counted at all.