Merge branch '1.13.x' into 1.14.x

Author: jonatan-ivanov

README.md

@@ -47,6 +47,10 @@ Note that milestone releases are for testing purposes and are not intended for p
 
 The reference documentation is managed in the [docs directory](/docs) and published to https://micrometer.io/.
 
+## Samples/Examples
+
+You can find sample/example apps in the [micrometer-samples](https://github.com/micrometer-metrics/micrometer-samples) repository.
+
 ## Contributing
 
 See our [Contributing Guide](CONTRIBUTING.md) for information about contributing to Micrometer.

docs/modules/ROOT/pages/concepts/counters.adoc

@@ -154,10 +154,10 @@ FunctionCounter counter = FunctionCounter
     .register(registry);
 ----
 
-WARNING: Attempting to construct a function-tracking counter with a primitive number or one of its `java.lang` object forms is always incorrect. These numbers are immutable. Thus, the function-tracking counter cannot ever be changed. Attempting to "re-register" the function-tracking counter with a different number does not work, as the registry maintains only one meter for each unique combination of name and tags. "Re-registering" a function-tracking counter can happen indirectly for example as the result of a `MeterFilter` modifying the name and/or the tags of two different function-tracking counter so that they will be the same after the filter is applied.
+WARNING: Attempting to construct a function-tracking counter with a primitive number or one of its `java.lang` object forms is always incorrect. These numbers are immutable. Thus, the function-tracking counter cannot ever be changed. Attempting to "re-register" the function-tracking counter with a different number does not work, as the registry maintains only one meter for each unique combination of name and tags. "Re-registering" a function-tracking counter can happen indirectly for example as the result of a `MeterFilter` modifying the name and/or the tags of two different function-tracking counters so that they will be the same after the filter is applied.
 
 Attempting to "re-register" a function-tracking counter will result in a warning like this:
 [source]
 ----
 WARNING: This FunctionCounter has been already registered (MeterId{name='my.fc', tags=[]}), the registration will be ignored. Note that subsequent logs will be logged at debug level.
-----
+----

docs/modules/ROOT/pages/concepts/timers.adoc

@@ -186,7 +186,7 @@ FunctionTimer.builder("cache.gets.latency", cache,
     .register(registry);
 ----
 
-WARNING: Attempting to construct a function-tracking timer with a primitive number or one of its `java.lang` object forms is always incorrect. These numbers are immutable. Thus, the function-tracking timer cannot ever be changed. Attempting to "re-register" the function-tracking timer with a different number does not work, as the registry maintains only one meter for each unique combination of name and tags. "Re-registering" a function-tracking timer can happen indirectly for example as the result of a `MeterFilter` modifying the name and/or the tags of two different function-tracking timer so that they will be the same after the filter is applied.
+WARNING: Attempting to construct a function-tracking timer with a primitive number or one of its `java.lang` object forms is always incorrect. These numbers are immutable. Thus, the function-tracking timer cannot ever be changed. Attempting to "re-register" the function-tracking timer with a different number does not work, as the registry maintains only one meter for each unique combination of name and tags. "Re-registering" a function-tracking timer can happen indirectly for example as the result of a `MeterFilter` modifying the name and/or the tags of two different function-tracking timers so that they will be the same after the filter is applied.
 
 Attempting to "re-register" a function-tracking timer will result in a warning like this:
 [source]

implementations/micrometer-registry-azure-monitor/src/main/java/io/micrometer/azuremonitor/AzureMonitorConfig.java

@@ -52,8 +52,8 @@ default String instrumentationKey() {
     /**
      * Connection string to use when configuring sending metrics.
      * @return Connection String
-     * @see <a
-     * href=https://learn.microsoft.com/en-us/azure/azure-monitor/app/sdk-connection-string">Connection
+     * @see <a href=
+     * "https://learn.microsoft.com/en-us/azure/azure-monitor/app/sdk-connection-string">Connection
      * strings</a>
      * @since 1.11.0
      */

implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/DynatraceMeterRegistryTest.java

@@ -79,7 +79,7 @@ void shouldSendProperRequest() throws Throwable {
 
         meterRegistry.publish();
 
-        verify(httpClient).send(assertArg((request -> {
+        verify(httpClient).send(assertArg(request -> {
             assertThat(request.getRequestHeaders()).containsOnly(entry("Content-Type", "text/plain"),
                     entry("User-Agent", "micrometer"), entry("Authorization", "Api-Token apiToken"));
 
@@ -89,7 +89,7 @@ void shouldSendProperRequest() throws Throwable {
                         "my.timer,dt.metrics.source=micrometer gauge,min=12,max=42,sum=108,count=4 " + clock.wallTime(),
                         "my.gauge,dt.metrics.source=micrometer gauge," + formatDouble(gauge) + " " + clock.wallTime(),
                         "#my.timer gauge dt.meta.unit=ms");
-        })));
+        }));
     }
 
     @Test
@@ -144,11 +144,10 @@ void shouldNotTrackPercentilesWithDynatraceSummary() throws Throwable {
 
         clock.add(config.step());
         meterRegistry.publish();
-
-        verify(httpClient).send(assertArg((request -> assertThat(request.getEntity()).asString()
+        verify(httpClient).send(assertArg(request -> assertThat(request.getEntity()).asString()
             .hasLineCount(2)
             .contains("my.timer,dt.metrics.source=micrometer gauge,min=22,max=55,sum=77,count=2 " + clock.wallTime(),
-                    "#my.timer gauge dt.meta.unit=ms"))));
+                    "#my.timer gauge dt.meta.unit=ms")));
     }
 
     @Test
@@ -204,7 +203,7 @@ void shouldTrackPercentilesWhenDynatraceSummaryInstrumentsNotUsed() throws Throw
         lttCountDownLatch2.countDown();
 
         verify(httpClient).send(
-                assertArg((request -> assertThat(request.getEntity()).asString()
+                assertArg(request -> assertThat(request.getEntity()).asString()
                     .hasLineCount(16)
                     .contains(
                             // Timer lines
@@ -238,7 +237,7 @@ void shouldTrackPercentilesWhenDynatraceSummaryInstrumentsNotUsed() throws Throw
                             "my.ltt.percentile,dt.metrics.source=micrometer,phi=0.5 gauge,100 " + clock.wallTime(),
                             "my.ltt.percentile,dt.metrics.source=micrometer,phi=0.7 gauge,100 " + clock.wallTime(),
                             "my.ltt.percentile,dt.metrics.source=micrometer,phi=0.99 gauge,100 " + clock.wallTime(),
-                            "#my.ltt.percentile gauge dt.meta.unit=ms"))));
+                            "#my.ltt.percentile gauge dt.meta.unit=ms")));
     }
 
     @Test
@@ -272,7 +271,7 @@ void shouldTrackPercentilesWhenDynatraceSummaryInstrumentsNotUsed_shouldExport0P
         registry.publish();
 
         verify(httpClient)
-            .send(assertArg((request -> assertThat(request.getEntity()).asString()
+            .send(assertArg(request -> assertThat(request.getEntity()).asString()
                 .hasLineCount(10)
                 .contains(
                         // Timer lines
@@ -292,7 +291,7 @@ void shouldTrackPercentilesWhenDynatraceSummaryInstrumentsNotUsed_shouldExport0P
                         // the step rolled over.
                         "my.ds.percentile,dt.metrics.source=micrometer,phi=0 gauge,0 " + clock.wallTime(),
                         "my.ds.percentile,dt.metrics.source=micrometer,phi=0.5 gauge,0 " + clock.wallTime(),
-                        "my.ds.percentile,dt.metrics.source=micrometer,phi=0.99 gauge,0 " + clock.wallTime()))));
+                        "my.ds.percentile,dt.metrics.source=micrometer,phi=0.99 gauge,0 " + clock.wallTime())));
     }
 
     @Test

implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMetricConverter.java

@@ -159,7 +159,7 @@ private void writeFunctionTimer(FunctionTimer functionTimer) {
         Metric.Builder builder = getOrCreateMetricBuilder(functionTimer.getId(), DataCase.HISTOGRAM);
         HistogramDataPoint.Builder histogramDataPoint = HistogramDataPoint.newBuilder()
             .addAllAttributes(getKeyValuesForId(functionTimer.getId()))
-            .setStartTimeUnixNano(getStartTimeNanos((functionTimer)))
+            .setStartTimeUnixNano(getStartTimeNanos(functionTimer))
             .setTimeUnixNano(getTimeUnixNano())
             .setSum(functionTimer.totalTime(baseTimeUnit))
             .setCount((long) functionTimer.count());

micrometer-core/src/main/java/io/micrometer/core/instrument/Meter.java

@@ -245,8 +245,7 @@ public Id withTags(Iterable<Tag> tags) {
         /**
          * Generate a new id replacing all tags with new ones.
          * @param tags The tags to add.
-         * @return A new id with the only the provided tags. The source id remains
-         * unchanged.
+         * @return A new id with only the provided tags. The source id remains unchanged.
          * @since 1.1.0
          */
         public Id replaceTags(Iterable<Tag> tags) {

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

@@ -153,7 +153,7 @@ public void bindTo(MeterRegistry registry) {
                     "Incremented for an increase in the size of the (young) heap memory pool after one GC to before the next")
             .register(registry);
 
-        promotedBytes = (isGenerationalGc) ? Counter.builder("jvm.gc.memory.promoted")
+        promotedBytes = isGenerationalGc ? Counter.builder("jvm.gc.memory.promoted")
             .tags(tags)
             .baseUnit(BaseUnits.BYTES)
             .description(

micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionTimer.java

@@ -48,7 +48,7 @@ public class StepFunctionTimer<T> implements FunctionTimer, StepMeter {
 
     private final Clock clock;
 
-    private volatile long lastUpdateTime = (long) (-2e6);
+    private volatile long lastUpdateTime = (long) -2e6;
 
     private volatile long lastCount;
 

samples/micrometer-samples-spring-framework6/src/test/java/io/micrometer/samples/spring6/aop/HighCardinalityAnnotationHandler.java

@@ -54,8 +54,8 @@ static String resolveTagValue(HighCardinality annotation, Object argument,
             Function<Class<? extends ValueExpressionResolver>, ? extends ValueExpressionResolver> expressionResolverProvider) {
         String value = null;
         if (annotation.resolver() != NoOpValueResolver.class) {
-            ValueResolver ValueResolver = resolverProvider.apply(annotation.resolver());
-            value = ValueResolver.resolve(argument);
+            ValueResolver valueResolver = resolverProvider.apply(annotation.resolver());
+            value = valueResolver.resolve(argument);
         }
         else if (StringUtils.isNotBlank(annotation.expression())) {
             value = expressionResolverProvider.apply(ValueExpressionResolver.class)