Allow users to fall back to Micrometer instruments

Author: pirgeo

implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/DynatraceConfig.java

@@ -128,6 +128,20 @@ default boolean enrichWithDynatraceMetadata() {
         return getBoolean(this, "enrichWithDynatraceMetadata").orElse(true);
     }
 
+    /**
+     * Return whether to fall back to the built-in micrometer instruments for Timer and DistributionSummary.
+     *
+     * @return {@code true} if the resetting Dynatrace instruments should be used, and false if the registry should
+     * fall back to the built-in Micrometer instruments.
+     * @since 1.9.0
+     */
+    default boolean useDynatraceSummaryInstruments() {
+        if (apiVersion() == V1) {
+            return false;
+        }
+        return getBoolean(this, "useDynatraceSummaryInstruments").orElse(true);
+    }
+
     @Override
     default Validated<?> validate() {
         return checkAll(this,

implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/DynatraceMeterRegistry.java

@@ -58,8 +58,9 @@
 public class DynatraceMeterRegistry extends StepMeterRegistry {
     private static final ThreadFactory DEFAULT_THREAD_FACTORY = new NamedThreadFactory("dynatrace-metrics-publisher");
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(DynatraceMeterRegistry.class);
-    private final DynatraceApiVersion apiVersion;
 
+    private final DynatraceApiVersion apiVersion;
+    private final boolean useDynatraceSummaryInstruments;
     private final AbstractDynatraceExporter exporter;
 
     @SuppressWarnings("deprecation")
@@ -71,6 +72,7 @@ private DynatraceMeterRegistry(DynatraceConfig config, Clock clock, ThreadFactor
         super(config, clock);
 
         apiVersion = config.apiVersion();
+        useDynatraceSummaryInstruments = config.useDynatraceSummaryInstruments();
 
         if (apiVersion == DynatraceApiVersion.V2) {
             logger.info("Exporting to Dynatrace metrics API v2");
@@ -101,15 +103,15 @@ protected TimeUnit getBaseTimeUnit() {
 
     @Override
     protected DistributionSummary newDistributionSummary(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig, double scale) {
-        if (apiVersion == DynatraceApiVersion.V2) {
+        if (apiVersion == DynatraceApiVersion.V2 && useDynatraceSummaryInstruments) {
             return new DynatraceDistributionSummary(id, clock, distributionStatisticConfig, scale);
         }
         return super.newDistributionSummary(id, distributionStatisticConfig, scale);
     }
 
     @Override
     protected Timer newTimer(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig, PauseDetector pauseDetector) {
-        if (apiVersion == DynatraceApiVersion.V2) {
+        if (apiVersion == DynatraceApiVersion.V2 && useDynatraceSummaryInstruments) {
             return new DynatraceTimer(id, clock, distributionStatisticConfig, pauseDetector, exporter.getBaseTimeUnit());
         }
         return super.newTimer(id, distributionStatisticConfig, pauseDetector);