Merge pull request #38 from andrewshan/main

feat: consul加上定位信息
polaris-contrib · Aug 23, 2022 · 3212448 · 3212448
2 parents e6e720f + 8320156
commit 3212448
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...c/main/java/cn/polarismesh/polaris/sync/registry/plugins/consul/ConsulRegistryCenter.java b/...c/main/java/cn/polarismesh/polaris/sync/registry/plugins/consul/ConsulRegistryCenter.java
@@ -200,9 +200,11 @@ private List<Instance> convertConsulInstance(Service service, List<HealthService
         }
         Map<String, String> filters = (null == group ? null : group.getMetadataMap());
         for (HealthService healthService : instances) {
+            LOG.info("[Consul]convert instance {}", healthService);
             HealthService.Service instance = healthService.getService();
             Map<String, String> metadata = instance.getMeta();
             boolean matched = CommonUtils.matchMetadata(metadata, filters);
+            LOG.info("[Consul]convert instance {}, matched {}", healthService, matched);
             if (!matched) {
                 continue;
             }
@@ -211,7 +213,9 @@ private List<Instance> convertConsulInstance(Service service, List<HealthService
             builder.setService(ResponseUtils.toStringValue(service.getService()));
             builder.setHost(ResponseUtils.toStringValue(instance.getAddress()));
             builder.setPort(ResponseUtils.toUInt32Value(instance.getPort()));
-            builder.putAllMetadata(CommonUtils.defaultMap(instance.getMeta()));
+            if (!CollectionUtils.isEmpty(instance.getMeta())) {
+                builder.putAllMetadata(instance.getMeta());
+            }
             builder.setWeight(ResponseUtils.toUInt32Value(100));
             builder.setHealthy(ResponseUtils.toBooleanValue(true));
             builder.setIsolate(ResponseUtils.toBooleanValue(false));

diff --git a/...src/main/java/cn/polarismesh/polaris/sync/registry/plugins/nacos/NacosRegistryCenter.java b/...src/main/java/cn/polarismesh/polaris/sync/registry/plugins/nacos/NacosRegistryCenter.java
@@ -272,7 +272,9 @@ private List<ServiceProto.Instance> convertNacosInstances(Service service, List<
             builder.setNamespace(ResponseUtils.toStringValue(service.getNamespace()));
             builder.setService(ResponseUtils.toStringValue(service.getService()));
             builder.setWeight(ResponseUtils.toUInt32Value((int) weight));
-            builder.putAllMetadata(CommonUtils.defaultMap(metadata));
+            if (!CollectionUtils.isEmpty(metadata)) {
+                builder.putAllMetadata(metadata);
+            }
             builder.setHost(ResponseUtils.toStringValue(ip));
             builder.setPort(ResponseUtils.toUInt32Value(port));
             builder.setIsolate(ResponseUtils.toBooleanValue(!enabled));

diff --git a/...main/java/cn/polarismesh/polaris/sync/registry/plugins/polaris/PolarisRegistryCenter.java b/...main/java/cn/polarismesh/polaris/sync/registry/plugins/polaris/PolarisRegistryCenter.java
@@ -197,7 +197,9 @@ private List<ServiceProto.Instance> convertPolarisInstances(com.tencent.polaris.
             ServiceProto.Instance.Builder builder = ServiceProto.Instance.newBuilder();
             builder.setId(ResponseUtils.toStringValue(instanceId));
             builder.setWeight(ResponseUtils.toUInt32Value(instance.getWeight()));
-            builder.putAllMetadata(CommonUtils.defaultMap(metadata));
+            if (CollectionUtils.isEmpty(metadata)) {
+                builder.putAllMetadata(metadata);
+            }
             builder.setHost(ResponseUtils.toStringValue(ip));
             builder.setPort(ResponseUtils.toUInt32Value(port));
             builder.setIsolate(ResponseUtils.toBooleanValue(instance.isIsolated()));