Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-18407: Update to newer library to fix duplicate promethesus metric emitting (#4907)

Eric Pugh095a03b43d01
diff --git a/changelog/unreleased/SOLR-18407.yml b/changelog/unreleased/SOLR-18407.yml
new file mode 100644
index 00000000000..41dcc415987
--- /dev/null
+++ b/changelog/unreleased/SOLR-18407.yml
@@ -0,0 +1,7 @@
+title: Fix Solr emitting duplicate/conflicting JVM metrics from both runtime-telemetry-java8 and runtime-telemetry-java17 OTel scopes on Java 17, by migrating to the unified opentelemetry-runtime-telemetry module (upgraded to 2.31.1-alpha) that replaced the java8/java17 split. Also updating otel itself to 1.65.0 as well.
+type: fixed
+authors:
+ - name: Eric Pugh
+links:
+ - name: SOLR-18407
+ url: https://issues.apache.org/jira/browse/SOLR-18407
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 12a26dc3934..e548bc1f922 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -158,9 +158,9 @@ nodejs = "22.18.0"
onnx = "1.29.0"
openapi = "7.25.0"
openjdk-jmh = "1.37"
-opentelemetry = "1.63.0"
-opentelemetry-prometheus = "1.63.0-alpha"
-opentelemetry-runtime-telemetry = "2.27.0-alpha"
+opentelemetry = "1.65.0"
+opentelemetry-prometheus = "1.65.0-alpha"
+opentelemetry-runtime-telemetry = "2.31.1-alpha"
oshai-logging = "8.0.4"
# @keep for version alignment
ow2-asm = "9.10.1"
@@ -428,7 +428,7 @@ opentelemetry-context = { module = "io.opentelemetry:opentelemetry-context", ver
opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version.ref = "opentelemetry" }
opentelemetry-exporter-prometheus = { module = "io.opentelemetry:opentelemetry-exporter-prometheus", version.ref = "opentelemetry-prometheus" }
opentelemetry-exporter-sender-jdk = { module = "io.opentelemetry:opentelemetry-exporter-sender-jdk", version.ref = "opentelemetry" }
-opentelemetry-runtime-telemetry = { module = "io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17", version.ref = "opentelemetry-runtime-telemetry" }
+opentelemetry-runtime-telemetry = { module = "io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry", version.ref = "opentelemetry-runtime-telemetry" }
opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "opentelemetry" }
opentelemetry-sdk-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "opentelemetry" }
opentelemetry-sdk-extension-autoconfigure-spi = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", version.ref = "opentelemetry" }
diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile
index 21e4ad6f572..27f92627e52 100644
--- a/solr/api/gradle.lockfile
+++ b/solr/api/gradle.lockfile
@@ -53,20 +53,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=jarValidation,testCompileCla
io.netty:netty-transport-native-epoll:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,testRuntimeClasspath
diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile
index 7d537ba705b..33b2c9564b3 100644
--- a/solr/benchmark/gradle.lockfile
+++ b/solr/benchmark/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,testRuntimeClasspath
diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile
index ae79bf6cb4c..2191fcdbc84 100644
--- a/solr/core/gradle.lockfile
+++ b/solr/core/gradle.lockfile
@@ -52,22 +52,21 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-logs:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-testing:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-logs:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-testing:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java b/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java
index ab024789c58..a5941b003fe 100644
--- a/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java
+++ b/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java
@@ -24,7 +24,9 @@ import io.opentelemetry.api.metrics.MeterProvider;
import io.opentelemetry.api.metrics.ObservableLongGauge;
import io.opentelemetry.api.trace.TracerProvider;
import io.opentelemetry.context.propagation.ContextPropagators;
-import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics;
+import io.opentelemetry.instrumentation.runtimetelemetry.RuntimeTelemetry;
+import io.opentelemetry.instrumentation.runtimetelemetry.RuntimeTelemetryBuilder;
+import io.opentelemetry.instrumentation.runtimetelemetry.internal.Experimental;
import java.lang.invoke.MethodHandles;
import java.lang.management.ManagementFactory;
import org.apache.lucene.util.SuppressForbidden;
@@ -37,7 +39,7 @@ import org.slf4j.LoggerFactory;
public class OtelRuntimeJvmMetrics {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private RuntimeMetrics runtimeMetrics;
+ private RuntimeTelemetry runtimeMetrics;
private ObservableLongGauge systemMemoryGauge;
private boolean isInitialized = false;
@@ -75,11 +77,14 @@ public class OtelRuntimeJvmMetrics {
return OpenTelemetry.noop().getPropagators();
}
};
- this.runtimeMetrics =
- RuntimeMetrics.builder(otel)
- // TODO: We should have this configurable to enable/disable specific JVM metrics
- .enableAllFeatures()
- .build();
+
+ RuntimeTelemetryBuilder builder = RuntimeTelemetry.builder(otel);
+ // TODO: Make this configurable — Experimental.setJfrMetrics(builder, IncludeExclude) lets
+ // callers select individual JVM metrics instead of all-or-nothing; expose that via a
+ // solr.metrics.jvm.* system property instead of hardcoding true/true here.
+ Experimental.setEmitExperimentalMetrics(builder, true);
+ Experimental.setEmitExperimentalJfrMetrics(builder, true);
+ this.runtimeMetrics = builder.build();
java.lang.management.OperatingSystemMXBean osMxBean =
ManagementFactory.getOperatingSystemMXBean();
if (osMxBean instanceof com.sun.management.OperatingSystemMXBean extOsMxBean) {
diff --git a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
index f68ee18b2e6..43ec89f544c 100644
--- a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
@@ -83,7 +83,7 @@ import org.slf4j.LoggerFactory;
*
* <p>Solr creates 2 main {@link SdkMeterProvider}'s (solr.jvm, solr.node) as well as an additional
* provider for every {@link SolrCore} JVM metrics and registry are collected from {@link
- * io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics}
+ * io.opentelemetry.instrumentation.runtimetelemetry.RuntimeTelemetry}
*
* <p>The SolrMetricManager acts as a bridge between Solr and OpenTelemetry SDK providing the
* following:
diff --git a/solr/core/src/java/org/apache/solr/metrics/otel/FilterablePrometheusMetricReader.java b/solr/core/src/java/org/apache/solr/metrics/otel/FilterablePrometheusMetricReader.java
index 6461b3bb52a..932c5914747 100644
--- a/solr/core/src/java/org/apache/solr/metrics/otel/FilterablePrometheusMetricReader.java
+++ b/solr/core/src/java/org/apache/solr/metrics/otel/FilterablePrometheusMetricReader.java
@@ -19,6 +19,12 @@ package org.apache.solr.metrics.otel;
import static java.util.stream.Collectors.toList;
import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.metrics.InstrumentType;
+import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
+import io.opentelemetry.sdk.metrics.export.CollectionRegistration;
+import io.opentelemetry.sdk.metrics.export.MetricReader;
+import io.prometheus.metrics.model.registry.MultiCollector;
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
@@ -37,16 +43,47 @@ import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class FilterablePrometheusMetricReader extends PrometheusMetricReader {
+public class FilterablePrometheusMetricReader implements MetricReader, MultiCollector {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Set<String> PROM_SUFFIXES =
Set.of("_total", "_sum", "_bucket", "_created", "_info");
+ private final PrometheusMetricReader delegate;
+
public FilterablePrometheusMetricReader(
boolean otelScopeEnabled, Predicate<String> allowedResourceAttributesFilter) {
- super(otelScopeEnabled, allowedResourceAttributesFilter);
+ this.delegate =
+ PrometheusMetricReader.builder()
+ .setOtelScopeLabelsEnabled(otelScopeEnabled)
+ .setAllowedResourceAttributesFilter(allowedResourceAttributesFilter)
+ .build();
+ }
+
+ @Override
+ public AggregationTemporality getAggregationTemporality(InstrumentType instrumentType) {
+ return delegate.getAggregationTemporality(instrumentType);
+ }
+
+ @Override
+ public void register(CollectionRegistration registration) {
+ delegate.register(registration);
+ }
+
+ @Override
+ public CompletableResultCode forceFlush() {
+ return delegate.forceFlush();
+ }
+
+ @Override
+ public CompletableResultCode shutdown() {
+ return delegate.shutdown();
+ }
+
+ @Override
+ public MetricSnapshots collect() {
+ return delegate.collect();
}
/**
@@ -62,7 +99,7 @@ public class FilterablePrometheusMetricReader extends PrometheusMetricReader {
// If no filtering is requested then return all metrics
if (includedNames.isEmpty() && requiredLabels.isEmpty()) {
- return super.collect();
+ return delegate.collect();
}
// Users may filter by Prometheus-format names (e.g. "solr_core_requests") or with a
@@ -83,13 +120,13 @@ public class FilterablePrometheusMetricReader extends PrometheusMetricReader {
MetricSnapshots snapshotsToFilter;
if (sanitizedNames.isEmpty()) {
- snapshotsToFilter = super.collect();
+ snapshotsToFilter = delegate.collect();
} else {
// We collect all metrics and filter by Prometheus name rather than using
- // super.collect(Predicate) which matches on OTel internal names. This avoids a mismatch
+ // delegate.collect(Predicate) which matches on OTel internal names. This avoids a mismatch
// when OTel names use dot-separators (e.g. "solr.core.requests") but users filter by the
// Prometheus underscore-format name they see in the output (e.g. "solr_core_requests").
- MetricSnapshots all = super.collect();
+ MetricSnapshots all = delegate.collect();
MetricSnapshots.Builder nameFiltered = MetricSnapshots.builder();
for (MetricSnapshot snapshot : all) {
if (sanitizedNames.contains(snapshot.getMetadata().getPrometheusName())) {
@@ -134,9 +171,7 @@ public class FilterablePrometheusMetricReader extends PrometheusMetricReader {
case InfoSnapshot ignored -> {
// Do nothing for InfoSnapshots. Always filter it out
}
- default -> {
- log.error("Unknown metric snapshot type {}", metricSnapshot.getClass());
- }
+ default -> log.error("Unknown metric snapshot type {}", metricSnapshot.getClass());
}
}
return filteredSnapshots.build();
diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
index 19f4f5312e0..7da04f095e6 100644
--- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.solr.core;
-import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
import io.prometheus.metrics.model.snapshots.MetricSnapshots;
import java.util.ArrayList;
@@ -36,6 +35,7 @@ import org.apache.solr.handler.ReplicationHandler;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.component.QueryComponent;
import org.apache.solr.handler.component.SpellCheckComponent;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
@@ -350,7 +350,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
() -> {
while (!created.get()) {
try {
- PrometheusMetricReader reader =
+ FilterablePrometheusMetricReader reader =
coreContainer
.getMetricManager()
.getPrometheusMetricReader("solr.core." + coreName);
diff --git a/solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java b/solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java
index f099ba7d1d3..7430298abe4 100644
--- a/solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java
@@ -17,19 +17,23 @@
package org.apache.solr.metrics;
import com.sun.management.OperatingSystemMXBean;
-import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
+import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
import io.prometheus.metrics.model.snapshots.MetricSnapshots;
import java.lang.management.ManagementFactory;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.lucene.util.SuppressForbidden;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.NodeConfig;
import org.apache.solr.core.SolrXmlConfig;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
import org.apache.solr.util.SolrJettyTestRule;
import org.junit.Assume;
import org.junit.BeforeClass;
@@ -75,7 +79,7 @@ public class JvmMetricsTest extends SolrTestCaseJ4 {
@Test
public void testSetupJvmMetrics() throws InterruptedException {
- PrometheusMetricReader reader =
+ FilterablePrometheusMetricReader reader =
solrTestRule
.getJetty()
.getCoreContainer()
@@ -113,7 +117,7 @@ public class JvmMetricsTest extends SolrTestCaseJ4 {
@Test
@SuppressForbidden(reason = "Testing com.sun.management.OperatingSystemMXBean availability")
public void testSystemMemoryMetrics() {
- PrometheusMetricReader reader =
+ FilterablePrometheusMetricReader reader =
solrTestRule
.getJetty()
.getCoreContainer()
@@ -138,6 +142,38 @@ public class JvmMetricsTest extends SolrTestCaseJ4 {
metricNames.contains("jvm_system_memory_bytes"));
}
+ @Test
+ public void testNoDuplicateJvmMemoryMetrics() {
+ FilterablePrometheusMetricReader reader =
+ solrTestRule
+ .getJetty()
+ .getCoreContainer()
+ .getMetricManager()
+ .getPrometheusMetricReader("solr.jvm");
+ MetricSnapshots snapshots = reader.collect();
+
+ // A metric is duplicated when it's reported by more than one instrumentation scope
+ Map<String, String> scopeByMetric = new HashMap<>();
+ for (MetricSnapshot snapshot : snapshots) {
+ String metricName = snapshot.getMetadata().getPrometheusName();
+ for (DataPointSnapshot dataPoint : snapshot.getDataPoints()) {
+ String scope = dataPoint.getLabels().get("otel_scope_name");
+ if (scope == null) {
+ continue;
+ }
+ String otherScope = scopeByMetric.putIfAbsent(metricName, scope);
+ assertTrue(
+ "Metric "
+ + metricName
+ + " reported under multiple scopes with conflicting values: "
+ + otherScope
+ + " and "
+ + scope,
+ otherScope == null || otherScope.equals(scope));
+ }
+ }
+ }
+
@Test
public void testJvmMetricsDisabledNoSystemMemory() throws Exception {
// Verify that when JVM metrics are disabled, initialization is a no-op and close() is safe
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
index 51587663fa2..a27cdff6688 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
@@ -26,7 +26,6 @@ import io.opentelemetry.api.metrics.LongCounter;
import io.opentelemetry.api.metrics.LongGauge;
import io.opentelemetry.api.metrics.LongHistogram;
import io.opentelemetry.api.metrics.LongUpDownCounter;
-import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricExporter;
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
@@ -41,6 +40,7 @@ import java.util.concurrent.atomic.DoubleAdder;
import java.util.concurrent.atomic.LongAdder;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.util.RetryUtil;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +48,7 @@ import org.junit.Test;
public class SolrMetricManagerTest extends SolrTestCaseJ4 {
final String METER_PROVIDER_NAME = "test_provider_name";
private SolrMetricManager metricManager;
- private PrometheusMetricReader reader;
+ private FilterablePrometheusMetricReader reader;
@Before
@Override
@@ -299,7 +299,8 @@ public class SolrMetricManagerTest extends SolrTestCaseJ4 {
metricManager.longCounter(METER_PROVIDER_NAME, "my_counter", "desc", null);
counter.add(5);
- PrometheusMetricReader reader = metricManager.getPrometheusMetricReader(METER_PROVIDER_NAME);
+ FilterablePrometheusMetricReader reader =
+ metricManager.getPrometheusMetricReader(METER_PROVIDER_NAME);
MetricSnapshots metrics = reader.collect();
CounterSnapshot data =
metrics.stream()
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsContextTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsContextTest.java
index 048962f7a80..6fdaba66e3a 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsContextTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsContextTest.java
@@ -17,10 +17,10 @@
package org.apache.solr.metrics;
-import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricExporter;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.solr.SolrTestCase;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
import org.apache.solr.metrics.otel.OtelUnit;
import org.junit.After;
import org.junit.Before;
@@ -29,7 +29,7 @@ import org.junit.Test;
public class SolrMetricsContextTest extends SolrTestCase {
private static final String REGISTRY = "test_context_registry";
private SolrMetricManager metricManager;
- private PrometheusMetricReader reader;
+ private FilterablePrometheusMetricReader reader;
@Before
@Override
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
index 78120c4ed55..403b723e845 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.metrics;
-import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
import io.prometheus.metrics.model.snapshots.GaugeSnapshot.GaugeDataPointSnapshot;
import io.prometheus.metrics.model.snapshots.Labels;
import java.nio.charset.StandardCharsets;
@@ -33,6 +32,7 @@ import org.apache.solr.core.NodeConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrXmlConfig;
import org.apache.solr.embedded.JettySolrRunner;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
import org.apache.solr.util.SolrMetricTestUtils;
import org.apache.solr.util.TestHarness;
import org.eclipse.jetty.client.HttpClient;
@@ -83,7 +83,7 @@ public class SolrMetricsIntegrationTest extends SolrTestCaseJ4 {
}
private static GaugeDataPointSnapshot getGaugeOpt(
- PrometheusMetricReader reader, String metricName, String type) {
+ FilterablePrometheusMetricReader reader, String metricName, String type) {
return SolrMetricTestUtils.getGaugeDatapoint(
reader,
metricName,
diff --git a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
index efe89a4a9b7..4d00995690d 100644
--- a/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
@@ -29,7 +29,6 @@ import static org.apache.solr.security.Sha256AuthenticationProvider.getSaltedHas
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
@@ -66,6 +65,7 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.apache.solr.core.CoreContainer;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
import org.apache.solr.security.AuditEvent.EventType;
import org.apache.solr.security.AuditEvent.RequestType;
import org.apache.solr.security.AuditLoggerPlugin.JSONAuditEventFormatter;
@@ -87,7 +87,7 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {
// Use a harness per thread to be able to beast this test
private ThreadLocal<AuditTestHarness> testHarness = new ThreadLocal<>();
- private PrometheusMetricReader metricsReader;
+ private FilterablePrometheusMetricReader metricsReader;
@Override
@Before
diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile
index e7f4ddaafe5..fd79940e4ba 100644
--- a/solr/cross-dc-manager/gradle.lockfile
+++ b/solr/cross-dc-manager/gradle.lockfile
@@ -55,28 +55,27 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-bom:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-otlp-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-otlp:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-sender-jdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-logs:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-bom:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-otlp-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-otlp:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-sender-jdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-logs:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/licenses/opentelemetry-api-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.63.0.jar.sha1
deleted file mode 100644
index 4d520c3f678..00000000000
--- a/solr/licenses/opentelemetry-api-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-39c923c0f236417ec8c4e2091f9e3032b4b6fb91
diff --git a/solr/licenses/opentelemetry-api-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.65.0.jar.sha1
new file mode 100644
index 00000000000..a7866545104
--- /dev/null
+++ b/solr/licenses/opentelemetry-api-1.65.0.jar.sha1
@@ -0,0 +1 @@
+8b5df7f216b8b75da02f4f70daef71e70c91ff5e
diff --git a/solr/licenses/opentelemetry-api-incubator-1.61.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-api-incubator-1.61.0-alpha.jar.sha1
deleted file mode 100644
index 7ce2a16f16c..00000000000
--- a/solr/licenses/opentelemetry-api-incubator-1.61.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6cf3bcc6e6a9b2233abfa369e8a58a460d81fd9e
diff --git a/solr/licenses/opentelemetry-api-incubator-1.65.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-api-incubator-1.65.0-alpha.jar.sha1
new file mode 100644
index 00000000000..26e43c13639
--- /dev/null
+++ b/solr/licenses/opentelemetry-api-incubator-1.65.0-alpha.jar.sha1
@@ -0,0 +1 @@
+02cbb22257a4bd04fb5cd63e4dae3e159098f9fd
diff --git a/solr/licenses/opentelemetry-common-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-common-1.63.0.jar.sha1
deleted file mode 100644
index 92b1d5a7619..00000000000
--- a/solr/licenses/opentelemetry-common-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-450f8d552f33d51b19457d1336d8f7bdaec35e01
diff --git a/solr/licenses/opentelemetry-common-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-common-1.65.0.jar.sha1
new file mode 100644
index 00000000000..abef04ed4c6
--- /dev/null
+++ b/solr/licenses/opentelemetry-common-1.65.0.jar.sha1
@@ -0,0 +1 @@
+843f221202a008c893e18dafed0a024ef9d25ac1
diff --git a/solr/licenses/opentelemetry-context-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.63.0.jar.sha1
deleted file mode 100644
index fe9535c75a0..00000000000
--- a/solr/licenses/opentelemetry-context-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4af6d513cedbf78dafe104f82f8dce7c7a205f07
diff --git a/solr/licenses/opentelemetry-context-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.65.0.jar.sha1
new file mode 100644
index 00000000000..963bf088700
--- /dev/null
+++ b/solr/licenses/opentelemetry-context-1.65.0.jar.sha1
@@ -0,0 +1 @@
+d62950109b08e183ee6e397394a2443bc6bdbe84
diff --git a/solr/licenses/opentelemetry-exporter-common-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.63.0.jar.sha1
deleted file mode 100644
index 3e1869a902a..00000000000
--- a/solr/licenses/opentelemetry-exporter-common-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-75e2658228eb885770b894f71e8d145d46095fdf
diff --git a/solr/licenses/opentelemetry-exporter-common-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.65.0.jar.sha1
new file mode 100644
index 00000000000..c8fc36e1ed1
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-common-1.65.0.jar.sha1
@@ -0,0 +1 @@
+03e3a2444db518ae39519a066c17c4f825a5aaae
diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.63.0.jar.sha1
deleted file mode 100644
index 0d6393d6194..00000000000
--- a/solr/licenses/opentelemetry-exporter-otlp-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f02be0f4f2c44476e957bce9d7f7d3e0a1a7ae4
diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.65.0.jar.sha1
new file mode 100644
index 00000000000..1cb1db60d0c
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-otlp-1.65.0.jar.sha1
@@ -0,0 +1 @@
+ab2e7dec34b6568018908cc7ea9cc1c0bda10644
diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.63.0.jar.sha1
deleted file mode 100644
index fafd1c7f84f..00000000000
--- a/solr/licenses/opentelemetry-exporter-otlp-common-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6a9a75d3e4b9f69a67c3a333162a3b0783178c0
diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.65.0.jar.sha1
new file mode 100644
index 00000000000..1ae8fc65494
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-otlp-common-1.65.0.jar.sha1
@@ -0,0 +1 @@
+d0f646dae8614ab2b1875335093d7836f161835b
diff --git a/solr/licenses/opentelemetry-exporter-prometheus-1.63.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-exporter-prometheus-1.63.0-alpha.jar.sha1
deleted file mode 100644
index 538435d4627..00000000000
--- a/solr/licenses/opentelemetry-exporter-prometheus-1.63.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b8e1d8f31f9179d07dbd8a156ef661160d13d522
diff --git a/solr/licenses/opentelemetry-exporter-prometheus-1.65.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-exporter-prometheus-1.65.0-alpha.jar.sha1
new file mode 100644
index 00000000000..f91fe482efa
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-prometheus-1.65.0-alpha.jar.sha1
@@ -0,0 +1 @@
+e58e054ee860f4449d33140fa6148497ab331d24
diff --git a/solr/licenses/opentelemetry-exporter-sender-jdk-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-jdk-1.63.0.jar.sha1
deleted file mode 100644
index bcd5fc94bcb..00000000000
--- a/solr/licenses/opentelemetry-exporter-sender-jdk-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a8bcb023c8032e37713bedbf7511dd8e5c03f366
diff --git a/solr/licenses/opentelemetry-exporter-sender-jdk-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-jdk-1.65.0.jar.sha1
new file mode 100644
index 00000000000..18d94d6e506
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-sender-jdk-1.65.0.jar.sha1
@@ -0,0 +1 @@
+6cc9a7c8ebd9ffcffdd937a00664bc799e7167a4
diff --git a/solr/licenses/opentelemetry-instrumentation-api-2.27.0.jar.sha1 b/solr/licenses/opentelemetry-instrumentation-api-2.27.0.jar.sha1
deleted file mode 100644
index f208c99a918..00000000000
--- a/solr/licenses/opentelemetry-instrumentation-api-2.27.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e2b1010d19d5b3cabbf5f2eeb99cbfb23cbb01dc
diff --git a/solr/licenses/opentelemetry-instrumentation-api-2.31.1.jar.sha1 b/solr/licenses/opentelemetry-instrumentation-api-2.31.1.jar.sha1
new file mode 100644
index 00000000000..6bbccd658a4
--- /dev/null
+++ b/solr/licenses/opentelemetry-instrumentation-api-2.31.1.jar.sha1
@@ -0,0 +1 @@
+b82a6b9cf067b5486cfb8b9e0181d9ad9b1dfa52
diff --git a/solr/licenses/opentelemetry-instrumentation-api-incubator-2.27.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-instrumentation-api-incubator-2.27.0-alpha.jar.sha1
deleted file mode 100644
index 08e346df223..00000000000
--- a/solr/licenses/opentelemetry-instrumentation-api-incubator-2.27.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b76bb20c2bb9955969571a5f642adb25c84bfd2f
diff --git a/solr/licenses/opentelemetry-instrumentation-api-incubator-2.31.1-alpha.jar.sha1 b/solr/licenses/opentelemetry-instrumentation-api-incubator-2.31.1-alpha.jar.sha1
new file mode 100644
index 00000000000..e4e2cdef154
--- /dev/null
+++ b/solr/licenses/opentelemetry-instrumentation-api-incubator-2.31.1-alpha.jar.sha1
@@ -0,0 +1 @@
+b1906324fb9f84ea72f3471d2a69f0397a439b14
diff --git a/solr/licenses/opentelemetry-runtime-telemetry-2.27.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-runtime-telemetry-2.27.0-alpha.jar.sha1
deleted file mode 100644
index ed2989a82f3..00000000000
--- a/solr/licenses/opentelemetry-runtime-telemetry-2.27.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-16f7c09ebf09cfa6f126bb6e0491bcd5a117e692
diff --git a/solr/licenses/opentelemetry-runtime-telemetry-2.31.1-alpha.jar.sha1 b/solr/licenses/opentelemetry-runtime-telemetry-2.31.1-alpha.jar.sha1
new file mode 100644
index 00000000000..ba8d9f42d19
--- /dev/null
+++ b/solr/licenses/opentelemetry-runtime-telemetry-2.31.1-alpha.jar.sha1
@@ -0,0 +1 @@
+a8982bc9dd65aafb4cde46ff3a94b2b4610af599
diff --git a/solr/licenses/opentelemetry-runtime-telemetry-java17-2.27.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-runtime-telemetry-java17-2.27.0-alpha.jar.sha1
deleted file mode 100644
index b04dbd0e696..00000000000
--- a/solr/licenses/opentelemetry-runtime-telemetry-java17-2.27.0-alpha.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7d7f810ba0b92a12fd1a0542b1524bf9f6caa71d
diff --git a/solr/licenses/opentelemetry-sdk-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.63.0.jar.sha1
deleted file mode 100644
index dfa41e2f681..00000000000
--- a/solr/licenses/opentelemetry-sdk-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1d522dcf3fb4903c7f95835c3f6f631cf1c3824b
diff --git a/solr/licenses/opentelemetry-sdk-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.65.0.jar.sha1
new file mode 100644
index 00000000000..36f68b3eb53
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-1.65.0.jar.sha1
@@ -0,0 +1 @@
+0ec81a4855a64cd088f3aa0de5bf581717565838
diff --git a/solr/licenses/opentelemetry-sdk-common-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.63.0.jar.sha1
deleted file mode 100644
index 0883fa8952e..00000000000
--- a/solr/licenses/opentelemetry-sdk-common-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db2ec1f09c307adcf015bb8a87dd687eefa32e77
diff --git a/solr/licenses/opentelemetry-sdk-common-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.65.0.jar.sha1
new file mode 100644
index 00000000000..086b29c0fa5
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-common-1.65.0.jar.sha1
@@ -0,0 +1 @@
+7dbe712d9b9f51a48022f1cd358c0ed7e80f6a06
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.63.0.jar.sha1
deleted file mode 100644
index 0a85030199e..00000000000
--- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18fca38c89e76af8992cfc0423536434148a7d3e
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.65.0.jar.sha1
new file mode 100644
index 00000000000..6eacefb05e3
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.65.0.jar.sha1
@@ -0,0 +1 @@
+28ae444a769d8cade194ca5bbdd6924a56b1d513
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.63.0.jar.sha1
deleted file mode 100644
index 85505694881..00000000000
--- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cbe3039cd5b86e983bc6153b70132e8d5d74ca4b
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.65.0.jar.sha1
new file mode 100644
index 00000000000..86cb298b9cd
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.65.0.jar.sha1
@@ -0,0 +1 @@
+635051e4ba91ea38350e61ed58a39d16d573e977
diff --git a/solr/licenses/opentelemetry-sdk-logs-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.63.0.jar.sha1
deleted file mode 100644
index d65ac408726..00000000000
--- a/solr/licenses/opentelemetry-sdk-logs-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ef1e93dc6e05d2b9191d7fb9449fea8965086acb
diff --git a/solr/licenses/opentelemetry-sdk-logs-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.65.0.jar.sha1
new file mode 100644
index 00000000000..fa27a1b36c2
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-logs-1.65.0.jar.sha1
@@ -0,0 +1 @@
+9982196f3ef9531cb985ae951eb5eba952959793
diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.63.0.jar.sha1
deleted file mode 100644
index 256c4b17e43..00000000000
--- a/solr/licenses/opentelemetry-sdk-metrics-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-decbaf0de6dbe8156aa426ddc85b5b38354a236b
diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.65.0.jar.sha1
new file mode 100644
index 00000000000..8fa8f2bd855
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-metrics-1.65.0.jar.sha1
@@ -0,0 +1 @@
+75298219ef305b42193cb40ff1e72e0cf8df8f4f
diff --git a/solr/licenses/opentelemetry-sdk-testing-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-testing-1.63.0.jar.sha1
deleted file mode 100644
index 92d6b00c30e..00000000000
--- a/solr/licenses/opentelemetry-sdk-testing-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3335c2e8961a7a785abfa1e8c77ba39405207833
diff --git a/solr/licenses/opentelemetry-sdk-testing-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-testing-1.65.0.jar.sha1
new file mode 100644
index 00000000000..22e84c17f87
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-testing-1.65.0.jar.sha1
@@ -0,0 +1 @@
+aa6be6110498e5cc03a9a7e202f3215036cd0f9c
diff --git a/solr/licenses/opentelemetry-sdk-trace-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.63.0.jar.sha1
deleted file mode 100644
index 87f503089f9..00000000000
--- a/solr/licenses/opentelemetry-sdk-trace-1.63.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c948707623a0dbd79105eb29461f42bfe0db11b
diff --git a/solr/licenses/opentelemetry-sdk-trace-1.65.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.65.0.jar.sha1
new file mode 100644
index 00000000000..35c23f87915
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-trace-1.65.0.jar.sha1
@@ -0,0 +1 @@
+581326fd733b17cdd37e005575073e44a0a9b8ba
diff --git a/solr/licenses/opentelemetry-semconv-1.40.0.jar.sha1 b/solr/licenses/opentelemetry-semconv-1.40.0.jar.sha1
deleted file mode 100644
index cd33e3de83b..00000000000
--- a/solr/licenses/opentelemetry-semconv-1.40.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fca8594d7edb9ac5f7f9baa8d68f135354a7a243
diff --git a/solr/licenses/opentelemetry-semconv-1.43.0.jar.sha1 b/solr/licenses/opentelemetry-semconv-1.43.0.jar.sha1
new file mode 100644
index 00000000000..de82ac8b8aa
--- /dev/null
+++ b/solr/licenses/opentelemetry-semconv-1.43.0.jar.sha1
@@ -0,0 +1 @@
+a452c4166bda1a51a9792fbd0f459556143c2ae4
diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile
index 5d2073519d0..509f9213a15 100644
--- a/solr/modules/analysis-extras/gradle.lockfile
+++ b/solr/modules/analysis-extras/gradle.lockfile
@@ -50,20 +50,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile
index 1f48c17dc79..399e252e473 100644
--- a/solr/modules/clustering/gradle.lockfile
+++ b/solr/modules/clustering/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile
index adc7fc8b678..ddca67b53ab 100644
--- a/solr/modules/cross-dc/gradle.lockfile
+++ b/solr/modules/cross-dc/gradle.lockfile
@@ -50,20 +50,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile
index 9918580000a..b7ad03a1c72 100644
--- a/solr/modules/cuvs/gradle.lockfile
+++ b/solr/modules/cuvs/gradle.lockfile
@@ -50,20 +50,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile
index be3c21c0149..6f90f40c0f4 100644
--- a/solr/modules/extraction/gradle.lockfile
+++ b/solr/modules/extraction/gradle.lockfile
@@ -51,20 +51,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile
index 049b7d689b4..6e4318abe38 100644
--- a/solr/modules/gcs-repository/gradle.lockfile
+++ b/solr/modules/gcs-repository/gradle.lockfile
@@ -102,20 +102,19 @@ io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClas
io.opencensus:opencensus-api:0.31.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.opentelemetry.contrib:opentelemetry-gcp-resources:1.37.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.perfmark:perfmark-api:0.27.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile
index f2d58a07943..c281c10896e 100644
--- a/solr/modules/jwt-auth/gradle.lockfile
+++ b/solr/modules/jwt-auth/gradle.lockfile
@@ -63,20 +63,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile
index f0fe7652bc3..bf59d830a0f 100644
--- a/solr/modules/langid/gradle.lockfile
+++ b/solr/modules/langid/gradle.lockfile
@@ -49,20 +49,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile
index 30cff458954..8c09d9366e3 100644
--- a/solr/modules/language-models/gradle.lockfile
+++ b/solr/modules/language-models/gradle.lockfile
@@ -61,20 +61,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile
index ebcb462a4b1..71f6fb195a8 100644
--- a/solr/modules/ltr/gradle.lockfile
+++ b/solr/modules/ltr/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile
index 2b4ee796954..4736a1efdc2 100644
--- a/solr/modules/opentelemetry/gradle.lockfile
+++ b/solr/modules/opentelemetry/gradle.lockfile
@@ -48,29 +48,28 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-bom:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-otlp-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-otlp:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-sender-jdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-logs:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-testing:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-bom:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-otlp-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-otlp:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-sender-jdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-logs:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-testing:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile
index 1381f8bdcbb..87db066cf78 100644
--- a/solr/modules/s3-repository/gradle.lockfile
+++ b/solr/modules/s3-repository/gradle.lockfile
@@ -52,20 +52,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile
index ec10baf4e8f..9fcbe9df326 100644
--- a/solr/modules/scripting/gradle.lockfile
+++ b/solr/modules/scripting/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile
index 82673614124..855bb4e7df3 100644
--- a/solr/modules/sql/gradle.lockfile
+++ b/solr/modules/sql/gradle.lockfile
@@ -51,20 +51,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile
index 4086feee710..5d2e2c8fa7a 100644
--- a/solr/server/gradle.lockfile
+++ b/solr/server/gradle.lockfile
@@ -47,20 +47,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=jarValidation,runtimeClasspa
io.netty:netty-transport-native-epoll:4.2.17.Final=jarValidation,runtimeClasspath,solrCore
io.netty:netty-transport-native-unix-common:4.2.17.Final=jarValidation,runtimeClasspath,solrCore
io.netty:netty-transport:4.2.17.Final=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-api:1.63.0=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-common:1.63.0=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-context:1.63.0=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,solrCore
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-api:1.65.0=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-common:1.65.0=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-context:1.65.0=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,solrCore
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,solrCore
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,runtimeClasspath,solrCore
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,runtimeClasspath,solrCore
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,runtimeClasspath,solrCore
diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile
index 110c44f1131..601078d1317 100644
--- a/solr/solr-ref-guide/gradle.lockfile
+++ b/solr/solr-ref-guide/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=testCompileClasspath,testRun
io.netty:netty-transport-native-epoll:4.2.17.Final=testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=testRuntimeClasspath
diff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfile
index f73618cdef5..53bf712cbbe 100644
--- a/solr/solrj-jetty/gradle.lockfile
+++ b/solr/solrj-jetty/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=jarValidation,testCompileCla
io.netty:netty-transport-native-epoll:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,testRuntimeClasspath
diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile
index 9c8038cd0e7..843b05e79ce 100644
--- a/solr/solrj-streaming/gradle.lockfile
+++ b/solr/solrj-streaming/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=jarValidation,testCompileCla
io.netty:netty-transport-native-epoll:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,testRuntimeClasspath
diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile
index 6bc5794cca5..9a72a1cf57e 100644
--- a/solr/solrj-zookeeper/gradle.lockfile
+++ b/solr/solrj-zookeeper/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,testRuntimeClasspath
diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile
index 075cdca0ea1..c3c204ea833 100644
--- a/solr/solrj/gradle.lockfile
+++ b/solr/solrj/gradle.lockfile
@@ -48,20 +48,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=jarValidation,testCompileCla
io.netty:netty-transport-native-epoll:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,testRuntimeClasspath
diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile
index 309368d720e..1cb8d2e82d9 100644
--- a/solr/test-framework/gradle.lockfile
+++ b/solr/test-framework/gradle.lockfile
@@ -49,20 +49,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=compileClasspath,jarValidati
io.netty:netty-transport-native-epoll:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,runtimeClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java
index 8ee2e5032c1..0efc46b114e 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudAuthTestCase.java
@@ -19,7 +19,6 @@ package org.apache.solr.cloud;
import static java.nio.charset.StandardCharsets.UTF_8;
-import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
@@ -37,6 +36,7 @@ import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.embedded.JettySolrRunner;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
import org.apache.solr.security.AuthenticationPlugin;
import org.apache.solr.security.PKIAuthenticationPlugin;
import org.apache.solr.util.SolrMetricTestUtils;
@@ -252,7 +252,7 @@ public class SolrCloudAuthTestCase extends SolrCloudTestCase {
private static Map<String, DataPointSnapshot> getMetricValues(
CoreContainer coreContainer, List<String> metricNames, String registryName, Labels labels) {
Map<String, DataPointSnapshot> metrics = new HashMap<>();
- PrometheusMetricReader prometheusMetricReader =
+ FilterablePrometheusMetricReader prometheusMetricReader =
SolrMetricTestUtils.getPrometheusMetricReader(coreContainer, registryName);
for (String metricName : metricNames) {
if ("solr_authentication_request_times_nanoseconds".equals(metricName)) {
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java b/solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java
index 409aae86c37..eb87ece1d22 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java
@@ -19,7 +19,6 @@ package org.apache.solr.util;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.metrics.LongCounter;
-import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
@@ -37,6 +36,7 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.metrics.SolrMetricProducer;
import org.apache.solr.metrics.SolrMetricsContext;
+import org.apache.solr.metrics.otel.FilterablePrometheusMetricReader;
public final class SolrMetricTestUtils {
@@ -81,7 +81,7 @@ public final class SolrMetricTestUtils {
* typically cast to something useful.
*/
public static DataPointSnapshot getDataPointSnapshot(
- PrometheusMetricReader reader, String metricName, Labels labels) {
+ FilterablePrometheusMetricReader reader, String metricName, Labels labels) {
MetricSnapshots metricSnapshots = reader.collect();
return metricSnapshots.stream()
.filter(ms -> ms.getMetadata().getPrometheusName().equals(metricName))
@@ -111,12 +111,12 @@ public final class SolrMetricTestUtils {
return Labels.builder().label("core", coreName).label("otel_scope_name", "org.apache.solr");
}
- public static PrometheusMetricReader getPrometheusMetricReader(SolrCore core) {
+ public static FilterablePrometheusMetricReader getPrometheusMetricReader(SolrCore core) {
return getPrometheusMetricReader(
core.getCoreContainer(), core.getCoreMetricManager().getRegistryName());
}
- public static PrometheusMetricReader getPrometheusMetricReader(
+ public static FilterablePrometheusMetricReader getPrometheusMetricReader(
CoreContainer container, String registryName) {
return container.getMetricManager().getPrometheusMetricReader(registryName);
}
@@ -137,7 +137,10 @@ public final class SolrMetricTestUtils {
}
private static <T> T getDataPoint(
- PrometheusMetricReader reader, String metricName, Labels labels, Class<T> snapshotType) {
+ FilterablePrometheusMetricReader reader,
+ String metricName,
+ Labels labels,
+ Class<T> snapshotType) {
return snapshotType.cast(SolrMetricTestUtils.getDataPointSnapshot(reader, metricName, labels));
}
@@ -152,17 +155,17 @@ public final class SolrMetricTestUtils {
}
public static CounterSnapshot.CounterDataPointSnapshot getCounterDatapoint(
- PrometheusMetricReader reader, String metricName, Labels labels) {
+ FilterablePrometheusMetricReader reader, String metricName, Labels labels) {
return getDataPoint(reader, metricName, labels, CounterSnapshot.CounterDataPointSnapshot.class);
}
public static GaugeSnapshot.GaugeDataPointSnapshot getGaugeDatapoint(
- PrometheusMetricReader reader, String metricName, Labels labels) {
+ FilterablePrometheusMetricReader reader, String metricName, Labels labels) {
return getDataPoint(reader, metricName, labels, GaugeSnapshot.GaugeDataPointSnapshot.class);
}
public static HistogramSnapshot.HistogramDataPointSnapshot getHistogramDatapoint(
- PrometheusMetricReader reader, String metricName, Labels labels) {
+ FilterablePrometheusMetricReader reader, String metricName, Labels labels) {
return getDataPoint(
reader, metricName, labels, HistogramSnapshot.HistogramDataPointSnapshot.class);
}
diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile
index ce4881bc128..20cd38a7c7e 100644
--- a/solr/webapp/gradle.lockfile
+++ b/solr/webapp/gradle.lockfile
@@ -49,20 +49,19 @@ io.netty:netty-transport-classes-epoll:4.2.17.Final=jarValidation,solrCore,testC
io.netty:netty-transport-native-epoll:4.2.17.Final=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.2.17.Final=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
io.netty:netty-transport:4.2.17.Final=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.27.0-alpha=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.27.0=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.27.0-alpha=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.27.0-alpha=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry.semconv:opentelemetry-semconv:1.40.0=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api-incubator:1.61.0-alpha=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.63.0=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.63.0=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.63.0=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.63.0=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.63.0=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.63.0=jarValidation,solrCore,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.63.0=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.31.1-alpha=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.31.1=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry:2.31.1-alpha=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry.semconv:opentelemetry-semconv:1.43.0=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api-incubator:1.65.0-alpha=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.65.0=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.65.0=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.65.0=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.65.0-alpha=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.65.0=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.65.0=jarValidation,solrCore,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.65.0=jarValidation,solrCore,testRuntimeClasspath
io.prometheus:prometheus-metrics-config:1.8.0=jarValidation,solrCore,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.8.0=jarValidation,solrCore,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-textformats:1.8.0=jarValidation,solrCore,testRuntimeClasspath