You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2023/05/19 15:49:10 UTC
[solr] branch branch_9_2 updated: SOLR-16808: Don't publish envVars via the Metrics API
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9_2
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_2 by this push:
new 1dd45b51c8e SOLR-16808: Don't publish envVars via the Metrics API
1dd45b51c8e is described below
commit 1dd45b51c8e0968cbead37e432fbfb2680973953
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri May 19 10:58:41 2023 -0400
SOLR-16808: Don't publish envVars via the Metrics API
(cherry picked from commit 35fc4bdc48171d9a64251c54a1e76deb558cf9d8)
---
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/servlet/CoreContainerProvider.java | 12 ------------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b4ad929064c..065b973c71c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -13,6 +13,8 @@ Bug Fixes
* SOLR-16789: Fixed Admin UI dashboard "Security" panel to show the right information regarding authentication (Tomás Fernández Löbbe)
+* SOLR-16808: Stop publishing environment variables via the Metrics API (Houston Putman)
+
Dependency Upgrades
---------------------
(No changes)
diff --git a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
index e8880270621..0dd4b3f7234 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
@@ -469,18 +469,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);
}