Skip to content

Commit 462c692

Browse files
trasktrask
committed
Rename Quarkus RESTEasy Reactive and Tomcat JDBC modules
1 parent 145c33d commit 462c692

57 files changed

Lines changed: 42 additions & 36 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.fossa.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ targets:
243243
target: ':instrumentation:powerjob-4.0:javaagent'
244244
- type: gradle
245245
path: ./
246-
target: ':instrumentation:quarkus-resteasy-reactive:javaagent'
246+
target: ':instrumentation:quarkus-resteasy-reactive-1.11:javaagent'
247247
- type: gradle
248248
path: ./
249249
target: ':instrumentation:quartz-2.0:javaagent'
@@ -1032,7 +1032,7 @@ targets:
10321032
target: ':instrumentation:tomcat:tomcat-common-7.0:javaagent'
10331033
- type: gradle
10341034
path: ./
1035-
target: ':instrumentation:tomcat:tomcat-jdbc:javaagent'
1035+
target: ':instrumentation:tomcat:tomcat-jdbc-8.5:javaagent'
10361036
- type: gradle
10371037
path: ./
10381038
target: ':instrumentation:vertx:vertx-kafka-client-3.6:javaagent'

‎.github/scripts/instrumentations.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ readonly INSTRUMENTATIONS=(
286286
"tapestry-5.4:javaagent:test"
287287
"tomcat:tomcat-7.0:javaagent:test"
288288
"tomcat:tomcat-10.0:javaagent:test"
289-
"tomcat:tomcat-jdbc:javaagent:test"
290-
"tomcat:tomcat-jdbc:javaagent:testStableSemconv"
289+
"tomcat:tomcat-jdbc-8.5:javaagent:test"
290+
"tomcat:tomcat-jdbc-8.5:javaagent:testStableSemconv"
291291
"twilio-6.6:javaagent:test"
292292
"twilio-6.6:javaagent:testExperimental"
293293
"undertow-1.4:javaagent:test"

‎docs/instrumentation-list.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12323,16 +12323,16 @@ libraries:
1232312323
type: STRING
1232412324
- name: server.port
1232512325
type: LONG
12326-
- name: quarkus-resteasy-reactive
12326+
- name: quarkus-resteasy-reactive-1.11
1232712327
display_name: Quarkus RESTEasy Reactive
1232812328
description: |
1232912329
This instrumentation enriches HTTP server spans with route information for Quarkus RESTEasy Reactive, it does not emit any telemetry on its own.
1233012330
library_link: https://quarkus.io/guides/resteasy-reactive/
1233112331
features:
1233212332
- HTTP_ROUTE
12333-
source_path: instrumentation/quarkus-resteasy-reactive
12333+
source_path: instrumentation/quarkus-resteasy-reactive-1.11
1233412334
scope:
12335-
name: io.opentelemetry.quarkus-resteasy-reactive
12335+
name: io.opentelemetry.quarkus-resteasy-reactive-1.11
1233612336
has_javaagent: true
1233712337
javaagent_target_versions:
1233812338
- io.quarkus:quarkus-rest:[3.9.0,)
@@ -15814,14 +15814,14 @@ libraries:
1581415814
type: STRING
1581515815
- name: user_agent.original
1581615816
type: STRING
15817-
- name: tomcat-jdbc
15817+
- name: tomcat-jdbc-8.5
1581815818
display_name: Tomcat JDBC
1581915819
description: This instrumentation enables database connection pool metrics for Tomcat
1582015820
JDBC.
1582115821
semantic_conventions:
1582215822
- DATABASE_POOL_METRICS
1582315823
library_link: https://tomcat.apache.org/tomcat-8.5-doc/jdbc-pool.html
15824-
source_path: instrumentation/tomcat/tomcat-jdbc
15824+
source_path: instrumentation/tomcat/tomcat-jdbc-8.5
1582515825
scope:
1582615826
name: io.opentelemetry.tomcat-jdbc
1582715827
has_javaagent: true

instrumentation/quarkus-resteasy-reactive/javaagent/build.gradle.kts renamed to instrumentation/quarkus-resteasy-reactive-1.11/javaagent/build.gradle.kts

File renamed without changes.

instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/AbstractResteasyReactiveContextInstrumentation.java renamed to instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/AbstractResteasyReactiveContextInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive;
6+
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive.v1_11;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99

instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/InvocationHandlerInstrumentation.java renamed to instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/InvocationHandlerInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive;
6+
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive.v1_11;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99

instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/OtelRequestContext.java renamed to instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/OtelRequestContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive;
6+
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive.v1_11;
77

88
import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
99

instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/QuarkusResteasyReactiveInstrumentationModule.java renamed to instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/QuarkusResteasyReactiveInstrumentationModule.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive;
6+
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive.v1_11;
77

8+
import static io.opentelemetry.javaagent.extension.instrumentation.internal.DeprecatedInstrumentationNames.expandDeprecatedNames;
89
import static java.util.Arrays.asList;
910

1011
import com.google.auto.service.AutoService;
@@ -16,7 +17,12 @@
1617
public class QuarkusResteasyReactiveInstrumentationModule extends InstrumentationModule {
1718

1819
public QuarkusResteasyReactiveInstrumentationModule() {
19-
super("quarkus", "jaxrs", "quarkus-resteasy-reactive", "quarkus-resteasy-reactive-3.0");
20+
super(
21+
"quarkus",
22+
expandDeprecatedNames(
23+
"jaxrs",
24+
"quarkus-resteasy-reactive",
25+
"quarkus-resteasy-reactive-1.11|deprecated:quarkus-resteasy-reactive-3.0"));
2026
}
2127

2228
@Override

instrumentation/quarkus-resteasy-reactive/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/ResteasyReactiveSpanName.java renamed to instrumentation/quarkus-resteasy-reactive-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/quarkus/resteasy/reactive/v1_11/ResteasyReactiveSpanName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive;
6+
package io.opentelemetry.javaagent.instrumentation.quarkus.resteasy.reactive.v1_11;
77

88
import static io.opentelemetry.javaagent.instrumentation.jaxrs.common.JaxrsPathUtil.normalizePath;
99

instrumentation/quarkus-resteasy-reactive/metadata.yaml renamed to instrumentation/quarkus-resteasy-reactive-1.11/metadata.yaml

File renamed without changes.

0 commit comments

Comments
 (0)