From d90c3e9221b70ab8f04bd8c2e2e85e011385c3f2 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sun, 22 Dec 2024 12:32:02 +0900 Subject: [PATCH] Suppress deprecations on AggregationTemporality.toOtlpAggregationTemporality() See gh-5733 --- .../java/io/micrometer/registry/otlp/OtlpMetricConverter.java | 1 + .../io/micrometer/registry/otlp/OtlpMeterRegistryTest.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMetricConverter.java b/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMetricConverter.java index d8b70d045e..8959eaf27b 100644 --- a/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMetricConverter.java +++ b/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMetricConverter.java @@ -56,6 +56,7 @@ class OtlpMetricConverter { private final long deltaTimeUnixNano; + @SuppressWarnings("deprecation") OtlpMetricConverter(Clock clock, Duration step, TimeUnit baseTimeUnit, AggregationTemporality aggregationTemporality, NamingConvention namingConvention) { this.clock = clock; diff --git a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpMeterRegistryTest.java b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpMeterRegistryTest.java index e6970ba0de..7dd54b45ac 100644 --- a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpMeterRegistryTest.java +++ b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpMeterRegistryTest.java @@ -172,6 +172,7 @@ void distributionWithPercentileShouldWriteSummary() { assertThat(writeToMetric(ds).getDataCase().getNumber()).isEqualTo(Metric.DataCase.SUMMARY.getNumber()); } + @SuppressWarnings("deprecation") @Test void multipleMetricsWithSameMetaDataShouldBeSingleMetric() { Tags firstTag = Tags.of("key", "first"); @@ -333,6 +334,7 @@ protected void stepOverNStep(int numStepsToSkip) { clock.addSeconds(otlpConfig().step().getSeconds() * numStepsToSkip); } + @SuppressWarnings("deprecation") protected void assertHistogram(Metric metric, long startTime, long endTime, String unit, long count, double sum, double max) { assertThat(metric.getHistogram().getAggregationTemporality()) @@ -361,6 +363,7 @@ protected void assertHistogram(Metric metric, long startTime, long endTime, Stri } } + @SuppressWarnings("deprecation") protected void assertSum(Metric metric, long startTime, long endTime, double expectedValue) { NumberDataPoint sumDataPoint = metric.getSum().getDataPoints(0); assertThat(metric.getName()).isEqualTo(METER_NAME);