Merge branch '1.8.x' into 1.9.x

Author: jonatan-ivanov

micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/TimeWindowPercentileHistogram.java

@@ -22,6 +22,10 @@
 import java.io.PrintStream;
 
 /**
+ * <b>NOTE: This class is intended for internal use as an implementation detail. You
+ * should not compile against its API. Please contact the project maintainers if you need
+ * this as public API.</b>
+ * <p>
  * A histogram implementation that supports the computation of percentiles by Micrometer
  * for publishing to a monitoring system.
  *

micrometer-test/src/main/java/io/micrometer/core/instrument/HttpClientTimingInstrumentationVerificationTests.java

@@ -37,7 +37,7 @@
  * to receive real requests from an instrumented HTTP client.
  */
 @WireMockTest
-@Incubating(since = "1.9.2")
+@Incubating(since = "1.8.8")
 public abstract class HttpClientTimingInstrumentationVerificationTests extends InstrumentationVerificationTests {
 
     /**

micrometer-test/src/main/java/io/micrometer/core/instrument/InstrumentationVerificationTests.java

@@ -21,6 +21,10 @@ abstract class InstrumentationVerificationTests {
 
     private final MeterRegistry registry = new SimpleMeterRegistry();
 
+    /**
+     * {@link MeterRegistry} to use for instrumentation verification tests.
+     * @return registry to use
+     */
     protected MeterRegistry getRegistry() {
         return registry;
     }

micrometer-test/src/test/java/io/micrometer/core/instrument/JettyClientTimingInstrumentationVerificationTests.java

@@ -26,6 +26,8 @@
 
 class JettyClientTimingInstrumentationVerificationTests extends HttpClientTimingInstrumentationVerificationTests {
 
+    private static final String HEADER_URI_PATTERN = "URI_PATTERN";
+
     private final HttpClient httpClient = new HttpClient();
 
     @Override
@@ -36,7 +38,7 @@ protected String timerName() {
     @BeforeEach
     void setup() throws Exception {
         httpClient.getRequestListeners().add(JettyClientMetrics
-                .builder(getRegistry(), result -> result.getRequest().getHeaders().get("URI_PATTERN")).build());
+                .builder(getRegistry(), result -> result.getRequest().getHeaders().get(HEADER_URI_PATTERN)).build());
         httpClient.start();
     }
 
@@ -45,7 +47,7 @@ protected void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI bas
             String... pathVariables) {
         try {
             Request request = httpClient.newRequest(baseUri + substitutePathVariables(templatedPath, pathVariables))
-                    .method(method.name()).header("URI_PATTERN", templatedPath);
+                    .method(method.name()).header(HEADER_URI_PATTERN, templatedPath);
             if (body != null) {
                 request.content(new BytesContentProvider(body));
             }