fix: update stale org/openjdk/btrace path strings to io/btrace#863
Merged
Conversation
A handful of path-filter and ASM-descriptor string literals still referenced the pre-repackaging org.openjdk.btrace package, missed by the org.openjdk.btrace -> io.btrace repackaging: - BTraceExtensionPlugin: ASM annotation descriptors for ServiceDescriptor/ExtensionDescriptor used the old binary names, so bytecode scanning for these markers matched nothing. - SingleSourceApiPartition: same descriptor mismatch for ServiceDescriptor/ExternalType. - PermissionScanner: JFR permission detection checked the old package prefix. - btrace-dist: doc-comment example paths, plus (functionally meaningful) classdata masking path filters were already correct except this doc block. - btrace-agent, btrace-core, btrace-dtrace, benchmarks/*: stale javadoc exclude, jacoco include filter, and shadowJar/jmhJar include filters. Verified with a full `./gradlew test` (all green). The :btrace-gradle-plugin:test TestKit suite fails identically on unmodified develop in this environment (Gradle 9.5.1 vs. the module's JDK 11 toolchain — UnsupportedJavaRuntimeException), confirmed pre-existing and unrelated to this change. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates remaining stale org.openjdk.btrace / org/openjdk/btrace string literals to io.btrace / io/btrace across the Gradle plugin and build tooling, aligning bytecode descriptor checks and path-based filters with the post-repackaging package layout so extension scanning and packaging filters work correctly.
Changes:
- Fix ASM descriptor string literals used for annotation-based scanning (
ServiceDescriptor,ExtensionDescriptor,ExternalType) so bytecode scanning matches again. - Update path-prefix checks and Gradle include/exclude filters (Shadow/JMH/Jacoco/Javadoc) to use
io/btrace/.... - Refresh a distribution build comment block example to reflect the current
io/btrace/...layout.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| btrace-gradle-plugin/src/main/groovy/io/btrace/gradle/SingleSourceApiPartition.groovy | Updates ASM descriptor strings for extension API partitioning to io/btrace. |
| btrace-gradle-plugin/src/main/groovy/io/btrace/gradle/PermissionScanner.groovy | Updates JFR owner-prefix detection to io/btrace/core/jfr/. |
| btrace-gradle-plugin/src/main/groovy/io/btrace/gradle/BTraceExtensionPlugin.groovy | Updates annotation descriptor strings used for extension/service scanning and permission extraction. |
| btrace-dtrace/build.gradle | Updates ShadowJar include filter to the io/btrace/dtrace/** package path. |
| btrace-dist/build.gradle | Updates fat-agent JAR structure comment examples to io/btrace/.... |
| btrace-core/build.gradle | Updates JaCoCo class include filter path to io/btrace/core/comm/**. |
| btrace-agent/build.gradle | Updates Javadoc exclusion path for PerfReaderImpl.java to io/btrace/.... |
| benchmarks/runtime-benchmarks/build.gradle | Updates JMH jar include filters to io/btrace/... packages. |
| benchmarks/agent-benchmark/build.gradle | Updates JMH jar include filters to io/btrace/... packages. |
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
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.
Summary
Found while auditing
refactor/module-consolidation(a separate, now-superseded branch that independently reached the same module layoutdevelopalready has): a handful of path-filter and ASM-descriptor string literals still referenced the pre-repackagingorg.openjdk.btracepackage, missed by theorg.openjdk.btrace → io.btracerepackaging.BTraceExtensionPlugin: ASM annotation descriptors forServiceDescriptor/ExtensionDescriptorused the old binary names, so bytecode scanning for these markers matched nothing (extension permission/API-partition logic silently no-op'd on these markers).SingleSourceApiPartition: same descriptor mismatch forServiceDescriptor/ExternalType.PermissionScanner: JFR permission detection checked the old package prefix.btrace-dist: stale doc-comment example paths (the actual classdata masking filters were already correct).btrace-agent,btrace-core,btrace-dtrace,benchmarks/*: stale javadoc exclude, jacoco include filter, and shadowJar/jmhJar include filters.Test plan
./gradlew test— full suite passes:btrace-gradle-plugin:test(TestKit) fails identically on unmodifieddevelopin this environment (Gradle 9.5.1 vs. the module's JDK 11 toolchain →UnsupportedJavaRuntimeException) — confirmed pre-existing and unrelated to this change, not something this PR introduces or fixesorg/openjdk/btrace/org.openjdk.btracereferences in any.gradle/.groovyfile🤖 Generated with Claude Code
This change is