Wrap instrumented data source in spring starter #14255
Merged
+160
−16
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
github-actions
bot
added
the
test native
zeitlinger
reviewed
Jul 23, 2025
| import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; | ||
| import org.springframework.boot.test.context.runner.ApplicationContextRunner; | ||
|
|
||
| class JdbcInstrumentationAutoConfigurationTest { |
There was a problem hiding this comment.
is this test failing without the fix?
There was a problem hiding this comment.
assertThat(AopUtils.isAopProxy(dataSource)).isTrue(); should fail
zeitlinger
approved these changes
Jul 24, 2025
jaydeluca
approved these changes
Aug 8, 2025
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.
Hopefully resolves #13512
Supersedes #13950
Wrap instrumented data source with a custom wrapper that looks like an spring aop proxy. This lets aop proxy aware code unwrap the data source to the original data source. We are using a custom wrapper instead of jdk proxy support built into spring to get better interoperability with graalvm native. Since the custom wrapper does not use reflection extra configuration isn't needed for graalvm.