Merge branch '1.13.x' into 1.14.x

micrometer-metrics · Dec 10, 2024 · 6633939 · 6633939
2 parents 4f534a7 + 0fcfffa
commit 6633939
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/docs/modules/ROOT/pages/concepts/counters.adoc b/docs/modules/ROOT/pages/concepts/counters.adoc
@@ -124,6 +124,8 @@ include::{include-java}/metrics/CountedAspectTest.java[tags=example_value_spel,i
 include::{include-java}/metrics/CountedAspectTest.java[tags=example_multi_annotations,indent=0]
 -----
 
+NOTE: `CountedAspect` doesn't support meta-annotations with `@Counted`.
+
 == Function-tracking Counters
 
 Micrometer also provides a more infrequently used counter pattern that tracks a monotonically increasing function (a function that stays the same or increases over time but never decreases). Some monitoring systems, such as Prometheus, push cumulative values for counters to the backend, but others publish the rate at which a counter is incrementing over the push interval. By employing this pattern, you let the Micrometer implementation for your monitoring system choose whether to rate-normalize the counter, and your counter remains portable across different types of monitoring systems.

diff --git a/docs/modules/ROOT/pages/concepts/timers.adoc b/docs/modules/ROOT/pages/concepts/timers.adoc
@@ -114,6 +114,8 @@ public class ExampleService {
 }
 ----
 
+NOTE: `TimedAspect` doesn't support meta-annotations with `@Timed`.
+
 === @MeterTag on Method Parameters
 
 To support using the `@MeterTag` annotation on method parameters, you need to configure the `@TimedAspect` to add the `MeterTagAnnotationHandler`.
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,6 +114,8 @@ public class ExampleService { @@
     }
     ----
+    NOTE: `TimedAspect` doesn't support meta-annotations with `@Timed`.
     === @MeterTag on Method Parameters
     To support using the `@MeterTag` annotation on method parameters, you need to configure the `@TimedAspect` to add the `MeterTagAnnotationHandler`.
@@ Expand Down @@