Skip to content

Commit c8e0470

Browse files
dsmileydsmiley
authored
SOLR-17458: fix analyzeDependencies (#3771)
1 parent 1d0a569 commit c8e0470

File tree

9 files changed

+28
-29
lines changed

9 files changed

+28
-29
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,10 @@ opentelemetry-exporter-prometheus = { module = "io.opentelemetry:opentelemetry-e
486486
opentelemetry-exporter-sender-okhttp = { module = "io.opentelemetry:opentelemetry-exporter-sender-okhttp", version.ref = "opentelemetry" }
487487
opentelemetry-runtime-telemetry = { module = "io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17", version.ref = "opentelemetry-runtime-telemetry" }
488488
opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "opentelemetry" }
489-
opentelemetry-sdkextension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "opentelemetry" }
490-
opentelemetry-sdktesting = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }
491-
opentelemetry-sdktrace = { module = "io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" }
489+
opentelemetry-sdk-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "opentelemetry" }
490+
opentelemetry-sdk-testing = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }
491+
opentelemetry-sdk-trace = { module = "io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" }
492+
opentelemetry-sdk-metrics = { module = "io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "opentelemetry" }
492493
osgi-annotation = { module = "org.osgi:osgi.annotation", version.ref = "osgi-annotation" }
493494
oshai-logging = { module = "io.github.oshai:kotlin-logging", version.ref = "oshai-logging" }
494495
# @keep transitive dependency for version alignment

‎solr/core/build.gradle‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,16 @@ dependencies {
148148
// StatsComponents percentiles
149149
implementation libs.tdunning.tdigest
150150

151-
// Distributed Tracing
151+
// OpenTelemetry
152152
api libs.opentelemetry.api
153153
implementation libs.opentelemetry.context
154-
155154
implementation(libs.opentelemetry.exporter.prometheus) {
156155
transitive = false
157156
}
158-
159-
implementation(libs.opentelemetry.sdk, {
157+
implementation(libs.opentelemetry.sdk) {
160158
exclude group: "io.opentelemetry", module: "opentelemetry-sdk-logs"
161-
})
162-
159+
}
160+
implementation libs.opentelemetry.sdk.metrics
163161
// JVM Runtime Telemetry metrics
164162
implementation libs.opentelemetry.runtime.telemetry
165163

@@ -217,6 +215,6 @@ dependencies {
217215
testImplementation libs.apache.httpcomponents.httpclient
218216
testImplementation libs.apache.httpcomponents.httpcore
219217

220-
testImplementation libs.opentelemetry.sdktesting
218+
testImplementation libs.opentelemetry.sdk.testing
221219
testImplementation libs.dropwizard.metrics.core
222220
}

‎solr/modules/cross-dc/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
implementation libs.slf4j.api
3737
implementation libs.apache.kafka.clients
3838
implementation libs.google.guava
39-
implementation libs.dropwizard.metrics.core
39+
implementation libs.opentelemetry.api
4040
implementation libs.apache.zookeeper.zookeeper
4141
implementation libs.apache.zookeeper.jute
4242

‎solr/modules/cross-dc/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ commons-cli:commons-cli:1.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeL
3535
commons-codec:commons-codec:1.19.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3636
commons-io:commons-io:2.20.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
3737
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
38-
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
38+
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
3939
io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
4040
io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
4141
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor

‎solr/modules/jwt-auth/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ dependencies {
4545
testImplementation project(':solr:test-framework')
4646
testImplementation libs.apache.lucene.testframework
4747
testImplementation libs.junit.junit
48-
testImplementation libs.prometheus.metrics.model
49-
testImplementation(libs.opentelemetry.exporter.prometheus) {
50-
transitive = false
51-
}
48+
5249
testImplementation(libs.mockito.core, {
5350
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
5451
})

‎solr/modules/jwt-auth/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=jarValidation,runtimeC
7373
io.opentelemetry:opentelemetry-api:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
7474
io.opentelemetry:opentelemetry-common:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
7575
io.opentelemetry:opentelemetry-context:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
76-
io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
76+
io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
7777
io.opentelemetry:opentelemetry-sdk-common:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
7878
io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
7979
io.opentelemetry:opentelemetry-sdk-trace:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
8080
io.opentelemetry:opentelemetry-sdk:1.53.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
8181
io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
82-
io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
82+
io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
8383
io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
8484
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
8585
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath

‎solr/modules/opentelemetry/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ dependencies {
3030
implementation libs.slf4j.api
3131

3232
implementation libs.opentelemetry.api
33-
implementation libs.opentelemetry.sdkextension.autoconfigure
33+
implementation libs.opentelemetry.sdk
34+
implementation libs.opentelemetry.sdk.metrics
35+
implementation libs.opentelemetry.sdk.extension.autoconfigure
3436
implementation libs.opentelemetry.exporter.otlp
3537
// End users must recompile with jaeger exporter and/or zipkin exporter if they need these
3638

@@ -46,7 +48,6 @@ dependencies {
4648

4749
testImplementation project(':solr:test-framework')
4850
testImplementation libs.junit.junit
49-
testImplementation libs.opentelemetry.sdk
50-
testImplementation libs.opentelemetry.sdktrace
51-
testImplementation libs.opentelemetry.sdktesting
51+
testImplementation libs.opentelemetry.sdk.trace
52+
testImplementation libs.opentelemetry.sdk.testing
5253
}

‎solr/test-framework/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ dependencies {
7979
implementation(libs.opentelemetry.sdk) {
8080
exclude group: "io.opentelemetry", module: "opentelemetry-sdk-logs"
8181
}
82+
permitUnusedDeclared libs.opentelemetry.sdk
8283

8384
implementation libs.jakarta.servlet.api
8485
implementation libs.eclipse.jetty.server

‎solr/test-framework/gradle.lockfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,15 @@ io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17:2.11.0-a
5757
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:2.11.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
5858
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
5959
io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
60-
io.opentelemetry:opentelemetry-api:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
61-
io.opentelemetry:opentelemetry-common:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
62-
io.opentelemetry:opentelemetry-context:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
60+
io.opentelemetry:opentelemetry-api:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
61+
io.opentelemetry:opentelemetry-common:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
62+
io.opentelemetry:opentelemetry-context:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6363
io.opentelemetry:opentelemetry-exporter-prometheus:1.50.0-alpha=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
64-
io.opentelemetry:opentelemetry-sdk-common:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
65-
io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
66-
io.opentelemetry:opentelemetry-sdk-trace:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
67-
io.opentelemetry:opentelemetry-sdk:1.53.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
64+
io.opentelemetry:opentelemetry-sdk-common:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
65+
io.opentelemetry:opentelemetry-sdk-logs:1.53.0=permitUnusedDeclared
66+
io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
67+
io.opentelemetry:opentelemetry-sdk-trace:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
68+
io.opentelemetry:opentelemetry-sdk:1.53.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6869
io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6970
io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7071
io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)