SOLR-17855: restore dropwizard-metrics, runtimeOnly (#4468)

dropwizard-metrics is nonetheless needed when embedding a ZooKeeper server

Author: dsmiley

changelog/unreleased/SOLR-17855-dropwizard-removal.yml

@@ -1,4 +1,8 @@
-title: Remove Dropwizard Metrics as a direct Solr dependency. The `OVERSEERSTATUS` response no longer includes per-operation timing metrics per-operation `requests` and `errors` counts still exist. Users needing per-operation latency can use distributed tracing as a substitute.
+title: >
+  Remove Dropwizard Metrics as a *direct* Solr dependency.
+  The `OVERSEERSTATUS` response no longer includes per-operation timing metrics, albeit the counters `requests` and `errors` remain.
+  Users needing per-operation timing can use distributed tracing as a substitute.
+  Nonetheless, Solr still includes dropwizard-metrics for embedding ZooKeeper.
 type: removed
 authors:
   - name: Matthew Biscocho

gradle/libs.versions.toml

@@ -82,6 +82,7 @@ decompose = "3.4.0"
 diffplug-spotless = "8.3.0"
 # @keep Use for dockerfile JRE version
 dockerfile-baseimage-java = "25"
+dropwizard-metrics = "4.2.33"
 eclipse-ecj = "3.39.0"
 eclipse-jetty = "12.0.34"
 # @keep jgit version used by git-status.gradle
@@ -325,6 +326,7 @@ cuvs-java = { module = "com.nvidia.cuvs:cuvs-java", version.ref = "cuvs-java" }
 cuvs-lucene = { module = "com.nvidia.cuvs.lucene:cuvs-lucene", version.ref = "cuvs-lucene" }
 decompose-decompose = { module = "com.arkivanov.decompose:decompose", version.ref = "decompose" }
 decompose-extensions-compose = { module = "com.arkivanov.decompose:extensions-compose", version.ref = "decompose" }
+dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" }
 eclipse-jdt-ecj = { module = "org.eclipse.jdt:ecj", version.ref = "eclipse-ecj" }
 eclipse-jetty-alpnjavaclient = { module = "org.eclipse.jetty:jetty-alpn-java-client", version.ref = "eclipse-jetty" }
 eclipse-jetty-alpnjavaserver = { module = "org.eclipse.jetty:jetty-alpn-java-server", version.ref = "eclipse-jetty" }

solr/api/gradle.lockfile

@@ -38,7 +38,7 @@ com.tdunning:t-digest:3.3=jarValidation,testRuntimeClasspath
 commons-cli:commons-cli:1.11.0=jarValidation,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=jarValidation,testRuntimeClasspath
 commons-io:commons-io:2.21.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,testRuntimeClasspath
 io.github.classgraph:classgraph:4.8.165=swaggerBuild
 io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor

solr/benchmark/gradle.lockfile

@@ -34,7 +34,7 @@ com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=jarValidation,runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,testRuntimeClasspath
 io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

solr/core/build.gradle

@@ -129,8 +129,9 @@ dependencies {
   }
   testImplementation variantOf(libs.apache.zookeeper.zookeeper) {classifier 'tests'}
 
-  // required for instantiating a Zookeeper server (for embedding ZK or running tests)
+  // required for instantiating a Zookeeper server (for embedding ZK)
   runtimeOnly libs.xerial.snappy.java
+  runtimeOnly libs.dropwizard.metrics.core
 
   implementation(libs.jayway.jsonpath, {
     exclude group: "net.minidev", module: "json-smart"

solr/core/gradle.lockfile

@@ -38,7 +38,7 @@ com.tdunning:t-digest:3.3=compileClasspath,jarValidation,runtimeClasspath,runtim
 commons-cli:commons-cli:1.11.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 commons-codec:commons-codec:1.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-core:3.2.5=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
 io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.netty:netty-buffer:4.2.12.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath

solr/cross-dc-manager/gradle.lockfile

@@ -54,7 +54,7 @@ commons-collections:commons-collections:3.2.2=jarValidation,runtimeClasspath,run
 commons-digester:commons-digester:2.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
 commons-io:commons-io:2.21.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
 commons-validator:commons-validator:1.10.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-core:4.1.12.1=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-core:4.2.33=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
 io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.grpc:grpc-api:1.80.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath

solr/licenses/metrics-core-3.2.5.jar.sha1

@@ -0,0 +1 @@
+703e6a1d55238024576a3e0d253511bd4d9c02bb