Skip to content

Commit e76836c

Browse files
committed
feat:support TSF global namespace. (#626)
(cherry picked from commit 4a88fc8)
1 parent 13dc63a commit e76836c

File tree

1 file changed

+7
-1
lines changed
  • polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service

1 file changed

+7
-1
lines changed

polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/InstanceService.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
123123
if (CollectionUtils.isNotEmpty(value)) {
124124
for (HealthService healthService : value) {
125125
ServiceProto.Instance.Builder instanceBuilder = ServiceProto.Instance.newBuilder()
126-
.setNamespace(StringValue.of(namespace))
127126
.setService(StringValue.of(serviceId))
128127
.setHost(StringValue.of(findHost(healthService)))
129128
.setPort(UInt32Value.of(healthService.getService().getPort()))
@@ -144,6 +143,13 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
144143
if (CollectionUtils.isNotEmpty(metadata)) {
145144
instanceBuilder.putAllMetadata(metadata);
146145
}
146+
// set namespace
147+
String metadataNamespace = metadata.get(TsfMetadataConstants.TSF_NAMESPACE_ID);
148+
if (StringUtils.isNotBlank(metadataNamespace)) {
149+
instanceBuilder.setNamespace(StringValue.of(metadataNamespace));
150+
} else {
151+
instanceBuilder.setNamespace(StringValue.of(namespace));
152+
}
147153
// set createTime
148154
Long createTime = null;
149155
if (StringUtils.isNotEmpty(metadata.get(TSF_CREATION_TIME_KEY))) {

0 commit comments

Comments
 (0)