Apache Solr open-source search software
SOLR-16808: Don't publish envVars via the Metrics API
Houston Putman35fc4bdc4817
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex a33bfd8523a..245c1329351 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -187,6 +187,8 @@ Bug Fixes* SOLR-16801: Reset the thread's contextClassloader after loading the CoreContainer (Thomas Wöckinger, Houston Putman)+* SOLR-16808: Stop publishing environment variables via the Metrics API (Houston Putman)+Dependency Upgrades---------------------* PR#1494: Upgrade forbiddenapis to 3.5 (Uwe Schindler)diff --git a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.javaindex fba2870063c..47eb8198e82 100644--- a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java+++ b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java@@ -468,18 +468,6 @@ public class CoreContainerProvider implements ServletContextListener {ResolutionStrategy.IGNORE,"properties","system");- MetricsMap sysenv =- new MetricsMap(- map ->- System.getenv()- .forEach(- (k, v) -> {- if (!hiddenSysProps.contains(k)) {- map.putNoEx(String.valueOf(k), v);- }- }));- metricManager.registerGauge(- null, registryName, sysenv, metricTag, ResolutionStrategy.IGNORE, "env", "system");} catch (Exception e) {log.warn("Error registering JVM metrics", e);}