Add ID to filter 'configure'

micrometer-metrics · Nov 3, 2017 · fc53c0c · fc53c0c
1 parent 67240da
commit fc53c0c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/MeterFilter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/MeterFilter.java
@@ -56,10 +56,12 @@ default Meter.Id map(Meter.Id id) {
      * This is only called when filtering new timers and distribution summaries (i.e. those meter types
      * that use {@link HistogramConfig}).
      *
+     *
+     * @param id Id with {@link MeterFilter#map} transformations applied.
      * @param config A histogram configuration guaranteed to be non-null.
      * @return Overrides to any part of the histogram config, when applicable.
      */
-    default HistogramConfig configure(HistogramConfig config) {
+    default HistogramConfig configure(Meter.Id id, HistogramConfig config) {
         return config;
     }
 
@@ -142,4 +144,4 @@ public MeterFilterReply accept(Meter.Id id) {
     static MeterFilter denyNameStartsWith(String prefix) {
         return deny(id -> id.getName().startsWith(prefix));
     }
-}
+}
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/MeterRegistry.java
@@ -628,7 +628,7 @@ private <M extends Meter> M registerMeterIfNecessary(Class<M> meterClass, Meter.
         HistogramConfig mappedConfig = config;
         if (mappedConfig != null) {
             for (MeterFilter filter : filters) {
-                mappedConfig = filter.configure(mappedConfig);
+                mappedConfig = filter.configure(mappedId, mappedConfig);
             }
         }
 

diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterRegistryTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterRegistryTest.java
@@ -59,7 +59,7 @@ protected Timer newTimer(Meter.Id id, HistogramConfig histogramConfig) {
 
         registry.config().meterFilter(new MeterFilter() {
             @Override
-            public HistogramConfig configure(HistogramConfig config) {
+            public HistogramConfig configure(Meter.Id mappedId, HistogramConfig config) {
                 return HistogramConfig.builder()
                     .percentilesHistogram(true)
                     .build()
@@ -69,4 +69,4 @@ public HistogramConfig configure(HistogramConfig config) {
 
         registry.timer("my.timer");
     }
-}
+}