Rename Quarkus RESTEasy Reactive and Tomcat JDBC modules#18838
Open
trask wants to merge 1 commit into
Open
Conversation
9f95f26 to
462c692
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Aligns Gradle module names and instrumentation module identifiers for Quarkus RESTEasy Reactive and Tomcat JDBC to follow the repo’s version-suffixed module naming scheme (part of #18428), while updating build wiring, documentation, and tests/plugins accordingly.
Changes:
- Renames the Quarkus RESTEasy Reactive module to
quarkus-resteasy-reactive-1.11and updates includes, docs, and dependent test modules/plugins. - Renames the Tomcat JDBC module to
tomcat-jdbc-8.5and updates includes, docs, and CI script targets. - Adds Quarkus Gradle tooling plugin sources/builds used by the Quarkus testing modules (2.0 / 3.0 / 3.9).
Reviewed changes
Copilot reviewed 16 out of 57 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| settings.gradle.kts | Updates included Gradle projects/builds to the renamed Quarkus + Tomcat JDBC module paths. |
| instrumentation/tomcat/tomcat-jdbc-8.5/metadata.yaml | Adds module metadata for Tomcat JDBC under the new versioned module directory. |
| instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/build.gradle.kts | Defines the Tomcat JDBC javaagent module build (muzzle + stable semconv test task). |
| instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/v8_5/TomcatJdbcInstrumentationModule.java | Updates package and registers additional instrumentation name tomcat-jdbc-8.5. |
| instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/v8_5/TomcatConnectionPoolMetrics.java | Moves Tomcat JDBC pool metrics helper into the versioned package. |
| instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/v8_5/DataSourceProxyInstrumentation.java | Moves ByteBuddy instrumentation to the versioned package. |
| instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/v8_5/TomcatJdbcInstrumentationTest.java | Updates test package to match new module/package structure. |
| instrumentation/quarkus-resteasy-reactive-1.11/metadata.yaml | Adds module metadata for the renamed Quarkus RESTEasy Reactive instrumentation. |
| instrumentation/quarkus-resteasy-reactive-1.11/javaagent/build.gradle.kts | Defines muzzle targeting both quarkus-resteasy-reactive (<3.9) and quarkus-rest (>=3.9). |
| instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/QuarkusResteasyReactiveInstrumentationModule.java | Updates package and instrumentation name wiring for the renamed module (incl. deprecated-name expansion). |
| instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/ResteasyReactiveSpanName.java | Moves span name updater into the versioned package. |
| instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/OtelRequestContext.java | Moves request-context virtual field helper into the versioned package. |
| instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/InvocationHandlerInstrumentation.java | Moves invocation handler instrumentation into the versioned package. |
| instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/AbstractResteasyReactiveContextInstrumentation.java | Moves request-context instrumentation into the versioned package. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-common-testing/build.gradle.kts | Introduces a shared test-support module for Quarkus REST endpoints + assertions. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-common-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/AbstractQuarkusJaxRsTest.java | Adds shared JAX-RS route tests used by multiple Quarkus-version test modules. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-common-plugin/settings.gradle.kts | Sets included-build rootProject name for the shared Quarkus tooling build. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-common-plugin/build.gradle.kts | Declares the shared Quarkus tooling build (repositories + compileOnly deps). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-common-plugin/src/main/java/io/quarkus/gradle/tooling/ToolingUtils.java | Adds shared tooling utilities (vendored/adapted from Quarkus). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-common-plugin/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java | Adds shared model builder (vendored/adapted from Quarkus; Gradle-9 compatibility changes noted inline). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-common-plugin/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java | Adds shared conditional-dependency resolver (vendored/adapted from Quarkus). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-testing/build.gradle.kts | Updates test module wiring to depend on renamed javaagent + shared common-testing. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-testing/src/main/resources/application.properties | Configures Quarkus test port for the 2.0 test module. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v2_0/TestRootResource.java | Adds Quarkus 2.0 REST test resource. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v2_0/TestFilter.java | Adds Quarkus 2.0 request filter used by tests (abort case). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v2_0/SubResourceLocatorTestResource.java | Adds Quarkus 2.0 sub-resource locator test resource. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v2_0/GreetingResource.java | Adds Quarkus 2.0 greeting routes used by route-name assertions. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-testing/src/test/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v2_0/QuarkusJaxRsTest.java | Runs the shared AbstractQuarkusJaxRsTest under Quarkus 2.0. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-testing/build.gradle.kts | Updates test module wiring to depend on renamed javaagent + shared common-testing. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-testing/src/main/resources/application.properties | Configures Quarkus test port for the 3.0 test module. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_0/TestRootResource.java | Adds Quarkus 3.0 REST test resource. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_0/TestFilter.java | Adds Quarkus 3.0 request filter used by tests (abort case). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_0/SubResourceLocatorTestResource.java | Adds Quarkus 3.0 sub-resource locator test resource. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_0/GreetingResource.java | Adds Quarkus 3.0 greeting routes used by route-name assertions. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-testing/src/test/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_0/QuarkusJaxRsTest.java | Runs the shared AbstractQuarkusJaxRsTest under Quarkus 3.0. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-testing/build.gradle.kts | Updates test module wiring to depend on renamed javaagent + shared common-testing. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-testing/src/main/resources/application.properties | Configures Quarkus test port for the 3.9 test module. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_9/TestRootResource.java | Adds Quarkus 3.9 REST test resource. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_9/TestFilter.java | Adds Quarkus 3.9 request filter used by tests (abort case). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_9/SubResourceLocatorTestResource.java | Adds Quarkus 3.9 sub-resource locator test resource. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_9/GreetingResource.java | Adds Quarkus 3.9 greeting routes used by route-name assertions. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-testing/src/test/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/v3_9/QuarkusJaxRsTest.java | Runs the shared AbstractQuarkusJaxRsTest under Quarkus 3.9. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-plugin/build.gradle.kts | Adds Gradle plugin build for Quarkus 2.0 model/tooling. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-plugin/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java | Adds Quarkus 2.0 dependency tooling helper (vendored/adapted). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-2.0-plugin/src/main/java/io/opentelemetry/instrumentation/quarkus/v2_0/plugin/Quarkus2Plugin.java | Declares non-applicable plugin entrypoint (used via apply false). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-plugin/build.gradle.kts | Adds Gradle plugin build for Quarkus 3.0 model/tooling. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-plugin/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java | Adds Quarkus 3.0 dependency tooling helper (vendored/adapted). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.0-plugin/src/main/java/io/opentelemetry/instrumentation/quarkus/v3_0/plugin/Quarkus3Plugin.java | Declares non-applicable plugin entrypoint (used via apply false). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-plugin/build.gradle.kts | Adds Gradle plugin build for Quarkus 3.9 model/tooling. |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-plugin/src/main/java/io/quarkus/gradle/tooling/ToolingUtils.java | Adds Quarkus 3.9 tooling utilities (vendored/adapted). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-plugin/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java | Adds Quarkus 3.9 model builder (vendored/adapted). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-plugin/src/main/java/io/quarkus/gradle/tooling/dependency/DependencyUtils.java | Adds Quarkus 3.9 dependency tooling helper (vendored/adapted). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-plugin/src/main/java/io/quarkus/gradle/dependency/ConditionalDependenciesEnabler.java | Adds Quarkus 3.9 conditional-dependency resolver (vendored/adapted). |
| instrumentation/quarkus-resteasy-reactive-1.11/quarkus-3.9-plugin/src/main/java/io/opentelemetry/instrumentation/quarkus/v3_9/plugin/Quarkus39Plugin.java | Declares non-applicable plugin entrypoint (used via apply false). |
| docs/instrumentation-list.yaml | Updates generated instrumentation list entries to reflect renamed modules/paths. |
| .github/scripts/instrumentations.sh | Updates CI/test script targets for renamed Tomcat JDBC module. |
| .fossa.yml | Updates FOSSA Gradle targets to renamed Quarkus + Tomcat JDBC javaagent modules. |
Comments suppressed due to low confidence (1)
instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/QuarkusResteasyReactiveInstrumentationModule.java:25
expandDeprecatedNamesis registeringquarkus-resteasy-reactive-3.0as a deprecated name, but that name doesn't appear anywhere else in this repo. If the intent is to preserve config compatibility for a previous module/instrumentation rename, consider switching the deprecated marker to the actual prior name (or removing the deprecated marker entirely) to avoid introducing a new, seemingly-unused instrumentation name/config key.
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.
Part of