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

Jump to bottom

[hotfix-1786][chunjun-metrics-prometheus] Fix uploading of startLocat… #1894

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[hotfix-1786][chunjun-metrics-prometheus] Fix uploading of startLocat… #1894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion ...ics-prometheus/src/main/java/com/dtstack/chunjun/metrics/prometheus/PrometheusReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@

import java.io.IOException;
import java.lang.reflect.Field;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -70,6 +72,8 @@ public class PrometheusReport extends CustomReporter {

private Configuration configuration;

// 如果是 Flink1.16 或更高版本，PrometheusPushGateway 主机名和端口号的配置项变成了 metrics.reporter.promgateway.hostUrl
private static final String KEY_HOST_URL = "metrics.reporter.promgateway.hostUrl";
private static final String KEY_HOST = "metrics.reporter.promgateway.host";
private static final String KEY_PORT = "metrics.reporter.promgateway.port";
private static final String KEY_JOB_NAME = "metrics.reporter.promgateway.jobName";
Expand All @@ -79,7 +83,7 @@ public class PrometheusReport extends CustomReporter {
"metrics.reporter.promgateway.deleteOnShutdown";

private static final char SCOPE_SEPARATOR = '_';
private static final String SCOPE_PREFIX = "org/apache/flink" + SCOPE_SEPARATOR;
private static final String SCOPE_PREFIX = "flink" + SCOPE_SEPARATOR;

private final Map<String, AbstractMap.SimpleImmutableEntry<Collector, Integer>>
collectorsWithCountByMetricName = new HashMap<>();
Expand Down Expand Up @@ -107,8 +111,22 @@ private void initConfiguration() {

@Override
public void open() {
// 尝试从新的配置项读取，如果未配置则使用旧的配置项
String hostUrl = configuration.getString(KEY_HOST_URL, "");
String host = configuration.getString(KEY_HOST, null);
int port = configuration.getInteger(KEY_PORT, 0);
// 解析 hostUrl 如果有
if (!StringUtils.isNullOrWhitespaceOnly(hostUrl)) {
try {
URL url = new URL(hostUrl);
host = url.getHost();
port = url.getPort();
} catch (MalformedURLException e) {
log.error("Error parsing Prometheus PushGateway URL: {}", hostUrl, e);
return; // URL 格式错误则终止执行
}
}

String configuredJobName = configuration.getString(KEY_JOB_NAME, "jiangboJob");
boolean randomSuffix = configuration.getBoolean(KEY_RANDOM_JOB_NAME_SUFFIX, false);
deleteOnShutdown = configuration.getBoolean(KEY_DELETE_ON_SHUTDOWN, true);
Expand Down
Loading