Skip to content

Commit

Permalink
Merge pull request #43961 from radcortez/remove-opentracing
Browse files Browse the repository at this point in the history
Remove OpenTracing
  • Loading branch information
gsmet authored Oct 21, 2024
2 parents ac3c81c + c249980 commit a7f0966
Show file tree
Hide file tree
Showing 13 changed files with 3 additions and 162 deletions.
9 changes: 0 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ updates:
- dependency-name: org.eclipse.microprofile.metrics:microprofile-metrics-*-tck
- dependency-name: org.eclipse.microprofile.reactive.messaging:microprofile-reactive-messaging-tck
- dependency-name: org.eclipse.microprofile.openapi:microprofile-openapi-tck
- dependency-name: org.eclipse.microprofile.opentracing:microprofile-opentracing-tck*
- dependency-name: org.eclipse.microprofile.rest.client:microprofile-rest-client-tck
# Dev UI web dependencies
- dependency-name: org.mvnpm:*
Expand All @@ -166,7 +165,6 @@ updates:
- dependency-name: io.dekorate:servicebinding-annotations
- dependency-name: io.opentelemetry:*
- dependency-name: io.opentelemetry.*:*
- dependency-name: io.opentracing.contrib:*
- dependency-name: org.aesh:readline
- dependency-name: org.checkerframework:checker-qual
- dependency-name: org.jboss.metadata:jboss-metadata-web
Expand All @@ -189,11 +187,6 @@ updates:
- dependency-name: io.fabric8:maven-model-helper
- dependency-name: org.codejive:java-properties
ignore:
# this one cannot be upgraded due to the usage of proxies in new versions
# the proxy implements interfaces in a random order which causes issues
# https://github.com/quarkusio/quarkus/issues/18033
# https://github.com/opentracing-contrib/java-jdbc/issues/116
- dependency-name: io.opentracing.contrib:opentracing-jdbc
- dependency-name: org.eclipse.microprofile.config:microprofile-config-tck
update-types: ["version-update:semver-major", "version-update:semver-minor"]
- dependency-name: org.eclipse.microprofile.context-propagation:microprofile-context-propagation-tck
Expand All @@ -212,8 +205,6 @@ updates:
update-types: ["version-update:semver-major", "version-update:semver-minor"]
- dependency-name: org.eclipse.microprofile.openapi:microprofile-openapi-tck
update-types: ["version-update:semver-major", "version-update:semver-minor"]
- dependency-name: org.eclipse.microprofile.opentracing:microprofile-opentracing-tck*
update-types: ["version-update:semver-major", "version-update:semver-minor"]
- dependency-name: org.eclipse.microprofile.rest.client:microprofile-rest-client-tck
update-types: ["version-update:semver-major", "version-update:semver-minor"]
# Major/minor upgrades require more work and synchronization, we do them manually.
Expand Down
6 changes: 0 additions & 6 deletions .github/quarkus-github-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,6 @@ triage:
- integration-tests/vertx-graphql/
- integration-tests/smallrye-graphql/
- integration-tests/smallrye-graphql-client/
- id: tracing
labels: [area/tracing, area/smallrye]
title: "(trace|tracing)"
notify: [radcortez, brunobat]
directories:
- extensions/smallrye-opentracing/
- id: opentelemetry
labels: [area/tracing]
title: "(trace|opentelemetry)"
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ repositories {
### MicroProfile TCK's

Quarkus has a TCK module in `tcks` where all the MicroProfile TCK's are set up for you to run if you wish. These include
tests to areas like Config, JWT Authentication, Fault Tolerance, Health Checks, Metrics, OpenAPI, OpenTracing, REST
tests to areas like Config, JWT Authentication, Fault Tolerance, Health Checks, Metrics, OpenAPI, Telemetry, REST
Client, Reactive Messaging and Context Propagation.

The TCK module is not part of the main Maven reactor build, but you can enable it and run the TCK tests by activating
Expand Down
3 changes: 0 additions & 3 deletions MAINTAINERS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,6 @@ If you think some information is outdated, either provide a pull request or emai
|SmallRye GraphQL Client
|https://github.com/jmartisk[Jan Martiska], https://github.com/phillip-kruger[Phillip Kruger]

|SmallRye OpenTracing
|https://github.com/radcortez[Roberto Cortez]

|SmallRye Reactive Messaging
|https://github.com/cescoffier[Clément Escoffier]

Expand Down
57 changes: 0 additions & 57 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<resteasy-microprofile.version>2.1.5.Final</resteasy-microprofile.version>
<resteasy-spring-web.version>3.1.3.Final</resteasy-spring-web.version>
<resteasy.version>6.2.10.Final</resteasy.version>
<opentracing.version>0.33.0</opentracing.version>
<opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>
<opentracing-kafka.version>0.1.15</opentracing-kafka.version>
<opentracing-mongo.version>0.1.5</opentracing-mongo.version>
<opentelemetry.version>1.42.1</opentelemetry.version>
<opentelemetry-alpha.version>2.8.0-alpha</opentelemetry-alpha.version>
<opentelemetry-semconv.version>1.27.0-alpha</opentelemetry-semconv.version>
Expand All @@ -45,7 +41,6 @@
<microprofile-health-api.version>4.0.1</microprofile-health-api.version>
<microprofile-metrics-api.version>4.0.1</microprofile-metrics-api.version>
<microprofile-context-propagation.version>1.3</microprofile-context-propagation.version>
<microprofile-opentracing-api.version>3.0</microprofile-opentracing-api.version>
<microprofile-fault-tolerance-api.version>4.1.1</microprofile-fault-tolerance-api.version>
<microprofile-reactive-streams-operators.version>3.0.1</microprofile-reactive-streams-operators.version>
<microprofile-rest-client.version>3.0.1</microprofile-rest-client.version>
Expand Down Expand Up @@ -3726,47 +3721,6 @@
<artifactId>rxjava</artifactId>
<version>${rxjava.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
<version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-noop</artifactId>
<version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
<version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>
<version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
<version>${opentracing.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>io.opentracing.contrib</groupId>
<artifactId>opentracing-jdbc</artifactId>
<version>${opentracing-jdbc.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing.contrib</groupId>
<artifactId>opentracing-kafka-client</artifactId>
<version>${opentracing-kafka.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing.contrib</groupId>
<artifactId>opentracing-mongo-common</artifactId>
<version>${opentracing-mongo.version}</version>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
Expand Down Expand Up @@ -4582,17 +4536,6 @@
<artifactId>microprofile-context-propagation-api</artifactId>
<version>${microprofile-context-propagation.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.opentracing</groupId>
<artifactId>microprofile-opentracing-api</artifactId>
<version>${microprofile-opentracing-api.version}</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.fault-tolerance</groupId>
<artifactId>microprofile-fault-tolerance-api</artifactId>
Expand Down
1 change: 0 additions & 1 deletion docs/.vale/fixtures/Quarkus/Spelling/testinvalid.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Nuget
Oauth
Omnisharp
Openshift
Opentracing
php
Postgresql
postgres
Expand Down
1 change: 0 additions & 1 deletion docs/.vale/fixtures/Quarkus/Spelling/testvalid.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ Onboarding
OpenID
OpenJDK
OpenShift
OpenTracing
Operator
osd
OTel
Expand Down
1 change: 0 additions & 1 deletion docs/.vale/styles/Quarkus/Headings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ exceptions:
- OpenJDK
- OpenRewrite
- OpenShift
- OpenTracing
- PHP
- Podman
- Podman Desktop
Expand Down
1 change: 0 additions & 1 deletion docs/.vale/styles/Quarkus/Spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,6 @@ filters:
- OpenJDK
- OpenRewrite
- OpenShift
- OpenTracing
- OSBuild
- osd
- OSs
Expand Down
17 changes: 2 additions & 15 deletions docs/src/main/asciidoc/datasource.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -259,26 +259,13 @@ For more information about configuring JDBC, see <<jdbc-url,JDBC URL format refe
[[other-databases]]
===== Custom databases and drivers

If you need to connect to a database for which Quarkus does not provide an extension with the JDBC driver, you can use a custom driver instead.
For example, if you are using the OpenTracing JDBC driver in your project.
If you need to connect to a database for which Quarkus does not provide an extension with the JDBC driver,
you can use a custom driver instead. For example, if you are using the OpenTelemetry JDBC driver in your project.

Without an extension, the driver will work correctly in any Quarkus app running in JVM mode.
However, the driver is unlikely to work when compiling your application to a native executable.
If you plan to make a native executable, use the existing JDBC Quarkus extensions, or contribute one for your driver.

[WARNING]
====
OpenTracing has been deprecated in favor of OpenTelemetry.
For tracing information, please check the related section about <<datasource-tracing>>, bellow.
====

.A custom driver definition example with the legacy OpenTracing driver:

[source,properties]
----
quarkus.datasource.jdbc.driver=io.opentracing.contrib.jdbc.TracingDriver
----

.An example for defining access to a database with no built-in support in JVM mode:

[source,properties]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -723,23 +723,6 @@
},
"artifact" : "io.quarkus:quarkus-infinispan-client::jar:999-SNAPSHOT",
"origins" : [ "io.quarkus:quarkus-bom-quarkus-platform-descriptor:999-SNAPSHOT:json:999-SNAPSHOT" ]
}, {
"name" : "Jaeger",
"description" : "Trace your services with Jaeger",
"metadata" : {
"keywords" : [ "tracing", "distributed-tracing", "jaeger" ],
"categories" : [ "observability" ],
"unlisted" : true,
"status" : "stable",
"config" : [ "quarkus.jaeger." ],
"built-with-quarkus-core" : "999-SNAPSHOT",
"capabilities" : {
"provides" : [ "io.quarkus.opentracing" ]
},
"extension-dependencies" : [ "io.quarkus:quarkus-core", "io.quarkus:quarkus-arc" ]
},
"artifact" : "io.quarkus:quarkus-jaeger::jar:999-SNAPSHOT",
"origins" : [ "io.quarkus:quarkus-bom-quarkus-platform-descriptor:999-SNAPSHOT:json:999-SNAPSHOT" ]
}, {
"name" : "JDBC Driver - DB2",
"description" : "Connect to the DB2 database via JDBC",
Expand Down Expand Up @@ -1125,23 +1108,6 @@
},
"artifact" : "io.quarkus:quarkus-smallrye-graphql-client::jar:999-SNAPSHOT",
"origins" : [ "io.quarkus:quarkus-bom-quarkus-platform-descriptor:999-SNAPSHOT:json:999-SNAPSHOT" ]
}, {
"name" : "SmallRye OpenTracing",
"description" : "Trace your services with SmallRye OpenTracing",
"metadata" : {
"keywords" : [ "smallrye-opentracing", "opentracing", "tracing", "distributed-tracing", "jaeger" ],
"guide" : "https://quarkus.io/guides/opentracing",
"categories" : [ "observability" ],
"status" : "stable",
"config" : [ "quarkus.jaeger.", "mp.opentracing." ],
"built-with-quarkus-core" : "999-SNAPSHOT",
"capabilities" : {
"provides" : [ "io.quarkus.smallrye.opentracing" ]
},
"extension-dependencies" : [ "io.quarkus:quarkus-arc", "io.quarkus:quarkus-core", "io.quarkus:quarkus-jaeger", "io.quarkus:quarkus-jsonp" ]
},
"artifact" : "io.quarkus:quarkus-smallrye-opentracing::jar:999-SNAPSHOT",
"origins" : [ "io.quarkus:quarkus-bom-quarkus-platform-descriptor:999-SNAPSHOT:json:999-SNAPSHOT" ]
}, {
"name" : "REST Client",
"description" : "Call REST services",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1099,22 +1099,6 @@
},
"artifact" : "io.quarkus:quarkus-jacoco::jar:2.0.3.Final",
"origins" : [ "io.quarkus:quarkus-universe-bom-quarkus-platform-descriptor:2.0.3.Final:json:2.0.3.Final" ]
}, {
"name" : "Jaeger",
"description" : "Trace your services with Jaeger",
"metadata" : {
"keywords" : [ "tracing", "distributed-tracing", "jaeger" ],
"categories" : [ "observability" ],
"unlisted" : true,
"status" : "stable",
"built-with-quarkus-core" : "2.0.3.Final",
"capabilities" : {
"provides" : [ "io.quarkus.opentracing" ]
},
"extension-dependencies" : [ "io.quarkus:quarkus-core" ]
},
"artifact" : "io.quarkus:quarkus-jaeger::jar:2.0.3.Final",
"origins" : [ "io.quarkus:quarkus-universe-bom-quarkus-platform-descriptor:2.0.3.Final:json:2.0.3.Final" ]
}, {
"name" : "JAXB",
"description" : "XML serialization support",
Expand Down Expand Up @@ -2547,22 +2531,6 @@
},
"artifact" : "io.quarkus:quarkus-smallrye-openapi::jar:2.0.3.Final",
"origins" : [ "io.quarkus:quarkus-universe-bom-quarkus-platform-descriptor:2.0.3.Final:json:2.0.3.Final" ]
}, {
"name" : "SmallRye OpenTracing",
"description" : "Trace your services with SmallRye OpenTracing",
"metadata" : {
"keywords" : [ "smallrye-opentracing", "opentracing", "tracing", "distributed-tracing", "jaeger" ],
"guide" : "https://quarkus.io/guides/opentracing",
"categories" : [ "observability" ],
"status" : "stable",
"built-with-quarkus-core" : "2.0.3.Final",
"capabilities" : {
"provides" : [ "io.quarkus.smallrye.opentracing" ]
},
"extension-dependencies" : [ "io.quarkus:quarkus-arc", "io.quarkus:quarkus-core", "io.quarkus:quarkus-jaeger", "io.quarkus:quarkus-jsonp" ]
},
"artifact" : "io.quarkus:quarkus-smallrye-opentracing::jar:2.0.3.Final",
"origins" : [ "io.quarkus:quarkus-universe-bom-quarkus-platform-descriptor:2.0.3.Final:json:2.0.3.Final" ]
}, {
"name" : "SmallRye Reactive Messaging - AMQP Connector",
"description" : "Connect to AMQP with Reactive Messaging",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ void testRegexpMatches() throws Exception {
final T project = readProject();
hasNoDependency(project, "quarkus-messaging");
hasNoDependency(project, "quarkus-smallrye-reactive-streams-operators");
hasNoDependency(project, "quarkus-smallrye-opentracing");
hasNoDependency(project, "quarkus-smallrye-metrics");
hasNoDependency(project, "quarkus-messaging-kafka");
hasNoDependency(project, "quarkus-smallrye-health");
Expand Down

0 comments on commit a7f0966

Please sign in to comment.