Skip to content

Commit 5bc1732

Browse files
breedx-splkbreedx-splk
committed
fix up remaining usages, regen sdk apidiff
1 parent 692f912 commit 5bc1732

File tree

5 files changed

+64
-22
lines changed

5 files changed

+64
-22
lines changed

‎docs/apidiffs/current_vs_latest/opentelemetry-sdk-metrics.txt‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,46 @@
11
Comparing source compatibility of opentelemetry-sdk-metrics-1.54.0-SNAPSHOT.jar against opentelemetry-sdk-metrics-1.53.0.jar
2-
No changes.
2+
+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.sdk.metrics.exemplar.AlwaysOffFilter (not serializable)
3+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
4+
+++ NEW INTERFACE: io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter
5+
+++ NEW SUPERCLASS: java.lang.Object
6+
+++ NEW METHOD: PUBLIC(+) boolean shouldSampleMeasurement(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
7+
+++ NEW METHOD: PUBLIC(+) boolean shouldSampleMeasurement(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
8+
+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.sdk.metrics.exemplar.AlwaysOnFilter (not serializable)
9+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
10+
+++ NEW INTERFACE: io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter
11+
+++ NEW SUPERCLASS: java.lang.Object
12+
+++ NEW METHOD: PUBLIC(+) boolean shouldSampleMeasurement(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
13+
+++ NEW METHOD: PUBLIC(+) boolean shouldSampleMeasurement(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
14+
+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter (not serializable)
15+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
16+
+++ NEW SUPERCLASS: java.lang.Object
17+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter alwaysOff()
18+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter alwaysOn()
19+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) boolean shouldSampleMeasurement(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
20+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) boolean shouldSampleMeasurement(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
21+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter traceBased()
22+
+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir (not serializable)
23+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
24+
GENERIC TEMPLATES: +++ T:io.opentelemetry.sdk.metrics.data.ExemplarData
25+
+++ NEW SUPERCLASS: java.lang.Object
26+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.List<T> collectAndReset(io.opentelemetry.api.common.Attributes)
27+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<io.opentelemetry.sdk.metrics.data.DoubleExemplarData> doubleFixedSizeReservoir(io.opentelemetry.sdk.common.Clock, int, java.util.function.Supplier<java.util.Random>)
28+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<io.opentelemetry.sdk.metrics.data.DoubleExemplarData> doubleNoSamples()
29+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<T> filtered(io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter, io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<T>)
30+
GENERIC TEMPLATES: +++ T:io.opentelemetry.sdk.metrics.data.ExemplarData
31+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<io.opentelemetry.sdk.metrics.data.DoubleExemplarData> histogramBucketReservoir(io.opentelemetry.sdk.common.Clock, java.util.List<java.lang.Double>)
32+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<io.opentelemetry.sdk.metrics.data.LongExemplarData> longFixedSizeReservoir(io.opentelemetry.sdk.common.Clock, int, java.util.function.Supplier<java.util.Random>)
33+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<io.opentelemetry.sdk.metrics.data.LongExemplarData> longNoSamples()
34+
+++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<T> longToDouble(io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir<T>)
35+
GENERIC TEMPLATES: +++ T:io.opentelemetry.sdk.metrics.data.ExemplarData
36+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void offerDoubleMeasurement(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
37+
+++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void offerLongMeasurement(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
38+
+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.sdk.metrics.exemplar.TraceBasedExemplarFilter (not serializable)
39+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
40+
+++ NEW INTERFACE: io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter
41+
+++ NEW SUPERCLASS: java.lang.Object
42+
+++ NEW METHOD: PUBLIC(+) boolean shouldSampleMeasurement(long, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
43+
+++ NEW METHOD: PUBLIC(+) boolean shouldSampleMeasurement(double, io.opentelemetry.api.common.Attributes, io.opentelemetry.context.Context)
44+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder (not serializable)
45+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
46+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder setExemplarFilter(io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter)

‎integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
import io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter;
7171
import io.opentelemetry.sdk.metrics.export.MetricExporter;
7272
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
73-
import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil;
7473
import io.opentelemetry.sdk.resources.Resource;
7574
import io.opentelemetry.sdk.trace.IdGenerator;
7675
import io.opentelemetry.sdk.trace.SdkTracerProvider;
@@ -470,7 +469,7 @@ private static void testMetricExport(MetricExporter metricExporter) {
470469
.build());
471470

472471
// Enable alwaysOn exemplar filter, instead of default traceBased filter
473-
SdkMeterProviderUtil.setExemplarFilter(meterProviderBuilder, ExemplarFilter.alwaysOn());
472+
meterProviderBuilder.setExemplarFilter(ExemplarFilter.alwaysOn());
474473

475474
SdkMeterProvider meterProvider = meterProviderBuilder.build();
476475

‎sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/MeterProviderConfiguration.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter;
1414
import io.opentelemetry.sdk.metrics.export.MetricExporter;
1515
import io.opentelemetry.sdk.metrics.export.MetricReader;
16-
import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil;
1716
import io.opentelemetry.sdk.metrics.internal.state.MetricStorage;
1817
import java.io.Closeable;
1918
import java.util.Collections;
@@ -39,20 +38,8 @@ static void configureMeterProvider(
3938
List<Closeable> closeables) {
4039

4140
// Configure default exemplar filters.
42-
String exemplarFilter =
43-
config.getString("otel.metrics.exemplar.filter", "trace_based").toLowerCase(Locale.ROOT);
44-
switch (exemplarFilter) {
45-
case "always_off":
46-
SdkMeterProviderUtil.setExemplarFilter(meterProviderBuilder, ExemplarFilter.alwaysOff());
47-
break;
48-
case "always_on":
49-
SdkMeterProviderUtil.setExemplarFilter(meterProviderBuilder, ExemplarFilter.alwaysOn());
50-
break;
51-
case "trace_based":
52-
default:
53-
SdkMeterProviderUtil.setExemplarFilter(meterProviderBuilder, ExemplarFilter.traceBased());
54-
break;
55-
}
41+
ExemplarFilter filter = getExemplarFilter(config);
42+
meterProviderBuilder.setExemplarFilter(filter);
5643

5744
Integer cardinalityLimit = config.getInt("otel.java.metrics.cardinality.limit");
5845
if (cardinalityLimit == null) {
@@ -76,6 +63,20 @@ static void configureMeterProvider(
7663
reader, instrumentType -> resolvedCardinalityLimit));
7764
}
7865

66+
private static ExemplarFilter getExemplarFilter(ConfigProperties config) {
67+
String exemplarFilter =
68+
config.getString("otel.metrics.exemplar.filter", "trace_based").toLowerCase(Locale.ROOT);
69+
switch (exemplarFilter) {
70+
case "always_off":
71+
return ExemplarFilter.alwaysOff();
72+
case "always_on":
73+
return ExemplarFilter.alwaysOn();
74+
case "trace_based":
75+
default:
76+
return ExemplarFilter.traceBased();
77+
}
78+
}
79+
7980
static List<MetricReader> configureMetricReaders(
8081
ConfigProperties config,
8182
SpiHelper spiHelper,

‎sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramCollectBenchmark.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter;
1818
import io.opentelemetry.sdk.metrics.export.MetricExporter;
1919
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
20-
import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil;
2120
import java.time.Duration;
2221
import java.util.ArrayList;
2322
import java.util.Collection;
@@ -76,7 +75,7 @@ public void setup() {
7675
.setInterval(Duration.ofSeconds(Integer.MAX_VALUE))
7776
.build());
7877
// Disable exemplars
79-
SdkMeterProviderUtil.setExemplarFilter(builder, ExemplarFilter.alwaysOff());
78+
builder.setExemplarFilter(ExemplarFilter.alwaysOff());
8079
sdkMeterProvider = builder.build();
8180
histogram = sdkMeterProvider.get("meter").histogramBuilder("histogram").build();
8281

‎sdk/metrics/src/jmhBasedTest/java/io/opentelemetry/sdk/metrics/internal/state/InstrumentGarbageCollectionBenchmark.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
1313
import io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter;
1414
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
15-
import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil;
1615
import io.opentelemetry.sdk.metrics.internal.state.TestInstrumentType.InstrumentTester;
1716
import io.opentelemetry.sdk.metrics.internal.state.TestInstrumentType.TestInstrumentsState;
1817
import java.time.Duration;
@@ -96,7 +95,7 @@ public void setup() {
9695
attributesList = AttributesGenerator.generate(cardinality);
9796

9897
// Disable exemplars
99-
SdkMeterProviderUtil.setExemplarFilter(builder, ExemplarFilter.alwaysOff());
98+
builder.setExemplarFilter(ExemplarFilter.alwaysOff());
10099

101100
sdkMeterProvider = builder.build();
102101
testInstrumentsState =

0 commit comments

Comments
 (0)