Moved Jersey references to test scope

micrometer-metrics · Dec 14, 2023 · 04975ce · 04975ce
1 parent d2b01da
commit 04975ce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 48 deletions.
diff --git a/...src/main/java/io/micrometer/core/instrument/binder/http/HttpObservationDocumentation.java b/...src/main/java/io/micrometer/core/instrument/binder/http/HttpObservationDocumentation.java
@@ -215,45 +215,6 @@ public String asString() {
 
     public enum CommonHighCardinalityKeys implements KeyName {
 
-        /**
-         * The size of the request payload body in bytes. This is the number of bytes
-         * transferred excluding headers and is often, but not always, present as the
-         * Content-Length header. For requests using transport encoding, this should be
-         * the compressed size.
-         */
-        // TODO: Currently unused
-        REQUEST_BODY_SIZE {
-            @Override
-            public boolean isRequired() {
-                return false;
-            }
-
-            @Override
-            public String asString() {
-                return "http.request.body.size";
-            }
-        },
-
-        /**
-         * The size of the response payload body in bytes. This is the number of bytes
-         * transferred excluding headers and is often, but not always, present as the
-         * Content-Length header. For requests using transport encoding, this should be
-         * the compressed size.
-         */
-        // TODO: Currently unused
-        RESPONSE_BODY_SIZE {
-            @Override
-            public boolean isRequired() {
-                return false;
-            }
-
-            @Override
-            public String asString() {
-                return "http.response.body.size";
-            }
-
-        },
-
         /**
          * Value of the HTTP User-Agent header sent by the client.
          */

diff --git a/...ometer/jakarta9/instrument/binder/http/jaxrs/client/ObservationJaxRsHttpClientFilter.java b/...ometer/jakarta9/instrument/binder/http/jaxrs/client/ObservationJaxRsHttpClientFilter.java
@@ -28,12 +28,10 @@
 
 /**
  * A {@link ClientResponseFilter} and {@link ClientResponseFilter} that is an around
- * wrapper over sending an HTTP call. For handling exceptions, configure
- * {@link ObservationJerseyClientInterceptor}.
+ * wrapper over sending an HTTP call. This interceptor does not handle exceptions.
  *
  * @author Marcin Grzejszczak
  * @since 1.13.0
- * @see ObservationJerseyClientInterceptor
  */
 public class ObservationJaxRsHttpClientFilter implements ClientRequestFilter, ClientResponseFilter {
 

diff --git a/...tp/jaxrs/ObservationAutoDiscoverable.java → ...s/client/ObservationAutoDiscoverable.java b/...tp/jaxrs/ObservationAutoDiscoverable.java → ...s/client/ObservationAutoDiscoverable.java
@@ -13,17 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.micrometer.jakarta9.instrument.binder.http.jaxrs;
+package io.micrometer.jakarta9.instrument.binder.http.jaxrs.client;
 
-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;
 import org.glassfish.jersey.internal.spi.AutoDiscoverable;
 
 /**
- * Binds observation into Jersey.
+ * Example of binding observation into Jersey.
  */
 @ConstrainedTo(RuntimeType.CLIENT)
 public class ObservationAutoDiscoverable implements AutoDiscoverable {

diff --git a/...t/ObservationJerseyClientInterceptor.java → ...t/ObservationJerseyClientInterceptor.java b/...t/ObservationJerseyClientInterceptor.java → ...t/ObservationJerseyClientInterceptor.java
@@ -22,8 +22,8 @@
 import org.glassfish.jersey.client.spi.PostInvocationInterceptor;
 
 /**
- * A post-invocation client interceptor that will stop an observation started in
- * {@link ObservationJaxRsHttpClientFilter} in case of exceptions.
+ * Example of a post-invocation client interceptor that will stop an observation started
+ * in {@link ObservationJaxRsHttpClientFilter} in case of exceptions.
  *
  * @author Marcin Grzejszczak
  * @since 1.13.0