Skip to content

Commit 43f0dc8

Browse files
committed
feat:support TSF global namespace.
1 parent 85c6aa6 commit 43f0dc8

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
@@ -124,7 +124,6 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
124124
if (CollectionUtils.isNotEmpty(value)) {
125125
for (HealthService healthService : value) {
126126
ServiceProto.Instance.Builder instanceBuilder = ServiceProto.Instance.newBuilder()
127-
.setNamespace(StringValue.of(namespace))
128127
.setService(StringValue.of(serviceId))
129128
.setHost(StringValue.of(findHost(healthService)))
130129
.setPort(UInt32Value.of(healthService.getService().getPort()))
@@ -145,6 +144,13 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
145144
if (CollectionUtils.isNotEmpty(metadata)) {
146145
instanceBuilder.putAllMetadata(metadata);
147146
}
147+
// set namespace
148+
String metadataNamespace = metadata.get(TsfMetadataConstants.TSF_NAMESPACE_ID);
149+
if (StringUtils.isNotBlank(metadataNamespace)) {
150+
instanceBuilder.setNamespace(StringValue.of(metadataNamespace));
151+
} else {
152+
instanceBuilder.setNamespace(StringValue.of(namespace));
153+
}
148154
// set createTime
149155
Long createTime = null;
150156
if (StringUtils.isNotEmpty(metadata.get(TSF_CREATION_TIME_KEY))) {

0 commit comments

Comments
 (0)