diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 97d93ed4c2cb3..c066b9b432ddf 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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:* @@ -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 @@ -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 @@ -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. diff --git a/.github/quarkus-github-bot.yml b/.github/quarkus-github-bot.yml index 57704b9af0c9d..170eecc0484ea 100644 --- a/.github/quarkus-github-bot.yml +++ b/.github/quarkus-github-bot.yml @@ -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)" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 74183fd8497d3..e08e11629ce53 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/MAINTAINERS.adoc b/MAINTAINERS.adoc index 5480395b48333..fa8a42f66b7e7 100644 --- a/MAINTAINERS.adoc +++ b/MAINTAINERS.adoc @@ -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] diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 505f2d6344949..c9b791cf476a1 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -29,10 +29,6 @@ 2.1.5.Final 3.1.3.Final 6.2.10.Final - 0.33.0 - 0.2.4 - 0.1.15 - 0.1.5 1.42.1 2.8.0-alpha 1.27.0-alpha @@ -45,7 +41,6 @@ 4.0.1 4.0.1 1.3 - 3.0 4.1.1 3.0.1 3.0.1 @@ -3726,47 +3721,6 @@ rxjava ${rxjava.version} - - io.opentracing - opentracing-api - ${opentracing.version} - - - io.opentracing - opentracing-noop - ${opentracing.version} - - - io.opentracing - opentracing-util - ${opentracing.version} - - - io.opentracing - opentracing-mock - ${opentracing.version} - - - io.opentracing - opentracing-util - ${opentracing.version} - test-jar - - - io.opentracing.contrib - opentracing-jdbc - ${opentracing-jdbc.version} - - - io.opentracing.contrib - opentracing-kafka-client - ${opentracing-kafka.version} - - - io.opentracing.contrib - opentracing-mongo-common - ${opentracing-mongo.version} - io.rest-assured rest-assured @@ -4582,17 +4536,6 @@ microprofile-context-propagation-api ${microprofile-context-propagation.version} - - org.eclipse.microprofile.opentracing - microprofile-opentracing-api - ${microprofile-opentracing-api.version} - - - org.osgi - org.osgi.annotation.versioning - - - org.eclipse.microprofile.fault-tolerance microprofile-fault-tolerance-api diff --git a/docs/.vale/fixtures/Quarkus/Spelling/testinvalid.adoc b/docs/.vale/fixtures/Quarkus/Spelling/testinvalid.adoc index a8c28b7468765..64a18edf98b19 100644 --- a/docs/.vale/fixtures/Quarkus/Spelling/testinvalid.adoc +++ b/docs/.vale/fixtures/Quarkus/Spelling/testinvalid.adoc @@ -42,7 +42,6 @@ Nuget Oauth Omnisharp Openshift -Opentracing php Postgresql postgres diff --git a/docs/.vale/fixtures/Quarkus/Spelling/testvalid.adoc b/docs/.vale/fixtures/Quarkus/Spelling/testvalid.adoc index 9960286927220..6f07167b7d5c6 100644 --- a/docs/.vale/fixtures/Quarkus/Spelling/testvalid.adoc +++ b/docs/.vale/fixtures/Quarkus/Spelling/testvalid.adoc @@ -245,7 +245,6 @@ Onboarding OpenID OpenJDK OpenShift -OpenTracing Operator osd OTel diff --git a/docs/.vale/styles/Quarkus/Headings.yml b/docs/.vale/styles/Quarkus/Headings.yml index fe3ab4f44c783..66c0cb0f903ef 100644 --- a/docs/.vale/styles/Quarkus/Headings.yml +++ b/docs/.vale/styles/Quarkus/Headings.yml @@ -178,7 +178,6 @@ exceptions: - OpenJDK - OpenRewrite - OpenShift - - OpenTracing - PHP - Podman - Podman Desktop diff --git a/docs/.vale/styles/Quarkus/Spelling.yml b/docs/.vale/styles/Quarkus/Spelling.yml index 1c983fd4ed65a..291f603eb7f3f 100644 --- a/docs/.vale/styles/Quarkus/Spelling.yml +++ b/docs/.vale/styles/Quarkus/Spelling.yml @@ -358,7 +358,6 @@ filters: - OpenJDK - OpenRewrite - OpenShift - - OpenTracing - OSBuild - osd - OSs diff --git a/docs/src/main/asciidoc/datasource.adoc b/docs/src/main/asciidoc/datasource.adoc index f07072b8a0ffc..887a9ca1250e7 100644 --- a/docs/src/main/asciidoc/datasource.adoc +++ b/docs/src/main/asciidoc/datasource.adoc @@ -259,26 +259,13 @@ For more information about configuring JDBC, see <>, 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] diff --git a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json index 503d7fb1d580a..63ae43092b278 100644 --- a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json +++ b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json @@ -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", @@ -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", diff --git a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json index 8bd6fdf406b72..a0ae761f937bc 100644 --- a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json +++ b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json @@ -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", @@ -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", diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java index 382a4ba52e60e..36b8e0d8d233f 100644 --- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java +++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java @@ -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");