Skip to content

SOLR-17855: Cleanup Dropwizard metric code and tests #3745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 14, 2025
Merged

SOLR-17855: Cleanup Dropwizard metric code and tests #3745

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95a8f4b
Remove NOCOMMITs and dropwizard code
mlbiscoc Oct 9, 2025
3c41eb3
Show prometheus metrics for jettyRunner
mlbiscoc Oct 10, 2025
7daafff
Move off dropwizard for SystemInfoHandler
mlbiscoc Oct 10, 2025
4d6af72
Bring back setupCluster for CloudExitableDirectoryReaderTest
mlbiscoc Oct 10, 2025
9ae98af
Changes from comments
mlbiscoc Oct 13, 2025
f2bbb3a
Disable SplitShardCmd checkDiskSpace with nocommit
dsmiley Oct 14, 2025
c477a4c
fix TestDistributedTracing wt=prometheus
dsmiley Oct 14, 2025
0efdf01
Merge remote-tracking branch 'apache/feature/SOLR-17458-rebased' into…
dsmiley Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,7 @@ cybozulabs-langdetect = { module = "com.cybozu.labs:langdetect", version.ref = "
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" }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still see dropwizard dependencies

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgot to mention this. I didn't remove it completely because a few things were using the instruments but not necessarily the registry for the metrics collection beside CrossDcConsumer (I don't know much about this module).

  1. Stats was being used for overseer and Zk distributed queue and this was also being used by embedded zk metrics. It worked with the OverseerStatusCmd API to just get some averages and rates from the instruments.
  2. MiniClusterState was using the meter instrument for logging somethings
  3. CrossDcConsumer was creating its own registry it looks like for collecting metrics

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay; looks like another JIRA I guess. At least doesn't seem like a release blocker.

dropwizard-metrics-graphite = { module = "io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" }
dropwizard-metrics-jetty12 = { module = "io.dropwizard.metrics:metrics-jetty12", version.ref = "dropwizard-metrics" }
dropwizard-metrics-jetty12-ee10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" }
dropwizard-metrics-jmx = { module = "io.dropwizard.metrics:metrics-jmx", version.ref = "dropwizard-metrics" }
dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" }
dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-jakarta-servlets", 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" }
Expand Down
5 changes: 1 addition & 4 deletions solr/api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,9 @@ commons-cli:commons-cli:1.10.0=jarValidation,testRuntimeClasspath
commons-codec:commons-codec:1.19.0=jarValidation,testRuntimeClasspath
commons-io:commons-io:2.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=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
Expand Down
3 changes: 0 additions & 3 deletions solr/benchmark/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@ commons-codec:commons-codec:1.19.0=jarValidation,runtimeClasspath,testRuntimeCla
commons-io:commons-io:2.17.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=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.6.Final=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
8 changes: 2 additions & 6 deletions solr/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,7 @@ dependencies {
api project(':solr:solrj-zookeeper')
api project(':solr:solrj-streaming')

api libs.dropwizard.metrics.core
implementation (libs.dropwizard.metrics.graphite, {
exclude group: "com.rabbitmq", module: "amqp-client"
})
implementation libs.dropwizard.metrics.jmx
implementation libs.dropwizard.metrics.jvm
implementation libs.dropwizard.metrics.core

implementation(libs.jersey.containers.jettyhttp, {
exclude group: "org.eclipse.jetty", module: "jetty-continuation"
Expand Down Expand Up @@ -224,4 +219,5 @@ dependencies {
testImplementation libs.apache.httpcomponents.httpcore

testImplementation libs.opentelemetry.sdktesting
testImplementation libs.dropwizard.metrics.core
}
5 changes: 1 addition & 4 deletions solr/core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,9 @@ commons-cli:commons-cli:1.10.0=compileClasspath,jarValidation,runtimeClasspath,r
commons-codec:commons-codec:1.19.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
commons-io:commons-io:2.17.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=compileClasspath,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.6.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
Expand Down
3 changes: 1 addition & 2 deletions solr/core/src/java/org/apache/solr/blockcache/Metrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ public class Metrics extends SolrCacheBase implements SolrInfoBean {
private AutoCloseable toClose;

@Override
public void initializeMetrics(
SolrMetricsContext parentContext, Attributes attributes, String scope) {
public void initializeMetrics(SolrMetricsContext parentContext, Attributes attributes) {
solrMetricsContext = parentContext.getChildContext(this);
var baseAttributes =
attributes.toBuilder().put(CATEGORY_ATTR, getCategory().toString()).build();
Expand Down
10 changes: 3 additions & 7 deletions solr/core/src/java/org/apache/solr/cloud/Overseer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,11 @@ public ClusterStateUpdater(
this.compressor = compressor;

this.clusterStateUpdaterMetricContext = solrMetricsContext.getChildContext(this);
initializeMetrics(
solrMetricsContext, Attributes.of(CATEGORY_ATTR, getCategory().toString()), "");
initializeMetrics(solrMetricsContext, Attributes.of(CATEGORY_ATTR, getCategory().toString()));
}

@Override
public void initializeMetrics(
SolrMetricsContext parentContext, Attributes attributes, String scope) {
public void initializeMetrics(SolrMetricsContext parentContext, Attributes attributes) {
this.toClose =
parentContext.observableLongGauge(
"solr_overseer_state_update_queue_size",
Expand Down Expand Up @@ -660,7 +658,6 @@ private LeaderStatus amILeader() {
public void close() {
this.isClosed = true;
IOUtils.closeQuietly(toClose);
clusterStateUpdaterMetricContext.unregister();
}

@Override
Expand Down Expand Up @@ -750,8 +747,7 @@ public Overseer(
this.solrMetricsContext =
new SolrMetricsContext(
zkController.getCoreContainer().getMetricManager(),
SolrInfoBean.Group.overseer.toString(),
metricTag);
SolrInfoBean.Group.overseer.toString());
}

public synchronized void start(String id) {
Expand Down
6 changes: 2 additions & 4 deletions solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ public OverseerTaskProcessor(
thisNode = MDCLoggingContext.getNodeName();

this.overseerTaskProcessorMetricsContext = solrMetricsContext.getChildContext(this);
initializeMetrics(
solrMetricsContext, Attributes.of(CATEGORY_ATTR, getCategory().toString()), "");
initializeMetrics(solrMetricsContext, Attributes.of(CATEGORY_ATTR, getCategory().toString()));
}

@Override
Expand Down Expand Up @@ -407,8 +406,7 @@ private void cleanUpRunningTasks() {
}

@Override
public void initializeMetrics(
SolrMetricsContext parentContext, Attributes attributes, String scope) {
public void initializeMetrics(SolrMetricsContext parentContext, Attributes attributes) {
this.toClose =
parentContext.observableLongGauge(
"solr_overseer_collection_work_queue_size",
Expand Down
67 changes: 14 additions & 53 deletions solr/core/src/java/org/apache/solr/core/CoreContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.apache.solr.common.params.CommonParams.METRICS_PATH;
import static org.apache.solr.common.params.CommonParams.ZK_PATH;
import static org.apache.solr.common.params.CommonParams.ZK_STATUS_PATH;
import static org.apache.solr.metrics.SolrMetricManager.NODE_REGISTRY;
import static org.apache.solr.metrics.SolrMetricProducer.CATEGORY_ATTR;
import static org.apache.solr.metrics.SolrMetricProducer.HANDLER_ATTR;
import static org.apache.solr.metrics.SolrMetricProducer.NAME_ATTR;
Expand Down Expand Up @@ -521,9 +522,7 @@ private void initializeAuditloggerPlugin(Map<String, Object> auditConf) {

newAuditloggerPlugin.plugin.init(auditConf);
newAuditloggerPlugin.plugin.initializeMetrics(
solrMetricsContext,
Attributes.builder().put(HANDLER_ATTR, "/auditlogging").build(),
"/auditlogging");
solrMetricsContext, Attributes.builder().put(HANDLER_ATTR, "/auditlogging").build());
} else {
log.debug("Security conf doesn't exist. Skipping setup for audit logging module.");
}
Expand Down Expand Up @@ -589,9 +588,7 @@ private synchronized void initializeAuthenticationPlugin(
authenticationPlugin.plugin.init(authenticationConfig);
setupHttpClientForAuthPlugin(authenticationPlugin.plugin);
authenticationPlugin.plugin.initializeMetrics(
solrMetricsContext,
Attributes.builder().put(HANDLER_ATTR, "/authentication").build(),
"/authentication");
solrMetricsContext, Attributes.builder().put(HANDLER_ATTR, "/authentication").build());
}
this.authenticationPlugin = authenticationPlugin;
try {
Expand Down Expand Up @@ -779,21 +776,18 @@ private void loadInternal() {
containerPluginsRegistry.registerListener(
clusterEventProducerFactory.getPluginRegistryListener());

solrMetricsContext =
new SolrMetricsContext(
metricManager, SolrMetricManager.getRegistryName(SolrInfoBean.Group.node), metricTag);
solrMetricsContext = new SolrMetricsContext(metricManager, NODE_REGISTRY);

shardHandlerFactory =
ShardHandlerFactory.newInstance(cfg.getShardHandlerFactoryPluginInfo(), loader);
if (shardHandlerFactory instanceof SolrMetricProducer metricProducer) {
metricProducer.initializeMetrics(solrMetricsContext, Attributes.empty(), "httpShardHandler");
metricProducer.initializeMetrics(solrMetricsContext, Attributes.empty());
}

updateShardHandler = new UpdateShardHandler(cfg.getUpdateShardHandlerConfig());
solrClientProvider =
new HttpSolrClientProvider(cfg.getUpdateShardHandlerConfig(), solrMetricsContext);
updateShardHandler.initializeMetrics(
solrMetricsContext, Attributes.empty(), "updateShardHandler");
updateShardHandler.initializeMetrics(solrMetricsContext, Attributes.empty());
solrClientCache = new SolrClientCache(solrClientProvider.getSolrClient());

Map<String, CacheConfig> cachesConfig = cfg.getCachesConfig();
Expand Down Expand Up @@ -827,17 +821,15 @@ private void loadInternal() {
.getZkMetricsProducer()
.initializeMetrics(
solrMetricsContext,
Attributes.of(CATEGORY_ATTR, SolrInfoBean.Category.CONTAINER.toString()),
"zkClient");
Attributes.of(CATEGORY_ATTR, SolrInfoBean.Category.CONTAINER.toString()));
pkiAuthenticationSecurityBuilder =
new PKIAuthenticationPlugin(
this,
zkSys.getZkController().getNodeName(),
(PublicKeyHandler) containerHandlers.get(PublicKeyHandler.PATH));
pkiAuthenticationSecurityBuilder.initializeMetrics(
solrMetricsContext,
Attributes.builder().put(HANDLER_ATTR, "/authentication/pki").build(),
"/authentication/pki");
Attributes.builder().put(HANDLER_ATTR, "/authentication/pki").build());

fileStore = new DistribFileStore(this);
registerV2ApiIfEnabled(ClusterFileStore.class);
Expand Down Expand Up @@ -901,31 +893,23 @@ private void loadInternal() {

metricsHandler = new MetricsHandler(this);
containerHandlers.put(METRICS_PATH, metricsHandler);
// TODO SOLR-17458: Add Otel
metricsHandler.initializeMetrics(
solrMetricsContext,
Attributes.builder().put(HANDLER_ATTR, METRICS_PATH).build(),
METRICS_PATH);
solrMetricsContext, Attributes.builder().put(HANDLER_ATTR, METRICS_PATH).build());

containerHandlers.put(AUTHZ_PATH, securityConfHandler);
// TODO SOLR-17458: Add Otel
securityConfHandler.initializeMetrics(
solrMetricsContext, Attributes.builder().put(HANDLER_ATTR, AUTHZ_PATH).build(), AUTHZ_PATH);
solrMetricsContext, Attributes.builder().put(HANDLER_ATTR, AUTHZ_PATH).build());
containerHandlers.put(AUTHC_PATH, securityConfHandler);

PluginInfo[] metricReporters = cfg.getMetricsConfig().getMetricReporters();
metricManager.loadReporters(metricReporters, loader, this, null, null, SolrInfoBean.Group.node);
metricManager.loadReporters(metricReporters, loader, this, null, null, SolrInfoBean.Group.jvm);
metricManager.loadReporters(
metricReporters, loader, this, null, null, SolrInfoBean.Group.jetty);

containerProperties.putAll(cfg.getSolrProperties());

Attributes containerAttrs =
Attributes.builder().put(CATEGORY_ATTR, SolrInfoBean.Category.CONTAINER.toString()).build();

// initialize gauges for reporting the number of cores and disk total/free
solrCores.initializeMetrics(solrMetricsContext, containerAttrs, "");
solrCores.initializeMetrics(solrMetricsContext, containerAttrs);

Path dataHome =
cfg.getSolrDataHome() != null ? cfg.getSolrDataHome() : cfg.getCoreRootDirectory();
Expand Down Expand Up @@ -953,13 +937,7 @@ private void loadInternal() {

SolrFieldCacheBean fieldCacheBean = new SolrFieldCacheBean();
fieldCacheBean.initializeMetrics(
solrMetricsContext,
Attributes.of(CATEGORY_ATTR, SolrInfoBean.Category.CACHE.toString()),
"");

if (isZooKeeperAware()) {
metricManager.loadClusterReporters(metricReporters, this);
}
solrMetricsContext, Attributes.of(CATEGORY_ATTR, SolrInfoBean.Category.CACHE.toString()));

// setup executor to load cores in parallel
coreLoadExecutor =
Expand Down Expand Up @@ -1271,28 +1249,12 @@ public void shutdown() {
customThreadPool.execute(replayUpdatesExecutor::shutdownAndAwaitTermination);

if (metricManager != null) {
metricManager.closeReporters(SolrMetricManager.getRegistryName(SolrInfoBean.Group.node));
metricManager.closeReporters(SolrMetricManager.getRegistryName(SolrInfoBean.Group.jvm));
metricManager.closeReporters(SolrMetricManager.getRegistryName(SolrInfoBean.Group.jetty));

metricManager.unregisterGauges(
SolrMetricManager.getRegistryName(SolrInfoBean.Group.node), metricTag);
metricManager.unregisterGauges(
SolrMetricManager.getRegistryName(SolrInfoBean.Group.jvm), metricTag);
metricManager.unregisterGauges(
SolrMetricManager.getRegistryName(SolrInfoBean.Group.jetty), metricTag);

// Close all OTEL meter providers and metrics
metricManager.closeAllRegistries();
}

if (isZooKeeperAware()) {
cancelCoreRecoveries();

if (metricManager != null) {
metricManager.closeReporters(
SolrMetricManager.getRegistryName(SolrInfoBean.Group.cluster));
}
}

try {
Expand Down Expand Up @@ -1796,8 +1758,7 @@ private SolrCore processCoreCreateException(
private void resetIndexDirectory(CoreDescriptor dcore, ConfigSet coreConfig) {
SolrConfig config = coreConfig.getSolrConfig();

String registryName =
SolrMetricManager.getRegistryName(SolrInfoBean.Group.core, dcore.getName());
String registryName = SolrMetricManager.enforcePrefix(dcore.getName());
DirectoryFactory df = DirectoryFactory.loadDirectoryFactory(config, this, registryName);
String dataDir = SolrCore.findDataDir(df, null, config, dcore);

Expand Down Expand Up @@ -2285,7 +2246,7 @@ protected <T> T createHandler(String path, String handlerClass, Class<T> clazz)
if (handler instanceof SolrMetricProducer) {
((SolrMetricProducer) handler)
.initializeMetrics(
solrMetricsContext, Attributes.builder().put(HANDLER_ATTR, path).build(), path);
solrMetricsContext, Attributes.builder().put(HANDLER_ATTR, path).build());
}
return handler;
}
Expand Down
3 changes: 1 addition & 2 deletions solr/core/src/java/org/apache/solr/core/HttpSolrClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ private void initializeMetrics(SolrMetricsContext parentContext) {
var solrMetricsContext = parentContext.getChildContext(this);
String expandedScope =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now not needed

SolrMetricManager.mkName(METRIC_SCOPE_NAME, SolrInfoBean.Category.HTTP.name());
// TODO SOLR-17458: Add Otel
trackHttpSolrMetrics.initializeMetrics(solrMetricsContext, Attributes.empty(), expandedScope);
trackHttpSolrMetrics.initializeMetrics(solrMetricsContext, Attributes.empty());
}

Http2SolrClient getSolrClient() {
Expand Down
14 changes: 5 additions & 9 deletions solr/core/src/java/org/apache/solr/core/SolrCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,6 @@ protected SolrCore(
// Initialize the metrics manager
this.coreMetricManager = initCoreMetricManager(solrConfig);
this.solrMetricsContext = coreMetricManager.getSolrMetricsContext();
this.coreMetricManager.loadReporters();

if (updateHandler == null) {
directoryFactory = initDirectoryFactory();
Expand All @@ -1132,7 +1131,7 @@ protected SolrCore(
initCoreAttributes();

// initialize core metrics
initializeMetrics(solrMetricsContext, coreAttributes, "");
initializeMetrics(solrMetricsContext, coreAttributes);

// init pluggable circuit breakers, after metrics because some circuit breakers use metrics
initPlugins(null, CircuitBreaker.class);
Expand All @@ -1142,8 +1141,7 @@ protected SolrCore(
// also register it here for back-compat
solrFieldCacheBean.initializeMetrics(
solrMetricsContext,
coreAttributes.toBuilder().put(CATEGORY_ATTR, Category.CACHE.toString()).build(),
"");
coreAttributes.toBuilder().put(CATEGORY_ATTR, Category.CACHE.toString()).build());
infoRegistry.put("fieldCache", solrFieldCacheBean);

this.maxWarmingSearchers = solrConfig.maxWarmingSearchers;
Expand Down Expand Up @@ -1220,8 +1218,7 @@ protected SolrCore(
// Allow the directory factory to report metrics
if (directoryFactory instanceof SolrMetricProducer) {
((SolrMetricProducer) directoryFactory)
// TODO SOLR-17458: Add Otel
.initializeMetrics(solrMetricsContext, Attributes.empty(), "directoryFactory");
.initializeMetrics(solrMetricsContext, Attributes.empty());
}

bufferUpdatesIfConstructing(coreDescriptor);
Expand Down Expand Up @@ -1334,8 +1331,7 @@ private SolrCoreMetricManager initCoreMetricManager(SolrConfig config) {
}

@Override
public void initializeMetrics(
SolrMetricsContext parentContext, Attributes attributes, String scope) {
public void initializeMetrics(SolrMetricsContext parentContext, Attributes attributes) {
final List<AutoCloseable> observables = new ArrayList<>();

Attributes baseSearcherAttributes =
Expand Down Expand Up @@ -1690,7 +1686,7 @@ public StatsCache createStatsCache() {
}
cache = new LocalStatsCache();
}
cache.initializeMetrics(solrMetricsContext, coreAttributes, null);
cache.initializeMetrics(solrMetricsContext, coreAttributes);
return cache;
}

Expand Down
Loading