From e90c0df8d7079f5e7e1486942047bc96f2724ef3 Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Thu, 8 Sep 2022 10:05:11 -0500 Subject: [PATCH 1/2] Revert "Restore prior histogram defaults (#4717)" This reverts commit 160af1c480ff5b5fa3f8aee718c3659c6a202b76. --- sdk/metrics/build.gradle.kts | 4 +- .../ExplicitBucketHistogramUtilsTest.java | 28 ------------- .../descriptor/InstrumentDescriptorTest.java | 0 .../opentelemetry/testing/SourceInfoTest.java | 0 .../aggregator/HistogramAggregationParam.java | 2 +- .../aggregator/HistogramValueGenerator.java | 2 +- .../ExplicitBucketHistogramUtils.java | 42 +------------------ .../ExplicitBucketHistogramAggregation.java | 2 +- .../ExplicitBucketHistogramUtilsTest.java | 20 --------- 9 files changed, 7 insertions(+), 93 deletions(-) delete mode 100644 sdk/metrics/src/configurationTest/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtilsTest.java rename sdk/metrics/src/{configurationTest => debugEnabledTest}/java/io/opentelemetry/sdk/metrics/internal/descriptor/InstrumentDescriptorTest.java (100%) rename sdk/metrics/src/{configurationTest => debugEnabledTest}/java/io/opentelemetry/testing/SourceInfoTest.java (100%) delete mode 100644 sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtilsTest.java diff --git a/sdk/metrics/build.gradle.kts b/sdk/metrics/build.gradle.kts index 2994dd00cad..a9ef2556a76 100644 --- a/sdk/metrics/build.gradle.kts +++ b/sdk/metrics/build.gradle.kts @@ -32,11 +32,11 @@ dependencies { testing { suites { - val configurationTest by registering(JvmTestSuite::class) { + val debugEnabledTest by registering(JvmTestSuite::class) { targets { all { testTask.configure { - jvmArgs("-Dotel.experimental.sdk.metrics.debug=true", "-Dotel.java.histogram.legacy.buckets.enabled=true") + jvmArgs("-Dotel.experimental.sdk.metrics.debug=true") } } } diff --git a/sdk/metrics/src/configurationTest/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtilsTest.java b/sdk/metrics/src/configurationTest/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtilsTest.java deleted file mode 100644 index 26c790081ee..00000000000 --- a/sdk/metrics/src/configurationTest/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtilsTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.sdk.metrics.internal.aggregator; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.Arrays; -import org.junit.jupiter.api.Test; - -class ExplicitBucketHistogramUtilsTest { - - /** - * {@link ExplicitBucketHistogramUtils#getDefaultBucketBoundaries()} returns different values when - * {@code otel.java.histogram.legacy.buckets.enabled=true}, which is set for this test in {@code - * build.gradle.kts}. - */ - @Test - void defaultBucketBoundaries() { - assertThat(ExplicitBucketHistogramUtils.getDefaultBucketBoundaries()) - .isEqualTo( - Arrays.asList( - 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 750d, 1_000d, 2_500d, 5_000d, 7_500d, - 10_000d)); - } -} diff --git a/sdk/metrics/src/configurationTest/java/io/opentelemetry/sdk/metrics/internal/descriptor/InstrumentDescriptorTest.java b/sdk/metrics/src/debugEnabledTest/java/io/opentelemetry/sdk/metrics/internal/descriptor/InstrumentDescriptorTest.java similarity index 100% rename from sdk/metrics/src/configurationTest/java/io/opentelemetry/sdk/metrics/internal/descriptor/InstrumentDescriptorTest.java rename to sdk/metrics/src/debugEnabledTest/java/io/opentelemetry/sdk/metrics/internal/descriptor/InstrumentDescriptorTest.java diff --git a/sdk/metrics/src/configurationTest/java/io/opentelemetry/testing/SourceInfoTest.java b/sdk/metrics/src/debugEnabledTest/java/io/opentelemetry/testing/SourceInfoTest.java similarity index 100% rename from sdk/metrics/src/configurationTest/java/io/opentelemetry/testing/SourceInfoTest.java rename to sdk/metrics/src/debugEnabledTest/java/io/opentelemetry/testing/SourceInfoTest.java diff --git a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramAggregationParam.java b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramAggregationParam.java index b634027e5ea..360a0e6e407 100644 --- a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramAggregationParam.java +++ b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramAggregationParam.java @@ -15,7 +15,7 @@ public enum HistogramAggregationParam { EXPLICIT_DEFAULT_BUCKET( new DoubleExplicitBucketHistogramAggregator( ExplicitBucketHistogramUtils.createBoundaryArray( - ExplicitBucketHistogramUtils.getDefaultBucketBoundaries()), + ExplicitBucketHistogramUtils.DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES), ExemplarReservoir::doubleNoSamples)), EXPLICIT_SINGLE_BUCKET( new DoubleExplicitBucketHistogramAggregator( diff --git a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramValueGenerator.java b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramValueGenerator.java index 7100afd35b6..cbe48550dc6 100644 --- a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramValueGenerator.java +++ b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramValueGenerator.java @@ -64,7 +64,7 @@ private static double[] explicitDefaultBucketPool() { // Add minimal recording value. fixedBoundaries.add(0.0); // Add the bucket LE bucket boundaries (starts at 5). - fixedBoundaries.addAll(ExplicitBucketHistogramUtils.getDefaultBucketBoundaries()); + fixedBoundaries.addAll(ExplicitBucketHistogramUtils.DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES); // Add Double max value as our other extreme. fixedBoundaries.add(Double.MAX_VALUE); return ExplicitBucketHistogramUtils.createBoundaryArray(fixedBoundaries); diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtils.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtils.java index ec2ac955c8a..93958461736 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtils.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtils.java @@ -8,9 +8,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Locale; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Utilities for interacting with explicit bucket histograms. @@ -19,46 +16,11 @@ * at any time. */ public final class ExplicitBucketHistogramUtils { + private ExplicitBucketHistogramUtils() {} - private static final Logger logger = - Logger.getLogger(ExplicitBucketHistogramUtils.class.getName()); - private static final String LEGACY_BUCKETS_ENABLED = "otel.java.histogram.legacy.buckets.enabled"; - private static final List DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES = + public static final List DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES = Collections.unmodifiableList( Arrays.asList(0d, 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 1_000d)); - private static final List LEGACY_HISTOGRAM_BUCKET_BOUNDARIES = - Collections.unmodifiableList( - Arrays.asList( - 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 750d, 1_000d, 2_500d, 5_000d, 7_500d, - 10_000d)); - - private static final List defaultBucketBoundaries; - - static { - // TODO: remove support for configuring legacy bucket boundaries after 1.24.0 - boolean legacyBucketsEnabled = - Boolean.parseBoolean(System.getProperty(LEGACY_BUCKETS_ENABLED)) - || Boolean.parseBoolean( - System.getenv(LEGACY_BUCKETS_ENABLED.toUpperCase(Locale.ROOT).replace(".", "_"))); - if (legacyBucketsEnabled) { - logger.log( - Level.WARNING, - "Legacy explicit bucket histogram buckets have been enabled. Support will be removed " - + "after version 1.24.0. If you depend on the legacy bucket boundaries, please " - + "use the View API as described in " - + "https://opentelemetry.io/docs/instrumentation/java/manual/#views."); - defaultBucketBoundaries = LEGACY_HISTOGRAM_BUCKET_BOUNDARIES; - } else { - defaultBucketBoundaries = DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES; - } - } - - private ExplicitBucketHistogramUtils() {} - - /** Returns the default explicit bucket histogram bucket boundaries. */ - public static List getDefaultBucketBoundaries() { - return defaultBucketBoundaries; - } /** Converts bucket boundary "convenient" configuration into the "more efficient" array. */ public static double[] createBoundaryArray(List boundaries) { diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ExplicitBucketHistogramAggregation.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ExplicitBucketHistogramAggregation.java index e4d67af0932..1e108944aa5 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ExplicitBucketHistogramAggregation.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ExplicitBucketHistogramAggregation.java @@ -27,7 +27,7 @@ public final class ExplicitBucketHistogramAggregation implements Aggregation, Ag private static final Aggregation DEFAULT = new ExplicitBucketHistogramAggregation( - ExplicitBucketHistogramUtils.getDefaultBucketBoundaries()); + ExplicitBucketHistogramUtils.DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES); public static Aggregation getDefault() { return DEFAULT; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtilsTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtilsTest.java deleted file mode 100644 index 1b641d06a26..00000000000 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtilsTest.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.sdk.metrics.internal.aggregator; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.Arrays; -import org.junit.jupiter.api.Test; - -class ExplicitBucketHistogramUtilsTest { - - @Test - void defaultBucketBoundaries() { - assertThat(ExplicitBucketHistogramUtils.getDefaultBucketBoundaries()) - .isEqualTo(Arrays.asList(0d, 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 1_000d)); - } -} From 449d69d20af7083c7c0ab97f8ac47ac88818cabc Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Thu, 8 Sep 2022 10:05:24 -0500 Subject: [PATCH 2/2] Revert "Update bucket hist defaults to match spec (#4684)" This reverts commit 84456420526af75ad4ce452266c967fa01af87f4. --- .../ExplicitBucketHistogramUtils.java | 4 ++- .../sdk/metrics/SdkDoubleHistogramTest.java | 30 ++++++++++++------- .../sdk/metrics/SdkLongHistogramTest.java | 30 ++++++++++++------- .../sdk/metrics/SdkMeterProviderTest.java | 6 ++-- 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtils.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtils.java index 93958461736..c0e0123f054 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtils.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/ExplicitBucketHistogramUtils.java @@ -20,7 +20,9 @@ private ExplicitBucketHistogramUtils() {} public static final List DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES = Collections.unmodifiableList( - Arrays.asList(0d, 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 1_000d)); + Arrays.asList( + 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 750d, 1_000d, 2_500d, 5_000d, 7_500d, + 10_000d)); /** Converts bucket boundary "convenient" configuration into the "more efficient" array. */ public static double[] createBoundaryArray(List boundaries) { diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogramTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogramTest.java index 1f3e628b5d2..9d81e469881 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogramTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogramTest.java @@ -112,8 +112,10 @@ void collectMetrics_WithEmptyAttributes() { .hasCount(2) .hasSum(24) .hasBucketBoundaries( - 0, 5, 10, 25, 50, 75, 100, 250, 500, 1_000) - .hasBucketCounts(0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0)))); + 5, 10, 25, 50, 75, 100, 250, 500, 750, 1_000, 2_500, + 5_000, 7_500, 10_000) + .hasBucketCounts( + 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)))); } @Test @@ -147,7 +149,8 @@ void collectMetrics_WithMultipleCollects() { .hasEpochNanos(testClock.now()) .hasCount(3) .hasSum(566.3d) - .hasBucketCounts(0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0) + .hasBucketCounts( + 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry("K", "V")), point -> point @@ -155,7 +158,8 @@ void collectMetrics_WithMultipleCollects() { .hasEpochNanos(testClock.now()) .hasCount(2) .hasSum(22.2d) - .hasBucketCounts(0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(Attributes.empty())))); // Histograms are cumulative by default. @@ -178,7 +182,8 @@ void collectMetrics_WithMultipleCollects() { .hasEpochNanos(testClock.now()) .hasCount(4) .hasSum(788.3) - .hasBucketCounts(0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0) + .hasBucketCounts( + 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry("K", "V")), point -> point @@ -186,7 +191,8 @@ void collectMetrics_WithMultipleCollects() { .hasEpochNanos(testClock.now()) .hasCount(3) .hasSum(39.2) - .hasBucketCounts(0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(Attributes.empty())))); } finally { bound.unbind(); @@ -380,7 +386,8 @@ void stressTest_WithDifferentLabelSet() { .hasEpochNanos(testClock.now()) .hasCount(4_000) .hasSum(40_000) - .hasBucketCounts(0, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[0], values[0])), point -> point @@ -388,7 +395,8 @@ void stressTest_WithDifferentLabelSet() { .hasEpochNanos(testClock.now()) .hasCount(4_000) .hasSum(40_000) - .hasBucketCounts(0, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[1], values[1])), point -> point @@ -396,7 +404,8 @@ void stressTest_WithDifferentLabelSet() { .hasEpochNanos(testClock.now()) .hasCount(4_000) .hasSum(40_000) - .hasBucketCounts(0, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[2], values[2])), point -> point @@ -404,7 +413,8 @@ void stressTest_WithDifferentLabelSet() { .hasEpochNanos(testClock.now()) .hasCount(4_000) .hasSum(40_000) - .hasBucketCounts(0, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[3], values[3]))))); } diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongHistogramTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongHistogramTest.java index 6b62d479a39..cf564a3cbe0 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongHistogramTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongHistogramTest.java @@ -112,8 +112,10 @@ void collectMetrics_WithEmptyAttributes() { .hasCount(2) .hasSum(24) .hasBucketBoundaries( - 0, 5, 10, 25, 50, 75, 100, 250, 500, 1_000) - .hasBucketCounts(0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0)))); + 5, 10, 25, 50, 75, 100, 250, 500, 750, 1_000, 2_500, + 5_000, 7_500, 10_000) + .hasBucketCounts( + 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)))); } @Test @@ -147,7 +149,8 @@ void collectMetrics_WithMultipleCollects() { .hasEpochNanos(testClock.now()) .hasCount(3) .hasSum(445) - .hasBucketCounts(0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0) + .hasBucketCounts( + 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry("K", "V")), point -> point @@ -155,7 +158,8 @@ void collectMetrics_WithMultipleCollects() { .hasEpochNanos(testClock.now()) .hasCount(2) .hasSum(23) - .hasBucketCounts(0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(Attributes.empty())))); // Histograms are cumulative by default. @@ -178,7 +182,8 @@ void collectMetrics_WithMultipleCollects() { .hasEpochNanos(testClock.now()) .hasCount(4) .hasSum(667) - .hasBucketCounts(0, 1, 0, 0, 0, 0, 0, 2, 1, 0, 0) + .hasBucketCounts( + 1, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry("K", "V")), point -> point @@ -186,7 +191,8 @@ void collectMetrics_WithMultipleCollects() { .hasEpochNanos(testClock.now()) .hasCount(3) .hasSum(40) - .hasBucketCounts(0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(Attributes.empty())))); } finally { bound.unbind(); @@ -381,7 +387,8 @@ void stressTest_WithDifferentLabelSet() { .hasEpochNanos(testClock.now()) .hasCount(2_000) .hasSum(20_000) - .hasBucketCounts(0, 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[0], values[0])), point -> point @@ -389,7 +396,8 @@ void stressTest_WithDifferentLabelSet() { .hasEpochNanos(testClock.now()) .hasCount(2_000) .hasSum(20_000) - .hasBucketCounts(0, 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[1], values[1])), point -> point @@ -397,7 +405,8 @@ void stressTest_WithDifferentLabelSet() { .hasEpochNanos(testClock.now()) .hasCount(2_000) .hasSum(20_000) - .hasBucketCounts(0, 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[2], values[2])), point -> point @@ -405,7 +414,8 @@ void stressTest_WithDifferentLabelSet() { .hasEpochNanos(testClock.now()) .hasCount(2_000) .hasSum(20_000) - .hasBucketCounts(0, 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0) + .hasBucketCounts( + 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[3], values[3]))))); } diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderTest.java index 9498cc83e0d..20462630a17 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterProviderTest.java @@ -130,7 +130,8 @@ void collectAllSyncInstruments() { .hasAttributes(Attributes.empty()) .hasCount(1) .hasSum(10.1) - .hasBucketCounts(0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0))), + .hasBucketCounts( + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))), metric -> assertThat(metric) .hasName("testDoubleCounter") @@ -158,7 +159,8 @@ void collectAllSyncInstruments() { .hasAttributes(Attributes.empty()) .hasCount(1) .hasSum(10) - .hasBucketCounts(0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0))), + .hasBucketCounts( + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))), metric -> assertThat(metric) .hasName("testLongUpDownCounter")