This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
from 2aa21a19e6d Update dependency com.github.spotbugs:spotbugs-annotations
to v4.9.6 (#3662)
add 6a62ea4d31d SOLR-17774: Refactor initialization of GlobalOpenTelemetry
(#3379)
add 437767d5208 SOLR-17785: Integrate foundational OTEL meter instruments
(#3384)
add 50af82fbbc1 SOLR-17793: Create dedicated SdkMeterProviders for Solr
core metrics (#3402)
add fcfb995949e Change up requestHandlerBase (#3415)
add d3e23eac4ce SOLR-17806: Migrate SolrCore metrics to OTEL (#3430)
add 8f348551157 SOLR-17806: Migrate DirectUpdateHandler2 metrics to OTEL
(#3417)
add ed7f2d116ad SOLR-17806: Migrate PeerSync and PeerSyncWithLeader
metrics to OTEL (#3440)
add bee4a36db5b SOLR-17806: Migrate ADMIN node registry metrics to OTEL
(#3444)
add 2c2183d3239 SOLR-17806: Migrate UpdateLog metrics to OTEL (#3438)
add 8e02bfc4e87 SOLR-17818: Expose Open Metrics 1.0 format from
/admin/metrics and exemplar support (#3427)
add 3d35f4defe9 SOLR-17827: Remove JXM, SLF4J and Graphite reporters
(#3443)
add 42c9b415738 SOLR-17806: Migrate ZkContainer metrics to OTEL (#3453)
add bfa519d3689 SOLR-17806: Use OtelUnit to create Otel instruments with
units as metadata (#3466)
add 9561d06026f SOLR-14393: Remove HIGHLIGHTER, QUERYPARSER, SPELLCHECKER
metrics (#3469)
add 0832659324d Build failure from zkContainer
add 09125e74c36 SOLR-17806: Recreate OTEL metric registries on core
rename/swapping (#3458)
add b966470824a Close OTEL Observable instruments (#3517)
add a6b687c8b04 SOLR-17806: OTEL Java 17 Runtime telemetry for JVM metrics
(#3494)
add 5c87f8d8597 SOLR-17806: switch ReplicationHandler metrics to OTEL
(#3514)
add 046b206de34 SOLR-17854: Support filters to /admin/metrics endpoint for
Prometheus metrics (#3499)
add e551fa15e48 SOLR-17806: Migrate SolrIndexWriter metrics to OTEL (#3568)
add 838b38a14bc SOLR-17806 Move SolrMetricTestUtils to test-framework
(#3624)
add ebe843be934 Fix test failure on AbstractBasicDistributedZkTestBase
(#3620)
add e6d4d446d75 SOLR-17806: Migrate Overseer and Blockcache metrics to
OTEL (#3607)
add e9ee7836d52 SOLR-17806 Migrate AuthenticationPlugin metrics to OTEL
(#3636)
add 63f8fccf259 SOLR-17806: Migrate thread pool metrics to OTEL (#3519)
add 598b5d75d4f Migrate FieldCacheMetrics to OTEL (#3619)
add 1bb61d17e94 SOLR-17806: Migrate AuditLoggerPlugin to OTEL (#3665)
add e02bd5367a9 SOLR-17828: Remove Prometheus exporter (#3470)
add 06775b0deb8 SOLR-17806: Migrate CaffeineCache to OTEL (#3671)
add c022d6bb427 SOLR-17806: Migrate SolrIndexSearcher metrics to OTEL
(#3482)
add fc3545764a0 SOLR-17798: Integrate SDK OTLP metric exporter (#3413)
add bed6205d9b4 SOLR-17806: Migrate suggest component and cross-dc metrics
to OTEL (#3668)
add b33762e7129 Test failures and builds from bad rebase
add 8cb654b7371 SOLR-17806: Convert CoreContainer metrics to OTEL (#3509)
add e4af8c9bd81 Broken tests from closing meter providers on core unload
and reload (#3707)
add f88e8199843 SOLR-17880: Migrate SolrClientNodeStateProvider and
NodeValueFetcher to OTEL (#3713)
add a466f04441a SOLR-17855: OTEL - CPU circuit breaker, awaitFixes and
NOCOMMIT fixes (#3719)
add 94e9dfe356c SOLR-17853: Migrate Plugins / Stats UI tab with Prometheus
metrics (#3623)
add e6c70a9100a SOLR-17799: Revamp index merge & flush metrics. Use OTEL.
add 49e02946bed SOLR-17799: add core attributes.
add 315bf57ee49 SOLR-17865: Support aggregateNodeLevelMetricsEnabled
(#3734)
add cee53df8e0a SOLR-17855: Cleanup Dropwizard metric code and tests
(#3745)
add 0261c4bc1d2 SOLR-17458: fix precommit source matters
add c6bbe451459 SOLR-17458: dependency matters
add 70c02c9e3bd SOLR-17458: dependency matters (test runtime)
add 0a84fa5f07c SOLR-17458: Remove prometheus exporter integration tests
(bats & docker)
add 06c6f7b8930 SOLR-17458: SplitShardCmd.checkDiskSpace remove nocommit
And reference a new JIRA issue
add d5c7882265d Merge branch 'refs/heads/main' into
feature/SOLR-17458-rebased
add 1abd6aa550e SOLR-17458: licenses: sha1 files for OTEL
new 61177998a2c SOLR-17458: Metrics: Switch to OTEL from Dropwizard
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 +-
.../org/apache/solr/metrics/SolrCoreReporter.java | 46 -
.../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} | 24 +-
.../otel/OtelUnit.java} | 34 +-
.../otel/instruments/AttributedDoubleCounter.java} | 27 +-
.../otel/instruments/AttributedDoubleGauge.java} | 21 +-
.../instruments/AttributedDoubleHistogram.java} | 28 +-
.../AttributedDoubleUpDownCounter.java} | 27 +-
.../instruments/AttributedInstrumentFactory.java | 155 +
.../otel/instruments/AttributedLongCounter.java} | 27 +-
.../otel/instruments/AttributedLongGauge.java} | 23 +-
.../otel/instruments/AttributedLongHistogram.java} | 29 +-
.../otel/instruments/AttributedLongTimer.java | 69 +
.../instruments/AttributedLongUpDownCounter.java} | 32 +-
.../DualRegistryAttributedLongCounter.java} | 36 +-
.../DualRegistryAttributedLongTimer.java} | 37 +-
.../DualRegistryAttributedLongUpDownCounter.java | 45 +
.../metrics/otel/instruments}/package-info.java | 7 +-
.../apache/solr/metrics/otel}/package-info.java | 6 +-
.../java/org/apache/solr/metrics/package-info.java | 3 +-
.../apache/solr/metrics/prometheus/SolrMetric.java | 57 -
.../solr/metrics/prometheus/SolrNoOpMetric.java | 29 -
.../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 -
.../solr/metrics/prometheus/core/package-info.java | 22 -
.../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/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/MockCounterSupplier.java | 34 -
.../apache/solr/metrics/MockHistogramSupplier.java | 39 -
.../org/apache/solr/metrics/MockMeterSupplier.java | 34 -
.../org/apache/solr/metrics/MockTimerSupplier.java | 44 -
.../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 +-
...onTracingTest.java => TestMetricExemplars.java} | 88 +-
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 -
.../prometheus/collector/CollectionsCollector.java | 37 -
.../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/SearchCollector.java | 37 -
.../solr/prometheus/collector/package-info.java | 19 -
.../exporter/CachedPrometheusCollector.java | 38 -
.../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 +-
436 files changed, 9239 insertions(+), 35811 deletions(-)
rename solr/core/src/java/org/apache/solr/core/{TracerConfigurator.java =>
OpenTelemetryConfigurator.java} (63%)
delete mode 100644
solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.java
delete mode 100644
solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
delete mode 100644
solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/AggregateMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/AltBufferPoolMetricSet.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/DelegateRegistryCounter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/DelegateRegistryHistogram.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/DelegateRegistryMeter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/DelegateRegistryTimer.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/FilteringSolrMetricReporter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/MetricSuppliers.java
delete mode 100644 solr/core/src/java/org/apache/solr/metrics/MetricsMap.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/OperatingSystemMetricSet.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/SolrCoreContainerReporter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/SolrCoreReporter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/SolrDelegateRegistryMetricsContext.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/SolrMetricReporter.java
create mode 100644
solr/core/src/java/org/apache/solr/metrics/otel/FilterablePrometheusMetricReader.java
copy
solr/{solrj/src/java/org/apache/solr/client/solrj/impl/SolrZkClientTimeout.java
=> core/src/java/org/apache/solr/metrics/otel/MetricExporterFactory.java} (58%)
copy solr/core/src/java/org/apache/solr/{update/RollbackUpdateCommand.java =>
metrics/otel/OtelUnit.java} (62%)
copy solr/{solrj/src/java/org/apache/solr/common/params/EventParams.java =>
core/src/java/org/apache/solr/metrics/otel/instruments/AttributedDoubleCounter.java}
(63%)
copy solr/{api/src/java/org/apache/solr/client/api/model/IndexType.java =>
core/src/java/org/apache/solr/metrics/otel/instruments/AttributedDoubleGauge.java}
(64%)
copy solr/core/src/java/org/apache/solr/{analysis/SolrAnalyzer.java =>
metrics/otel/instruments/AttributedDoubleHistogram.java} (61%)
copy
solr/core/src/java/org/apache/solr/{core/SolrResourceNotFoundException.java =>
metrics/otel/instruments/AttributedDoubleUpDownCounter.java} (57%)
create mode 100644
solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedInstrumentFactory.java
copy
solr/{modules/ltr/src/java/org/apache/solr/ltr/response/transform/package-info.java
=>
core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongCounter.java}
(60%)
copy solr/core/src/java/org/apache/solr/{logging/ListenerConfig.java =>
metrics/otel/instruments/AttributedLongGauge.java} (64%)
copy solr/core/src/java/org/apache/solr/{analysis/SolrAnalyzer.java =>
metrics/otel/instruments/AttributedLongHistogram.java} (60%)
create mode 100644
solr/core/src/java/org/apache/solr/metrics/otel/instruments/AttributedLongTimer.java
copy
solr/core/src/java/org/apache/solr/{search/grouping/distributed/command/QueryCommandResult.java
=> metrics/otel/instruments/AttributedLongUpDownCounter.java} (57%)
copy solr/core/src/java/org/apache/solr/{request/RegexBytesRefFilter.java =>
metrics/otel/instruments/DualRegistryAttributedLongCounter.java} (51%)
copy
solr/core/src/java/org/apache/solr/{cluster/events/ClusterEventListener.java =>
metrics/otel/instruments/DualRegistryAttributedLongTimer.java} (51%)
create mode 100644
solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongUpDownCounter.java
copy solr/{api/src/java/org/apache/solr/client/api/model =>
core/src/java/org/apache/solr/metrics/otel/instruments}/package-info.java (74%)
copy solr/{api/src/java/org/apache/solr/client/api/model =>
core/src/java/org/apache/solr/metrics/otel}/package-info.java (79%)
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/SolrMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/SolrNoOpMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/SolrPrometheusFormatter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/PrometheusCoreFormatterInfo.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreCacheMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHandlerMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreHighlighterMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreIndexMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreSearcherMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrCoreTlogMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/SolrPrometheusCoreFormatter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/core/package-info.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/SolrJettyDispatchesMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/SolrJettyMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/SolrJettyReqRespMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/SolrPrometheusJettyFormatter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jetty/package-info.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/PrometheusJvmFormatterInfo.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmBuffersMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmGcMetrics.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmMemoryMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrJvmOsMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/SolrPrometheusJvmFormatter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/jvm/package-info.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/PrometheusNodeFormatterInfo.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/SolrNodeContainerMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/SolrNodeHandlerMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/SolrNodeMetric.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/SolrPrometheusNodeFormatter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/node/package-info.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/prometheus/package-info.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/ReporterClientCache.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/SolrGraphiteReporter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxObjectNameFactory.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/jmx/package-info.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/package-info.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java
delete mode 100644
solr/core/src/java/org/apache/solr/metrics/reporters/solr/package-info.java
create mode 100644
solr/core/src/java/org/apache/solr/util/stats/OtelInstrumentedExecutorService.java
delete mode 100644
solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
delete mode 100644
solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/DelegateRegistryTimerTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/MetricsConfigTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/MetricsDisabledCloudTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/MockCounterSupplier.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/MockHistogramSupplier.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/MockMeterSupplier.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/MockTimerSupplier.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/SolrCoreMetricTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/SolrMetricReporterTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/SolrMetricTestUtils.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/SolrPrometheusFormatterTest.java
create mode 100644
solr/core/src/test/org/apache/solr/metrics/otel/FilterablePrometheusMetricReaderTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/reporters/MockMetricReporter.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterCloudTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
delete mode 100644
solr/core/src/test/org/apache/solr/metrics/reporters/SolrSlf4jReporterTest.java
create mode 100644
solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriterCloud.java
create mode 100644
solr/core/src/test/org/apache/solr/security/MockSolrMetricsContextFactory.java
delete mode 100644
solr/core/src/test/org/apache/solr/util/stats/MetricUtilsTest.java
create mode 100644
solr/core/src/test/org/apache/solr/util/stats/OtelInstrumentedExecutorServiceTest.java
delete mode 100755 solr/docker/tests/cases/prometheus-exporter-cloud/test.sh
delete mode 100755
solr/docker/tests/cases/prometheus-exporter-standalone/test.sh
delete mode 100644 solr/licenses/jackson-jq-0.0.13.jar.sha1
delete mode 100644 solr/licenses/metrics-graphite-4.2.26.jar.sha1
delete mode 100644 solr/licenses/metrics-graphite-LICENSE-ASL.txt
delete mode 100644 solr/licenses/metrics-graphite-NOTICE.txt
delete mode 100644 solr/licenses/metrics-jmx-4.2.26.jar.sha1
delete mode 100644 solr/licenses/metrics-jmx-LICENSE-ASL.txt
delete mode 100644 solr/licenses/metrics-jmx-NOTICE.txt
create mode 100644
solr/licenses/opentelemetry-api-incubator-1.45.0-alpha.jar.sha1
create mode 100644
solr/licenses/opentelemetry-exporter-prometheus-1.50.0-alpha.jar.sha1
create mode 100644
solr/licenses/opentelemetry-instrumentation-api-2.11.0.jar.sha1
create mode 100644
solr/licenses/opentelemetry-instrumentation-api-incubator-2.11.0-alpha.jar.sha1
create mode 100644
solr/licenses/opentelemetry-runtime-telemetry-java17-2.11.0-alpha.jar.sha1
create mode 100644
solr/licenses/opentelemetry-runtime-telemetry-java8-2.11.0-alpha.jar.sha1
create mode 100644 solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1
delete mode 100644 solr/licenses/simpleclient-0.16.0.jar.sha1
delete mode 100644 solr/licenses/simpleclient-LICENSE-ASL.txt
delete mode 100644 solr/licenses/simpleclient-NOTICE.txt
delete mode 100644 solr/licenses/simpleclient_common-0.16.0.jar.sha1
delete mode 100644 solr/licenses/simpleclient_common-LICENSE-ASL.txt
delete mode 100644 solr/licenses/simpleclient_common-NOTICE.txt
delete mode 100644 solr/licenses/simpleclient_httpserver-0.16.0.jar.sha1
delete mode 100644 solr/licenses/simpleclient_httpserver-LICENSE-ASL.txt
delete mode 100644 solr/licenses/simpleclient_httpserver-NOTICE.txt
delete mode 100644 solr/licenses/spring-boot-actuator-3.3.3.jar.sha1
delete mode 100644
solr/licenses/spring-boot-actuator-autoconfigure-3.3.3.jar.sha1
create mode 100644
solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtlpExporterFactory.java
copy
solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/{BasicAuthIntegrationTracingTest.java
=> TestMetricExemplars.java} (50%)
delete mode 100644 solr/packaging/test/test_prometheus.bats
delete mode 100644 solr/prometheus-exporter/README.md
delete mode 100755 solr/prometheus-exporter/bin/solr-exporter
delete mode 100644 solr/prometheus-exporter/bin/solr-exporter.cmd
delete mode 100644 solr/prometheus-exporter/build.gradle
delete mode 100644 solr/prometheus-exporter/conf/grafana-solr-dashboard.json
delete mode 100644 solr/prometheus-exporter/conf/log4j2.xml
delete mode 100644 solr/prometheus-exporter/conf/solr-exporter-config.xml
delete mode 100644 solr/prometheus-exporter/gradle.lockfile
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/CollectionsCollector.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricCollector.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricSamples.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollector.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollectorFactory.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/PingCollector.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SearchCollector.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/package-info.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/CachedPrometheusCollector.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsConfiguration.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQueryTemplate.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/package-info.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrScraper.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrStandaloneScraper.java
delete mode 100644
solr/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/package-info.java
delete mode 100644 solr/prometheus-exporter/src/java/overview.html
delete mode 100644
solr/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-integration-test-config.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/conf/test-config-with-templates.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/gb18030-example.xml
delete mode 100644 solr/prometheus-exporter/src/test-files/exampledocs/hd.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/ipod_other.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/ipod_video.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/manufacturers.xml
delete mode 100644 solr/prometheus-exporter/src/test-files/exampledocs/mem.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/money.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/monitor.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/monitor2.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/mp500.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/sample.html
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/sd500.xml
delete mode 100644 solr/prometheus-exporter/src/test-files/exampledocs/solr.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/utf8-example.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/exampledocs/vidcard.xml
delete mode 100644 solr/prometheus-exporter/src/test-files/log4j2.xml
delete mode 100644 solr/prometheus-exporter/src/test-files/query-metrics.json
delete mode 100644
solr/prometheus-exporter/src/test-files/solr/collection1/conf/managed-schema.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml
delete mode 100644
solr/prometheus-exporter/src/test-files/solr/collection1/conf/stopwords.txt
delete mode 100644
solr/prometheus-exporter/src/test-files/solr/collection1/conf/synonyms.txt
delete mode 100644 solr/prometheus-exporter/src/test-files/solr/solr.xml
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/PrometheusExporterTestBase.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/MetricsQueryTemplateTest.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTest.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperBasicAuthTest.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java
delete mode 100644
solr/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java
create mode 100644
solr/solrj/src/test/org/apache/solr/client/solrj/SolrJMetricTestUtils.java
create mode 100644
solr/test-framework/src/java/org/apache/solr/util/SolrMetricTestUtils.java
