Backport: Ensure no warnings are printed when using default settings (#…

…3155) See original commit: 24dcfa6 and PR gh-3155
micrometer-metrics · May 9, 2022 · 41ec8f2 · 41ec8f2
1 parent de70a01
commit 41ec8f2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/...eter-registry-dynatrace/src/main/java/io/micrometer/dynatrace/DynatraceMeterRegistry.java b/...eter-registry-dynatrace/src/main/java/io/micrometer/dynatrace/DynatraceMeterRegistry.java
@@ -140,6 +140,11 @@ private void registerMinPercentile() {
              */
             @Override
             public DistributionStatisticConfig configure(Meter.Id id, DistributionStatisticConfig config) {
+                if (useDynatraceSummaryInstruments && dynatraceInstrumentTypeExists(id)) {
+                    // do not add artificial 0 percentile when using Dynatrace instruments
+                    return config;
+                }
+
                 double[] percentiles;
 
                 double[] configPercentiles = config.getPercentiles();
@@ -179,6 +184,16 @@ private boolean hasArtificialZerothPercentile(Meter.Id id) {
         });
     }
 
+    private boolean dynatraceInstrumentTypeExists(Meter.Id id) {
+        switch (id.getType()) {
+        case DISTRIBUTION_SUMMARY:
+        case TIMER:
+            return true;
+        default:
+            return false;
+        }
+    }
+
     public static class Builder {
 
         private final DynatraceConfig config;

diff --git a/...y-dynatrace/src/main/java/io/micrometer/dynatrace/types/DynatraceDistributionSummary.java b/...y-dynatrace/src/main/java/io/micrometer/dynatrace/types/DynatraceDistributionSummary.java
@@ -39,16 +39,20 @@ public final class DynatraceDistributionSummary extends AbstractDistributionSumm
     // Configuration that will set the Histogram in AbstractDistributionSummary to a
     // NoopHistogram.
     private static final DistributionStatisticConfig NOOP_HISTOGRAM_CONFIG = DistributionStatisticConfig.builder()
-            .percentilesHistogram(false).percentiles().build();
+            .percentilesHistogram(false).percentiles().serviceLevelObjectives().build();
 
     private final DynatraceSummary summary = new DynatraceSummary();
 
     public DynatraceDistributionSummary(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
             double scale) {
-        super(id, clock, NOOP_HISTOGRAM_CONFIG, scale, false);
-
-        if (distributionStatisticConfig != DistributionStatisticConfig.NONE) {
-            LOGGER.warn("Distribution statistic config is currently ignored.");
+        // make sure the Histogram in AbstractDistributionSummary is always a
+        // NoopHistogram by disabling the respective config options
+        super(id, clock, distributionStatisticConfig.merge(NOOP_HISTOGRAM_CONFIG), scale, false);
+
+        if (distributionStatisticConfig.isPublishingPercentiles()
+                || distributionStatisticConfig.isPublishingHistogram()) {
+            LOGGER.warn(
+                    "Histogram config on DistributionStatisticConfig is currently ignored. Collecting summary statistics.");
         }
     }
 

diff --git a/...ometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/types/DynatraceTimer.java b/...ometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/types/DynatraceTimer.java
@@ -38,18 +38,20 @@ public final class DynatraceTimer extends AbstractTimer implements DynatraceSumm
 
     // Configuration that will set the Histogram in AbstractTimer to a NoopHistogram.
     private static final DistributionStatisticConfig NOOP_HISTOGRAM_CONFIG = DistributionStatisticConfig.builder()
-            .percentilesHistogram(false).percentiles().build();
+            .percentilesHistogram(false).percentiles().serviceLevelObjectives().build();
 
     private final DynatraceSummary summary = new DynatraceSummary();
 
     public DynatraceTimer(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
             PauseDetector pauseDetector, TimeUnit baseTimeUnit) {
         // make sure the Histogram in AbstractTimer is always a NoopHistogram by disabling
         // the respective config options
-        super(id, clock, NOOP_HISTOGRAM_CONFIG, pauseDetector, baseTimeUnit, false);
+        super(id, clock, distributionStatisticConfig.merge(NOOP_HISTOGRAM_CONFIG), pauseDetector, baseTimeUnit, false);
 
-        if (distributionStatisticConfig != DistributionStatisticConfig.NONE) {
-            LOGGER.warn("Distribution statistic config is currently ignored.");
+        if (distributionStatisticConfig.isPublishingPercentiles()
+                || distributionStatisticConfig.isPublishingHistogram()) {
+            LOGGER.warn(
+                    "Histogram config on DistributionStatisticConfig is currently ignored. Collecting summary statistics.");
         }
     }