Module cleanup (run 25289766144)#18539
Merged
Merged
Conversation
Automated module cleanup of instrumentation/cassandra/cassandra-common-4.0/testing.
Automated module cleanup of instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent.
Automated module cleanup of instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent.
Automated module cleanup of instrumentation/couchbase/couchbase-3.2/javaagent.
Automated module cleanup of instrumentation/couchbase/couchbase-common/testing.
Automated module cleanup of instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent.
Automated module cleanup of instrumentation/dropwizard/dropwizard-views-0.7/javaagent.
Automated module cleanup of instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent.
trask
approved these changes
May 4, 2026
The Couchbase async client test cleanup path used Duration.getSeconds(), which Error Prone flags under -Werror. Use the Java 8-compatible Duration.toMillis() value with MILLISECONDS to preserve the same timeout without triggering the JavaDurationGetSecondsToToSeconds warning. Validation: .\gradlew.bat :instrumentation:couchbase:couchbase-common:testing:compileJava
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:
cassandra-4.4:testingcassandra-common-4.0:testingclickhouse-client-common-0.5:javaagentclickhouse-client-v1-0.5:javaagentclickhouse-client-v2-0.8:javaagentcouchbase-2.0:javaagentcouchbase-2.6:javaagentcouchbase-3.1.6:javaagentcouchbase-3.1.6:tracing-opentelemetry-shadedcouchbase-3.1:javaagentcouchbase-3.1:tracing-opentelemetry-shadedcouchbase-3.2:javaagentcouchbase-3.2:tracing-opentelemetry-shadedcouchbase-3.4:javaagentcouchbase-3.4:tracing-opentelemetry-shadedcouchbase-common-2.0:javaagentcouchbase-common-2.0:javaagent-unit-testscouchbase-common:testingdropwizard-metrics-4.0:javaagentdropwizard:dropwizard-testingdropwizard-views-0.7:javaagentelasticsearch-api-client-7.16:javaagentModule:
cassandra-4.4:testingModule path:
instrumentation/cassandra/cassandra-4.4/testingSummary
No safe repository-guideline fixes were found in
instrumentation/cassandra/cassandra-4.4/testing; no files were changed.Applied Changes
No safe automated changes were applied.
Module:
cassandra-common-4.0:testingModule path:
instrumentation/cassandra/cassandra-common-4.0/testingSummary
Applied one safe cleanup in
cassandra-common-4.0/testingand committed it asf7a76f73.Applied Changes
Nullability
File:
AbstractCassandraTest.java:328Change: Added `@Nullable` to `Parameter.keyspace`, `Parameter.table`, matching constructor parameters, and `getSession(String keyspace)`.
Reason: Repository nullability guidance requires annotating values that can actually be `null`; this test helper passes `null` from parameter data and `testMetrics()` into `getSession`, and uses `null` table/keyspace values to represent absent Cassandra attributes.
Module:
clickhouse-client-common-0.5:javaagentModule path:
instrumentation/clickhouse/clickhouse-client-common-0.5/javaagentSummary
No safe repository-guideline fixes were applied under
instrumentation/clickhouse/clickhouse-client-common-0.5/javaagent. The in-scope files already match the applicable Javaagent, style, Gradle, nullability, and shared-module caller requirements reviewed.Applied Changes
No safe automated changes were applied.
Module:
clickhouse-client-v1-0.5:javaagentModule path:
instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagentSummary
Applied safe cleanup fixes for
clickhouse-client-v1-0.5javaagent and committed them inc21a1be2.Applied Changes
Config
File:
ClickHouseInstrumenterFactory.java:32Change: Wired `SqlClientAttributesExtractor` to `DbConfig.isQuerySanitizationEnabled(GlobalOpenTelemetry.get(), "clickhouse")`.
Reason: `metadata-yaml-format.md` requires documented `metadata.yaml` configuration to match actual code usage; this makes `otel.instrumentation.common.db.query-sanitization.enabled` effective for ClickHouse via the established DB config helper.
Testing
File:
ClickHouseClientV1Test.java:54Change: Converted class-scoped `ClickHouseClient` and container cleanup from `@AfterAll` to `AutoCleanupExtension.deferAfterAll(...)`, made the extension static, and normalized constant-like test fields to `DATABASE_NAME` and `TABLE_NAME`.
Reason: `testing-general-patterns.md` prefers colocating class-scoped cleanup with resource creation via `AutoCleanupExtension.deferAfterAll(...)`; the style guide requires uppercase names for constant-like `static final` values.
Module:
clickhouse-client-v2-0.8:javaagentModule path:
instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagentSummary
Applied safe cleanup in
clickhouse-client-v2-0.8javaagent tests and committed it asea3d42e9.Applied Changes
Testing
File:
ClickHouseClientV2Test.java:281Change: Wrapped short-lived `CommandResponse` and `Records` response resources in try-with-resources where assertions use the resource.
Reason: Repository test resource guidance keeps short-lived response bodies scoped with try-with-resources, and this prevents leaking `AutoCloseable` ClickHouse response resources.
Module:
couchbase-2.0:javaagentModule path:
instrumentation/couchbase/couchbase-2.0/javaagentSummary
No safe fixes were applied. The only deterministic cleanup candidate, adding
testExperimentalwiring forotel.instrumentation.couchbase.experimental-span-attributes, was reverted because it caused the module:checktask to fail.Applied Changes
No safe automated changes were applied.
Unresolved Items
File:
build.gradle.ktsReason: Missing `testExperimental` coverage for `otel.instrumentation.couchbase.experimental-span-attributes` could not be safely fixed: adding the canonical task made shared Couchbase tests fail because `couchbase-2.0` spans do not populate `couchbase.local.address`/`couchbase.operation_id`; next action is to decide whether to implement 2.0 attribute population or remove/adjust the experimental metadata/tests.
Module:
couchbase-2.6:javaagentModule path:
instrumentation/couchbase/couchbase-2.6/javaagentSummary
No safe repository-guideline fixes were found under
instrumentation/couchbase/couchbase-2.6/javaagent; no files were changed.Applied Changes
No safe automated changes were applied.
Module:
couchbase-3.1.6:javaagentModule path:
instrumentation/couchbase/couchbase-3.1.6/javaagentSummary
No safe repository-guideline fixes were needed for
instrumentation/couchbase/couchbase-3.1.6/javaagent; no source changes were applied.Applied Changes
No safe automated changes were applied.
Module:
couchbase-3.1.6:tracing-opentelemetry-shadedModule path:
instrumentation/couchbase/couchbase-3.1.6/tracing-opentelemetry-shadedSummary
No safe repository-guideline fixes were applied. Reviewed
instrumentation/couchbase/couchbase-3.1.6/tracing-opentelemetry-shaded;build.gradle.ktsalready matches the established Couchbase shaded-module pattern, parentmetadata.yamlhas no config entries requiring changes, and remaining in-scope files are generated shaded-jar artifacts or binaries.Applied Changes
No safe automated changes were applied.
Module:
couchbase-3.1:javaagentModule path:
instrumentation/couchbase/couchbase-3.1/javaagentSummary
No issues found. Reviewed tracked files under
instrumentation/couchbase/couchbase-3.1/javaagentand validated the associatedmetadata.yaml; no safe repository-guideline fixes were needed.Applied Changes
No safe automated changes were applied.
Module:
couchbase-3.1:tracing-opentelemetry-shadedModule path:
instrumentation/couchbase/couchbase-3.1/tracing-opentelemetry-shadedSummary
No safe repository-guideline fixes were applied under
instrumentation/couchbase/couchbase-3.1/tracing-opentelemetry-shaded; the only tracked in-scope file isbuild.gradle.kts, and it matches the established Couchbase shaded-module pattern. The parentmetadata.yamlhas no 3.x Couchbase-specific config entries to update because the 3.x javaagent does not read Couchbase instrumentation config properties.Applied Changes
No safe automated changes were applied.
Module:
couchbase-3.2:javaagentModule path:
instrumentation/couchbase/couchbase-3.2/javaagentSummary
Applied one safe cleanup in
instrumentation/couchbase/couchbase-3.2/javaagentand committed it asCleanup for couchbase-3.2 javaagent.Applied Changes
Javaagent
File:
CouchbaseInstrumentationModule.java:28Change: Moved the `3.4.0` version-boundary comment from inside the `hasClassesNamed(...)` argument list to the chained matcher call.
Reason: `javaagent-module-patterns.md` says chained single-class `hasClassesNamed(...)` landmark checks should keep the class string inline and place the version comment on the chained matcher line.
Module:
couchbase-3.2:tracing-opentelemetry-shadedModule path:
instrumentation/couchbase/couchbase-3.2/tracing-opentelemetry-shadedSummary
No safe repository-guideline fixes were found under
instrumentation/couchbase/couchbase-3.2/tracing-opentelemetry-shaded; no files were changed.Applied Changes
No safe automated changes were applied.
Module:
couchbase-3.4:javaagentModule path:
instrumentation/couchbase/couchbase-3.4/javaagentSummary
No safe repository-guideline fixes remain for
instrumentation/couchbase/couchbase-3.4/javaagent. One candidateclassLoaderMatcher()style cleanup was reverted becausespotlessJavaCheckrejects it and restores the existing formatting.Applied Changes
No safe automated changes were applied.
Module:
couchbase-3.4:tracing-opentelemetry-shadedModule path:
instrumentation/couchbase/couchbase-3.4/tracing-opentelemetry-shadedSummary
No safe repository-guideline fixes were applied under
instrumentation/couchbase/couchbase-3.4/tracing-opentelemetry-shaded; the only tracked reviewable file,build.gradle.kts, already matches the established shaded-module Gradle pattern, and no target-localmetadata.yamlexists.Applied Changes
No safe automated changes were applied.
Module:
couchbase-common-2.0:javaagentModule path:
instrumentation/couchbase/couchbase-common-2.0/javaagentSummary
No safe repository-guideline fixes were applied under
instrumentation/couchbase/couchbase-common-2.0/javaagent; the reviewed source andbuild.gradle.ktsalready matched the applicable cleanup rules, and no substantive diff remains.Applied Changes
No safe automated changes were applied.
Module:
couchbase-common-2.0:javaagent-unit-testsModule path:
instrumentation/couchbase/couchbase-common-2.0/javaagent-unit-testsSummary
No safe repository-guideline fixes were needed for
instrumentation/couchbase/couchbase-common-2.0/javaagent-unit-tests; the scopedbuild.gradle.ktsandCouchbaseQuerySanitizerTest.javaalready conform to the applicable build and testing review rules.Applied Changes
No safe automated changes were applied.
Module:
couchbase-common:testingModule path:
instrumentation/couchbase/couchbase-common/testingSummary
Applied one safe cleanup and committed it as
6dc08f5c(Cleanup for couchbase-common testing).Applied Changes
Testing
File:
AbstractCouchbaseAsyncClientTest.java:98Change: Replaced checked `CompletableFuture.get(timeout, unit)` assertions with AssertJ `succeedsWithin(...)` assertions and removed checked `throws` clauses from JUnit test entry points.
Reason: Repository testing guidance says JUnit test entry points should avoid multi-exception `throws` clauses and prefer direct AssertJ assertions; `succeedsWithin(...)` preserves the timeout behavior without broad `throws Exception`, which Error Prone rejects for `InterruptedException`.
Module:
dropwizard-metrics-4.0:javaagentModule path:
instrumentation/dropwizard/dropwizard-metrics-4.0/javaagentSummary
Applied safe cleanup fixes for
instrumentation/dropwizard/dropwizard-metrics-4.0/javaagentand committed them as63d0c46f.Applied Changes
Javaagent
File:
DropwizardSingletons.java:12Change: Renamed the private `DropwizardMetricsAdapter` field from `metricsAdapter` to `metrics` so it matches the `metrics()` singleton accessor.
Reason: `javaagent-singletons-patterns.md` requires exported singleton accessor methods to have the exact same lower-camel name as the backing collaborator field.
Testing
File:
DropwizardMetricsTest.java:32Change: Removed fixed `Thread.sleep(100)` metric-export waits and the resulting `throws InterruptedException` clauses from `@Test` methods.
Reason: `testing-general-patterns.md` prefers `InstrumentationExtension.waitAndAssertMetrics(...)` for metric assertions and discourages fixed exporter-interval sleeps; test throws clauses should be narrowed when checked exceptions are no longer needed.
Module:
dropwizard:dropwizard-testingModule path:
instrumentation/dropwizard/dropwizard-testingSummary
No safe repository-guideline fixes were found under
instrumentation/dropwizard/dropwizard-testing; no source changes were applied.Applied Changes
No safe automated changes were applied.
Module:
dropwizard-views-0.7:javaagentModule path:
instrumentation/dropwizard/dropwizard-views-0.7/javaagentSummary
Applied one safe cleanup in
dropwizard-views-0.7javaagent tests and committed it asdef9846e.Applied Changes
Testing
File:
ViewRenderTest.java:62Change: Replaced `Thread.sleep(500)` plus a final empty-span assertion with `await().during(Duration.ofMillis(500)).untilAsserted(...)`, narrowing `testDoesNotCreateSpanWithoutParent()` from `throws Exception` to `throws IOException`.
Reason: `testing-general-patterns.md` requires `@Test` methods to use a single, specific checked exception type when possible; removing the fixed sleep avoids `InterruptedException` and keeps the negative span assertion stable for the wait duration.
Module:
elasticsearch-api-client-7.16:javaagentModule path:
instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagentSummary
Applied and committed one safe cleanup in
elasticsearch-api-client-7.16javaagent. One build cleanup remains unresolved because the canonicalassertInverse.set(true)form conflicts with this module's multi-range muzzle setup.Applied Changes
Style
File:
ElasticsearchEndpointMap.java:17Change: Renamed immutable static endpoint map field from `routesMap` to `ROUTES_MAP` and moved the private utility constructor after methods.
Reason: Repository style guide says constant-like immutable static fields use `SCREAMING_SNAKE_CASE`, and static utility class constructors should appear after methods.
Unresolved Items
File:
build.gradle.ktsReason: Adding `assertInverse.set(true)` to the two `muzzle` `pass` blocks is recommended by Gradle conventions, but it caused `:muzzle` configuration to fail with duplicate `muzzle-AssertFail-co.elastic.clients-elasticsearch-java-7.15.0` configurations because both pass ranges target the same artifact; this needs a broader muzzle configuration/plugin decision.
Download module cleanup diagnostics