diff --git a/CHANGELOG.md b/CHANGELOG.md index f43419f81cd..52ccf4ce3e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Unreleased +### SDK + +#### Logs + +#### SDK Extensions + * Autoconfigure now supports an option to disable the SDK. If `otel.sdk.disabled=true`, `AutoConfiguredOpenTelemetrySdk#getOpenTelemetrySdk()` returns a minimal (but not noop) `OpenTelemetrySdk` with noop tracing, metric and logging providers. The same minimal instance is set 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 c0e0123f054..fd11247c57c 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 @@ -21,7 +21,7 @@ private ExplicitBucketHistogramUtils() {} public static final List DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES = Collections.unmodifiableList( Arrays.asList( - 5d, 10d, 25d, 50d, 75d, 100d, 250d, 500d, 750d, 1_000d, 2_500d, 5_000d, 7_500d, + 0d, 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. */ 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 9d81e469881..75728e868d7 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,10 +112,10 @@ void collectMetrics_WithEmptyAttributes() { .hasCount(2) .hasSum(24) .hasBucketBoundaries( - 5, 10, 25, 50, 75, 100, 250, 500, 750, 1_000, 2_500, - 5_000, 7_500, 10_000) + 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)))); + 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)))); } @Test @@ -150,7 +150,7 @@ void collectMetrics_WithMultipleCollects() { .hasCount(3) .hasSum(566.3d) .hasBucketCounts( - 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry("K", "V")), point -> point @@ -159,7 +159,7 @@ void collectMetrics_WithMultipleCollects() { .hasCount(2) .hasSum(22.2d) .hasBucketCounts( - 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(Attributes.empty())))); // Histograms are cumulative by default. @@ -183,7 +183,7 @@ void collectMetrics_WithMultipleCollects() { .hasCount(4) .hasSum(788.3) .hasBucketCounts( - 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry("K", "V")), point -> point @@ -192,7 +192,7 @@ void collectMetrics_WithMultipleCollects() { .hasCount(3) .hasSum(39.2) .hasBucketCounts( - 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(Attributes.empty())))); } finally { bound.unbind(); @@ -387,7 +387,7 @@ void stressTest_WithDifferentLabelSet() { .hasCount(4_000) .hasSum(40_000) .hasBucketCounts( - 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[0], values[0])), point -> point @@ -396,7 +396,7 @@ void stressTest_WithDifferentLabelSet() { .hasCount(4_000) .hasSum(40_000) .hasBucketCounts( - 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[1], values[1])), point -> point @@ -405,7 +405,7 @@ void stressTest_WithDifferentLabelSet() { .hasCount(4_000) .hasSum(40_000) .hasBucketCounts( - 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[2], values[2])), point -> point @@ -414,7 +414,7 @@ void stressTest_WithDifferentLabelSet() { .hasCount(4_000) .hasSum(40_000) .hasBucketCounts( - 0, 2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 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 cf564a3cbe0..6ecb61d6d55 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,10 +112,10 @@ void collectMetrics_WithEmptyAttributes() { .hasCount(2) .hasSum(24) .hasBucketBoundaries( - 5, 10, 25, 50, 75, 100, 250, 500, 750, 1_000, 2_500, - 5_000, 7_500, 10_000) + 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)))); + 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)))); } @Test @@ -150,7 +150,7 @@ void collectMetrics_WithMultipleCollects() { .hasCount(3) .hasSum(445) .hasBucketCounts( - 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0) + 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry("K", "V")), point -> point @@ -159,7 +159,7 @@ void collectMetrics_WithMultipleCollects() { .hasCount(2) .hasSum(23) .hasBucketCounts( - 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(Attributes.empty())))); // Histograms are cumulative by default. @@ -183,7 +183,7 @@ void collectMetrics_WithMultipleCollects() { .hasCount(4) .hasSum(667) .hasBucketCounts( - 1, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0) + 0, 1, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry("K", "V")), point -> point @@ -192,7 +192,7 @@ void collectMetrics_WithMultipleCollects() { .hasCount(3) .hasSum(40) .hasBucketCounts( - 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(Attributes.empty())))); } finally { bound.unbind(); @@ -388,7 +388,7 @@ void stressTest_WithDifferentLabelSet() { .hasCount(2_000) .hasSum(20_000) .hasBucketCounts( - 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[0], values[0])), point -> point @@ -397,7 +397,7 @@ void stressTest_WithDifferentLabelSet() { .hasCount(2_000) .hasSum(20_000) .hasBucketCounts( - 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[1], values[1])), point -> point @@ -406,7 +406,7 @@ void stressTest_WithDifferentLabelSet() { .hasCount(2_000) .hasSum(20_000) .hasBucketCounts( - 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) .hasAttributes(attributeEntry(keys[2], values[2])), point -> point @@ -415,7 +415,7 @@ void stressTest_WithDifferentLabelSet() { .hasCount(2_000) .hasSum(20_000) .hasBucketCounts( - 0, 1000, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + 0, 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 20462630a17..be8ea25eea3 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 @@ -131,7 +131,7 @@ void collectAllSyncInstruments() { .hasCount(1) .hasSum(10.1) .hasBucketCounts( - 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))), + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))), metric -> assertThat(metric) .hasName("testDoubleCounter") @@ -160,7 +160,7 @@ void collectAllSyncInstruments() { .hasCount(1) .hasSum(10) .hasBucketCounts( - 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))), + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))), metric -> assertThat(metric) .hasName("testLongUpDownCounter")