Add base versions to four common javaagent modules (hibernate, jedis, jms, redisson)#18423
Merged
Conversation
…dules to versioned form Adds base versions to four common javaagent modules and moves their internal classes into versioned packages (per open-telemetry#16090 / open-telemetry#18181 convention): - hibernate-common -> hibernate-common-3.3 io.opentelemetry.javaagent.instrumentation.hibernate -> .hibernate.common.v3_3 - jedis-common -> jedis-common-1.4 io.opentelemetry.javaagent.instrumentation.jedis -> .jedis.common.v1_4 - jms-common -> jms-common-1.1 io.opentelemetry.javaagent.instrumentation.jms -> .jms.common.v1_1 (bootstrap class JmsReceiveContextHolder stays in io.opentelemetry.javaagent.bootstrap.jms) - redisson-common -> redisson-common-3.0 io.opentelemetry.javaagent.instrumentation.redisson -> .redisson.common.v3_0 Cross-version test helpers under .../testing/ keep their unversioned package names since they are reused by multiple version modules.
# Conflicts: # instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaInstrumentation.java # instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryInstrumentation.java # instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionInstrumentation.java # instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/TransactionInstrumentation.java # instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/QueryInstrumentation.java # instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionInstrumentation.java # instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/TransactionInstrumentation.java
laurit
approved these changes
Apr 30, 2026
This was referenced May 1, 2026
trask
added a commit
to trask/opentelemetry-java-instrumentation
that referenced
this pull request
May 1, 2026
- instrumentation/clickhouse/clickhouse-client-common -> clickhouse-client-common-0.5 (package io.opentelemetry.javaagent.instrumentation.clickhouse.common -> io.opentelemetry.javaagent.instrumentation.clickhouse.client.common.v0_5) Follows the pattern established in open-telemetry#18423.
trask
added a commit
to trask/opentelemetry-java-instrumentation
that referenced
this pull request
May 1, 2026
Renames: - instrumentation/jaxws/jaxws-common -> jaxws-common-2.0 (package io.opentelemetry.javaagent.instrumentation.jaxws.common -> io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0) - instrumentation/xxl-job/xxl-job-common -> xxl-job-common-1.9.2 (package io.opentelemetry.javaagent.instrumentation.xxljob.common -> io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2) Follows the pattern established in open-telemetry#18423 for hibernate-common, jedis-common, jms-common, and redisson-common.
trask
added a commit
to trask/opentelemetry-java-instrumentation
that referenced
this pull request
May 1, 2026
Renames: - instrumentation/jaxws/jaxws-common -> jaxws-common-2.0 (package io.opentelemetry.javaagent.instrumentation.jaxws.common -> io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0) - instrumentation/xxl-job/xxl-job-common -> xxl-job-common-1.9.2 (package io.opentelemetry.javaagent.instrumentation.xxljob.common -> io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2) Follows the pattern established in open-telemetry#18423 for hibernate-common, jedis-common, jms-common, and redisson-common.
trask
added a commit
to trask/opentelemetry-java-instrumentation
that referenced
this pull request
May 1, 2026
Renames: - instrumentation/jaxws/jaxws-common -> jaxws-common-2.0 (package io.opentelemetry.javaagent.instrumentation.jaxws.common -> io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0) - instrumentation/xxl-job/xxl-job-common -> xxl-job-common-1.9.2 (package io.opentelemetry.javaagent.instrumentation.xxljob.common -> io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2) Follows the pattern established in open-telemetry#18423 for hibernate-common, jedis-common, jms-common, and redisson-common.
trask
added a commit
to trask/opentelemetry-java-instrumentation
that referenced
this pull request
May 3, 2026
Renames: - instrumentation/jaxws/jaxws-common -> jaxws-common-2.0 (package io.opentelemetry.javaagent.instrumentation.jaxws.common -> io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0) - instrumentation/xxl-job/xxl-job-common -> xxl-job-common-1.9.2 (package io.opentelemetry.javaagent.instrumentation.xxljob.common -> io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2) Follows the pattern established in open-telemetry#18423 for hibernate-common, jedis-common, jms-common, and redisson-common.
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
2 participants
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.
Per #16090 / #18181 module-naming convention.
Renames four
-commonjavaagent modules to versioned form and moves their internal classes into versioned packages:hibernate-commonhibernate-common-3.3io.opentelemetry.javaagent.instrumentation.hibernate.common.v3_3jedis-commonjedis-common-1.4io.opentelemetry.javaagent.instrumentation.jedis.common.v1_4jms-commonjms-common-1.1io.opentelemetry.javaagent.instrumentation.jms.common.v1_1redisson-commonredisson-common-3.0io.opentelemetry.javaagent.instrumentation.redisson.common.v3_0Notes:
JmsReceiveContextHolderstays inio.opentelemetry.javaagent.bootstrap.jms(bootstrap packages are not affected by this rename)..../testing/retain their unversioned package names since they are reused by multiple version modules.