diff --git a/gradle/wrapper/.gradle-wrapper2818896035930485786.tmp b/gradle/wrapper/.gradle-wrapper2818896035930485786.tmp new file mode 100644 index 00000000000..e69de29bb2d diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index 38c58e90571..3c8ae7197fa 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -43,6 +43,9 @@ com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,testRuntimeClasspath com.sun.activation:jakarta.activation:2.0.1=swaggerBuild com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,testRuntimeClasspath @@ -72,7 +75,10 @@ io.netty:netty-transport:4.1.114.Final=jarValidation,testCompileClasspath,testRu io.opentelemetry:opentelemetry-api:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,testRuntimeClasspath @@ -179,6 +185,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,testRuntimeClasspath org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,swaggerBuild,swaggerDeps,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile index 62e08084f88..d6173b5485d 100644 --- a/solr/benchmark/gradle.lockfile +++ b/solr/benchmark/gradle.lockfile @@ -31,6 +31,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.17.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,7 +61,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,testRuntimeClasspath @@ -151,6 +157,11 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime org.hamcrest:hamcrest:3.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,runtimeClasspath,testRuntimeClasspath diff --git a/solr/core/build.gradle b/solr/core/build.gradle index 14119619820..b0802c356da 100644 --- a/solr/core/build.gradle +++ b/solr/core/build.gradle @@ -156,6 +156,7 @@ dependencies { // Distributed Tracing api libs.opentelemetry.api implementation libs.opentelemetry.context + implementation libs.opentelemetry.exporter.otlp implementation(libs.opentelemetry.exporter.prometheus, { exclude group: "io.prometheus", module: "prometheus-metrics-exporter-httpserver" @@ -217,4 +218,6 @@ dependencies { testRuntimeOnly(libs.mockito.subclass, { exclude group: "net.bytebuddy", module: "byte-buddy-agent" }) + + testImplementation libs.opentelemetry.sdktesting } diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index 66793066e4b..40d37433923 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -39,6 +39,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.ibm.icu:icu4j:74.2=jarValidation,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-cli:commons-cli:1.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.17.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -66,11 +69,15 @@ io.netty:netty-transport:4.1.114.Final=apiHelper,compileClasspath,jarValidation, io.opentelemetry:opentelemetry-api:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-metrics:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-testing:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.prometheus:prometheus-metrics-exposition-formats:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -183,6 +190,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=compileClasspath,jarValidation,perm org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testCompileClasspath,testRuntimeClasspath 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 fa600e5c3cd..6cced1bba2a 100644 --- a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java +++ b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java @@ -16,6 +16,10 @@ */ package org.apache.solr.metrics; +import static org.apache.solr.metrics.otel.OtlpExporterFactory.OTLP_EXPORTER_ENABLED; +import static org.apache.solr.metrics.otel.OtlpExporterFactory.OTLP_EXPORTER_INTERVAL; +import static org.apache.solr.metrics.otel.OtlpExporterFactory.OTLP_EXPORTER_PROTOCOL; + import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; @@ -52,6 +56,10 @@ import io.opentelemetry.api.metrics.ObservableLongUpDownCounter; import io.opentelemetry.exporter.prometheus.PrometheusMetricReader; import io.opentelemetry.sdk.metrics.SdkMeterProvider; +import io.opentelemetry.sdk.metrics.export.MetricExporter; +import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader; +import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil; +import io.opentelemetry.sdk.metrics.internal.exemplar.ExemplarFilter; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.util.ArrayList; @@ -82,6 +90,7 @@ import org.apache.solr.core.SolrInfoBean; import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.logging.MDCLoggingContext; +import org.apache.solr.metrics.otel.OtlpExporterFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -152,8 +161,11 @@ public class SolrMetricManager { private final ConcurrentMap meterProviderAndReaders = new ConcurrentHashMap<>(); - public SolrMetricManager() { + private final MetricExporter metricExporter; + + public SolrMetricManager(MetricExporter exporter) { metricsConfig = new MetricsConfig.MetricsConfigBuilder().build(); + metricExporter = exporter; counterSupplier = MetricSuppliers.counterSupplier(null, null); meterSupplier = MetricSuppliers.meterSupplier(null, null); timerSupplier = MetricSuppliers.timerSupplier(null, null); @@ -162,6 +174,7 @@ public SolrMetricManager() { public SolrMetricManager(SolrResourceLoader loader, MetricsConfig metricsConfig) { this.metricsConfig = metricsConfig; + this.metricExporter = OtlpExporterFactory.getExporter(); counterSupplier = MetricSuppliers.counterSupplier(loader, metricsConfig.getCounterSupplier()); meterSupplier = MetricSuppliers.meterSupplier(loader, metricsConfig.getMeterSupplier()); timerSupplier = MetricSuppliers.timerSupplier(loader, metricsConfig.getTimerSupplier()); @@ -723,10 +736,15 @@ public SdkMeterProvider meterProvider(String providerName) { providerName, key -> { var reader = new PrometheusMetricReader(true, null); - // NOCOMMIT: We need to add a Periodic Metric Reader here if we want to push with OTLP - // with an exporter - var provider = SdkMeterProvider.builder().registerMetricReader(reader).build(); - return new MeterProviderAndReaders(provider, reader); + var builder = SdkMeterProvider.builder().registerMetricReader(reader); + if (OTLP_EXPORTER_ENABLED && !OTLP_EXPORTER_PROTOCOL.equals("none")) { + builder.registerMetricReader( + PeriodicMetricReader.builder(metricExporter) + .setInterval(OTLP_EXPORTER_INTERVAL, TimeUnit.MILLISECONDS) + .build()); + } + SdkMeterProviderUtil.setExemplarFilter(builder, ExemplarFilter.traceBased()); + return new MeterProviderAndReaders(builder.build(), reader); }) .sdkMeterProvider(); } @@ -754,7 +772,7 @@ private static MetricRegistry getOrCreateRegistry( * * @param registry name of the registry to remove */ - // TODO SOLR-17458: You can't delete OTEL meters + // NOCOMMIT: Remove this public void removeRegistry(String registry) { // NOCOMMIT Remove all closing Dropwizard registries // close any reporters for this registry first @@ -1670,6 +1688,10 @@ public PrometheusMetricReader getPrometheusMetricReader(String providerName) { return (mpr != null) ? mpr.prometheusMetricReader() : null; } + public MetricExporter getMetricExporter() { + return metricExporter; + } + private record MeterProviderAndReaders( SdkMeterProvider sdkMeterProvider, PrometheusMetricReader prometheusMetricReader) {} } diff --git a/solr/core/src/java/org/apache/solr/metrics/otel/NoopMetricExporter.java b/solr/core/src/java/org/apache/solr/metrics/otel/NoopMetricExporter.java new file mode 100644 index 00000000000..578a8f5a01c --- /dev/null +++ b/solr/core/src/java/org/apache/solr/metrics/otel/NoopMetricExporter.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.metrics.otel; + +import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.metrics.InstrumentType; +import io.opentelemetry.sdk.metrics.data.AggregationTemporality; +import io.opentelemetry.sdk.metrics.data.MetricData; +import io.opentelemetry.sdk.metrics.export.MetricExporter; +import java.util.Collection; + +public class NoopMetricExporter implements MetricExporter { + @Override + public CompletableResultCode export(Collection metrics) { + return CompletableResultCode.ofSuccess(); + } + + @Override + public CompletableResultCode flush() { + return CompletableResultCode.ofSuccess(); + } + + @Override + public CompletableResultCode shutdown() { + return CompletableResultCode.ofSuccess(); + } + + @Override + public AggregationTemporality getAggregationTemporality(InstrumentType instrumentType) { + return AggregationTemporality.CUMULATIVE; + } +} diff --git a/solr/core/src/java/org/apache/solr/metrics/otel/OtlpExporterFactory.java b/solr/core/src/java/org/apache/solr/metrics/otel/OtlpExporterFactory.java new file mode 100644 index 00000000000..90a7add3c9c --- /dev/null +++ b/solr/core/src/java/org/apache/solr/metrics/otel/OtlpExporterFactory.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.metrics.otel; + +import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter; +import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter; +import io.opentelemetry.sdk.metrics.export.MetricExporter; +import java.lang.invoke.MethodHandles; +import org.apache.solr.common.util.EnvUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Factory class for creating OpenTelemetry OTLP metric exporters and its configuration properties. + * + * @see io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter + * @see io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter + * @see NoopMetricExporter + */ +public class OtlpExporterFactory { + + private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + public static final Boolean OTLP_EXPORTER_ENABLED = + Boolean.parseBoolean(EnvUtils.getProperty("solr.otlpMetricExporterEnabled", "false")); + + public static final String OTLP_EXPORTER_PROTOCOL = + EnvUtils.getProperty("solr.otlpMetricExporterProtocol", "grpc"); + + public static final int OTLP_EXPORTER_INTERVAL = + Integer.parseInt(EnvUtils.getProperty("solr.otlpMetricExporterInterval", "60000")); + + public static MetricExporter getExporter() { + if (!OTLP_EXPORTER_ENABLED) { + log.info("OTLP metric exporter is disabled."); + return new NoopMetricExporter(); + } + + return switch (OTLP_EXPORTER_PROTOCOL) { + case "grpc" -> OtlpGrpcMetricExporter.getDefault(); + case "http" -> OtlpHttpMetricExporter.getDefault(); + case "none" -> new NoopMetricExporter(); + default -> { + log.warn( + "Unknown OTLP exporter type: {}. Defaulting to NO-OP exporter.", + OTLP_EXPORTER_PROTOCOL); + yield new NoopMetricExporter(); + } + }; + } +} diff --git a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java index 77fd3642b2a..79a28ef758c 100644 --- a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java @@ -18,7 +18,7 @@ import io.opentelemetry.exporter.prometheus.PrometheusMetricReader; import io.opentelemetry.sdk.metrics.SdkMeterProvider; -import io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter; +import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter; import io.prometheus.metrics.model.snapshots.CounterSnapshot; import io.prometheus.metrics.model.snapshots.GaugeSnapshot; import io.prometheus.metrics.model.snapshots.HistogramSnapshot; @@ -41,7 +41,8 @@ public class PrometheusResponseWriter implements QueryResponseWriter { // not TextQueryResponseWriter because Prometheus libs work with an OutputStream - private static final String CONTENT_TYPE_PROMETHEUS = "text/plain; version=0.0.4"; + private static final String CONTENT_TYPE_OPEN_METRICS = + "application/openmetrics-text; version=1.0.0; charset=utf-8"; private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @Override @@ -55,12 +56,12 @@ public void write( List snapshots = readers.values().stream().flatMap(r -> r.collect().stream()).toList(); - new PrometheusTextFormatWriter(false).write(out, mergeSnapshots(snapshots)); + new OpenMetricsTextFormatWriter(false, true).write(out, mergeSnapshots(snapshots)); } @Override public String getContentType(SolrQueryRequest request, SolrQueryResponse response) { - return CONTENT_TYPE_PROMETHEUS; + return CONTENT_TYPE_OPEN_METRICS; } /** diff --git a/solr/core/src/test/org/apache/solr/blockcache/BufferStoreTest.java b/solr/core/src/test/org/apache/solr/blockcache/BufferStoreTest.java index 46bc29685ca..47860b20ba8 100644 --- a/solr/core/src/test/org/apache/solr/blockcache/BufferStoreTest.java +++ b/solr/core/src/test/org/apache/solr/blockcache/BufferStoreTest.java @@ -24,6 +24,7 @@ import org.apache.solr.metrics.MetricsMap; import org.apache.solr.metrics.SolrMetricManager; import org.apache.solr.metrics.SolrMetricsContext; +import org.apache.solr.metrics.otel.NoopMetricExporter; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -39,7 +40,7 @@ public class BufferStoreTest extends SolrTestCase { @Before public void setup() { metrics = new Metrics(); - SolrMetricManager metricManager = new SolrMetricManager(); + SolrMetricManager metricManager = new SolrMetricManager(new NoopMetricExporter()); String registry = TestUtil.randomSimpleString(random(), 2, 10); String scope = TestUtil.randomSimpleString(random(), 2, 10); SolrMetricsContext solrMetricsContext = new SolrMetricsContext(metricManager, registry, "foo"); 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 2c8f51aec6d..baae96e7fbb 100644 --- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java @@ -30,6 +30,8 @@ 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; import io.prometheus.metrics.model.snapshots.GaugeSnapshot; import io.prometheus.metrics.model.snapshots.HistogramSnapshot; @@ -49,6 +51,7 @@ import org.apache.solr.core.SolrInfoBean; import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.metrics.reporters.MockMetricReporter; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -60,19 +63,24 @@ public class SolrMetricManagerTest extends SolrTestCaseJ4 { @Before public void setUp() throws Exception { super.setUp(); - this.metricManager = new SolrMetricManager(); + System.setProperty("solr.otlpMetricExporterInterval", "1000"); + this.metricManager = new SolrMetricManager(InMemoryMetricExporter.create()); // Initialize a metric reader for tests metricManager.meterProvider(METER_PROVIDER_NAME); this.reader = metricManager.getPrometheusMetricReader(METER_PROVIDER_NAME); } + @After + public void tearDown() throws Exception { + super.tearDown(); + metricManager.removeRegistry(METER_PROVIDER_NAME); + } + // NOCOMMIT: We might not be supported core swapping in 10. Maybe remove this test @Test public void testSwapRegistries() { Random r = random(); - SolrMetricManager metricManager = new SolrMetricManager(); - Map metrics1 = SolrMetricTestUtils.getRandomMetrics(r, true); Map metrics2 = SolrMetricTestUtils.getRandomMetrics(r, true); String fromName = "from-" + TestUtil.randomSimpleString(r, 1, 10); @@ -114,8 +122,6 @@ public void testSwapRegistries() { public void testRegisterAll() throws Exception { Random r = random(); - SolrMetricManager metricManager = new SolrMetricManager(); - Map metrics = SolrMetricTestUtils.getRandomMetrics(r, true); MetricRegistry mr = new MetricRegistry(); for (Map.Entry entry : metrics.entrySet()) { @@ -144,8 +150,6 @@ public void testRegisterAll() throws Exception { public void testClearMetrics() { Random r = random(); - SolrMetricManager metricManager = new SolrMetricManager(); - Map metrics = SolrMetricTestUtils.getRandomMetrics(r, true); String registryName = TestUtil.randomSimpleString(r, 1, 10); @@ -187,8 +191,6 @@ public void testClearMetrics() { public void testSimpleMetrics() { Random r = random(); - SolrMetricManager metricManager = new SolrMetricManager(); - String registryName = TestUtil.randomSimpleString(r, 1, 10); metricManager.counter(null, registryName, "simple_counter", "foo", "bar"); @@ -223,8 +225,6 @@ public void testRegistryName() { public void testReporters() throws Exception { try (SolrResourceLoader loader = new SolrResourceLoader(createTempDir())) { - SolrMetricManager metricManager = new SolrMetricManager(); - PluginInfo[] plugins = new PluginInfo[] { createPluginInfo("universal_foo", null, null), @@ -502,6 +502,32 @@ public void testObservableDoubleUpDownCounter() { assertEquals(-10.1, actual.getDataPoints().getFirst().getValue(), 1e-6); } + @Test + public void testMetricExporter() throws Exception { + LongCounter counter = + metricManager.longCounter(METER_PROVIDER_NAME, "my_counter", "desc", null); + counter.add(5); + counter.add(3); + InMemoryMetricExporter exporter = (InMemoryMetricExporter) metricManager.getMetricExporter(); + + // Wait 3 seconds for the exporter to push metrics + Thread.sleep(3000); + + var metrics = exporter.getFinishedMetricItems(); + + MetricData actual = + metrics.stream() + .filter(m -> "my_counter".equals(m.getName())) + .findFirst() + .orElseThrow(() -> new AssertionError("my_counter metric not found from exporter")); + + // Exporter pushes metrics every 1 second, so we only need to find at least 1 metric point with + // the correct value + assertTrue( + "Exported counter had different recorded value than expected", + actual.getLongSumData().getPoints().stream().anyMatch(p -> p.getValue() == 8L)); + } + @Test public void testCloseMeterProviders() { LongCounter counter = diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java index c0ff0827d57..62924e68cf0 100644 --- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java @@ -23,6 +23,7 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.CoreAdminParams; import org.apache.solr.core.PluginInfo; +import org.apache.solr.metrics.otel.NoopMetricExporter; import org.apache.solr.metrics.reporters.MockMetricReporter; import org.apache.solr.schema.FieldType; import org.junit.Test; @@ -33,7 +34,7 @@ public class SolrMetricReporterTest extends SolrTestCaseJ4 { public void testInit() throws Exception { Random random = random(); - SolrMetricManager metricManager = new SolrMetricManager(); + SolrMetricManager metricManager = new SolrMetricManager(new NoopMetricExporter()); final String registryName = TestUtil.randomSimpleString(random); final MockMetricReporter reporter = new MockMetricReporter(metricManager, registryName); diff --git a/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java b/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java index d70ea43a468..81b06a54b4e 100644 --- a/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java +++ b/solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java @@ -35,12 +35,13 @@ import org.apache.solr.SolrTestCase; import org.apache.solr.metrics.SolrMetricManager; import org.apache.solr.metrics.SolrMetricsContext; +import org.apache.solr.metrics.otel.NoopMetricExporter; import org.junit.Test; /** Test for {@link CaffeineCache}. */ public class TestCaffeineCache extends SolrTestCase { - SolrMetricManager metricManager = new SolrMetricManager(); + SolrMetricManager metricManager = new SolrMetricManager(new NoopMetricExporter()); String registry = TestUtil.randomSimpleString(random(), 2, 10); String scope = TestUtil.randomSimpleString(random(), 2, 10); diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java b/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java index 989140b28f0..9b32ab4b387 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java +++ b/solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java @@ -30,6 +30,7 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.metrics.SolrMetricManager; import org.apache.solr.metrics.SolrMetricsContext; +import org.apache.solr.metrics.otel.NoopMetricExporter; import org.junit.Before; import org.junit.Test; import org.junit.runners.model.MultipleFailureException; @@ -98,7 +99,7 @@ private void doTestGetPutCompute( boolean useCompute) throws Exception { for (Class clazz : IMPLS) { - SolrMetricManager metricManager = new SolrMetricManager(); + SolrMetricManager metricManager = new SolrMetricManager(new NoopMetricExporter()); @SuppressWarnings({"unchecked"}) SolrCache cache = clazz.getDeclaredConstructor().newInstance(); Map params = new HashMap<>(); diff --git a/solr/core/src/test/org/apache/solr/search/TestThinCache.java b/solr/core/src/test/org/apache/solr/search/TestThinCache.java index de14da997ea..7892865b1ac 100644 --- a/solr/core/src/test/org/apache/solr/search/TestThinCache.java +++ b/solr/core/src/test/org/apache/solr/search/TestThinCache.java @@ -27,6 +27,7 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.metrics.SolrMetricManager; import org.apache.solr.metrics.SolrMetricsContext; +import org.apache.solr.metrics.otel.NoopMetricExporter; import org.apache.solr.util.EmbeddedSolrServerTestRule; import org.apache.solr.util.TestHarness; import org.apache.solr.util.stats.MetricUtils; @@ -84,7 +85,7 @@ public static void setupSolrHome() throws Exception { lrf = h.getRequestFactory("/select", 0, 20); } - SolrMetricManager metricManager = new SolrMetricManager(); + SolrMetricManager metricManager = new SolrMetricManager(new NoopMetricExporter()); String registry = TestUtil.randomSimpleString(random(), 2, 10); String scope = TestUtil.randomSimpleString(random(), 2, 10); diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 42deb05940b..d54cd16ac28 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -38,6 +38,9 @@ com.helger:profiler:1.1.1=compileClasspath,jarValidation,runtimeClasspath,runtim com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.thoughtworks.paranamer:paranamer:2.8=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.typesafe.scala-logging:scala-logging_2.13:3.9.5=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath @@ -75,7 +78,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -193,6 +199,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,runt org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/licenses/opentelemetry-api-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.50.0.jar.sha1 deleted file mode 100644 index 3c7f32b2643..00000000000 --- a/solr/licenses/opentelemetry-api-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -83a69114c56ff2664d21906c62431bceb1c294ed diff --git a/solr/licenses/opentelemetry-api-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.51.0.jar.sha1 new file mode 100644 index 00000000000..a59c48632cf --- /dev/null +++ b/solr/licenses/opentelemetry-api-1.51.0.jar.sha1 @@ -0,0 +1 @@ +9806bcb604f693fb4b75962df9d4d2d19da4806d diff --git a/solr/licenses/opentelemetry-context-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.50.0.jar.sha1 deleted file mode 100644 index e6d67b0652e..00000000000 --- a/solr/licenses/opentelemetry-context-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dcdc20a193e82d66ecf5a1a978a799bc19e9b210 diff --git a/solr/licenses/opentelemetry-context-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.51.0.jar.sha1 new file mode 100644 index 00000000000..0a3d1596e36 --- /dev/null +++ b/solr/licenses/opentelemetry-context-1.51.0.jar.sha1 @@ -0,0 +1 @@ +e807ef03950f5b01f7b8c2698c0abba4072288ed diff --git a/solr/licenses/opentelemetry-exporter-common-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.50.0.jar.sha1 deleted file mode 100644 index 827f7773e3f..00000000000 --- a/solr/licenses/opentelemetry-exporter-common-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -73bc444d344995bfcd4705a0261662c27d58c9c9 diff --git a/solr/licenses/opentelemetry-exporter-common-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.51.0.jar.sha1 new file mode 100644 index 00000000000..9f65e786944 --- /dev/null +++ b/solr/licenses/opentelemetry-exporter-common-1.51.0.jar.sha1 @@ -0,0 +1 @@ +84812087b686c4391d6bd39904462c9828849027 diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.50.0.jar.sha1 deleted file mode 100644 index e5cffae0071..00000000000 --- a/solr/licenses/opentelemetry-exporter-otlp-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8eb4ce42340ae0443793e9fa41ba9e4f7743e66e diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.51.0.jar.sha1 new file mode 100644 index 00000000000..df77a4b2b6b --- /dev/null +++ b/solr/licenses/opentelemetry-exporter-otlp-1.51.0.jar.sha1 @@ -0,0 +1 @@ +e7b0f0e8107ffb04b57a33ee0530df57fe9ff206 diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.50.0.jar.sha1 deleted file mode 100644 index 9f5ed208526..00000000000 --- a/solr/licenses/opentelemetry-exporter-otlp-common-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3b5cf0eeffa6087324f7c57b5d9e48c62b8e2e8c diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.51.0.jar.sha1 new file mode 100644 index 00000000000..909ac937dfb --- /dev/null +++ b/solr/licenses/opentelemetry-exporter-otlp-common-1.51.0.jar.sha1 @@ -0,0 +1 @@ +6f18bd13954ad52d573e6910edde7aa0c2d07ca5 diff --git a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.50.0.jar.sha1 deleted file mode 100644 index 30283f96545..00000000000 --- a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -83ee66ff7ff5babc1884533a8c3a6a99fd64d643 diff --git a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.51.0.jar.sha1 new file mode 100644 index 00000000000..6fde8d4e6ab --- /dev/null +++ b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.51.0.jar.sha1 @@ -0,0 +1 @@ +193a1108f9ff040583cbe6a1e9aac331da7bb4c2 diff --git a/solr/licenses/opentelemetry-sdk-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.50.0.jar.sha1 deleted file mode 100644 index ab4123d5478..00000000000 --- a/solr/licenses/opentelemetry-sdk-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1c6ffdd0bf5a3e42154912f0ab1b1bbd73499af1 diff --git a/solr/licenses/opentelemetry-sdk-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.51.0.jar.sha1 new file mode 100644 index 00000000000..b1f38ee606e --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-1.51.0.jar.sha1 @@ -0,0 +1 @@ +f5c088880d3c63c573dd598b53450a6d266df879 diff --git a/solr/licenses/opentelemetry-sdk-common-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.50.0.jar.sha1 deleted file mode 100644 index 6739b9258fc..00000000000 --- a/solr/licenses/opentelemetry-sdk-common-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -928c43d75cd0675070d38d041973370823d6face diff --git a/solr/licenses/opentelemetry-sdk-common-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.51.0.jar.sha1 new file mode 100644 index 00000000000..673e3125160 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-common-1.51.0.jar.sha1 @@ -0,0 +1 @@ +b5038626586b5756d2a62a2e7307b2cca5386aad diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.50.0.jar.sha1 deleted file mode 100644 index 4190d963d8f..00000000000 --- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ad69f784c48db4bdc216f90fddead6c7e26b0727 diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.51.0.jar.sha1 new file mode 100644 index 00000000000..9ce9afec573 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.51.0.jar.sha1 @@ -0,0 +1 @@ +3ed1a610bbbb0d2979254d8a6f70f99ab5f8dab5 diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.50.0.jar.sha1 deleted file mode 100644 index 3112fe841ec..00000000000 --- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47676b3c16db83a30b002d0e9cd9e6405236dd21 diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.51.0.jar.sha1 new file mode 100644 index 00000000000..ce8bd930d21 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.51.0.jar.sha1 @@ -0,0 +1 @@ +676e3163b2773c9b315ff0075d88bcd31d1031d9 diff --git a/solr/licenses/opentelemetry-sdk-logs-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.50.0.jar.sha1 deleted file mode 100644 index b2e86ef3a8e..00000000000 --- a/solr/licenses/opentelemetry-sdk-logs-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fb7ace15eca8878a2c3cf86320ed1d2fd1c0f206 diff --git a/solr/licenses/opentelemetry-sdk-logs-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.51.0.jar.sha1 new file mode 100644 index 00000000000..b0adbd885ee --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-logs-1.51.0.jar.sha1 @@ -0,0 +1 @@ +33f962d29bb6eddf33005b169b0948cd785f82d6 diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.50.0.jar.sha1 deleted file mode 100644 index cbaa77257d3..00000000000 --- a/solr/licenses/opentelemetry-sdk-metrics-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49432de0171798f671bda82bf7eef6ae283b3b7d diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.51.0.jar.sha1 new file mode 100644 index 00000000000..501bee5e30d --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-metrics-1.51.0.jar.sha1 @@ -0,0 +1 @@ +769cf069a94fa2eac393441efff3fb4408a4327b diff --git a/solr/licenses/opentelemetry-sdk-testing-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-testing-1.50.0.jar.sha1 deleted file mode 100644 index 2f3100622bb..00000000000 --- a/solr/licenses/opentelemetry-sdk-testing-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2972ea619333a9c39f5e6104884278ab9d439f69 diff --git a/solr/licenses/opentelemetry-sdk-testing-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-testing-1.51.0.jar.sha1 new file mode 100644 index 00000000000..15913588eb8 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-testing-1.51.0.jar.sha1 @@ -0,0 +1 @@ +06a63b3805251380afe95eae8b842c20fa23a894 diff --git a/solr/licenses/opentelemetry-sdk-trace-1.50.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.50.0.jar.sha1 deleted file mode 100644 index 3255b03451f..00000000000 --- a/solr/licenses/opentelemetry-sdk-trace-1.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19d60d3b72aa2d0d89a02361eedf7157ecc1fc7d diff --git a/solr/licenses/opentelemetry-sdk-trace-1.51.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.51.0.jar.sha1 new file mode 100644 index 00000000000..1f790c3f6bd --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-trace-1.51.0.jar.sha1 @@ -0,0 +1 @@ +22abd9ed89341e341f1968acf1817fd57bf23000 diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile index 09190b03892..c6369a43611 100644 --- a/solr/modules/analysis-extras/gradle.lockfile +++ b/solr/modules/analysis-extras/gradle.lockfile @@ -32,6 +32,9 @@ com.ibm.icu:icu4j:74.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLi com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -59,7 +62,10 @@ io.netty:netty-transport:4.1.114.Final=apiHelper,compileClasspath,jarValidation, io.opentelemetry:opentelemetry-api:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -163,6 +169,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=apiHelper,jarValidation,runtimeClas org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile index 4547445629e..c15fb63a768 100644 --- a/solr/modules/clustering/gradle.lockfile +++ b/solr/modules/clustering/gradle.lockfile @@ -31,6 +31,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -58,7 +61,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -153,6 +159,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,runt org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile index b2522248373..e300e1fc418 100644 --- a/solr/modules/cross-dc/gradle.lockfile +++ b/solr/modules/cross-dc/gradle.lockfile @@ -32,6 +32,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -59,7 +62,10 @@ io.netty:netty-transport:4.1.114.Final=apiHelper,compileClasspath,jarValidation, io.opentelemetry:opentelemetry-api:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -156,6 +162,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=apiHelper,jarValidation,runtimeClas org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java b/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java index ed914dfaeb1..a4cb9a97cc3 100644 --- a/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java +++ b/solr/modules/cross-dc/src/test/org/apache/solr/crossdc/handler/MirroringCollectionsHandlerTest.java @@ -31,7 +31,6 @@ import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.params.SolrParams; import org.apache.solr.core.CoreContainer; -import org.apache.solr.core.OpenTelemetryConfigurator; import org.apache.solr.core.SolrXmlConfig; import org.apache.solr.crossdc.common.KafkaCrossDcConf; import org.apache.solr.crossdc.common.KafkaMirroringSink; @@ -161,8 +160,6 @@ private void runCommand(SolrParams params, boolean expectResult) throws Exceptio @Test public void testCoreContainerInit() throws Exception { - OpenTelemetryConfigurator.resetForTest(); - Path home = createTempDir(); String solrXml = IOUtils.resourceToString("/mirroring-solr.xml", StandardCharsets.UTF_8); CoreContainer cores = new CoreContainer(SolrXmlConfig.fromString(home, solrXml)); diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 9febc006aa1..1cdfcdfede6 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -49,6 +49,9 @@ com.mchange:mchange-commons-java:0.2.19=compileClasspath,jarValidation,runtimeCl com.pff:java-libpst:0.9.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.rometools:rome-utils:1.18.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.rometools:rome:1.18.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.sun.activation:jakarta.activation:1.2.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -86,7 +89,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -225,6 +231,11 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat org.itadaki:bzip2:0.9.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jdom:jdom2:2.0.6.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile index 40b20c2468a..fb9afef8a39 100644 --- a/solr/modules/gcs-repository/gradle.lockfile +++ b/solr/modules/gcs-repository/gradle.lockfile @@ -60,6 +60,9 @@ com.google.re2j:re2j:1.7=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeC com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -107,7 +110,10 @@ io.opencensus:opencensus-proto:0.2.0=jarValidation,runtimeClasspath,runtimeLibs, io.opentelemetry:opentelemetry-api:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -203,6 +209,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=apiHelper,jarValidation,runtimeClas org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index cd5ef0c024e..c1237c10397 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -38,9 +38,9 @@ com.nimbusds:lang-tag:1.7=jarValidation,testCompileClasspath,testRuntimeClasspat com.nimbusds:nimbus-jose-jwt:9.48=jarValidation,testCompileClasspath,testRuntimeClasspath com.nimbusds:oauth2-oidc-sdk:10.10.1=jarValidation,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.11.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:4.12.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.6.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:3.6.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -71,7 +71,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -178,11 +181,11 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.8.22=jarValidation,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath -org.jetbrains:annotations:26.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile index 9cb3aed31ac..b124e103d3e 100644 --- a/solr/modules/langid/gradle.lockfile +++ b/solr/modules/langid/gradle.lockfile @@ -32,6 +32,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -59,7 +62,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -156,6 +162,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,runt org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile index f4958581520..febc59dc7ac 100644 --- a/solr/modules/llm/gradle.lockfile +++ b/solr/modules/llm/gradle.lockfile @@ -35,9 +35,9 @@ com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,s com.knuddels:jtokkit:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs com.squareup.okhttp3:okhttp-sse:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.squareup.retrofit2:converter-jackson:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.squareup.retrofit2:retrofit:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -73,7 +73,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -167,11 +170,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,runt org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile index f1314eb1e87..c65eb9fcc82 100644 --- a/solr/modules/ltr/gradle.lockfile +++ b/solr/modules/ltr/gradle.lockfile @@ -31,6 +31,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -58,7 +61,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -153,6 +159,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,runt org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index 321694605a5..a21e7725e4b 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -34,9 +34,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,jarValid com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs -com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -78,10 +78,10 @@ io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtime io.opentelemetry:opentelemetry-bom:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -179,11 +179,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,runt org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 1c520b72506..d4ad26fcbdb 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -42,6 +42,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.sun.istack:istack-commons-runtime:4.1.2=jarValidation,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -74,7 +77,10 @@ io.netty:netty-transport:4.1.114.Final=apiHelper,compileClasspath,jarValidation, io.opentelemetry:opentelemetry-api:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -200,6 +206,11 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidati org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.2.1=jarValidation,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile index 2c416304ee6..30c0c6af9d3 100644 --- a/solr/modules/scripting/gradle.lockfile +++ b/solr/modules/scripting/gradle.lockfile @@ -31,6 +31,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -58,7 +61,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -152,6 +158,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,runt org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile index ad11eb50db9..14b2641867e 100644 --- a/solr/modules/sql/gradle.lockfile +++ b/solr/modules/sql/gradle.lockfile @@ -38,6 +38,9 @@ com.ibm.icu:icu4j:74.2=jarValidation,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -65,7 +68,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -179,6 +185,11 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtime org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.immutables:value-annotations:2.10.1=compileClasspath,compileOnlyHelper,jarValidation org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/prometheus-exporter/gradle.lockfile b/solr/prometheus-exporter/gradle.lockfile index ef2e6807261..86deee993f0 100644 --- a/solr/prometheus-exporter/gradle.lockfile +++ b/solr/prometheus-exporter/gradle.lockfile @@ -31,6 +31,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=jarValidation,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,solrPlatformLibs,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,solrPlatformLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.17.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -58,7 +61,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,runtimeCla io.opentelemetry:opentelemetry-api:1.50.0=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,solrPlatformLibs,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,solrPlatformLibs,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,solrPlatformLibs,testRuntimeClasspath @@ -156,6 +162,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,solrPlatformLibs,test org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,solrPlatformLibs,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,solrPlatformLibs,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile index 0d454681d3d..7d789ce8d2a 100644 --- a/solr/server/gradle.lockfile +++ b/solr/server/gradle.lockfile @@ -28,6 +28,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,solrCore com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,solrCore com.lmax:disruptor:3.4.4=jarValidation,libExt,runtimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,solrCore +com.squareup.okio:okio-jvm:3.6.0=jarValidation,runtimeClasspath,solrCore +com.squareup.okio:okio:3.6.0=jarValidation,runtimeClasspath,solrCore com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,solrCore commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,solrCore commons-codec:commons-codec:1.17.1=jarValidation,runtimeClasspath,solrCore @@ -55,7 +58,10 @@ io.netty:netty-transport:4.1.114.Final=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-api:1.50.0=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-context:1.50.0=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,runtimeClasspath,solrCore +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,runtimeClasspath,solrCore +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,solrCore +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,runtimeClasspath,solrCore io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,runtimeClasspath,solrCore @@ -151,6 +157,11 @@ org.glassfish.jersey.ext:jersey-entity-filtering:3.1.9=jarValidation,runtimeClas org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,runtimeClasspath,solrCore org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,runtimeClasspath,solrCore org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,solrCore +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,runtimeClasspath,solrCore +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,runtimeClasspath,solrCore +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,runtimeClasspath,solrCore +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,runtimeClasspath,solrCore +org.jetbrains:annotations:26.0.2=jarValidation,runtimeClasspath,solrCore org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.locationtech.spatial4j:spatial4j:0.8=jarValidation,runtimeClasspath,solrCore org.ow2.asm:asm-commons:9.7.1=jarValidation,runtimeClasspath,solrCore diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile index 0707164cae2..a8e3ef13074 100644 --- a/solr/solr-ref-guide/gradle.lockfile +++ b/solr/solr-ref-guide/gradle.lockfile @@ -30,6 +30,9 @@ com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=testRuntimeClasspath +com.squareup.okio:okio:3.6.0=testRuntimeClasspath com.tdunning:t-digest:3.3=testRuntimeClasspath commons-cli:commons-cli:1.9.0=testRuntimeClasspath commons-codec:commons-codec:1.17.1=testRuntimeClasspath @@ -57,7 +60,10 @@ io.netty:netty-transport:4.1.114.Final=testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.50.0=testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=testRuntimeClasspath @@ -149,6 +155,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=testRuntimeClasspath org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=testRuntimeClasspath +org.jetbrains:annotations:26.0.2=testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index d60224f0fa2..c9aee3fe3a4 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -33,6 +33,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,jarValid com.googlecode.json-simple:json-simple:1.1.1=jarValidation,testRuntimeClasspath com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.17.1=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,7 +75,10 @@ io.netty:netty-transport:4.1.114.Final=jarValidation,testCompileClasspath,testRu io.opentelemetry:opentelemetry-api:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,testRuntimeClasspath @@ -175,6 +181,11 @@ org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRun org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.hsqldb:hsqldb:2.7.4=jarValidation,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index 0de65be2ba7..2f21c69b2e5 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -35,6 +35,9 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.17.1=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath @@ -74,7 +77,10 @@ io.netty:netty-transport:4.1.114.Final=compileClasspath,jarValidation,permitTest io.opentelemetry:opentelemetry-api:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,testRuntimeClasspath @@ -166,6 +172,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,testRuntimeClasspath org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 5dca5294d0d..b95519f50c0 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -33,6 +33,9 @@ com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=jarValidation,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=jarValidation,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=jarValidation,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=jarValidation,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=jarValidation,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,testRuntimeClasspath commons-codec:commons-codec:1.17.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,7 +75,10 @@ io.netty:netty-transport:4.1.114.Final=jarValidation,testCompileClasspath,testRu io.opentelemetry:opentelemetry-api:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=jarValidation,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=jarValidation,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=jarValidation,testRuntimeClasspath @@ -168,6 +174,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=jarValidation,testRuntimeClasspath org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=jarValidation,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=jarValidation,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=jarValidation,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile index 7d8d0cbe56f..921120c1cca 100644 --- a/solr/test-framework/gradle.lockfile +++ b/solr/test-framework/gradle.lockfile @@ -31,6 +31,9 @@ com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnnotationProcessor com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.6.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath commons-cli:commons-cli:1.9.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.17.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,7 +61,10 @@ io.netty:netty-transport:4.1.114.Final=apiHelper,compileClasspath,jarValidation, io.opentelemetry:opentelemetry-api:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.50.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.50.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.50.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath @@ -149,6 +155,11 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.9=apiHelper,jarValidation,runtimeClas org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath +org.jetbrains:annotations:26.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.junit.jupiter:junit-jupiter-api:5.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.6.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index 2d7a1d9a172..85e6f2fd31c 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -250,7 +250,6 @@ protected void assertExceptionThrownWithMessageContaining( @BeforeClass public static void setupTestCases() { - OpenTelemetryConfigurator.resetForTest(); resetExceptionIgnores(); testExecutor = @@ -298,6 +297,7 @@ public static void setupTestCases() { } ExecutorUtil.resetThreadLocalProviders(); + OpenTelemetryConfigurator.resetForTest(); } @AfterClass diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile index 02dc0b65355..4e04853b686 100644 --- a/solr/webapp/gradle.lockfile +++ b/solr/webapp/gradle.lockfile @@ -29,6 +29,9 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=permitUnusedDeclared,solrCore com.jayway.jsonpath:json-path:2.9.0=permitUnusedDeclared,solrCore com.lmax:disruptor:3.4.4=serverLib +com.squareup.okhttp3:okhttp:4.12.0=permitUnusedDeclared,solrCore +com.squareup.okio:okio-jvm:3.6.0=permitUnusedDeclared,solrCore +com.squareup.okio:okio:3.6.0=permitUnusedDeclared,solrCore com.tdunning:t-digest:3.3=permitUnusedDeclared,solrCore commons-cli:commons-cli:1.9.0=permitUnusedDeclared,solrCore commons-codec:commons-codec:1.17.1=permitUnusedDeclared,solrCore @@ -56,7 +59,10 @@ io.netty:netty-transport:4.1.114.Final=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-api:1.50.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-context:1.50.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-exporter-common:1.50.0=permitUnusedDeclared,solrCore +io.opentelemetry:opentelemetry-exporter-otlp-common:1.50.0=permitUnusedDeclared,solrCore +io.opentelemetry:opentelemetry-exporter-otlp:1.50.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=permitUnusedDeclared,solrCore +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.50.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-sdk-common:1.50.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.50.0=permitUnusedDeclared,solrCore io.opentelemetry:opentelemetry-sdk-logs:1.50.0=permitUnusedDeclared,solrCore @@ -151,6 +157,11 @@ org.glassfish.jersey.ext:jersey-entity-filtering:3.1.9=permitUnusedDeclared,solr org.glassfish.jersey.inject:jersey-hk2:3.1.9=permitUnusedDeclared,solrCore org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=permitUnusedDeclared,solrCore org.javassist:javassist:3.30.2-GA=permitUnusedDeclared,solrCore +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10=permitUnusedDeclared,solrCore +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10=permitUnusedDeclared,solrCore +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10=permitUnusedDeclared,solrCore +org.jetbrains.kotlin:kotlin-stdlib:2.1.10=permitUnusedDeclared,solrCore +org.jetbrains:annotations:26.0.2=permitUnusedDeclared,solrCore org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor org.locationtech.spatial4j:spatial4j:0.8=permitUnusedDeclared,solrCore org.ow2.asm:asm-commons:9.7.1=permitUnusedDeclared,solrCore