Skip to content

Commit 315a851

Browse files
Merge branch '1.14.x' into 1.15.x
2 parents 0bfe23b + 17ff40b commit 315a851

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ subprojects {
8383
"InlineFormatString",
8484
"LongDoubleConversion",
8585
"MissingOverride",
86-
"StringCaseLocaleUsage"
86+
"StringCaseLocaleUsage",
87+
"StringSplitter"
8788
)
8889
options.errorprone.disable(
8990
"StringConcatToTextBlock" // Requires JDK 15+

implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/v2/DynatraceExporterV2Test.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,14 +1120,14 @@ public DynatraceApiVersion apiVersion() {
11201120
private String extractBase(String line) {
11211121
if (line.startsWith("#"))
11221122
return String.join(" ", Arrays.copyOfRange(line.split(" ", 3), 0, 2));
1123-
return line.split(",", 2)[0] + " " + line.split(" ")[1]
1124-
+ (line.split(" ").length == 3 ? " " + line.split(" ")[2] : "");
1123+
String[] parts = line.split(" ", -1);
1124+
return line.split(",", 2)[0] + " " + parts[1] + (parts.length == 3 ? " " + parts[2] : "");
11251125
}
11261126

11271127
private List<String> extractDims(String line) {
11281128
if (line.startsWith("#"))
11291129
return Arrays.asList(line.split(" ", 3)[2].split(","));
1130-
return Arrays.asList(line.split(",", 2)[1].split(" ")[0].split(","));
1130+
return Arrays.asList(line.split(",", 2)[1].split(" ", -1)[0].split(",", -1));
11311131
}
11321132

11331133
}

micrometer-core/src/main/java/io/micrometer/core/instrument/config/NamingConvention.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public String tagKey(String key) {
7373
}
7474

7575
private String toCamelCase(String value) {
76-
String[] parts = value.split("\\.");
76+
String[] parts = value.split("\\.", 0);
7777
StringBuilder conventionName = new StringBuilder(value.length());
7878
for (int i = 0; i < parts.length; i++) {
7979
String str = parts[i];

0 commit comments

Comments
 (0)