Change lookup logic without making it customizable

Author: shakuzen

Diff for: implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpConfig.java

@@ -230,17 +230,16 @@ default HistogramFlavor histogramFlavor() {
 
     /**
      * Configures the histogram flavor mapping to use on a per-meter level. This can
-     * override the {@link #histogramFlavor()} configuration for matching Meters. By
-     * default, {@link OtlpMeterRegistry} (through
-     * {@link io.micrometer.registry.otlp.OtlpMeterRegistry.HistogramFlavorPerMeterLookup})
-     * uses the result of this method to look up the {@link HistogramFlavor} by
-     * {@link Meter.Id} (prefix match on the Meter's name by default). This means that
-     * this method provides the data while
-     * {@link io.micrometer.registry.otlp.OtlpMeterRegistry.HistogramFlavorPerMeterLookup}
-     * provides the logic for the lookup, and you can override them independently.
-     * @return mapping of meter name to histogram flavor
+     * override the {@link #histogramFlavor()} configuration for matching Meters.
+     * {@link OtlpMeterRegistry} uses the result of this method to look up the
+     * {@link HistogramFlavor} by {@link Meter.Id}. The longest dot-separated match wins.
+     * For example, if the returned Map has keys {@literal http} and
+     * {@literal http.server}, an ID with a name {@literal http.server.requests} would
+     * match with the entry having key {@literal http.server}, whereas an ID with name
+     * {@literal http.client.requests} would match with the entry having the key
+     * {@literal http}.
+     * @return mapping of meter name (or prefix) to histogram flavor
      * @since 1.15.0
-     * @see io.micrometer.registry.otlp.OtlpMeterRegistry.HistogramFlavorPerMeterLookup
      * @see #histogramFlavor()
      */
     default Map<String, HistogramFlavor> histogramFlavorPerMeter() {
@@ -275,19 +274,16 @@ default int maxBucketCount() {
 
     /**
      * Configures the max bucket count mapping to use on a per-meter level. This can
-     * override the {@link #maxBucketCount()} configuration for matching Meters. By
-     * default, {@link OtlpMeterRegistry} (through
-     * {@link io.micrometer.registry.otlp.OtlpMeterRegistry.MaxBucketsPerMeterLookup})
-     * uses the result of this method to look up the max bucket count by {@link Meter.Id}
-     * (prefix match on the Meter's name by default). This means that this method provides
-     * the data while
-     * {@link io.micrometer.registry.otlp.OtlpMeterRegistry.MaxBucketsPerMeterLookup}
-     * provides the logic for the lookup, and you can override them independently. This
-     * has no effect on a meter if it does not have an exponential bucket histogram
-     * configured.
+     * override the {@link #maxBucketCount()} configuration for matching Meters.
+     * {@link OtlpMeterRegistry} uses the result of this method to look up the max bucket
+     * count by {@link Meter.Id}. The longest dot-separated match wins. For example, if
+     * the returned Map has keys {@literal http} and {@literal http.server}, an ID with a
+     * name {@literal http.server.requests} would match with the entry having key
+     * {@literal http.server}, whereas an ID with name {@literal http.client.requests}
+     * would match with the entry having the key {@literal http}. This has no effect on a
+     * meter if it does not have an exponential bucket histogram configured.
      * @return mapping of meter name to max bucket count
      * @since 1.15.0
-     * @see io.micrometer.registry.otlp.OtlpMeterRegistry.MaxBucketsPerMeterLookup
      * @see #maxBucketCount()
      */
     default Map<String, Integer> maxBucketsPerMeter() {

Diff for: implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMeterRegistry.java

@@ -116,19 +116,17 @@ public OtlpMeterRegistry(OtlpConfig config, Clock clock) {
      * @since 1.14.0
      */
     public OtlpMeterRegistry(OtlpConfig config, Clock clock, ThreadFactory threadFactory) {
-        this(config, clock, threadFactory, new OtlpHttpMetricsSender(new HttpUrlConnectionSender()),
-                HistogramFlavorPerMeterLookup.DEFAULT, MaxBucketsPerMeterLookup.DEFAULT);
+        this(config, clock, threadFactory, new OtlpHttpMetricsSender(new HttpUrlConnectionSender()));
     }
 
     private OtlpMeterRegistry(OtlpConfig config, Clock clock, ThreadFactory threadFactory,
-            OtlpMetricsSender metricsSender, HistogramFlavorPerMeterLookup histogramFlavorPerMeterLookup,
-            MaxBucketsPerMeterLookup maxBucketsPerMeterLookup) {
+            OtlpMetricsSender metricsSender) {
         super(config, clock);
         this.config = config;
         this.baseTimeUnit = config.baseTimeUnit();
         this.metricsSender = metricsSender;
-        this.histogramFlavorPerMeterLookup = histogramFlavorPerMeterLookup;
-        this.maxBucketsPerMeterLookup = maxBucketsPerMeterLookup;
+        this.histogramFlavorPerMeterLookup = HistogramFlavorPerMeterLookup.DEFAULT;
+        this.maxBucketsPerMeterLookup = MaxBucketsPerMeterLookup.DEFAULT;
         this.resource = Resource.newBuilder().addAllAttributes(getResourceAttributes()).build();
         this.aggregationTemporality = config.aggregationTemporality();
         config().namingConvention(NamingConvention.dot);
@@ -510,11 +508,10 @@ static double[] getSloWithPositiveInf(DistributionStatisticConfig distributionSt
 
     /**
      * Overridable lookup mechanism for {@link HistogramFlavor}.
-     *
-     * @since 1.15.0
      */
+    // VisibleForTesting
     @FunctionalInterface
-    public interface HistogramFlavorPerMeterLookup {
+    interface HistogramFlavorPerMeterLookup {
 
         /**
          * Default implementation.
@@ -542,11 +539,10 @@ public interface HistogramFlavorPerMeterLookup {
     /**
      * Overridable lookup mechanism for max bucket count. This has no effect on a meter if
      * it does not have an exponential bucket histogram configured.
-     *
-     * @since 1.15.0
      */
+    // VisibleForTesting
     @FunctionalInterface
-    public interface MaxBucketsPerMeterLookup {
+    interface MaxBucketsPerMeterLookup {
 
         /**
          * Default implementation.
@@ -610,15 +606,9 @@ public static class Builder {
 
         private OtlpMetricsSender metricsSender;
 
-        private HistogramFlavorPerMeterLookup histogramFlavorPerMeterLookup;
-
-        private MaxBucketsPerMeterLookup maxBucketsPerMeterLookup;
-
         private Builder(OtlpConfig otlpConfig) {
             this.otlpConfig = otlpConfig;
             this.metricsSender = new OtlpHttpMetricsSender(new HttpUrlConnectionSender());
-            this.histogramFlavorPerMeterLookup = HistogramFlavorPerMeterLookup.DEFAULT;
-            this.maxBucketsPerMeterLookup = MaxBucketsPerMeterLookup.DEFAULT;
         }
 
         /** Override the default clock. */
@@ -644,43 +634,8 @@ public Builder metricsSender(OtlpMetricsSender metricsSender) {
             return this;
         }
 
-        /**
-         * Override the default matching behavior to use with
-         * {@link OtlpConfig#histogramFlavorPerMeter()}. The default behavior is longest
-         * dot-separated match wins. For example, if
-         * {@link OtlpConfig#histogramFlavorPerMeter()} has keys {@literal http} and
-         * {@literal http.server}, an ID with a name {@literal http.server.requests} would
-         * match with the entry having key {@literal http.server}, whereas an ID with name
-         * {@literal http.client.requests} would match with the entry having the key
-         * {@literal http}.
-         *
-         * @see OtlpConfig#histogramFlavorPerMeter()
-         */
-        public Builder histogramFlavorPerMeterLookup(HistogramFlavorPerMeterLookup histogramFlavorPerMeterLookup) {
-            this.histogramFlavorPerMeterLookup = histogramFlavorPerMeterLookup;
-            return this;
-        }
-
-        /**
-         * Override the default matching behavior to use with
-         * {@link OtlpConfig#maxBucketsPerMeter()}. The default behavior is longest
-         * dot-separated match wins. For example, if
-         * {@link OtlpConfig#maxBucketsPerMeter()} has keys {@literal http} and
-         * {@literal http.server}, an ID with a name {@literal http.server.requests} would
-         * match with the entry having key {@literal http.server}, whereas an ID with name
-         * {@literal http.client.requests} would match with the entry having the key
-         * {@literal http}.
-         *
-         * @see OtlpConfig#maxBucketsPerMeter()
-         */
-        public Builder maxBucketsPerMeterLookup(MaxBucketsPerMeterLookup maxBucketsPerMeterLookup) {
-            this.maxBucketsPerMeterLookup = maxBucketsPerMeterLookup;
-            return this;
-        }
-
         public OtlpMeterRegistry build() {
-            return new OtlpMeterRegistry(otlpConfig, clock, threadFactory, metricsSender, histogramFlavorPerMeterLookup,
-                    maxBucketsPerMeterLookup);
+            return new OtlpMeterRegistry(otlpConfig, clock, threadFactory, metricsSender);
         }
 
     }