Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop OTLP exponential histogram environment variable option #5290

Merged
merged 2 commits into from
Mar 17, 2023
Merged

Drop OTLP exponential histogram environment variable option #5290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b356ca3
Drop OTLP exponential histogram environment variable option
jack-berg Mar 10, 2023
0bc6f52
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
jack-berg Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...ers/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,8 @@ public static void configureOtlpHistogramDefaultAggregation(
if (defaultHistogramAggregation == null) {
return;
}
// TODO(jack-berg): remove EXPONENTIAL_BUCKET_HISTOGRAM in 1.24.0
if (defaultHistogramAggregation.equalsIgnoreCase("EXPONENTIAL_BUCKET_HISTOGRAM")
|| AggregationUtil.aggregationName(Aggregation.base2ExponentialBucketHistogram())
.equalsIgnoreCase(defaultHistogramAggregation)) {
if (AggregationUtil.aggregationName(Aggregation.base2ExponentialBucketHistogram())
.equalsIgnoreCase(defaultHistogramAggregation)) {
defaultAggregationSelectorConsumer.accept(
DefaultAggregationSelector.getDefault()
.with(InstrumentType.HISTOGRAM, Aggregation.base2ExponentialBucketHistogram()));
Expand Down
14 changes: 0 additions & 14 deletions ...otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/OtlpConfigUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,20 +390,6 @@ void configureOtlpHistogramDefaultAggregation() {
"BASE2_EXPONENTIAL_BUCKET_HISTOGRAM"))
.getDefaultAggregation(InstrumentType.HISTOGRAM))
.isEqualTo(Aggregation.base2ExponentialBucketHistogram());
assertThat(
configureHistogramDefaultAggregation(
ImmutableMap.of(
"otel.exporter.otlp.metrics.default.histogram.aggregation",
"exponential_bucket_histogram"))
.getDefaultAggregation(InstrumentType.HISTOGRAM))
.isEqualTo(Aggregation.base2ExponentialBucketHistogram());
assertThat(
configureHistogramDefaultAggregation(
ImmutableMap.of(
"otel.exporter.otlp.metrics.default.histogram.aggregation",
"EXPONENTIAL_BUCKET_HISTOGRAM"))
.getDefaultAggregation(InstrumentType.HISTOGRAM))
.isEqualTo(Aggregation.base2ExponentialBucketHistogram());

assertThat(
configureHistogramDefaultAggregation(
Expand Down
3 changes: 0 additions & 3 deletions ...autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/ResourceConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ static Resource configureResource(

Set<String> enabledProviders =
new HashSet<>(config.getList("otel.java.enabled.resource.providers"));
// TODO(anuraaga): We use a hyphen only once in this artifact, for
// otel.java.disabled.resource-providers. But fetching by the dot version is the simplest way
// to implement it for now.
Set<String> disabledProviders =
new HashSet<>(config.getList("otel.java.disabled.resource.providers"));
for (ResourceProvider resourceProvider :
Expand Down
1 change: 0 additions & 1 deletion ...configure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ void setup() {
@Test
@SetSystemProperty(key = "otel.propagators", value = "cat")
void invalidPropagator() {
// TODO(jack-berg): confirm log warnings go away once exporters are properly shutdown (#5113)
assertThatThrownBy(AutoConfiguredOpenTelemetrySdk::initialize)
.isInstanceOf(ConfigurationException.class)
.hasMessage(
Expand Down