This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new c8e0470cf88 SOLR-17458: fix analyzeDependencies (#3771)
c8e0470cf88 is described below
commit c8e0470cf88d5a67b561914e22cb8741680d5e7b
Author: David Smiley <[email protected]>
AuthorDate: Tue Oct 14 21:53:15 2025 -0400
SOLR-17458: fix analyzeDependencies (#3771)
---
gradle/libs.versions.toml | 7 ++++---
solr/core/build.gradle | 12 +++++-------
solr/modules/cross-dc/build.gradle | 2 +-
solr/modules/cross-dc/gradle.lockfile | 2 +-
solr/modules/jwt-auth/build.gradle | 5 +----
solr/modules/jwt-auth/gradle.lockfile | 4 ++--
solr/modules/opentelemetry/build.gradle | 9 +++++----
solr/test-framework/build.gradle | 1 +
solr/test-framework/gradle.lockfile | 15 ++++++++-------
9 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d97e58292f..87ea8f0c9e8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -486,9 +486,10 @@ opentelemetry-exporter-prometheus = { module =
"io.opentelemetry:opentelemetry-e
opentelemetry-exporter-sender-okhttp = { module =
"io.opentelemetry:opentelemetry-exporter-sender-okhttp", version.ref =
"opentelemetry" }
opentelemetry-runtime-telemetry = { module =
"io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17",
version.ref = "opentelemetry-runtime-telemetry" }
opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk",
version.ref = "opentelemetry" }
-opentelemetry-sdkextension-autoconfigure = { module =
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref =
"opentelemetry" }
-opentelemetry-sdktesting = { module =
"io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }
-opentelemetry-sdktrace = { module =
"io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" }
+opentelemetry-sdk-extension-autoconfigure = { module =
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref =
"opentelemetry" }
+opentelemetry-sdk-testing = { module =
"io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }
+opentelemetry-sdk-trace = { module =
"io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" }
+opentelemetry-sdk-metrics = { module =
"io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "opentelemetry" }
osgi-annotation = { module = "org.osgi:osgi.annotation", version.ref =
"osgi-annotation" }
oshai-logging = { module = "io.github.oshai:kotlin-logging", version.ref =
"oshai-logging" }
# @keep transitive dependency for version alignment
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 53821126ba4..bbe9b292141 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -148,18 +148,16 @@ dependencies {
// StatsComponents percentiles
implementation libs.tdunning.tdigest
- // Distributed Tracing
+ // OpenTelemetry
api libs.opentelemetry.api
implementation libs.opentelemetry.context
-
implementation(libs.opentelemetry.exporter.prometheus) {
transitive = false
}
-
- implementation(libs.opentelemetry.sdk, {
+ implementation(libs.opentelemetry.sdk) {
exclude group: "io.opentelemetry", module: "opentelemetry-sdk-logs"
- })
-
+ }
+ implementation libs.opentelemetry.sdk.metrics
// JVM Runtime Telemetry metrics
implementation libs.opentelemetry.runtime.telemetry
@@ -217,6 +215,6 @@ dependencies {
testImplementation libs.apache.httpcomponents.httpclient
testImplementation libs.apache.httpcomponents.httpcore
- testImplementation libs.opentelemetry.sdktesting
+ testImplementation libs.opentelemetry.sdk.testing
testImplementation libs.dropwizard.metrics.core
}
diff --git a/solr/modules/cross-dc/build.gradle
b/solr/modules/cross-dc/build.gradle
index 4e9ab5ab923..bfcb128ce59 100644
--- a/solr/modules/cross-dc/build.gradle
+++ b/solr/modules/cross-dc/build.gradle
@@ -36,7 +36,7 @@ dependencies {
implementation libs.slf4j.api
implementation libs.apache.kafka.clients
implementation libs.google.guava
- implementation libs.dropwizard.metrics.core
+ implementation libs.opentelemetry.api
implementation libs.apache.zookeeper.zookeeper
implementation libs.apache.zookeeper.jute
diff --git a/solr/modules/cross-dc/gradle.lockfile
b/solr/modules/cross-dc/gradle.lockfile
index e5307fbe55a..55ed1b6b2fd 100644
--- a/solr/modules/cross-dc/gradle.lockfile
+++ b/solr/modules/cross-dc/gradle.lockfile
@@ -35,7 +35,7 @@
commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
commons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
-io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
diff --git a/solr/modules/jwt-auth/build.gradle
b/solr/modules/jwt-auth/build.gradle
index 47e86a1ec64..8cb1d237bc0 100644
--- a/solr/modules/jwt-auth/build.gradle
+++ b/solr/modules/jwt-auth/build.gradle
@@ -45,10 +45,7 @@ dependencies {
testImplementation project(':solr:test-framework')
testImplementation libs.apache.lucene.testframework
testImplementation libs.junit.junit
- testImplementation libs.prometheus.metrics.model
- testImplementation(libs.opentelemetry.exporter.prometheus) {
- transitive = false
- }
+
testImplementation(libs.mockito.core, {
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
})
diff --git a/solr/modules/jwt-auth/gradle.lockfile
b/solr/modules/jwt-auth/gradle.lockfile
index f205f4a73bb..67a2db3d9be 100644
--- a/solr/modules/jwt-auth/gradle.lockfile
+++ b/solr/modules/jwt-auth/gradle.lockfile
@@ -73,13 +73,13 @@
io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=jarValidation,runtimeC
io.opentelemetry:opentelemetry-api:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.opentelemetry:opentelemetry-common:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.opentelemetry:opentelemetry-context:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.opentelemetry:opentelemetry-sdk-common:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.opentelemetry:opentelemetry-sdk:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/opentelemetry/build.gradle
b/solr/modules/opentelemetry/build.gradle
index 00a693d3fd6..2d9990f3465 100644
--- a/solr/modules/opentelemetry/build.gradle
+++ b/solr/modules/opentelemetry/build.gradle
@@ -30,7 +30,9 @@ dependencies {
implementation libs.slf4j.api
implementation libs.opentelemetry.api
- implementation libs.opentelemetry.sdkextension.autoconfigure
+ implementation libs.opentelemetry.sdk
+ implementation libs.opentelemetry.sdk.metrics
+ implementation libs.opentelemetry.sdk.extension.autoconfigure
implementation libs.opentelemetry.exporter.otlp
// End users must recompile with jaeger exporter and/or zipkin exporter if
they need these
@@ -46,7 +48,6 @@ dependencies {
testImplementation project(':solr:test-framework')
testImplementation libs.junit.junit
- testImplementation libs.opentelemetry.sdk
- testImplementation libs.opentelemetry.sdktrace
- testImplementation libs.opentelemetry.sdktesting
+ testImplementation libs.opentelemetry.sdk.trace
+ testImplementation libs.opentelemetry.sdk.testing
}
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 1cdff5ec53b..86f83e33c39 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -79,6 +79,7 @@ dependencies {
implementation(libs.opentelemetry.sdk) {
exclude group: "io.opentelemetry", module: "opentelemetry-sdk-logs"
}
+ permitUnusedDeclared libs.opentelemetry.sdk
implementation libs.jakarta.servlet.api
implementation libs.eclipse.jetty.server
diff --git a/solr/test-framework/gradle.lockfile
b/solr/test-framework/gradle.lockfile
index 038a3a23c1c..54dd4c556a5 100644
--- a/solr/test-framework/gradle.lockfile
+++ b/solr/test-framework/gradle.lockfile
@@ -57,14 +57,15 @@
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.11.0-a
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.11.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-api:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-common:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-context:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-common:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk-trace:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.opentelemetry:opentelemetry-sdk:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-common:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-logs:1.53.0=permitUnusedDeclared
+io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk-trace:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.opentelemetry:opentelemetry-sdk:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
