This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch jira/SOLR-17975 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 001cc11e27e075c70f310e56ec90cb454806838b Merge: 07a895f866c 63d244ed89f Author: Chris Hostetter <[email protected]> AuthorDate: Wed Feb 4 10:55:20 2026 -0700 Merge remote-tracking branch 'origin/main' into jira/SOLR-17975 .github/PULL_REQUEST_TEMPLATE.md | 1 + .github/scripts/generate-renovate-changelog.py | 51 ++- .github/workflows/renovate-changelog.yml | 2 +- changelog/unreleased/SOLR-17436-v2-metrics-api.yml | 8 + .../unreleased/SOLR-18073-jwt-bool-claims.yml | 9 + changelog/unreleased/solr-18060.yml | 9 + dev-docs/FAQ.adoc | 5 + dev-docs/how-to-contribute.adoc | 16 +- gradle/changelog.gradle | 8 +- gradle/libs.versions.toml | 2 - .../solr/client/api/endpoint/MetricsApi.java | 84 +++++ .../solr/handler/admin/AdminHandlersProxy.java | 62 +++- .../apache/solr/handler/admin/MetricsHandler.java | 162 ++-------- .../apache/solr/handler/admin/api/GetMetrics.java | 181 +++++++++++ .../org/apache/solr/handler/api/V2ApiUtils.java | 5 + .../org/apache/solr/jersey/JerseyApplications.java | 2 + .../org/apache/solr/jersey/MessageBodyWriters.java | 30 ++ .../solr/response/PrometheusResponseWriter.java | 22 +- .../apache/solr/response/QueryResponseWriter.java | 3 + .../solr/response/ResponseWritersRegistry.java | 4 +- .../org/apache/solr/util/stats/MetricUtils.java | 192 +++++++++++- .../apache/solr/cloud/BasicDistributedZkTest.java | 2 - .../apache/solr/cloud/TestBaseStatsCacheCloud.java | 2 - .../solr/handler/admin/MetricsHandlerTest.java | 51 ++- .../solr/handler/admin/api/GetMetricsTest.java | 276 +++++++++++++++++ .../response/TestPrometheusResponseWriter.java | 3 +- .../TestPrometheusResponseWriterCloud.java | 3 - solr/cross-dc-manager/build.gradle | 9 +- solr/cross-dc-manager/gradle.lockfile | 52 +++- .../solr/crossdc/manager/consumer/Consumer.java | 23 +- .../crossdc/manager/consumer/ConsumerMetrics.java | 171 ++++++++++ .../manager/consumer/KafkaCrossDcConsumer.java | 49 +-- .../crossdc/manager/consumer/MetricsServlet.java | 69 +++++ .../solr/crossdc/manager/consumer/OtelMetrics.java | 182 +++++++++++ .../solr/crossdc/manager/consumer/ThreadDump.java | 142 +++++++++ .../manager/consumer/ThreadDumpServlet.java | 76 +++++ .../apache/solr/crossdc/manager/consumer/Util.java | 55 ++-- .../messageprocessor/SolrMessageProcessor.java | 40 +-- .../crossdc/manager/DeleteByQueryToIdTest.java | 8 +- .../crossdc/manager/SimpleSolrIntegrationTest.java | 4 +- .../manager/SolrAndKafkaIntegrationTest.java | 46 ++- .../manager/consumer/KafkaCrossDcConsumerTest.java | 8 +- .../messageprocessor/SolrMessageProcessorTest.java | 4 +- .../messageprocessor/TestMessageProcessor.java | 5 +- solr/licenses/metrics-healthchecks-4.2.26.jar.sha1 | 1 - .../metrics-jakarta-servlets-4.2.26.jar.sha1 | 1 - solr/licenses/metrics-json-4.2.26.jar.sha1 | 1 - solr/licenses/metrics-jvm-4.2.26.jar.sha1 | 1 - solr/licenses/metrics-jvm-LICENSE-ASL.txt | 203 ------------ solr/licenses/metrics-jvm-NOTICE.txt | 12 - ...tcnative-boringssl-static-2.0.73.Final.jar.sha1 | 1 + .../netty-tcnative-classes-2.0.73.Final.jar.sha1 | 1 + solr/licenses/profiler-1.1.1.jar.sha1 | 1 - solr/licenses/profiler-LICENSE-ASL.txt | 345 --------------------- solr/licenses/profiler-NOTICE.txt | 0 .../processor/KafkaRequestMirroringHandler.java | 4 +- .../apache/solr/security/jwt/JWTAuthPlugin.java | 6 +- .../solr/security/jwt/JWTAuthPluginTest.java | 34 ++ .../solr/opentelemetry/TestDistributedTracing.java | 5 +- .../solr/opentelemetry/TestMetricExemplars.java | 2 - solr/packaging/build.gradle | 11 +- solr/packaging/test/bats_helper.bash | 48 +-- solr/packaging/test/test_extraction.bats | 36 ++- solr/packaging/test/test_rolling_upgrade.bats | 172 ++++++++++ solr/packaging/test/test_start_solr.bats | 2 + .../deployment-guide/pages/metrics-reporting.adoc | 26 +- .../solrj/impl/SolrClientNodeStateProvider.java | 2 - .../solr/client/solrj/request/MetricsRequest.java | 51 ++- .../test-files/solrj/solr/solr-metrics-enabled.xml | 50 +++ .../client/solrj/request/TestMetricsRequest.java | 147 +++++++++ .../org/apache/solr/util/SolrJMetricTestUtils.java | 4 - 71 files changed, 2317 insertions(+), 988 deletions(-)
