Skip to content
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

fix labels from env #12604

Merged
merged 2 commits into from
Sep 5, 2024
Merged

fix labels from env #12604

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8c9226
修复环境变量设置标签失效bug
shiyiyue1102 Sep 4, 2024
37929a1
pmd
shiyiyue1102 Sep 4, 2024
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
10 changes: 6 additions & 4 deletions common/src/main/java/com/alibaba/nacos/common/labels/impl/DefaultLabelsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public class DefaultLabelsCollector implements LabelsCollector {

private static final String UNDERSCORE = "_";

private static final String ESCAPE = "\\";

/**
* init labels.
*
Expand Down Expand Up @@ -79,12 +81,12 @@ public Map<String, String> collectLabels(Properties properties) {

//env
LOGGER.info("default nacos collect env raw labels: {}",
System.getenv(Constants.APP_CONN_LABELS_KEY.replaceAll(DOT, UNDERSCORE)));
System.getenv(Constants.APP_CONN_LABELS_KEY.replaceAll(ESCAPE + DOT, UNDERSCORE)));
Map<String, String> envLabels = ConnLabelsUtils.parseRawLabels(
System.getenv(Constants.APP_CONN_LABELS_KEY.replaceAll(DOT, UNDERSCORE)));
if (System.getenv(Constants.CONFIG_GRAY_LABEL.replaceAll(DOT, UNDERSCORE)) != null) {
System.getenv(Constants.APP_CONN_LABELS_KEY.replaceAll(ESCAPE + DOT, UNDERSCORE)));
if (System.getenv(Constants.CONFIG_GRAY_LABEL.replaceAll(ESCAPE + DOT, UNDERSCORE)) != null) {
envLabels.put(Constants.CONFIG_GRAY_LABEL,
System.getenv(Constants.CONFIG_GRAY_LABEL.replaceAll(DOT, UNDERSCORE)));
System.getenv(Constants.CONFIG_GRAY_LABEL.replaceAll(ESCAPE + DOT, UNDERSCORE)));
}
LOGGER.info("default nacos collect env labels: {}", envLabels);

Expand Down
Loading