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
commit 61177998a2c250007f78e1a3626e5ea6dd5d0902 Merge: 2aa21a19e6d 1abd6aa550e Author: David Smiley <[email protected]> AuthorDate: Tue Oct 14 14:15:40 2025 -0400 SOLR-17458: Metrics: Switch to OTEL from Dropwizard Merging feature/SOLR-17458-rebased .github/labeler.yml | 6 - .github/workflows/bin-solr-test.yml | 1 - .github/workflows/docker-test.yml | 1 - dev-tools/scripts/smokeTestRelease.py | 4 +- gradle/libs.versions.toml | 9 +- gradle/maven/defaults-maven.gradle | 1 - gradle/solr/packaging.gradle | 4 +- .../randomization/policies/solr-tests.policy | 10 +- settings.gradle | 1 - solr/README.adoc | 3 - solr/api/gradle.lockfile | 16 +- solr/benchmark/gradle.lockfile | 14 +- solr/core/build.gradle | 23 +- solr/core/gradle.lockfile | 18 +- .../java/org/apache/solr/blockcache/Metrics.java | 112 +- .../src/java/org/apache/solr/cloud/Overseer.java | 50 +- .../apache/solr/cloud/OverseerTaskProcessor.java | 42 +- .../solr/cloud/api/collections/SplitShardCmd.java | 5 +- .../org/apache/solr/cluster/placement/Metric.java | 27 + .../apache/solr/cluster/placement/NodeMetric.java | 27 +- .../placement/impl/AttributeFetcherImpl.java | 131 +- .../solr/cluster/placement/impl/MetricImpl.java | 62 +- .../cluster/placement/impl/NodeMetricImpl.java | 78 +- .../cluster/placement/impl/ReplicaMetricImpl.java | 11 +- .../java/org/apache/solr/core/CoreContainer.java | 211 +- .../apache/solr/core/HttpSolrClientProvider.java | 6 +- ...gurator.java => OpenTelemetryConfigurator.java} | 99 +- .../src/java/org/apache/solr/core/SolrCore.java | 278 +- .../src/java/org/apache/solr/core/SolrCores.java | 49 +- .../java/org/apache/solr/core/SolrInfoBean.java | 4 +- .../java/org/apache/solr/core/SolrXmlConfig.java | 37 +- .../src/java/org/apache/solr/core/ZkContainer.java | 94 +- .../org/apache/solr/handler/ExportHandler.java | 8 +- .../apache/solr/handler/ReplicationHandler.java | 177 +- .../apache/solr/handler/RequestHandlerBase.java | 115 +- .../solr/handler/admin/CoreAdminHandler.java | 20 +- .../handler/admin/MetricsCollectorHandler.java | 252 - .../apache/solr/handler/admin/MetricsHandler.java | 585 +- .../solr/handler/admin/PluginInfoHandler.java | 85 - .../solr/handler/admin/SolrInfoMBeanHandler.java | 292 - .../solr/handler/admin/SystemInfoHandler.java | 95 +- .../solr/handler/component/HighlightComponent.java | 9 - .../handler/component/HttpShardHandlerFactory.java | 12 +- .../solr/handler/component/SearchComponent.java | 3 +- .../solr/handler/component/SearchHandler.java | 35 +- .../handler/component/SpellCheckComponent.java | 9 - .../solr/handler/component/SuggestComponent.java | 39 +- .../highlight/BreakIteratorBoundaryScanner.java | 9 - .../org/apache/solr/highlight/DefaultEncoder.java | 9 - .../org/apache/solr/highlight/GapFragmenter.java | 10 - .../solr/highlight/HighlightingPluginBase.java | 34 +- .../org/apache/solr/highlight/HtmlEncoder.java | 9 - .../org/apache/solr/highlight/HtmlFormatter.java | 10 - .../org/apache/solr/highlight/RegexFragmenter.java | 10 - .../solr/highlight/ScoreOrderFragmentsBuilder.java | 9 - .../solr/highlight/SimpleBoundaryScanner.java | 9 - .../solr/highlight/SimpleFragListBuilder.java | 11 - .../solr/highlight/SimpleFragmentsBuilder.java | 9 - .../solr/highlight/SingleFragListBuilder.java | 11 - .../apache/solr/highlight/SolrBoundaryScanner.java | 4 +- .../org/apache/solr/highlight/SolrEncoder.java | 3 +- .../org/apache/solr/highlight/SolrFormatter.java | 3 +- .../apache/solr/highlight/SolrFragListBuilder.java | 3 +- .../org/apache/solr/highlight/SolrFragmenter.java | 3 +- .../solr/highlight/SolrFragmentsBuilder.java | 4 +- .../solr/highlight/WeightedFragListBuilder.java | 11 - .../org/apache/solr/jersey/RequestContextKeys.java | 4 +- .../apache/solr/jersey/RequestMetricHandling.java | 13 +- .../org/apache/solr/metrics/AggregateMetric.java | 203 - .../solr/metrics/AltBufferPoolMetricSet.java | 46 - .../solr/metrics/DelegateRegistryCounter.java | 74 - .../solr/metrics/DelegateRegistryHistogram.java | 69 - .../apache/solr/metrics/DelegateRegistryMeter.java | 82 - .../apache/solr/metrics/DelegateRegistryTimer.java | 130 - .../solr/metrics/FilteringSolrMetricReporter.java | 58 - .../org/apache/solr/metrics/MetricSuppliers.java | 580 -- .../java/org/apache/solr/metrics/MetricsMap.java | 243 - .../solr/metrics/OperatingSystemMetricSet.java | 49 - .../apache/solr/metrics/OtelRuntimeJvmMetrics.java | 89 + .../solr/metrics/SolrCoreContainerReporter.java | 46 - .../apache/solr/metrics/SolrCoreMetricManager.java | 163 +- .../SolrDelegateRegistryMetricsContext.java | 84 - .../org/apache/solr/metrics/SolrMetricInfo.java | 12 - .../org/apache/solr/metrics/SolrMetricManager.java | 1560 +--- .../apache/solr/metrics/SolrMetricProducer.java | 32 +- .../apache/solr/metrics/SolrMetricReporter.java | 127 - .../apache/solr/metrics/SolrMetricsContext.java | 301 +- .../otel/FilterablePrometheusMetricReader.java | 185 + .../solr/metrics/otel/MetricExporterFactory.java} | 32 +- .../org/apache/solr/metrics/otel/OtelUnit.java} | 41 +- .../otel/instruments/AttributedDoubleCounter.java} | 27 +- .../otel/instruments/AttributedDoubleGauge.java} | 22 +- .../instruments/AttributedDoubleHistogram.java} | 22 +- .../AttributedDoubleUpDownCounter.java} | 33 +- .../instruments/AttributedInstrumentFactory.java | 155 + .../otel/instruments/AttributedLongCounter.java} | 26 +- .../otel/instruments/AttributedLongGauge.java} | 23 +- .../otel/instruments/AttributedLongHistogram.java} | 26 +- .../otel/instruments/AttributedLongTimer.java | 69 + .../instruments/AttributedLongUpDownCounter.java} | 30 +- .../DualRegistryAttributedLongCounter.java} | 35 +- .../DualRegistryAttributedLongTimer.java} | 41 +- .../DualRegistryAttributedLongUpDownCounter.java | 45 + .../core => otel/instruments}/package-info.java | 7 +- .../metrics/{reporters => otel}/package-info.java | 6 +- .../java/org/apache/solr/metrics/package-info.java | 3 +- .../apache/solr/metrics/prometheus/SolrMetric.java | 57 - .../prometheus/SolrPrometheusFormatter.java | 276 - .../core/PrometheusCoreFormatterInfo.java | 33 - .../prometheus/core/SolrCoreCacheMetric.java | 51 - .../prometheus/core/SolrCoreHandlerMetric.java | 72 - .../prometheus/core/SolrCoreHighlighterMetric.java | 49 - .../prometheus/core/SolrCoreIndexMetric.java | 47 - .../metrics/prometheus/core/SolrCoreMetric.java | 56 - .../prometheus/core/SolrCoreSearcherMetric.java | 64 - .../prometheus/core/SolrCoreTlogMetric.java | 51 - .../core/SolrPrometheusCoreFormatter.java | 70 - .../jetty/SolrJettyDispatchesMetric.java | 46 - .../metrics/prometheus/jetty/SolrJettyMetric.java | 27 - .../prometheus/jetty/SolrJettyReqRespMetric.java | 65 - .../jetty/SolrPrometheusJettyFormatter.java | 49 - .../metrics/prometheus/jetty/package-info.java | 22 - .../prometheus/jvm/PrometheusJvmFormatterInfo.java | 30 - .../prometheus/jvm/SolrJvmBuffersMetric.java | 56 - .../metrics/prometheus/jvm/SolrJvmGcMetrics.java | 54 - .../prometheus/jvm/SolrJvmMemoryMetric.java | 65 - .../solr/metrics/prometheus/jvm/SolrJvmMetric.java | 27 - .../metrics/prometheus/jvm/SolrJvmOsMetric.java | 58 - .../prometheus/jvm/SolrPrometheusJvmFormatter.java | 61 - .../solr/metrics/prometheus/jvm/package-info.java | 22 - .../node/PrometheusNodeFormatterInfo.java | 27 - .../prometheus/node/SolrNodeContainerMetric.java | 57 - .../prometheus/node/SolrNodeHandlerMetric.java | 59 - .../metrics/prometheus/node/SolrNodeMetric.java | 29 - .../node/SolrPrometheusNodeFormatter.java | 104 - .../solr/metrics/prometheus/node/package-info.java | 22 - .../solr/metrics/prometheus/package-info.java | 25 - .../metrics/reporters/ReporterClientCache.java | 85 - .../metrics/reporters/SolrGraphiteReporter.java | 117 - .../solr/metrics/reporters/SolrJmxReporter.java | 252 - .../solr/metrics/reporters/SolrSlf4jReporter.java | 187 - .../metrics/reporters/jmx/JmxMetricsReporter.java | 777 -- .../reporters/jmx/JmxObjectNameFactory.java | 169 - .../solr/metrics/reporters/jmx/package-info.java | 22 - .../solr/metrics/reporters/solr/SolrReporter.java | 496 -- .../solr/metrics/reporters/solr/package-info.java | 22 - .../solr/response/PrometheusResponseWriter.java | 130 +- .../java/org/apache/solr/search/CaffeineCache.java | 118 +- .../java/org/apache/solr/search/QParserPlugin.java | 32 +- .../org/apache/solr/search/SolrFieldCacheBean.java | 39 +- .../org/apache/solr/search/SolrIndexSearcher.java | 206 +- .../solr/search/join/HashRangeQParserPlugin.java | 5 - .../org/apache/solr/search/stats/StatsCache.java | 96 +- .../apache/solr/security/AuditLoggerPlugin.java | 128 +- .../apache/solr/security/AuthenticationPlugin.java | 85 +- .../org/apache/solr/security/BasicAuthPlugin.java | 4 +- .../org/apache/solr/security/MultiAuthPlugin.java | 6 +- .../solr/security/MultiDestinationAuditLogger.java | 7 +- .../solr/security/PKIAuthenticationPlugin.java | 2 +- .../apache/solr/servlet/CoreContainerProvider.java | 94 +- .../apache/solr/uninverting/UninvertingReader.java | 8 +- .../apache/solr/update/DirectUpdateHandler2.java | 349 +- .../src/java/org/apache/solr/update/PeerSync.java | 45 +- .../org/apache/solr/update/PeerSyncWithLeader.java | 45 +- .../org/apache/solr/update/SolrIndexWriter.java | 267 +- .../src/java/org/apache/solr/update/UpdateLog.java | 131 +- .../org/apache/solr/update/UpdateShardHandler.java | 17 +- .../core/src/java/org/apache/solr/util/RTimer.java | 15 +- .../util/circuitbreaker/CPUCircuitBreaker.java | 34 +- .../stats/InstrumentedHttpListenerFactory.java | 25 +- .../org/apache/solr/util/stats/MetricUtils.java | 749 +- .../stats/OtelInstrumentedExecutorService.java | 302 + .../apache/solr/util/tracing/SimplePropagator.java | 17 - .../org/apache/solr/util/tracing/TraceUtils.java | 6 +- solr/core/src/resources/ImplicitPlugins.json | 7 - .../collection1/conf/solrconfig-indexmetrics.xml | 2 + .../conf/solrconfig.xml | 4 +- .../org/apache/solr/BasicFunctionalityTest.java | 36 +- .../src/test/org/apache/solr/CursorPagingTest.java | 63 +- .../src/test/org/apache/solr/SolrInfoBeanTest.java | 7 +- .../apache/solr/blockcache/BufferStoreTest.java | 64 +- .../cloud/CloudExitableDirectoryReaderTest.java | 58 +- .../org/apache/solr/cloud/MigrateReplicasTest.java | 54 +- .../apache/solr/cloud/PeerSyncReplicationTest.java | 46 +- .../org/apache/solr/cloud/ReplaceNodeTest.java | 54 +- .../apache/solr/cloud/TestBaseStatsCacheCloud.java | 137 +- .../org/apache/solr/cloud/TestCloudRecovery.java | 35 +- .../org/apache/solr/cloud/TestPullReplica.java | 34 +- .../apache/solr/cloud/TestPullReplicaWithAuth.java | 57 +- .../solr/cloud/TestRandomRequestDistribution.java | 58 +- .../org/apache/solr/cloud/TestTlogReplica.java | 95 +- .../impl/PlacementPluginIntegrationTest.java | 32 +- .../org/apache/solr/core/DirectoryFactoryTest.java | 4 + .../org/apache/solr/core/RequestHandlersTest.java | 47 +- .../test/org/apache/solr/core/SolrCoreTest.java | 36 +- .../solr/core/TestHttpSolrClientProvider.java | 19 +- .../org/apache/solr/core/TestJmxIntegration.java | 279 - .../apache/solr/core/TestSolrConfigHandler.java | 40 +- .../apache/solr/core/TestTracerConfigurator.java | 6 +- .../test/org/apache/solr/core/TimeAllowedTest.java | 92 +- .../solr/handler/RequestHandlerBaseTest.java | 50 +- .../solr/handler/RequestHandlerMetricsTest.java | 181 +- .../solr/handler/admin/AdminHandlersProxyTest.java | 14 - .../solr/handler/admin/MBeansHandlerTest.java | 233 - .../solr/handler/admin/MetricsHandlerTest.java | 1156 +-- .../solr/handler/admin/StatsReloadRaceTest.java | 92 +- .../solr/handler/admin/SystemInfoHandlerTest.java | 10 +- .../solr/metrics/DelegateRegistryTimerTest.java | 209 - .../org/apache/solr/metrics/JvmMetricsTest.java | 116 +- .../org/apache/solr/metrics/MetricsConfigTest.java | 128 - .../solr/metrics/MetricsDisabledCloudTest.java | 83 - .../apache/solr/metrics/MockHistogramSupplier.java | 39 - .../solr/metrics/SolrCoreMetricManagerTest.java | 186 +- .../apache/solr/metrics/SolrCoreMetricTest.java | 82 - .../apache/solr/metrics/SolrMetricManagerTest.java | 505 +- .../solr/metrics/SolrMetricReporterTest.java | 69 - .../apache/solr/metrics/SolrMetricTestUtils.java | 122 - .../solr/metrics/SolrMetricsIntegrationTest.java | 304 +- .../solr/metrics/SolrPrometheusFormatterTest.java | 208 - .../otel/FilterablePrometheusMetricReaderTest.java | 95 + .../solr/metrics/reporters/MockMetricReporter.java | 86 - .../reporters/SolrGraphiteReporterTest.java | 123 - .../reporters/SolrJmxReporterCloudTest.java | 128 - .../metrics/reporters/SolrJmxReporterTest.java | 312 - .../metrics/reporters/SolrSlf4jReporterTest.java | 111 - .../response/TestPrometheusResponseWriter.java | 173 +- .../TestPrometheusResponseWriterCloud.java | 149 + .../apache/solr/search/RankQParserPluginTest.java | 17 +- .../org/apache/solr/search/TestCaffeineCache.java | 132 +- .../solr/search/TestFiltersQueryCaching.java | 49 +- .../org/apache/solr/search/TestIndexSearcher.java | 11 - .../apache/solr/search/TestMainQueryCaching.java | 61 +- .../solr/search/TestReRankQParserPlugin.java | 35 +- .../test/org/apache/solr/search/TestRecovery.java | 102 +- .../org/apache/solr/search/TestSolr4Spatial2.java | 49 +- .../org/apache/solr/search/TestSolrCachePerf.java | 27 +- .../apache/solr/search/TestSolrFieldCacheBean.java | 98 +- .../apache/solr/search/TestSolrQueryParser.java | 114 +- .../test/org/apache/solr/search/TestThinCache.java | 137 +- .../src/test/org/apache/solr/search/ThinCache.java | 99 +- .../org/apache/solr/search/join/BJQParserTest.java | 67 +- .../solr/search/join/TestNestedDocsSort.java | 22 +- .../solr/search/join/TestScoreJoinQPScore.java | 147 +- .../solr/security/AuditLoggerIntegrationTest.java | 145 +- .../solr/security/AuditLoggerPluginTest.java | 4 + .../solr/security/BasicAuthIntegrationTest.java | 29 +- .../apache/solr/security/CertAuthPluginTest.java | 54 +- .../security/MockSolrMetricsContextFactory.java | 53 + .../security/MultiDestinationAuditLoggerTest.java | 5 + .../security/SolrLogAuditLoggerPluginTest.java | 4 + .../solr/security/TestPKIAuthenticationPlugin.java | 17 + .../solr/update/DirectUpdateHandlerTest.java | 323 +- .../apache/solr/update/SolrIndexMetricsTest.java | 223 +- .../org/apache/solr/util/TestCircuitBreakers.java | 1 + .../apache/solr/util/stats/MetricUtilsTest.java | 257 - .../stats/OtelInstrumentedExecutorServiceTest.java | 244 + .../TestSimplePropagatorDistributedTracing.java | 14 +- solr/cross-dc-manager/gradle.lockfile | 21 +- solr/docker/build.gradle | 6 - solr/docker/templates/Dockerfile.body.template | 5 +- .../tests/cases/prometheus-exporter-cloud/test.sh | 51 - .../cases/prometheus-exporter-standalone/test.sh | 54 - solr/docker/tests/shared.sh | 19 - solr/licenses/jackson-jq-0.0.13.jar.sha1 | 1 - solr/licenses/metrics-graphite-4.2.26.jar.sha1 | 1 - solr/licenses/metrics-graphite-LICENSE-ASL.txt | 203 - solr/licenses/metrics-graphite-NOTICE.txt | 12 - solr/licenses/metrics-jmx-4.2.26.jar.sha1 | 1 - solr/licenses/metrics-jmx-LICENSE-ASL.txt | 203 - solr/licenses/metrics-jmx-NOTICE.txt | 12 - ...entelemetry-api-incubator-1.45.0-alpha.jar.sha1 | 1 + ...metry-exporter-prometheus-1.50.0-alpha.jar.sha1 | 1 + ...entelemetry-instrumentation-api-2.11.0.jar.sha1 | 1 + ...rumentation-api-incubator-2.11.0-alpha.jar.sha1 | 1 + ...-runtime-telemetry-java17-2.11.0-alpha.jar.sha1 | 1 + ...y-runtime-telemetry-java8-2.11.0-alpha.jar.sha1 | 1 + .../opentelemetry-semconv-1.29.0-alpha.jar.sha1 | 1 + solr/licenses/simpleclient-0.16.0.jar.sha1 | 1 - solr/licenses/simpleclient-LICENSE-ASL.txt | 201 - solr/licenses/simpleclient-NOTICE.txt | 11 - solr/licenses/simpleclient_common-0.16.0.jar.sha1 | 1 - solr/licenses/simpleclient_common-LICENSE-ASL.txt | 201 - solr/licenses/simpleclient_common-NOTICE.txt | 11 - .../simpleclient_httpserver-0.16.0.jar.sha1 | 1 - .../simpleclient_httpserver-LICENSE-ASL.txt | 201 - solr/licenses/simpleclient_httpserver-NOTICE.txt | 11 - solr/licenses/spring-boot-actuator-3.3.3.jar.sha1 | 1 - ...ring-boot-actuator-autoconfigure-3.3.3.jar.sha1 | 1 - solr/modules/analysis-extras/gradle.lockfile | 22 +- solr/modules/clustering/gradle.lockfile | 22 +- solr/modules/cross-dc/gradle.lockfile | 20 +- .../update/processor/MirroringUpdateProcessor.java | 2 +- .../crossdc/update/processor/ProducerMetrics.java | 73 +- .../processor/MirroringUpdateProcessorTest.java | 28 +- solr/modules/cuvs/gradle.lockfile | 22 +- solr/modules/extraction/gradle.lockfile | 22 +- solr/modules/gcs-repository/gradle.lockfile | 22 +- solr/modules/jwt-auth/build.gradle | 6 +- solr/modules/jwt-auth/gradle.lockfile | 24 +- .../apache/solr/security/jwt/JWTAuthPlugin.java | 6 +- .../security/jwt/JWTAuthPluginIntegrationTest.java | 18 + solr/modules/langid/gradle.lockfile | 22 +- solr/modules/llm/gradle.lockfile | 22 +- solr/modules/ltr/gradle.lockfile | 22 +- solr/modules/opentelemetry/build.gradle | 4 +- solr/modules/opentelemetry/gradle.lockfile | 28 +- .../solr/opentelemetry/OtelTracerConfigurator.java | 14 +- .../solr/opentelemetry/OtlpExporterFactory.java | 55 + .../CustomTestOtelTracerConfigurator.java | 2 - .../solr/opentelemetry/TestDistributedTracing.java | 14 +- .../solr/opentelemetry/TestMetricExemplars.java | 109 + solr/modules/s3-repository/build.gradle | 12 +- solr/modules/s3-repository/gradle.lockfile | 24 +- solr/modules/scripting/gradle.lockfile | 22 +- solr/modules/sql/gradle.lockfile | 22 +- solr/packaging/README.txt | 4 - solr/packaging/build.gradle | 13 - solr/packaging/gradle.lockfile | 2 +- solr/packaging/test/bats_helper.bash | 9 +- solr/packaging/test/test_prometheus.bats | 56 - solr/prometheus-exporter/README.md | 40 - solr/prometheus-exporter/bin/solr-exporter | 152 - solr/prometheus-exporter/bin/solr-exporter.cmd | 119 - solr/prometheus-exporter/build.gradle | 93 - .../conf/grafana-solr-dashboard.json | 7864 -------------------- solr/prometheus-exporter/conf/log4j2.xml | 40 - .../conf/solr-exporter-config.xml | 1134 --- solr/prometheus-exporter/gradle.lockfile | 164 - .../solr/prometheus/collector/MetricCollector.java | 22 - .../solr/prometheus/collector/MetricSamples.java | 86 - .../prometheus/collector/MetricsCollector.java | 41 - .../collector/MetricsCollectorFactory.java | 71 - .../solr/prometheus/collector/PingCollector.java | 47 - .../collector/SchedulerMetricsCollector.java | 125 - .../solr/prometheus/collector/package-info.java | 19 - .../prometheus/exporter/MetricsConfiguration.java | 185 - .../solr/prometheus/exporter/MetricsQuery.java | 148 - .../prometheus/exporter/MetricsQueryTemplate.java | 129 - .../exporter/PrometheusExporterSettings.java | 90 - .../prometheus/exporter/SolrClientFactory.java | 87 - .../solr/prometheus/exporter/SolrExporter.java | 391 - .../exporter/SolrScrapeConfiguration.java | 125 - .../solr/prometheus/exporter/package-info.java | 19 - .../solr/prometheus/scraper/SolrCloudScraper.java | 152 - .../solr/prometheus/scraper/SolrScraper.java | 238 - .../prometheus/scraper/SolrStandaloneScraper.java | 112 - .../solr/prometheus/scraper/package-info.java | 19 - solr/prometheus-exporter/src/java/overview.html | 26 - ...theus-solr-exporter-integration-test-config.xml | 1741 ----- ...rometheus-solr-exporter-scraper-test-config.xml | 173 - .../test-files/conf/test-config-with-templates.xml | 222 - .../src/test-files/exampledocs/gb18030-example.xml | 32 - .../src/test-files/exampledocs/hd.xml | 56 - .../src/test-files/exampledocs/ipod_other.xml | 60 - .../src/test-files/exampledocs/ipod_video.xml | 40 - .../src/test-files/exampledocs/manufacturers.xml | 75 - .../src/test-files/exampledocs/mem.xml | 77 - .../src/test-files/exampledocs/money.xml | 65 - .../src/test-files/exampledocs/monitor.xml | 34 - .../src/test-files/exampledocs/monitor2.xml | 33 - .../src/test-files/exampledocs/mp500.xml | 43 - .../src/test-files/exampledocs/sample.html | 13 - .../src/test-files/exampledocs/sd500.xml | 38 - .../src/test-files/exampledocs/solr.xml | 38 - .../src/test-files/exampledocs/utf8-example.xml | 41 - .../src/test-files/exampledocs/vidcard.xml | 62 - solr/prometheus-exporter/src/test-files/log4j2.xml | 40 - .../src/test-files/query-metrics.json | 91 - .../solr/collection1/conf/managed-schema.xml | 413 - .../solr/collection1/conf/solrconfig.xml | 177 - .../test-files/solr/collection1/conf/stopwords.txt | 14 - .../test-files/solr/collection1/conf/synonyms.txt | 29 - .../src/test-files/solr/solr.xml | 42 - .../prometheus/PrometheusExporterTestBase.java | 74 - .../prometheus/collector/MetricSamplesTest.java | 133 - .../exporter/MetricsQueryTemplateTest.java | 134 - .../exporter/SolrExporterIntegrationTest.java | 102 - .../solr/prometheus/exporter/SolrExporterTest.java | 29 - .../prometheus/exporter/SolrExporterTestBase.java | 140 - .../prometheus/scraper/SolrCloudScraperTest.java | 209 - .../SolrStandaloneScraperBasicAuthTest.java | 127 - .../scraper/SolrStandaloneScraperTest.java | 167 - .../org/apache/solr/prometheus/utils/Helpers.java | 74 - solr/server/build.gradle | 19 - solr/server/contexts/solr-jetty-context.xml | 2 +- solr/server/etc/jetty.xml | 26 +- solr/server/etc/security.policy | 6 +- solr/server/gradle.lockfile | 19 +- solr/solr-ref-guide/gradle.lockfile | 16 +- .../deployment-guide/pages/audit-logging.adoc | 25 +- .../deployment-guide/pages/installing-solr.adoc | 9 +- .../deployment-guide/pages/metrics-reporting.adoc | 48 +- .../pages/major-changes-in-solr-10.adoc | 8 +- solr/solrj-streaming/gradle.lockfile | 16 +- solr/solrj-zookeeper/gradle.lockfile | 16 +- .../solr/client/solrj/impl/NodeValueFetcher.java | 348 +- .../solrj/impl/SolrClientNodeStateProvider.java | 148 +- .../solr/common/cloud/NodesSysPropsCacher.java | 13 +- .../solr/common/cloud/SolrZKMetricsListener.java | 93 +- .../org/apache/solr/common/cloud/SolrZkClient.java | 3 +- solr/solrj/build.gradle | 1 - solr/solrj/gradle.lockfile | 16 +- .../java/org/apache/solr/common/util/IOUtils.java | 5 + .../solr/client/solrj/SolrJMetricTestUtils.java | 116 + .../solrj/impl/CloudHttp2SolrClientRetryTest.java | 30 +- .../solrj/impl/CloudHttp2SolrClientTest.java | 109 +- .../solrj/impl/CloudSolrClientRetryTest.java | 32 +- .../client/solrj/impl/CloudSolrClientTest.java | 103 +- .../solr/client/solrj/request/TestCoreAdmin.java | 66 +- solr/test-framework/build.gradle | 12 + solr/test-framework/gradle.lockfile | 18 +- .../org/apache/solr/SolrIgnoredThreadsFilter.java | 5 + .../src/java/org/apache/solr/SolrTestCaseJ4.java | 4 + .../cloud/AbstractBasicDistributedZkTestBase.java | 40 +- .../apache/solr/cloud/MiniSolrCloudCluster.java | 8 +- .../apache/solr/cloud/SolrCloudAuthTestCase.java | 286 +- ...bstractCollectionsAPIDistributedZkTestBase.java | 39 +- .../core/MockQuerySenderListenerReqHandler.java | 13 +- .../org/apache/solr/embedded/JettySolrRunner.java | 28 +- .../org/apache/solr/util/SolrMetricTestUtils.java | 300 + .../src/java/org/apache/solr/util/TestHarness.java | 12 +- solr/webapp/gradle.lockfile | 19 +- solr/webapp/web/css/angular/plugins.css | 15 + solr/webapp/web/js/angular/controllers/plugins.js | 221 +- solr/webapp/web/js/angular/services.js | 31 +- solr/webapp/web/partials/plugins.html | 17 +- 426 files changed, 9287 insertions(+), 35454 deletions(-)
