management.health.db.ignore-routing-datasources=true has no effect when an AbstractRoutingDataSource has been wrapped #42313
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
nosan changed the title 
spring-projects-issues added the status: waiting-for-triage 
philwebb added type: bug 
…etermining AbstractRoutingDataSource
nosan force-pushed the datasourcehealthcontributor-routingdatasource branch from ae7c9ad to d5aa1a9 Compare 
wilkinsona changed the title snicoll pushed a commit that referenced this pull request Sep 16, 2024
This commit uses DataSource.isWrapperFor and DataSource.unwrap to detect if a DataSource is an AbstractRoutingDataSource. Previously, it relied on instanceof which does not account for cases where the datasource has been proxied. See gh-42313
snicoll added a commit that referenced this pull request Sep 16, 2024
| Thanks again @nosan! |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Currently, the logic inside
DataSourceHealthContributorAutoConfigurationauto-configuration is based solely oninstanceofand does not account for situations where someone has added a proxy/wrapper aroundAbstractRoutingDataSourcethroughBeanPostProcessoror other ways.