Rewrite InstrumentPlugin to be lazy #9475
Draft
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
Contributor
|
Hi! 👋 Thanks for your pull request! 🎉 To help us review it, please make sure to:
If you need help, please check our contributing guidelines. |
bric3
added
tag: no release notes
Contributor
AlexeyKuznetsov-DD
left a comment
AlexeyKuznetsov-DD
left a comment
There was a problem hiding this comment.
Just curious, what would be the benefit? Faster build?
Comment on lines
41
to
44
| project.pluginManager.withPlugin("java") {configurePostCompilationInstrumentation("java", project, extension) } | ||
| project.pluginManager.withPlugin("kotlin") {configurePostCompilationInstrumentation("kotlin", project, extension) } | ||
| project.pluginManager.withPlugin("scala") {configurePostCompilationInstrumentation("scala", project, extension) } | ||
| project.pluginManager.withPlugin("groovy") {configurePostCompilationInstrumentation("groovy", project, extension) } |
Contributor
There was a problem hiding this comment.
Maybe this way would be a bit more elegant? WDYT?
Suggested change
| project.pluginManager.withPlugin("java") {configurePostCompilationInstrumentation("java", project, extension) } | |
| project.pluginManager.withPlugin("kotlin") {configurePostCompilationInstrumentation("kotlin", project, extension) } | |
| project.pluginManager.withPlugin("scala") {configurePostCompilationInstrumentation("scala", project, extension) } | |
| project.pluginManager.withPlugin("groovy") {configurePostCompilationInstrumentation("groovy", project, extension) } | |
| ['java', 'kotlin', 'scala', 'groovy'].each { id -> | |
| project.pluginManager.withPlugin(id) { | |
| configurePostCompilationInstrumentation(id, project, extension) | |
| } | |
| } |
| */ | ||
| @SuppressWarnings('unused') | ||
| class InstrumentPlugin implements Plugin<Project> { | ||
| public static final String DEFAULT_JAVA_VERSION = 'default' |
Contributor
There was a problem hiding this comment.
Just curious, why it is default and not 8?
Contributor
Author
There was a problem hiding this comment.
Good question! In the previous code javaVersion was null if not explicitly set, but declaring an additional task input via it.inputs.property("javaVersion", javaVersion) do not allow null, so I introduced a default value. The java version is maily used to affect which workQueue is chosen, so using default or 8 has no consequences in this PR.
That being said, decoupling the Java target version from the Gradle JVM will have an effect and in this case we will have to be handled, but that's a separate work.
| project.afterEvaluate { p -> | ||
| instrumentJava.dependsOn compileMain_play27Java | ||
| forbiddenApisMain_play27.dependsOn instrumentMain_play27Java | ||
| // instrumentJava.dependsOn compileMain_play27Java |
Contributor
There was a problem hiding this comment.
Looks like missing TODO remove here too?
Contributor
Author
There was a problem hiding this comment.
Yeah, you are too early for the review 😅
I need to work a bit here and there on this
| } | ||
| apply plugin: 'instrument' | ||
| // apply plugin: 'instrument' |
Contributor
There was a problem hiding this comment.
Better to remove?
Contributor
There was a problem hiding this comment.
OK, will wait a bit 👍
bric3
force-pushed
the
bdu/lazy-instrument-plugin
branch
from
248b4eb to
3094d50
Compare
Contributor
Author
|
Status report The new approach of the instrument post-processing works in almost all simple projects, e.g. Important The diff was made by this custom tool https://github.com/bric3/jardiff
|
The current implementation was using bad practices in various ways, `project.afterEvaluate`, task creation, explicit `dependsOn`
…utions to instrument plugin
bric3
force-pushed
the
bdu/lazy-instrument-plugin
branch
from
aa6d660 to
0067ada
Compare
bric3
added
type: enhancement
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.
What Does This Do
This work explore a rewrite of the InstrumentPlugin to avoid eager configuration.
At the same time, I'm exploring the instrument post-processing to be a compiler last action,
instead of adding its own task to run after compilation and intercepting itself.
Motivation
Related to
MuzzlePlugin#9315CallSiteInstrumentationPlugin#9316Additional Notes
Contributor Checklist
type:and (comp:orinst:) labels in addition to any usefull labelsclose,fixor any linking keywords when referencing an issue.Use
solvesinstead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]