Merge branch '1.15.x'

Author: shakuzen

build.gradle

@@ -89,8 +89,11 @@ subprojects {
                 error(
                     "AttemptedNegativeZero",
                     "BadImport",
+                    "CatchAndPrintStackTrace",
                     "ClassCanBeStatic",
+                    "CollectionUndefinedEquality",
                     "DefaultCharset",
+                    "DoNotCallSuggester",
                     "EqualsGetClass",
                     "InlineFormatString",
                     "LongDoubleConversion",

implementations/micrometer-registry-influx/src/main/java/io/micrometer/influx/InfluxNamingConvention.java

@@ -48,7 +48,7 @@ public InfluxNamingConvention(NamingConvention delegate) {
 
     @Override
     public String name(String name, Meter.Type type, @Nullable String baseUnit) {
-        return escape(delegate.name(name, type, baseUnit).replace("=", "_"));
+        return escape(delegate.name(name, type, baseUnit).replace('=', '_'));
     }
 
     @Override

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmThreadMetrics.java

@@ -102,7 +102,7 @@ static long getThreadStateCount(ThreadMXBean threadBean, Thread.State state) {
     }
 
     private static String getStateTagValue(Thread.State state) {
-        return state.name().toLowerCase(Locale.ROOT).replace("_", "-");
+        return state.name().toLowerCase(Locale.ROOT).replace('_', '-');
     }
 
 }

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaConsumerMetrics.java

@@ -428,7 +428,7 @@ private Iterable<Tag> nameTag(ObjectName name) {
     }
 
     private static String sanitize(String value) {
-        return value.replaceAll("-", ".");
+        return value.replace('-', '.');
     }
 
     @Override

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaMetrics.java

@@ -338,7 +338,7 @@ private double toDouble(@Nullable Metric metric) {
 
     private List<Tag> meterTags(MetricName metricName, boolean includeCommonTags) {
         List<Tag> tags = new ArrayList<>();
-        metricName.tags().forEach((key, value) -> tags.add(Tag.of(key.replaceAll("-", "."), value)));
+        metricName.tags().forEach((key, value) -> tags.add(Tag.of(key.replace('-', '.'), value)));
         tags.add(Tag.of(KAFKA_VERSION_TAG_NAME, kafkaVersion));
         extraTags.forEach(tags::add);
         if (includeCommonTags && commonTags != null) {
@@ -353,7 +353,7 @@ private List<Tag> meterTags(MetricName metricName) {
 
     private String meterName(MetricName metricName) {
         String name = METRIC_NAME_PREFIX + metricName.group() + "." + metricName.name();
-        return name.replaceAll("-metrics", "").replaceAll("-", ".");
+        return name.replaceAll("-metrics", "").replace('-', '.');
     }
 
     private Meter.Id meterIdForComparison(MetricName metricName) {

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/tomcat/TomcatMetrics.java

@@ -383,7 +383,7 @@ private long safeLong(Callable<Object> callable) {
     private Iterable<Tag> nameTag(ObjectName name) {
         String nameTagValue = name.getKeyProperty("name");
         if (nameTagValue != null) {
-            return Tags.of("name", nameTagValue.replaceAll("\"", ""));
+            return Tags.of("name", nameTagValue.replace("\"", ""));
         }
         return Collections.emptyList();
     }

micrometer-core/src/main/java/io/micrometer/core/instrument/util/HierarchicalNameMapper.java

@@ -36,7 +36,7 @@ public interface HierarchicalNameMapper {
             convention) -> id.getConventionName(convention) + id.getConventionTags(convention)
                 .stream()
                 .map(t -> "." + t.getKey() + "." + t.getValue())
-                .map(nameSegment -> nameSegment.replace(" ", "_"))
+                .map(nameSegment -> nameSegment.replace(' ', '_'))
                 .collect(Collectors.joining(""));
 
     String toHierarchicalName(Meter.Id id, NamingConvention convention);

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/grpc/GrpcAsyncTest.java

@@ -119,6 +119,7 @@ void simulate_trace_in_async_requests() {
         assertThat(futures).allSatisfy((future) -> {
             // Make sure the request-id in the response message matches with the one sent
             // to server.
+            @SuppressWarnings("CollectionUndefinedEquality")
             String expectedRequestId = requestIds.get(future);
             assertThat(future.get().getResponseMessage()).contains("request-id=" + expectedRequestId);
         });

samples/micrometer-samples-core/src/main/java/io/micrometer/core/samples/utils/SampleRegistries.java

@@ -67,6 +67,7 @@
 
 public class SampleRegistries {
 
+    @SuppressWarnings("DoNotCallSuggester")
     public static MeterRegistry pickOne() {
         throw new RuntimeException(
                 "Pick some other method on SampleRegistries to ship sample metrics to the system of your choice");