Merge branch '1.13.x' into 1.14.x

Author: shakuzen

micrometer-core/src/main/java/io/micrometer/core/aop/CountedAspect.java

@@ -15,6 +15,7 @@
  */
 package io.micrometer.core.aop;
 
+import io.micrometer.common.KeyValue;
 import io.micrometer.common.lang.NonNullApi;
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
@@ -83,7 +84,7 @@ public class CountedAspect {
 
     private static final Predicate<ProceedingJoinPoint> DONT_SKIP_ANYTHING = pjp -> false;
 
-    public final String DEFAULT_EXCEPTION_TAG_VALUE = "none";
+    public final String DEFAULT_EXCEPTION_TAG_VALUE = KeyValue.NONE_VALUE;
 
     public final String RESULT_TAG_FAILURE_VALUE = "failure";
 

micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java

@@ -15,6 +15,7 @@
  */
 package io.micrometer.core.aop;
 
+import io.micrometer.common.KeyValue;
 import io.micrometer.common.lang.NonNullApi;
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
@@ -96,7 +97,7 @@ public class TimedAspect {
 
     public static final String DEFAULT_METRIC_NAME = "method.timed";
 
-    public static final String DEFAULT_EXCEPTION_TAG_VALUE = "none";
+    public static final String DEFAULT_EXCEPTION_TAG_VALUE = KeyValue.NONE_VALUE;
 
     /**
      * Tag key for an exception.

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2Metrics.java

@@ -15,6 +15,7 @@
  */
 package io.micrometer.core.instrument.binder.commonspool2;
 
+import io.micrometer.common.KeyValue;
 import io.micrometer.common.lang.NonNull;
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.common.util.internal.logging.InternalLogger;
@@ -129,17 +130,18 @@ public void bindTo(@NonNull MeterRegistry registry) {
 
     private Iterable<Tag> nameTag(ObjectName name, String type)
             throws AttributeNotFoundException, MBeanException, ReflectionException, InstanceNotFoundException {
-        return Tags.of("name", name.getKeyProperty("name"), "type", type, "factoryType", getFactoryType(name, type));
+        return Tags.of("name", name.getKeyProperty("name"), "type", type, "factoryType",
+                getFactoryTypeTagValue(name, type));
     }
 
-    private String getFactoryType(ObjectName name, String type)
+    private String getFactoryTypeTagValue(ObjectName name, String type)
             throws ReflectionException, AttributeNotFoundException, InstanceNotFoundException, MBeanException {
         if (Objects.equals(type, "GenericObjectPool")) {
             // for GenericObjectPool, we want to include the name and factoryType as tags
             return mBeanServer.getAttribute(name, "FactoryType").toString();
         }
         else {
-            return "none";
+            return KeyValue.NONE_VALUE;
         }
     }
 

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/db/JooqExecuteListener.java

@@ -15,6 +15,7 @@
  */
 package io.micrometer.core.instrument.binder.db;
 
+import io.micrometer.common.KeyValue;
 import io.micrometer.common.util.StringUtils;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
@@ -84,8 +85,8 @@ private void stopTimerIfStillRunning(ExecuteContext ctx) {
         if (sample == null)
             return;
 
-        String exceptionName = "none";
-        String exceptionSubclass = "none";
+        String exceptionName = KeyValue.NONE_VALUE;
+        String exceptionSubclass = KeyValue.NONE_VALUE;
 
         Exception exception = ctx.exception();
         if (exception != null) {
@@ -94,7 +95,7 @@ private void stopTimerIfStillRunning(ExecuteContext ctx) {
                 exceptionName = dae.sqlStateClass().name().toLowerCase().replace('_', ' ');
                 exceptionSubclass = dae.sqlStateSubclass().name().toLowerCase().replace('_', ' ');
                 if (exceptionSubclass.contains("no subclass")) {
-                    exceptionSubclass = "none";
+                    exceptionSubclass = KeyValue.NONE_VALUE;
                 }
             }
             else {

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpMetricsEventListener.java

@@ -15,6 +15,7 @@
  */
 package io.micrometer.core.instrument.binder.okhttp3;
 
+import io.micrometer.common.KeyValue;
 import io.micrometer.common.lang.NonNullApi;
 import io.micrometer.common.lang.NonNullFields;
 import io.micrometer.common.lang.Nullable;
@@ -269,7 +270,7 @@ public static class Builder {
         private final String name;
 
         private Function<Request, String> uriMapper = (request) -> Optional.ofNullable(request.header(URI_PATTERN))
-            .orElse("none");
+            .orElse(KeyValue.NONE_VALUE);
 
         private Tags tags = Tags.empty();
 

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpObservationInterceptor.java

@@ -144,7 +144,7 @@ public static class Builder {
         private final ObservationRegistry registry;
 
         private Function<Request, String> uriMapper = (request) -> Optional.ofNullable(request.header(URI_PATTERN))
-            .orElse("none");
+            .orElse(KeyValue.NONE_VALUE);
 
         private KeyValues tags = KeyValues.empty();
 

micrometer-core/src/main/java/io/micrometer/core/instrument/observation/DefaultMeterObservationHandler.java

@@ -105,7 +105,7 @@ public void onEvent(Observation.Event event, Observation.Context context) {
 
     private String getErrorValue(Observation.Context context) {
         Throwable error = context.getError();
-        return error != null ? error.getClass().getSimpleName() : "none";
+        return error != null ? error.getClass().getSimpleName() : KeyValue.NONE_VALUE;
     }
 
     private List<Tag> createTags(Observation.Context context) {

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/kafka/KafkaMetricsTest.java

@@ -21,6 +21,8 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.core.testsupport.system.CapturedOutput;
+import io.micrometer.core.testsupport.system.OutputCaptureExtension;
 import org.apache.kafka.common.Metric;
 import org.apache.kafka.common.MetricName;
 import org.apache.kafka.common.metrics.KafkaMetric;
@@ -29,6 +31,7 @@
 import org.apache.kafka.common.utils.Time;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -42,6 +45,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@ExtendWith(OutputCaptureExtension.class)
 class KafkaMetricsTest {
 
     private KafkaMetrics kafkaMetrics;
@@ -286,7 +290,7 @@ void shouldRemoveOlderMeterWithLessTagsWhenCommonTagsConfigured() {
 
     @Issue("#2212")
     @Test
-    void shouldRemoveMeterWithLessTagsWithMultipleClients() {
+    void shouldRemoveMeterWithLessTagsWithMultipleClients(CapturedOutput output) {
         // Given
         AtomicReference<Map<MetricName, KafkaMetric>> metrics = new AtomicReference<>(new LinkedHashMap<>());
         Supplier<Map<MetricName, ? extends Metric>> supplier = () -> metrics.updateAndGet(map -> {
@@ -349,6 +353,8 @@ void shouldRemoveMeterWithLessTagsWithMultipleClients() {
         registry.getMeters()
             .forEach(meter -> assertThat(meter.getId().getTags()).extracting(Tag::getKey)
                 .containsOnly("key0", "key1", "client.id", "kafka.version"));
+
+        assertThat(output).doesNotContain("This Gauge has been already registered");
     }
 
     @Issue("#2726")

micrometer-core/src/test/java/io/micrometer/core/testsupport/system/CapturedOutput.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.micrometer.core.testsupport.system;
+
+/**
+ * Provides access to {@link System#out System.out} and {@link System#err System.err}
+ * output that has been captured by the {@link OutputCaptureExtension}. Can be used to
+ * apply assertions either using AssertJ or standard JUnit assertions. For example:
+ * <pre class="code">
+ * assertThat(output).contains("started"); // Checks all output
+ * assertThat(output.getErr()).contains("failed"); // Only checks System.err
+ * assertThat(output.getOut()).contains("ok"); // Only checks System.out
+ * </pre>
+ * <p>
+ * Copied from <a href=
+ * "https://github.com/spring-projects/spring-boot/blob/88c9ae97b5638491964537bb5b1f7dfbea1ae047/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/CapturedOutput.java">org.springframework.boot.test.system.CapturedOutput</a>
+ * in Spring Boot.
+ *
+ * @author Madhura Bhave
+ * @author Phillip Webb
+ * @author Andy Wilkinson
+ * @see OutputCaptureExtension
+ */
+public interface CapturedOutput extends CharSequence {
+
+    @Override
+    default int length() {
+        return toString().length();
+    }
+
+    @Override
+    default char charAt(int index) {
+        return toString().charAt(index);
+    }
+
+    @Override
+    default CharSequence subSequence(int start, int end) {
+        return toString().subSequence(start, end);
+    }
+
+    /**
+     * Return all content (both {@link System#out System.out} and {@link System#err
+     * System.err}) in the order that it was captured.
+     * @return all captured output
+     */
+    String getAll();
+
+    /**
+     * Return {@link System#out System.out} content in the order that it was captured.
+     * @return {@link System#out System.out} captured output
+     */
+    String getOut();
+
+    /**
+     * Return {@link System#err System.err} content in the order that it was captured.
+     * @return {@link System#err System.err} captured output
+     */
+    String getErr();
+
+}