Repository navigation
Align HBase common and Vert.x Redis instrumentation package naming - #20907
Merged
Merged
Conversation
Pull request dashboard statusMerged · refreshed 2026-10-23 19:06 UTC Status above doesn't look right?
|
…ule versions Co-authored-by: trask <218610+trask@users.noreply.github.com>
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix naming inconsistencies in instrumentation packages
Align HBase common and Vert.x Redis instrumentation package naming
Oct 23, 2026
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The mechanical renames consistently update registrations, compatibility exclusions, consumers, and shared-state references without introducing a blocking issue.
No open issues 🎉
What changed in this PR
Aligns HBase and Vert.x Redis javaagent packages with their Gradle modules’ base versions, preserving supported versions and runtime behavior.
Changes:
- Moves HBase common classes and tests into
hbase.client.common.v1_0, updating consumer imports and exposed helper names. - Consolidates Vert.x Redis implementations under
redisclient.v4_0, with distinct version-qualified classes and matching Muzzle exclusions. - Adds a regression assertion that the newer Vert.x implementation shares target state with the base instrumentation.
| File | Description |
|---|---|
instrumentation/vertx/vertx-redis-client/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedisClient445InstrumentationModule.java |
Relocates and renames the newer registration. |
instrumentation/vertx/vertx-redis-client/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedisClient40InstrumentationModule.java |
Gives the base registration a distinct name. |
instrumentation/vertx/vertx-redis-client/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedis445ServerTargets.java |
Relocates and renames the newer target helper. |
instrumentation/vertx/vertx-redis-client/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/Redis445ConnectionProviderInstrumentation.java |
Relocates and renames provider instrumentation. |
instrumentation/vertx/vertx-redis-client/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/Redis445ConnectionManagerInstrumentation.java |
Updates manager instrumentation and helper references. |
instrumentation/vertx/vertx-redis-client/vertx-redis-client-4.0/javaagent/build.gradle.kts |
Updates class-specific Muzzle exclusions. |
instrumentation/vertx/vertx-redis-client/vertx-redis-client-4.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedis445ServerTargetsTest.java |
Updates helper tests and verifies shared target state. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/org/apache/hadoop/hbase/ipc/OpenTelemetryCallUtil.java |
Updates the shared-state import, retaining package access. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/RetryingCallableInstrumentation.java |
Relocates retry instrumentation and state imports. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/RequestAndContext.java |
Relocates the request/context holder. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseZookeeperTarget.java |
Relocates ZooKeeper target handling. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseServerTarget.java |
Relocates server target state. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseServerEndpoint.java |
Relocates endpoint utilities. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseRequest.java |
Relocates the request model. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseMasterTarget.java |
Relocates master target handling. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseInstrumenterFactory.java |
Relocates the shared instrumenter factory. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseClientUtil.java |
Relocates client utilities and state imports. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseClientState.java |
Relocates shared client state. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseBatchMetadata.java |
Relocates batch metadata. |
instrumentation/hbase/hbase-client-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseAttributesGetter.java |
Relocates the attributes getter. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/test/java/org/apache/hadoop/hbase/ipc/OpenTelemetryCallUtilTest.java |
Updates request and context imports. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseZookeeperTargetTest.java |
Relocates baseline ZooKeeper target tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseServerTargetTest.java |
Relocates baseline server target tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseMasterTargetTest.java |
Relocates master target tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/hbase24Test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseZookeeperTarget24Test.java |
Relocates HBase 2.4 ZooKeeper tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/hbase24Test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseServerTarget24Test.java |
Relocates HBase 2.4 server target tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/hbase20Test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseZookeeperTarget20Test.java |
Relocates HBase 2.0 ZooKeeper tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/hbase20Test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseServerTarget20Test.java |
Relocates HBase 2.0 server target tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/hbase14Test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseZookeeperTarget14Test.java |
Relocates HBase 1.4 ZooKeeper tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/hbase14Test/java/io/opentelemetry/javaagent/instrumentation/hbase/client/common/v1_0/HbaseServerTarget14Test.java |
Relocates HBase 1.4 server target tests. |
instrumentation/hbase/hbase-client-common-1.0/javaagent-unit-tests/src/callTimeoutTest/java/org/apache/hadoop/hbase/ipc/OpenTelemetryCallUtilTimeoutTest.java |
Updates timeout-test model imports. |
instrumentation/hbase/hbase-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v2_0/RpcConnectionInstrumentation.java |
Updates shared request-state imports. |
instrumentation/hbase/hbase-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v2_0/RegionServerCallableInstrumentation.java |
Updates table-state helper imports. |
instrumentation/hbase/hbase-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v2_0/IpcCallInstrumentation.java |
Updates the request/context import. |
instrumentation/hbase/hbase-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v2_0/HbaseSingletons.java |
Updates factory and request imports. |
instrumentation/hbase/hbase-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v2_0/HbaseInstrumentationModule.java |
Updates exposed shared-state class names. |
instrumentation/hbase/hbase-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v2_0/AbstractRpcClientInstrumentation.java |
Updates common helper and model imports. |
instrumentation/hbase/hbase-client-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v1_4/RpcConnectionInstrumentation.java |
Updates shared request-state imports. |
instrumentation/hbase/hbase-client-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v1_4/IpcCallInstrumentation.java |
Updates the request/context import. |
instrumentation/hbase/hbase-client-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v1_4/HbaseSingletons.java |
Updates factory and request imports. |
instrumentation/hbase/hbase-client-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v1_4/HbaseInstrumentationModule.java |
Updates retry and exposed-state references. |
instrumentation/hbase/hbase-client-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v1_4/AbstractRpcClientInstrumentation.java |
Updates common helper and model imports. |
instrumentation/hbase/hbase-client-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v1_0/HbaseSingletons.java |
Updates factory and request imports. |
instrumentation/hbase/hbase-client-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v1_0/HbaseInstrumentationModule.java |
Updates the retry instrumentation import. |
instrumentation/hbase/hbase-client-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hbase/client/v1_0/AbstractRpcClientInstrumentation.java |
Updates common helper and model imports. |
Review effort: Balanced
Preserve the HBase and Vert.x package renames while incorporating Redis server-error classification and the Spring Rabbit producer-batch fix. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
trask
reviewed
Oct 23, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
trask
marked this pull request as ready for review
October 23, 2026 18:16
trask
approved these changes
Oct 23, 2026
laurit
approved these changes
Oct 23, 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
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.
Align both javaagent implementations with their enclosing Gradle modules’ base-version packages without changing supported versions or runtime behavior.
hbase.client.common.v1_0; update imports and injected-helper names across consumers.redisclient.v4_4_5intoredisclient.v4_0, using version-qualified class names and updated Muzzle exclusions.