Rebased main

Author: marcingrzejszczak

gradle/libs.versions.toml

@@ -39,6 +39,7 @@ hystrix = "1.5.12"
 jackson-databind = "2.16.0"
 javax-cache = "1.1.1"
 javax-inject = "1"
+javax-rsapi = "2.1.1"
 jaxb = "2.3.1"
 jetty9 = "9.4.53.v20231009"
 jetty11 = "11.0.16"
@@ -65,6 +66,7 @@ okhttp = "5.0.0-alpha.11" # TODO is compiling against an alpha version intention
 postgre = "42.7.1"
 prometheus = "0.16.0"
 reactor = "2022.0.13"
+resteasy-netty4 = "6.2.6.Final"
 rest-assured = "5.4.0"
 signalfx = "1.0.37"
 slf4j = "1.7.36"
@@ -133,6 +135,7 @@ javalin = { module = "io.javalin:javalin", version = "5.6.3" }
 javax-cacheApi = { module = "javax.cache:cache-api", version.ref = "javax-cache" }
 javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" }
 javax-servletApi = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
+javax-rsapi = { module = "javax.ws.rs:javax.ws.rs-api", version.ref = "javax-rsapi" }
 jaxbApi = { module = "javax.xml.bind:jaxb-api", version.ref = "jaxb" }
 jetty9Client = { module = "org.eclipse.jetty:jetty-client", version.ref = "jetty9" }
 jetty9Server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty9" }
@@ -181,6 +184,7 @@ prometheusClient = { module = "io.prometheus:simpleclient_common", version.ref =
 prometheusPushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheus" }
 reactorBom = { module = "io.projectreactor:reactor-bom", version.ref = "reactor" }
 restAssured = { module = "io.rest-assured:rest-assured", version.ref = "rest-assured" }
+resteasy-netty4 = { module = "org.jboss.resteasy:resteasy-netty4", version.ref = "resteasy-netty4" }
 retrofit2 = { module = "com.squareup.retrofit2:retrofit", version = "2.9.0" }
 signalfx = { module = "com.signalfx.public:signalfx-java", version.ref = "signalfx" }
 slf4jApi = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

micrometer-core/build.gradle

@@ -66,7 +66,6 @@ jar {
 dependencies {
     api project(":micrometer-commons")
     api project(":micrometer-observation")
-    optionalApi 'javax.ws.rs:javax.ws.rs-api' // javax jax-rs
 
     java11Api project(":micrometer-commons")
     java11Api project(":micrometer-observation")

micrometer-jakarta/build.gradle

@@ -18,9 +18,20 @@ dependencies {
     api project(":micrometer-observation")
 
     optionalApi 'jakarta.jms:jakarta.jms-api'
+    optionalApi libs.javax.rsapi // jax-rs
+
+    // jakarta servlet
+    optionalApi 'jakarta.servlet:jakarta.servlet-api'
+    optionalApi 'org.apache.tomcat.embed:tomcat-embed-core:10.1.+' // can't move to dependencies.gradle, we have 2 versions of this lib (check micrometer-core)
+    optionalApi 'org.glassfish.jersey.core:jersey-server:3.1.+' // can't move to dependencies.gradle, we have 2 versions of this lib (check micrometer-core)
 
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testImplementation 'com.tngtech.archunit:archunit-junit5'
     testImplementation 'org.mockito:mockito-core'
     testImplementation 'org.assertj:assertj-core'
+    testImplementation 'ru.lanwen.wiremock:wiremock-junit5'
+    testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'
+    testImplementation libs.resteasy.netty4
+
+    testImplementation project(":micrometer-observation-test")
 }

micrometer-jakarta/src/test/java/io/micrometer/jakarta/instrument/binder/NoJavaxArchitectureTests.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micrometer.jakarta.instrument.binder.http;
+package io.micrometer.jakarta9.instrument.binder.http;
 
 import io.micrometer.common.docs.KeyName;
 import io.micrometer.core.instrument.binder.http.HttpObservationDocumentation.*;
-import io.micrometer.jakarta.instrument.binder.http.jaxrs.container.DefaultJaxRsContainerObservationConvention;
-import io.micrometer.jakarta.instrument.binder.http.jaxrs.client.DefaultJaxRsHttpClientObservationConvention;
-import io.micrometer.jakarta.instrument.binder.http.servlet.DefaultHttpServletObservationConvention;
+import io.micrometer.jakarta9.instrument.binder.http.jaxrs.container.DefaultJaxRsContainerObservationConvention;
+import io.micrometer.jakarta9.instrument.binder.http.jaxrs.client.DefaultJaxRsHttpClientObservationConvention;
+import io.micrometer.jakarta9.instrument.binder.http.servlet.DefaultHttpServletObservationConvention;
 import io.micrometer.observation.Observation.Context;
 import io.micrometer.observation.ObservationConvention;
 import io.micrometer.observation.docs.ObservationDocumentation;
@@ -29,7 +29,7 @@
  *
  * @author Brian Clozel
  * @author Marcin Grzejszczak
- * @since 1.12.0
+ * @since 1.13.0
  */
 public enum JakartaHttpObservationDocumentation implements ObservationDocumentation {
 

micrometer-jakarta9/build.gradle

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micrometer.jakarta.instrument.binder.http.jaxrs;
+package io.micrometer.jakarta9.instrument.binder.http.jaxrs;
 
-import io.micrometer.jakarta.instrument.binder.http.jaxrs.client.ObservationJaxRsHttpClientFilter;
-import io.micrometer.jakarta.instrument.binder.http.jaxrs.client.ObservationJerseyClientInterceptor;
+import io.micrometer.jakarta9.instrument.binder.http.jaxrs.client.ObservationJaxRsHttpClientFilter;
+import io.micrometer.jakarta9.instrument.binder.http.jaxrs.client.ObservationJerseyClientInterceptor;
 import jakarta.ws.rs.ConstrainedTo;
 import jakarta.ws.rs.RuntimeType;
 import jakarta.ws.rs.core.FeatureContext;

micrometer-jakarta/src/main/java/io/micrometer/jakarta/instrument/binder/http/JakartaHttpObservationDocumentation.java renamed to micrometer-jakarta9/src/main/java/io/micrometer/jakarta9/instrument/binder/http/JakartaHttpObservationDocumentation.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micrometer.jakarta.instrument.binder.http.jaxrs.client;
+package io.micrometer.jakarta9.instrument.binder.http.jaxrs.client;
 
 import io.micrometer.common.KeyValues;
 import io.micrometer.core.instrument.binder.http.AbstractDefaultHttpClientRequestObservationConvention;
-import io.micrometer.jakarta.instrument.binder.http.jaxrs.container.JaxRsContainerObservationConvention;
+import io.micrometer.jakarta9.instrument.binder.http.jaxrs.container.JaxRsContainerObservationConvention;
 
 import java.net.URI;
 
@@ -26,7 +26,7 @@
  *
  * @author Brian Clozel
  * @author Marcin Grzejszczak
- * @since 1.12.0
+ * @since 1.13.0
  */
 public class DefaultJaxRsHttpClientObservationConvention extends AbstractDefaultHttpClientRequestObservationConvention
         implements JaxRsHttpClientObservationConvention {

micrometer-jakarta/src/main/java/io/micrometer/jakarta/instrument/binder/http/jaxrs/ObservationAutoDiscoverable.java renamed to micrometer-jakarta9/src/main/java/io/micrometer/jakarta9/instrument/binder/http/jaxrs/ObservationAutoDiscoverable.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micrometer.jakarta.instrument.binder.http.jaxrs.client;
+package io.micrometer.jakarta9.instrument.binder.http.jaxrs.client;
 
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.observation.transport.RequestReplySenderContext;
@@ -29,7 +29,7 @@
  *
  * @author Brian Clozel
  * @author Marcin Grzejszczak
- * @since 1.12.0
+ * @since 1.13.0
  */
 public class JaxRsHttpClientObservationContext
         extends RequestReplySenderContext<ClientRequestContext, ClientResponseContext> {

micrometer-jakarta/src/main/java/io/micrometer/jakarta/instrument/binder/http/jaxrs/client/DefaultJaxRsHttpClientObservationConvention.java renamed to micrometer-jakarta9/src/main/java/io/micrometer/jakarta9/instrument/binder/http/jaxrs/client/DefaultJaxRsHttpClientObservationConvention.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micrometer.jakarta.instrument.binder.http.jaxrs.client;
+package io.micrometer.jakarta9.instrument.binder.http.jaxrs.client;
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationConvention;
@@ -23,7 +23,7 @@
  *
  * @author Brian Clozel
  * @author Marcin Grzejszczak
- * @since 1.12.0
+ * @since 1.13.0
  */
 public interface JaxRsHttpClientObservationConvention extends ObservationConvention<JaxRsHttpClientObservationContext> {