Module cleanup (run 25293783415)#18543
Merged
Merged
Conversation
Automated module cleanup of instrumentation/finatra-2.9/javaagent.
Automated module cleanup of instrumentation/google-http-client-1.19/javaagent.
Automated module cleanup of instrumentation/grails-3.0/javaagent.
Automated module cleanup of instrumentation/graphql-java/graphql-java-12.0/javaagent.
Automated module cleanup of instrumentation/graphql-java/graphql-java-20.0/javaagent.
Automated module cleanup of instrumentation/graphql-java/graphql-java-20.0/library.
Automated module cleanup of instrumentation/graphql-java/graphql-java-common-12.0/library.
Automated module cleanup of instrumentation/graphql-java/graphql-java-common-12.0/testing.
Automated module cleanup of instrumentation/grizzly-2.3/javaagent.
trask
approved these changes
May 4, 2026
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.
Automated module cleanup walked the following modules in order
and stopped after accumulating at least 10 modified files:
executors:testingexternal-annotations:javaagentexternal-annotations:javaagent-unit-testsfailsafe-3.0:libraryfinagle-http-23.11:javaagentfinatra-2.9:javaagentgeode-1.4:javaagentgoogle-http-client-1.19:javaagentgrails-3.0:javaagentgraphql-java-12.0:javaagentgraphql-java-12.0:librarygraphql-java-20.0:javaagentgraphql-java-20.0:librarygraphql-java-common-12.0:librarygraphql-java-common-12.0:testinggrizzly-2.3:javaagentModule:
executors:testingModule path:
instrumentation/executors/testingSummary
No safe repository-guideline fixes were needed for
instrumentation/executors/testing; all scoped reviewable files already conformed to the loaded cleanup rules.Applied Changes
No safe automated changes were applied.
Module:
external-annotations:javaagentModule path:
instrumentation/external-annotations/javaagentSummary
No safe repository-guideline fixes were needed under
instrumentation/external-annotations/javaagent; no files were changed.Applied Changes
No safe automated changes were applied.
Module:
external-annotations:javaagent-unit-testsModule path:
instrumentation/external-annotations/javaagent-unit-testsSummary
No safe repository-guideline fixes were found under
instrumentation/external-annotations/javaagent-unit-tests; no files were changed.Applied Changes
No safe automated changes were applied.
Module:
failsafe-3.0:libraryModule path:
instrumentation/failsafe-3.0/librarySummary
No safe repository-guideline fixes were applied under
instrumentation/failsafe-3.0/library; the in-scope files already match the loaded style, library, testing, Gradle, andmetadata.yamlreview guidance.Applied Changes
No safe automated changes were applied.
Module:
finagle-http-23.11:javaagentModule path:
instrumentation/finagle-http-23.11/javaagentSummary
No safe fixes were applied. The only deterministic cleanup candidate was reverted because validation showed it needs a manual muzzle/version-boundary decision.
Applied Changes
No safe automated changes were applied.
Unresolved Items
File:
build.gradle.ktsReason: `gradle-conventions.md` requires `assertInverse.set(true)` for bounded muzzle ranges like `[23.11.0,)`, but adding it caused `./gradlew :instrumentation:finagle-http-23.11:javaagent:muzzle` to fail because older `finagle-http` versions unexpectedly passed inverse validation; determine the correct muzzle/version boundary before adding `assertInverse.set(true)`.
Module:
finatra-2.9:javaagentModule path:
instrumentation/finatra-2.9/javaagentSummary
Applied safe cleanup in
FinatraSingletons.javaand committed it as92dbf8df(Cleanup for finatra-2.9 javaagent).Applied Changes
Style
File:
FinatraSingletons.java:27Change: Renamed the private static final `VirtualField` handle from `callbackClassField` to `CALLBACK_CLASS` and removed the redundant `request.controllerClass() != null` fallback in the span-name extractor.
Reason: The style guide treats `VirtualField` handles as constant-like semantic handles that should use `SCREAMING_SNAKE_CASE`, and nullability guidance discourages defensive null checks for values exposed by non-`@Nullable` APIs such as `FinatraRequest.controllerClass()`.
Module:
geode-1.4:javaagentModule path:
instrumentation/geode-1.4/javaagentSummary
No safe fixes were applied. The only deterministic candidate, adding
assertInverse.set(true)to the boundedmuzzlepass, was reverted because:instrumentation:geode-1.4:javaagent:muzzleshowed the instrumentation passes pre-1.4.0Geode versions where failure was expected.Applied Changes
No safe automated changes were applied.
Unresolved Items
File:
build.gradle.ktsReason: `muzzle` uses `versions.set("[1.4.0,)")` without `assertInverse.set(true)`, which normally violates the Gradle convention for bounded `pass` ranges; adding it caused inverse muzzle failures because `GeodeInstrumentationModule` still passes `geode-core` `1.0.0-incubating` through `1.3.0`. Manual version-boundary work is needed before `assertInverse.set(true)` can be enabled.
Module:
google-http-client-1.19:javaagentModule path:
instrumentation/google-http-client-1.19/javaagentSummary
Applied one safe cleanup fix and committed it in
c77015df(Cleanup for google-http-client-1.19 javaagent).Applied Changes
Config
File:
metadata.yaml:26Change: Added `declarative_name: java.common.peer_service_mapping` for `otel.instrumentation.common.peer-service-mapping`.
Reason: `metadata-yaml-format.md` requires each `metadata.yaml` config entry to include the correct declarative config path; sibling HTTP client metadata uses `java.common.peer_service_mapping` for this shared property.
Module:
grails-3.0:javaagentModule path:
instrumentation/grails-3.0/javaagentSummary
Applied one safe cleanup in
instrumentation/grails-3.0/javaagentand committed it as68bbcf3c(Cleanup for grails-3.0 javaagent).Applied Changes
Javaagent
File:
UrlMappingsInfoHandlerAdapterInstrumentation.java:8Change: Static-imported `GrailsServerSpanNaming.serverSpanName()` and used the accessor unqualified at the `HttpServerRoute.update(...)` call site.
Reason: The javaagent singleton holder guideline says exported singleton accessors should be static-imported and called unqualified from callers.
Module:
graphql-java-12.0:javaagentModule path:
instrumentation/graphql-java/graphql-java-12.0/javaagentSummary
Applied and committed one safe cleanup for
graphql-java-12.0javaagent.Applied Changes
Javaagent
File:
GraphqlInstrumentation.java:40Change: Qualified the `GraphqlSingletons.addInstrumentation(...)` helper call and removed the static import of `addInstrumentation`.
Reason: `javaagent-singletons-patterns.md` says callers should static-import only stored singleton accessors or uppercase constant-like fields, not non-accessor helper methods that perform work.
Module:
graphql-java-12.0:libraryModule path:
instrumentation/graphql-java/graphql-java-12.0/librarySummary
No safe repository-guideline fixes were found under
instrumentation/graphql-java/graphql-java-12.0/library; no source changes were applied.Applied Changes
No safe automated changes were applied.
Module:
graphql-java-20.0:javaagentModule path:
instrumentation/graphql-java/graphql-java-20.0/javaagentSummary
Applied one safe cleanup fix and committed it as
Cleanup for graphql-java-20.0 javaagent.Applied Changes
Build
File:
build.gradle.kts:32Change: Added `metadataConfig` for the default `test` task and updated `testDataFetcher` so collected telemetry is labeled with both active GraphQL config flags.
Reason: Gradle metadata collection guidance requires `metadataConfig` to describe non-default `jvmArgs`; this module enables `otel.instrumentation.graphql.operation-name-in-span-name.enabled=true` for all test tasks and `otel.instrumentation.graphql.data-fetcher.enabled=true` for `testDataFetcher`.
Module:
graphql-java-20.0:libraryModule path:
instrumentation/graphql-java/graphql-java-20.0/librarySummary
Applied and committed one safe cleanup in
graphql-java-20.0library: normalized single-test-task Gradle configuration fromtasks.withType<Test>().configureEachtotasks.test.Applied Changes
Build
File:
build.gradle.kts:18Change: Changed the JVM argument configuration block from `tasks.withType<Test>().configureEach` to `tasks.test`.
Reason: `gradle-conventions.md` says single-test-task modules should use `tasks.test`; `withType<Test>().configureEach` is reserved for modules with explicit additional `Test` tasks.
Module:
graphql-java-common-12.0:libraryModule path:
instrumentation/graphql-java/graphql-java-common-12.0/librarySummary
Applied one safe cleanup in
graphql-java-common-12.0library and committed it.Applied Changes
Semconv
File:
OpenTelemetryInstrumentationHelper.java:44Change: Replaced direct imports of `ExceptionAttributes.EXCEPTION_MESSAGE` and `ExceptionAttributes.EXCEPTION_TYPE` with copied local `AttributeKey` constants.
Reason: Repository semconv rule requires library instrumentation to copy semantic convention constants directly instead of depending on the semconv artifact.
Module:
graphql-java-common-12.0:testingModule path:
instrumentation/graphql-java/graphql-java-common-12.0/testingSummary
Applied one safe cleanup in
AbstractGraphqlTest.javato use more idiomatic AssertJ assertions for single GraphQL error checks.Applied Changes
Testing
File:
AbstractGraphqlTest.java:255Change: Replaced `hasSize(1)` plus `get(0)` assertions with AssertJ `singleElement().satisfies(...)` for parse and validation error checks.
Reason: `testing-general-patterns.md` prefers idiomatic AssertJ collection assertions over manual size checks and indexed element extraction.
Module:
grizzly-2.3:javaagentModule path:
instrumentation/grizzly-2.3/javaagentSummary
Applied and committed two safe cleanup fixes for
instrumentation/grizzly-2.3/javaagent.Applied Changes
Build
File:
build.gradle.kts:31Change: Changed the single test task configuration from `withType<Test>().configureEach` to `test`.
Reason: `gradle-conventions.md` says single-test-task modules should use `tasks.test`; `withType<Test>().configureEach` is reserved for modules with explicit custom `Test` tasks.
Javaagent
File:
FilterInstrumentation.java:54Change: Removed unused `@Advice.This BaseFilter it` parameters and the now-unused `BaseFilter` import.
Reason: Repository general/style guidance favors removing unused code and keeping advice method signatures to only the parameters needed by the advice body.
Download module cleanup diagnostics