diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/AnnotationFinder.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/AnnotationFinder.java index 15b34075ec..a8a59d9d4e 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/AnnotationFinder.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/AnnotationFinder.java @@ -18,6 +18,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; +/** + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead + */ +@Deprecated public interface AnnotationFinder { AnnotationFinder DEFAULT = new AnnotationFinder() { diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyObservationConvention.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyObservationConvention.java index 605491a2ab..ca20ded1c3 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyObservationConvention.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyObservationConvention.java @@ -26,7 +26,9 @@ * * @author Marcin Grzejszczak * @since 1.10.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public class DefaultJerseyObservationConvention implements JerseyObservationConvention { private final String metricsName; diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProvider.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProvider.java index 398e24a98b..211e8f57aa 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProvider.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProvider.java @@ -26,7 +26,9 @@ * @author Michael Weirauch * @author Johnny Lim * @since 1.8.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public final class DefaultJerseyTagsProvider implements JerseyTagsProvider { @Override diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyContext.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyContext.java index b4e6842a1a..cd5c4261dc 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyContext.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyContext.java @@ -28,7 +28,9 @@ * * @author Marcin Grzejszczak * @since 1.10.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public class JerseyContext extends RequestReplyReceiverContext { private RequestEvent requestEvent; diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyKeyValues.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyKeyValues.java index faf73d1515..e6e44488da 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyKeyValues.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyKeyValues.java @@ -27,6 +27,7 @@ * Factory methods for {@link KeyValue KeyValues} associated with a request-response * exchange that is handled by Jersey server. */ +@SuppressWarnings("deprecation") class JerseyKeyValues { private static final KeyValue URI_NOT_FOUND = JerseyObservationDocumentation.JerseyLegacyLowCardinalityTags.URI diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyObservationConvention.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyObservationConvention.java index 8a97977c1d..fef2085599 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyObservationConvention.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyObservationConvention.java @@ -24,7 +24,9 @@ * * @author Marcin Grzejszczak * @since 1.10.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public interface JerseyObservationConvention extends ObservationConvention { @Override diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyObservationDocumentation.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyObservationDocumentation.java index fcc29347c8..7b9996dd13 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyObservationDocumentation.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyObservationDocumentation.java @@ -26,7 +26,9 @@ * * @author Marcin Grzejszczak * @since 1.10.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated @NonNullApi public enum JerseyObservationDocumentation implements ObservationDocumentation { diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTags.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTags.java index d66d7196c1..a7b175fccb 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTags.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTags.java @@ -34,7 +34,9 @@ * @author Michael Weirauch * @author Johnny Lim * @since 1.8.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public final class JerseyTags { private static final Tag URI_NOT_FOUND = Tag.of("uri", "NOT_FOUND"); diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTagsProvider.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTagsProvider.java index 4f49c5380f..c8497f2c80 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTagsProvider.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTagsProvider.java @@ -23,7 +23,9 @@ * * @author Michael Weirauch * @since 1.8.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public interface JerseyTagsProvider { /** diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/MetricsApplicationEventListener.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/MetricsApplicationEventListener.java index d591ad1b1d..f35daada4a 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/MetricsApplicationEventListener.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/MetricsApplicationEventListener.java @@ -29,7 +29,9 @@ * * @author Michael Weirauch * @since 1.8.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public class MetricsApplicationEventListener implements ApplicationEventListener { private final MeterRegistry meterRegistry; diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListener.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListener.java index 6652b8caa4..876fe2cf09 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListener.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListener.java @@ -35,7 +35,9 @@ * @author Michael Weirauch * @author Jon Schneider * @since 1.8.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public class MetricsRequestEventListener implements RequestEventListener { private final Map shortTaskSample = Collections diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationApplicationEventListener.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationApplicationEventListener.java index 2685228f20..e2edcd4f8f 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationApplicationEventListener.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationApplicationEventListener.java @@ -30,7 +30,9 @@ * * @author Marcin Grzejszczak * @since 1.10.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public class ObservationApplicationEventListener implements ApplicationEventListener { private final ObservationRegistry observationRegistry; diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationRequestEventListener.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationRequestEventListener.java index 05f40e8e76..13c4cfafa3 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationRequestEventListener.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/ObservationRequestEventListener.java @@ -33,7 +33,9 @@ * * @author Marcin Grzejszczak * @since 1.10.0 + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ +@Deprecated public class ObservationRequestEventListener implements RequestEventListener { private final Map observations = Collections diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/TimedFinder.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/TimedFinder.java index ba2b1ee223..33dd469ba4 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/TimedFinder.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/TimedFinder.java @@ -24,6 +24,7 @@ import java.util.Set; import java.util.stream.Collectors; +@SuppressWarnings("deprecation") class TimedFinder { private final AnnotationFinder annotationFinder; diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/package-info.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/package-info.java index 9c6777e4d5..fa95ea8374 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/package-info.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/package-info.java @@ -16,5 +16,6 @@ /** * Meter binders for Jersey. + * @deprecated since 1.13.0 use the jersey-micrometer module in the Jersey project instead */ package io.micrometer.core.instrument.binder.jersey.server; diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProviderTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProviderTest.java index 5b6a4349eb..084997cf57 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProviderTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProviderTest.java @@ -44,6 +44,7 @@ * @author Michael Weirauch * @author Johnny Lim */ +@SuppressWarnings("deprecation") class DefaultJerseyTagsProviderTest { private final DefaultJerseyTagsProvider tagsProvider = new DefaultJerseyTagsProvider(); diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java index 44243c6e8c..70166534b2 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java @@ -38,6 +38,7 @@ * @author Michael Weirauch * @author Johnny Lim */ +@SuppressWarnings("deprecation") class MetricsRequestEventListenerTest extends JerseyTest { static { diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTimedTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTimedTest.java index 8348bee772..b9c3207c5a 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTimedTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTimedTest.java @@ -39,6 +39,7 @@ /** * @author Michael Weirauch */ +@SuppressWarnings("deprecation") class MetricsRequestEventListenerTimedTest extends JerseyTest { static { diff --git a/micrometer-test/src/test/java/io/micrometer/core/instrument/JerseyServerTimingInstrumentationVerificationTests.java b/micrometer-test/src/test/java/io/micrometer/core/instrument/JerseyServerTimingInstrumentationVerificationTests.java index 7831633135..381c383d80 100644 --- a/micrometer-test/src/test/java/io/micrometer/core/instrument/JerseyServerTimingInstrumentationVerificationTests.java +++ b/micrometer-test/src/test/java/io/micrometer/core/instrument/JerseyServerTimingInstrumentationVerificationTests.java @@ -30,6 +30,7 @@ import javax.ws.rs.core.Response; import java.net.URI; +@SuppressWarnings("deprecation") class JerseyServerTimingInstrumentationVerificationTests extends HttpServerTimingInstrumentationVerificationTests { JerseyTest jerseyTest; diff --git a/samples/micrometer-samples-jersey3/src/main/java/io/micrometer/samples/jersey3/Jersey3Main.java b/samples/micrometer-samples-jersey3/src/main/java/io/micrometer/samples/jersey3/Jersey3Main.java index 23d55ec915..333c19bf14 100644 --- a/samples/micrometer-samples-jersey3/src/main/java/io/micrometer/samples/jersey3/Jersey3Main.java +++ b/samples/micrometer-samples-jersey3/src/main/java/io/micrometer/samples/jersey3/Jersey3Main.java @@ -32,6 +32,7 @@ import java.net.InetSocketAddress; import java.time.Duration; +@SuppressWarnings("deprecation") public class Jersey3Main { public static void main(String[] args) throws IOException { diff --git a/samples/micrometer-samples-jersey3/src/test/java/io/micrometer/samples/jersey3/Jersey3Test.java b/samples/micrometer-samples-jersey3/src/test/java/io/micrometer/samples/jersey3/Jersey3Test.java index 184d96cbcc..5ca300edfe 100644 --- a/samples/micrometer-samples-jersey3/src/test/java/io/micrometer/samples/jersey3/Jersey3Test.java +++ b/samples/micrometer-samples-jersey3/src/test/java/io/micrometer/samples/jersey3/Jersey3Test.java @@ -32,6 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") class Jersey3Test extends JerseyTest { static final String TIMER_METRIC_NAME = "http.server.requests";