Skip to content

Commit 43de1f9

Browse files
mlbiscocmlbiscoc
authored
Update OTEL dependencies (#3884)
Bump the following OTEL dependencies versions: opentelemetry - "1.53.0" opentelemetry-prometheus - "1.50.0-alpha" opentelemetry-runtime-telemetry - "2.11.0-alpha" This should fix the flaky test DirectoryFactoryTest. Small change to how exemplars being set from a UTIL to the SdkMeterProviderBuilder
1 parent 1344194 commit 43de1f9

File tree

76 files changed

+397
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+397
-397
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ nodejs = "22.18.0"
179179
onnx = "1.23.0"
180180
openapi = "7.14.0"
181181
openjdk-jmh = "1.37"
182-
opentelemetry = "1.53.0"
183-
opentelemetry-prometheus = "1.50.0-alpha"
184-
opentelemetry-runtime-telemetry = "2.11.0-alpha"
182+
opentelemetry = "1.56.0"
183+
opentelemetry-prometheus = "1.56.0-alpha"
184+
opentelemetry-runtime-telemetry = "2.22.0-alpha"
185185
osgi-annotation = "8.1.0"
186186
oshai-logging = "7.0.13"
187187
# @keep for version alignment
@@ -483,7 +483,6 @@ opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version.ref
483483
opentelemetry-context = { module = "io.opentelemetry:opentelemetry-context", version.ref = "opentelemetry" }
484484
opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version.ref = "opentelemetry" }
485485
opentelemetry-exporter-prometheus = { module = "io.opentelemetry:opentelemetry-exporter-prometheus", version.ref = "opentelemetry-prometheus" }
486-
opentelemetry-exporter-sender-okhttp = { module = "io.opentelemetry:opentelemetry-exporter-sender-okhttp", version.ref = "opentelemetry" }
487486
opentelemetry-runtime-telemetry = { module = "io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17", version.ref = "opentelemetry-runtime-telemetry" }
488487
opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "opentelemetry" }
489488
opentelemetry-sdk-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "opentelemetry" }

‎solr/api/gradle.lockfile‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ io.netty:netty-transport-classes-epoll:4.2.6.Final=jarValidation,testCompileClas
5555
io.netty:netty-transport-native-epoll:4.2.6.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
5656
io.netty:netty-transport-native-unix-common:4.2.6.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
5757
io.netty:netty-transport:4.2.6.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
58-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.11.0-alpha=jarValidation,testRuntimeClasspath
59-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.11.0=jarValidation,testRuntimeClasspath
60-
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.11.0-alpha=jarValidation,testRuntimeClasspath
61-
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.11.0-alpha=jarValidation,testRuntimeClasspath
62-
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=jarValidation,testRuntimeClasspath
63-
io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=jarValidation,testRuntimeClasspath
64-
io.opentelemetry:opentelemetry-api:1.53.0=jarValidation,testCompileClasspath,testRuntimeClasspath
65-
io.opentelemetry:opentelemetry-common:1.53.0=jarValidation,testCompileClasspath,testRuntimeClasspath
66-
io.opentelemetry:opentelemetry-context:1.53.0=jarValidation,testCompileClasspath,testRuntimeClasspath
67-
io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,testRuntimeClasspath
68-
io.opentelemetry:opentelemetry-sdk-common:1.53.0=jarValidation,testRuntimeClasspath
69-
io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=jarValidation,testRuntimeClasspath
70-
io.opentelemetry:opentelemetry-sdk-trace:1.53.0=jarValidation,testRuntimeClasspath
71-
io.opentelemetry:opentelemetry-sdk:1.53.0=jarValidation,testRuntimeClasspath
58+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.22.0-alpha=jarValidation,testRuntimeClasspath
59+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.22.0=jarValidation,testRuntimeClasspath
60+
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.22.0-alpha=jarValidation,testRuntimeClasspath
61+
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.22.0-alpha=jarValidation,testRuntimeClasspath
62+
io.opentelemetry.semconv:opentelemetry-semconv:1.37.0=jarValidation,testRuntimeClasspath
63+
io.opentelemetry:opentelemetry-api-incubator:1.56.0-alpha=jarValidation,testRuntimeClasspath
64+
io.opentelemetry:opentelemetry-api:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath
65+
io.opentelemetry:opentelemetry-common:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath
66+
io.opentelemetry:opentelemetry-context:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath
67+
io.opentelemetry:opentelemetry-exporter-prometheus:1.56.0-alpha=jarValidation,testRuntimeClasspath
68+
io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,testRuntimeClasspath
69+
io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,testRuntimeClasspath
70+
io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,testRuntimeClasspath
71+
io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,testRuntimeClasspath
7272
io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,testRuntimeClasspath
7373
io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,testRuntimeClasspath
7474
io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath

‎solr/benchmark/gradle.lockfile‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@ io.netty:netty-transport-classes-epoll:4.2.6.Final=compileClasspath,jarValidatio
5050
io.netty:netty-transport-native-epoll:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5151
io.netty:netty-transport-native-unix-common:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5252
io.netty:netty-transport:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
53-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.11.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
54-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.11.0=jarValidation,runtimeClasspath,testRuntimeClasspath
55-
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.11.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
56-
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.11.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
57-
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
58-
io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
59-
io.opentelemetry:opentelemetry-api:1.53.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
60-
io.opentelemetry:opentelemetry-common:1.53.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
61-
io.opentelemetry:opentelemetry-context:1.53.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
62-
io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
63-
io.opentelemetry:opentelemetry-sdk-common:1.53.0=jarValidation,runtimeClasspath,testRuntimeClasspath
64-
io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=jarValidation,runtimeClasspath,testRuntimeClasspath
65-
io.opentelemetry:opentelemetry-sdk-trace:1.53.0=jarValidation,runtimeClasspath,testRuntimeClasspath
66-
io.opentelemetry:opentelemetry-sdk:1.53.0=jarValidation,runtimeClasspath,testRuntimeClasspath
53+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.22.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
54+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.22.0=jarValidation,runtimeClasspath,testRuntimeClasspath
55+
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.22.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
56+
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.22.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
57+
io.opentelemetry.semconv:opentelemetry-semconv:1.37.0=jarValidation,runtimeClasspath,testRuntimeClasspath
58+
io.opentelemetry:opentelemetry-api-incubator:1.56.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
59+
io.opentelemetry:opentelemetry-api:1.56.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
60+
io.opentelemetry:opentelemetry-common:1.56.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
61+
io.opentelemetry:opentelemetry-context:1.56.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
62+
io.opentelemetry:opentelemetry-exporter-prometheus:1.56.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
63+
io.opentelemetry:opentelemetry-sdk-common:1.56.0=jarValidation,runtimeClasspath,testRuntimeClasspath
64+
io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=jarValidation,runtimeClasspath,testRuntimeClasspath
65+
io.opentelemetry:opentelemetry-sdk-trace:1.56.0=jarValidation,runtimeClasspath,testRuntimeClasspath
66+
io.opentelemetry:opentelemetry-sdk:1.56.0=jarValidation,runtimeClasspath,testRuntimeClasspath
6767
io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
6868
io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
6969
io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath

‎solr/core/gradle.lockfile‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@ io.netty:netty-transport-classes-epoll:4.2.6.Final=apiHelper,compileClasspath,ja
5555
io.netty:netty-transport-native-epoll:4.2.6.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
5656
io.netty:netty-transport-native-unix-common:4.2.6.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
5757
io.netty:netty-transport:4.2.6.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
58-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.11.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
59-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.11.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
60-
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.11.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
61-
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.11.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
62-
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
63-
io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
64-
io.opentelemetry:opentelemetry-api:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
65-
io.opentelemetry:opentelemetry-common:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
66-
io.opentelemetry:opentelemetry-context:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
67-
io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
68-
io.opentelemetry:opentelemetry-sdk-common:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
69-
io.opentelemetry:opentelemetry-sdk-logs:1.53.0=jarValidation,testCompileClasspath,testRuntimeClasspath
70-
io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
71-
io.opentelemetry:opentelemetry-sdk-testing:1.53.0=jarValidation,testCompileClasspath,testRuntimeClasspath
72-
io.opentelemetry:opentelemetry-sdk-trace:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
73-
io.opentelemetry:opentelemetry-sdk:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
58+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.22.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
59+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.22.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
60+
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.22.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
61+
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.22.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
62+
io.opentelemetry.semconv:opentelemetry-semconv:1.37.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
63+
io.opentelemetry:opentelemetry-api-incubator:1.56.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
64+
io.opentelemetry:opentelemetry-api:1.56.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
65+
io.opentelemetry:opentelemetry-common:1.56.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
66+
io.opentelemetry:opentelemetry-context:1.56.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
67+
io.opentelemetry:opentelemetry-exporter-prometheus:1.56.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
68+
io.opentelemetry:opentelemetry-sdk-common:1.56.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
69+
io.opentelemetry:opentelemetry-sdk-logs:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath
70+
io.opentelemetry:opentelemetry-sdk-metrics:1.56.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
71+
io.opentelemetry:opentelemetry-sdk-testing:1.56.0=jarValidation,testCompileClasspath,testRuntimeClasspath
72+
io.opentelemetry:opentelemetry-sdk-trace:1.56.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
73+
io.opentelemetry:opentelemetry-sdk:1.56.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7474
io.prometheus:prometheus-metrics-exposition-formats:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7575
io.prometheus:prometheus-metrics-model:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
7676
io.sgr:s2-geometry-library-java:1.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath

‎solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,13 @@
4646
import io.opentelemetry.api.metrics.ObservableLongUpDownCounter;
4747
import io.opentelemetry.api.metrics.ObservableMeasurement;
4848
import io.opentelemetry.sdk.metrics.Aggregation;
49+
import io.opentelemetry.sdk.metrics.ExemplarFilter;
4950
import io.opentelemetry.sdk.metrics.InstrumentSelector;
5051
import io.opentelemetry.sdk.metrics.InstrumentType;
5152
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
5253
import io.opentelemetry.sdk.metrics.View;
5354
import io.opentelemetry.sdk.metrics.export.MetricExporter;
5455
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
55-
import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil;
56-
import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarFilter;
5756
import java.lang.invoke.MethodHandles;
5857
import java.util.Arrays;
5958
import java.util.Collections;
@@ -455,6 +454,7 @@ public SdkMeterProvider meterProvider(String providerName) {
455454
var builder =
456455
SdkMeterProvider.builder()
457456
.registerMetricReader(reader)
457+
.setExemplarFilter(ExemplarFilter.traceBased())
458458
.registerView(
459459
InstrumentSelector.builder()
460460
.setType(InstrumentType.HISTOGRAM)
@@ -470,7 +470,6 @@ public SdkMeterProvider meterProvider(String providerName) {
470470
PeriodicMetricReader.builder(metricExporter)
471471
.setInterval(OTLP_EXPORTER_INTERVAL, TimeUnit.MILLISECONDS)
472472
.build());
473-
SdkMeterProviderUtil.setExemplarFilter(builder, ExemplarFilter.traceBased());
474473
return new MeterProviderAndReaders(builder.build(), reader);
475474
})
476475
.sdkMeterProvider();

0 commit comments

Comments
 (0)