Skip to content

[ISSUE #10788] Tolerate invalid metric collector address #10789

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

Open
Aias00 wants to merge 2 commits into
base: develop
Choose a base branch
from
+77 −7
Open

[ISSUE #10788] Tolerate invalid metric collector address #10789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8b8384
[ISSUE #10788] Tolerate invalid metric collector address
Aias00 Aug 3, 2026
f7dddf8
test(proxy): preserve metric collector config
Aias00 Aug 4, 2026
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
48 changes: 41 additions & 7 deletions proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcClientSettingsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.broker.client.ConsumerGroupInfo;
import org.apache.rocketmq.common.ServiceThread;
import org.apache.rocketmq.common.constant.LoggerName;
Expand Down Expand Up @@ -117,13 +118,13 @@ protected Settings mergeMetric(Settings settings) {
final Metric.Builder metricBuilder = Metric.newBuilder();
switch (metricCollectorMode) {
case ON:
final String[] split = metricCollectorAddress.split(":");
final String host = split[0];
final int port = Integer.parseInt(split[1]);
Address address = Address.newBuilder().setHost(host).setPort(port).build();
final Endpoints endpoints = Endpoints.newBuilder().setScheme(AddressScheme.IPv4)
.addAddresses(address).build();
metricBuilder.setOn(true).setEndpoints(endpoints);
Address address = parseMetricCollectorAddress(metricCollectorAddress);
if (address == null) {
metricBuilder.setOn(false);
break;
}
metricBuilder.setOn(true).setEndpoints(Endpoints.newBuilder().setScheme(AddressScheme.IPv4)
.addAddresses(address).build());
break;
case PROXY:
metricBuilder.setOn(true).setEndpoints(settings.getAccessPoint());
Expand All @@ -137,6 +138,39 @@ protected Settings mergeMetric(Settings settings) {
return settings.toBuilder().setMetric(metric).build();
}

private Address parseMetricCollectorAddress(String metricCollectorAddress) {
if (StringUtils.isBlank(metricCollectorAddress)) {
log.warn("Disable gRPC client metric collection because metricCollectorAddress is blank");
return null;
}
String[] addressSegments = metricCollectorAddress.trim().split(":", -1);
if (addressSegments.length != 2) {
log.warn("Disable gRPC client metric collection because metricCollectorAddress is invalid: {}",
metricCollectorAddress);
return null;
}
String host = addressSegments[0].trim();
String portSegment = addressSegments[1].trim();
if (StringUtils.isBlank(host) || StringUtils.isBlank(portSegment)) {
log.warn("Disable gRPC client metric collection because metricCollectorAddress is invalid: {}",
metricCollectorAddress);
return null;
}
try {
int port = Integer.parseInt(portSegment);
if (port <= 0 || port > 65535) {
log.warn("Disable gRPC client metric collection because metricCollectorAddress port is out of range: {}",
metricCollectorAddress);
return null;
}
return Address.newBuilder().setHost(host).setPort(port).build();
} catch (NumberFormatException e) {
log.warn("Disable gRPC client metric collection because metricCollectorAddress port is invalid: {}",
metricCollectorAddress);
return null;
}
}

protected static Settings mergeSubscriptionData(Settings settings, SubscriptionGroupConfig groupConfig) {
Settings.Builder resultSettingsBuilder = settings.toBuilder();
ProxyConfig proxyConfig = ConfigurationManager.getProxyConfig();
Expand Down
36 changes: 36 additions & 0 deletions ...src/test/java/org/apache/rocketmq/proxy/grpc/v2/common/GrpcClientSettingsManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import org.apache.rocketmq.common.lite.LiteSubscriptionDTO;
import org.apache.rocketmq.proxy.common.ContextVariable;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.proxy.config.ConfigurationManager;
import org.apache.rocketmq.proxy.config.MetricCollectorMode;
import org.apache.rocketmq.proxy.grpc.v2.BaseActivityTest;
import org.apache.rocketmq.remoting.protocol.subscription.CustomizedRetryPolicy;
import org.apache.rocketmq.remoting.protocol.subscription.ExponentialRetryPolicy;
Expand Down Expand Up @@ -76,6 +78,40 @@ public void testGetProducerData() {
assertNotEquals(settings.getPublishing(), settings.getPublishing().getDefaultInstanceForType());
}

@Test
public void testMergeMetricWithValidCollectorAddress() {
String originalMetricCollectorMode = ConfigurationManager.getProxyConfig().getMetricCollectorMode();
String originalMetricCollectorAddress = ConfigurationManager.getProxyConfig().getMetricCollectorAddress();
ConfigurationManager.getProxyConfig().setMetricCollectorMode(MetricCollectorMode.ON.getModeString());
ConfigurationManager.getProxyConfig().setMetricCollectorAddress("127.0.0.1:9090");
try {
Settings settings = this.grpcClientSettingsManager.mergeMetric(Settings.getDefaultInstance());

assertEquals(true, settings.getMetric().getOn());
assertEquals("127.0.0.1", settings.getMetric().getEndpoints().getAddresses(0).getHost());
assertEquals(9090, settings.getMetric().getEndpoints().getAddresses(0).getPort());
} finally {
ConfigurationManager.getProxyConfig().setMetricCollectorMode(originalMetricCollectorMode);
ConfigurationManager.getProxyConfig().setMetricCollectorAddress(originalMetricCollectorAddress);
}
}

@Test
public void testMergeMetricShouldDisableMetricForInvalidCollectorAddress() {
String originalMetricCollectorMode = ConfigurationManager.getProxyConfig().getMetricCollectorMode();
String originalMetricCollectorAddress = ConfigurationManager.getProxyConfig().getMetricCollectorAddress();
ConfigurationManager.getProxyConfig().setMetricCollectorMode(MetricCollectorMode.ON.getModeString());
ConfigurationManager.getProxyConfig().setMetricCollectorAddress("localhost");
try {
Settings settings = this.grpcClientSettingsManager.mergeMetric(Settings.getDefaultInstance());

assertEquals(false, settings.getMetric().getOn());
} finally {
ConfigurationManager.getProxyConfig().setMetricCollectorMode(originalMetricCollectorMode);
ConfigurationManager.getProxyConfig().setMetricCollectorAddress(originalMetricCollectorAddress);
}
}

@Test
public void testGetSubscriptionData() {
ProxyContext context = ProxyContext.create().withVal(ContextVariable.CLIENT_ID, CLIENT_ID);
Expand Down
Loading