feat:add response type for TSF Consul. (#666)

SkyeBeFreeman · web-flow · commit 2135a85ed853 · 2025-11-21T10:58:04.000+08:00
Signed-off-by: Haotian Zhang &lt;928016560@qq.com&gt;
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/InstanceService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/InstanceService.java
@@ -189,6 +189,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
                 newDiscoverResponseBuilder.setService(service);
                 newDiscoverResponseBuilder.addAllInstances(instanceList);
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.INSTANCE);
 
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/ServiceService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/ServiceService.java
@@ -100,6 +100,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
             newDiscoverResponseBuilder.setService(newService);
             newDiscoverResponseBuilder.addAllServices(serviceList);
             newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+            newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.SERVICES);
 
             ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
             boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/authority/AuthorityService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/authority/AuthorityService.java
@@ -132,6 +132,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
                     newDiscoverResponseBuilder.addAllBlockAllowListRule(ruleList);
                 }
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.BLOCK_ALLOW_RULE);
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
                 if (newIndex != null) {
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/circuitbreaker/CircuitBreakingService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/circuitbreaker/CircuitBreakingService.java
@@ -152,6 +152,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
                 }
                 newDiscoverResponseBuilder.setCircuitBreaker(newCircuitBreakerBuilder);
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.CIRCUIT_BREAKER);
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
                 if (newIndex != null) {
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/fault/FaultService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/fault/FaultService.java
@@ -139,6 +139,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
                     newDiscoverResponseBuilder.addAllFaultInjection(faultInjectionList);
                 }
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.FAULT_INJECTION);
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
                 if (newIndex != null) {
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/lane/LaneService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/lane/LaneService.java
@@ -168,6 +168,7 @@ protected void sendRequest(ServiceUpdateTask serviceUpdateTask) {
             }
             newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
             newDiscoverResponseBuilder.setService(newServiceBuilder);
+            newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.LANE);
             ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
             boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
             // 重写index
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/lossless/LosslessService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/lossless/LosslessService.java
@@ -148,6 +148,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
 
                 newDiscoverResponseBuilder.addAllLosslessRules(losslessRuleList);
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.LOSSLESS);
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
                 if (newIndex != null) {
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/mirroring/MirroringService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/mirroring/MirroringService.java
@@ -142,6 +142,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
                     newDiscoverResponseBuilder.addAllTrafficMirroring(trafficMirroringList);
                 }
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.TRAFFIC_MIRRORING);
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
                 if (newIndex != null) {
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/ratelimiting/RateLimitingService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/ratelimiting/RateLimitingService.java
@@ -139,6 +139,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
                 }
                 newDiscoverResponseBuilder.setRateLimit(newRateLimitBuilder);
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.RATE_LIMIT);
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
                 if (newIndex != null) {
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/router/NearByRouteRuleService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/router/NearByRouteRuleService.java
@@ -135,6 +135,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
                     newDiscoverResponseBuilder.addAllNearbyRouteRules(routes);
                 }
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.NEARBY_ROUTE_RULE);
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
                 // 重写index
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/router/RoutingService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/router/RoutingService.java
@@ -146,6 +146,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
                 }
                 newDiscoverResponseBuilder.setRouting(newRoutingBuilder);
                 newDiscoverResponseBuilder.setCode(UInt32Value.of(code));
+                newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.ROUTING);
                 ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);
                 boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);
                 if (newIndex != null) {
diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
         <!-- Project revision -->
         <revision>2.1.1.0-SNAPSHOT</revision>
 
-        <specification.version>1.6.0</specification.version>
+        <specification.version>1.7.0-SNAPSHOT</specification.version>
         <timestamp>${maven.build.timestamp}</timestamp>
         <skip.maven.deploy>false</skip.maven.deploy>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {`
`132`	`132`	`newDiscoverResponseBuilder.addAllBlockAllowListRule(ruleList);`
`133`	`133`	`}`
`134`	`134`	`newDiscoverResponseBuilder.setCode(UInt32Value.of(code));`
	`135`	`+ newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.BLOCK_ALLOW_RULE);`
`135`	`136`	`ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);`
`136`	`137`	`boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);`
`137`	`138`	`if (newIndex != null) {`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {`
`152`	`152`	`}`
`153`	`153`	`newDiscoverResponseBuilder.setCircuitBreaker(newCircuitBreakerBuilder);`
`154`	`154`	`newDiscoverResponseBuilder.setCode(UInt32Value.of(code));`
	`155`	`+ newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.CIRCUIT_BREAKER);`
`155`	`156`	`ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);`
`156`	`157`	`boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);`
`157`	`158`	`if (newIndex != null) {`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {`
`139`	`139`	`newDiscoverResponseBuilder.addAllFaultInjection(faultInjectionList);`
`140`	`140`	`}`
`141`	`141`	`newDiscoverResponseBuilder.setCode(UInt32Value.of(code));`
	`142`	`+ newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.FAULT_INJECTION);`
`142`	`143`	`ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);`
`143`	`144`	`boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);`
`144`	`145`	`if (newIndex != null) {`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ protected void sendRequest(ServiceUpdateTask serviceUpdateTask) {`
`168`	`168`	`}`
`169`	`169`	`newDiscoverResponseBuilder.setCode(UInt32Value.of(code));`
`170`	`170`	`newDiscoverResponseBuilder.setService(newServiceBuilder);`
	`171`	`+ newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.LANE);`
`171`	`172`	`ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);`
`172`	`173`	`boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);`
`173`	`174`	`// 重写index`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {`
`142`	`142`	`newDiscoverResponseBuilder.addAllTrafficMirroring(trafficMirroringList);`
`143`	`143`	`}`
`144`	`144`	`newDiscoverResponseBuilder.setCode(UInt32Value.of(code));`
	`145`	`+ newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.TRAFFIC_MIRRORING);`
`145`	`146`	`ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);`
`146`	`147`	`boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);`
`147`	`148`	`if (newIndex != null) {`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {`
`135`	`135`	`newDiscoverResponseBuilder.addAllNearbyRouteRules(routes);`
`136`	`136`	`}`
`137`	`137`	`newDiscoverResponseBuilder.setCode(UInt32Value.of(code));`
	`138`	`+ newDiscoverResponseBuilder.setType(ResponseProto.DiscoverResponse.DiscoverResponseType.NEARBY_ROUTE_RULE);`
`138`	`139`	`ServerEvent serverEvent = new ServerEvent(serviceUpdateTask.getServiceEventKey(), newDiscoverResponseBuilder.build(), null, SERVER_CONNECTOR_CONSUL);`
`139`	`140`	`boolean svcDeleted = serviceUpdateTask.notifyServerEvent(serverEvent);`
`140`	`141`	`// 重写index`