Merge branch '1.7.x' into 1.8.x

micrometer-metrics · Jan 5, 2022 · 150f56d · 150f56d
2 parents add1583 + 988b5bd
commit 150f56d
Show file tree

Hide file tree

Showing 58 changed files with 145 additions and 151 deletions.
diff --git a/build.gradle b/build.gradle
@@ -168,7 +168,7 @@ subprojects {
             header rootProject.file('gradle/licenseHeader.txt')
             strictCheck true
             mapping {
-                kt = 'JAVADOC_STYLE'
+                java = 'SLASHSTAR_STYLE'
             }
             sourceSets = project.sourceSets
 

diff --git a/gradle/licenseHeader.txt b/gradle/licenseHeader.txt
@@ -1,11 +1,11 @@
 Copyright ${year} VMware, Inc.
-<p>
+
 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
-<p>
+
 https://www.apache.org/licenses/LICENSE-2.0
-<p>
+
 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.

diff --git a/implementations/micrometer-registry-atlas/src/test/resources/logback.xml b/implementations/micrometer-registry-atlas/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     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
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     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.

diff --git a/implementations/micrometer-registry-datadog/src/test/resources/logback.xml b/implementations/micrometer-registry-datadog/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     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
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     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.

diff --git a/...ons/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/package-info.java b/...ons/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/package-info.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 @NonNullApi
 @NonNullFields
 package io.micrometer.dynatrace;

diff --git a/implementations/micrometer-registry-graphite/src/test/resources/logback.xml b/implementations/micrometer-registry-graphite/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     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
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     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.

diff --git a/...entations/micrometer-registry-health/src/main/java/io/micrometer/health/package-info.java b/...entations/micrometer-registry-health/src/main/java/io/micrometer/health/package-info.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * SLO-based health meter registry.
  */

diff --git a/implementations/micrometer-registry-humio/src/test/resources/logback.xml b/implementations/micrometer-registry-humio/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     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
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     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.

diff --git a/implementations/micrometer-registry-statsd/src/test/resources/logback.xml b/implementations/micrometer-registry-statsd/src/test/resources/logback.xml
@@ -1,13 +1,13 @@
 <!--
 
     Copyright 2018 VMware, Inc.
-    <p>
+
     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
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     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.

diff --git a/...r-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounter.java b/...r-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounter.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.cache;
 
 import static java.util.Objects.requireNonNull;

diff --git a/...ain/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2Metrics.java b/...ain/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2Metrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Pivotal Software, Inc.
+ * Copyright 2020 VMware, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.commonspool2;
 
 import io.micrometer.core.instrument.*;

diff --git a/...n/java/io/micrometer/core/instrument/binder/grpc/AbstractMetricCollectingInterceptor.java b/...n/java/io/micrometer/core/instrument/binder/grpc/AbstractMetricCollectingInterceptor.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.grpc;
 
 import java.util.EnumMap;

diff --git a/...e/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java b/...e/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.grpc;
 
 import java.util.function.Consumer;

diff --git a/...ain/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientInterceptor.java b/...ain/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientInterceptor.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.grpc;
 
 import java.util.function.Consumer;

diff --git a/...ain/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerInterceptor.java b/...ain/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerInterceptor.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.grpc;
 
 import java.util.function.Consumer;

diff --git a/...core/src/main/java/io/micrometer/core/instrument/binder/jetty/JettyStatisticsMetrics.java b/...core/src/main/java/io/micrometer/core/instrument/binder/jetty/JettyStatisticsMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Pivotal Software, Inc.
+ * Copyright 2017 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/...ter-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaClientMetrics.java b/...ter-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaClientMetrics.java
@@ -2,7 +2,7 @@
  * Copyright 2020 VMware, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use super file except in compliance with 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

diff --git a/...er-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaStreamsMetrics.java b/...er-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaStreamsMetrics.java
@@ -1,15 +1,17 @@
 /*
  * Copyright 2020 VMware, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use super file except
- * in compliance with the License. You may obtain a copy of the License at
- * <p>
+ * 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
- * <p>
- * 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.
+ *
+ * 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.instrument.binder.kafka;
 

diff --git a/.../src/main/java/io/micrometer/core/instrument/internal/OnlyOnceLoggingDenyMeterFilter.java b/.../src/main/java/io/micrometer/core/instrument/internal/OnlyOnceLoggingDenyMeterFilter.java
@@ -5,15 +5,14 @@
  * 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
+ * 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.instrument.internal;
 
 import io.micrometer.core.instrument.Meter.Id;

diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNull.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2002-2017 the original author or authors.
  * Copyright 2017-2021 VMware, Inc.
- * <p>
+ *
  * 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
- * <p>
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * 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.

diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullApi.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2002-2017 the original author or authors.
  * Copyright 2017-2021 VMware, Inc.
- * <p>
+ *
  * 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
- * <p>
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * 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.

diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java b/micrometer-core/src/main/java/io/micrometer/core/lang/NonNullFields.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2002-2017 the original author or authors.
  * Copyright 2017-2021 VMware, Inc.
- * <p>
+ *
  * 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
- * <p>
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * 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.

diff --git a/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java b/micrometer-core/src/main/java/io/micrometer/core/lang/Nullable.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2002-2017 the original author or authors.
  * Copyright 2017-2021 VMware, Inc.
- * <p>
+ *
  * 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
- * <p>
+ *
  * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * 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.

diff --git a/...ain/resources/META-INF/native-image/io.micrometer/micrometer-core/native-image.properties b/...ain/resources/META-INF/native-image/io.micrometer/micrometer-core/native-image.properties
@@ -1,3 +1,4 @@
+#
 # Copyright 2021 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,5 +12,6 @@
 # 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.
+#
 
 Args = -H:ReflectionConfigurationResources=${.}/reflect-config.json
diff --git a/...re/src/test/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounterTest.java b/...re/src/test/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounterTest.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.micrometer.core.instrument.binder.cache;
 
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2MetricsTest.java b/...java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2MetricsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Pivotal Software, Inc.
+ * Copyright 2020 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-core/src/test/java/io/micrometer/core/instrument/util/AbstractPartitionTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/util/AbstractPartitionTest.java
@@ -1,15 +1,17 @@
 /*
  * Copyright 2019 VMware, Inc.
  *
- * 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
- * <p>
+ * 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
- * <p>
- * 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.
+ *
+ * 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.instrument.util;
 

diff --git a/micrometer-core/src/test/resources/binder/logging/log4j2-async-logger.xml b/micrometer-core/src/test/resources/binder/logging/log4j2-async-logger.xml
@@ -2,13 +2,13 @@
 <!--
 
     Copyright 2019 VMware, Inc.
-    <p>
+
     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
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     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.

diff --git a/micrometer-core/src/test/resources/binder/logging/log4j2-root-logger-additivity-false.xml b/micrometer-core/src/test/resources/binder/logging/log4j2-root-logger-additivity-false.xml
@@ -2,13 +2,13 @@
 <!--
 
     Copyright 2019 VMware, Inc.
-    <p>
+
     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
-    <p>
+
     https://www.apache.org/licenses/LICENSE-2.0
-    <p>
+
     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.