diff --git a/micrometer-jetty12/build.gradle b/micrometer-jetty12/build.gradle index 102131526e..56b9c09d7f 100644 --- a/micrometer-jetty12/build.gradle +++ b/micrometer-jetty12/build.gradle @@ -21,10 +21,6 @@ dependencies { testImplementation project(":micrometer-test") testImplementation libs.httpcomponents.client - - testImplementation libs.junitJupiter - testImplementation libs.assertj - testImplementation libs.wiremock } java { diff --git a/micrometer-jetty12/src/main/java/io/micrometer/jetty12/client/DefaultJettyClientObservationConvention.java b/micrometer-jetty12/src/main/java/io/micrometer/jetty12/client/DefaultJettyClientObservationConvention.java index c8bb5c6983..ed17eff145 100644 --- a/micrometer-jetty12/src/main/java/io/micrometer/jetty12/client/DefaultJettyClientObservationConvention.java +++ b/micrometer-jetty12/src/main/java/io/micrometer/jetty12/client/DefaultJettyClientObservationConvention.java @@ -26,7 +26,7 @@ */ public class DefaultJettyClientObservationConvention implements JettyClientObservationConvention { - public static DefaultJettyClientObservationConvention INSTANCE = new DefaultJettyClientObservationConvention(); + public static final DefaultJettyClientObservationConvention INSTANCE = new DefaultJettyClientObservationConvention(); @Override public KeyValues getLowCardinalityKeyValues(JettyClientContext context) { diff --git a/micrometer-jetty12/src/main/java/io/micrometer/jetty12/client/JettyClientTags.java b/micrometer-jetty12/src/main/java/io/micrometer/jetty12/client/JettyClientTags.java index c62a1b1e13..6cf5ed7fc6 100644 --- a/micrometer-jetty12/src/main/java/io/micrometer/jetty12/client/JettyClientTags.java +++ b/micrometer-jetty12/src/main/java/io/micrometer/jetty12/client/JettyClientTags.java @@ -69,7 +69,6 @@ public static Tag method(Request request) { * {@code request}. * @param request the request * @return the host tag derived from request - * @since 1.7.0 */ public static Tag host(Request request) { return (request != null) ? Tag.of("host", request.getHost()) : HOST_UNKNOWN; diff --git a/micrometer-jetty12/src/test/java/io/micrometer/jetty12/client/Jetty12ClientTimingInstrumentationVerificationTests.java b/micrometer-jetty12/src/test/java/io/micrometer/jetty12/client/Jetty12ClientTimingInstrumentationVerificationTests.java index 14e57c21df..4d5af4cfe4 100644 --- a/micrometer-jetty12/src/test/java/io/micrometer/jetty12/client/Jetty12ClientTimingInstrumentationVerificationTests.java +++ b/micrometer-jetty12/src/test/java/io/micrometer/jetty12/client/Jetty12ClientTimingInstrumentationVerificationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 VMware, Inc. + * Copyright 2024 VMware, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/micrometer-jetty12/src/test/java/io/micrometer/jetty12/client/JettyClientMetricsTest.java b/micrometer-jetty12/src/test/java/io/micrometer/jetty12/client/JettyClientMetricsTest.java index 02213b482b..18bd805d9e 100644 --- a/micrometer-jetty12/src/test/java/io/micrometer/jetty12/client/JettyClientMetricsTest.java +++ b/micrometer-jetty12/src/test/java/io/micrometer/jetty12/client/JettyClientMetricsTest.java @@ -57,7 +57,6 @@ public void lifeCycleStopped(LifeCycle event) { }); httpClient.start(); - } protected void addInstrumentingListener() {