remove instance id.

Author: SkyeBeFreeman

polaris-discovery/polaris-discovery-client/src/main/java/com/tencent/polaris/discovery/client/flow/DefaultDiscoveryFlow.java

@@ -153,8 +153,6 @@ private InstanceRegisterResponse doRegister(InstanceRegisterRequest req, Map<Str
                         response.getInstanceID());
                 serviceCallResult.setRetStatus(RetStatus.RetSuccess);
                 serviceCallResult.setRetCode(ErrorCode.Success.getCode());
-                sdkContext.getValueContext().setPort(req.getPort());
-                sdkContext.getValueContext().setInstanceId(response.getInstanceID());
                 return new InstanceRegisterResponse(response.getInstanceID(), response.isExists());
             } catch (PolarisException e) {
                 serviceCallResult.setRetStatus(RetStatus.RetFail);

polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/common/ValueContext.java

@@ -34,12 +34,8 @@ public class ValueContext {
 
     private static final String KEY_HOST = "key_host";
 
-    private static final String KEY_PORT = "key_port";
-
     private static final String KEY_CLIENT_ID = "key_clientId";
 
-    private static final String KEY_INSTANCE_ID = "key_instanceId";
-
     private static final String KEY_ENGINE = "key_engine";
 
     private static final String KEY_SERVER_CONNECTOR_PROTOCOL = "key_serverConnectorProtocol";
@@ -93,14 +89,6 @@ public void setHost(String host) {
         setValue(KEY_HOST, host);
     }
 
-    public Integer getPort() {
-        return getValue(KEY_PORT);
-    }
-
-    public void setPort(Integer port) {
-        setValue(KEY_PORT, port);
-    }
-
     public String getClientId() {
         return getValue(KEY_CLIENT_ID);
     }
@@ -109,14 +97,6 @@ public void setClientId(String clientId) {
         setValue(KEY_CLIENT_ID, clientId);
     }
 
-    public String getInstanceId() {
-        return getValue(KEY_INSTANCE_ID);
-    }
-
-    public void setInstanceId(String instanceId) {
-        setValue(KEY_INSTANCE_ID, instanceId);
-    }
-
     public String getServerConnectorProtocol() {
         return getValue(KEY_SERVER_CONNECTOR_PROTOCOL);
     }

polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/event/FlowEvent.java

@@ -93,12 +93,6 @@ public class FlowEvent {
     @JsonProperty("api_method")
     private final String apiMethod;
 
-    /**
-     * 实例ID
-     */
-    @JsonProperty("instance_id")
-    private final String instanceId;
-
     /**
      * 实例IP
      */
@@ -168,7 +162,6 @@ private FlowEvent(Builder builder) {
         this.apiProtocol = builder.apiProtocol;
         this.apiPath = builder.apiPath;
         this.apiMethod = builder.apiMethod;
-        this.instanceId = builder.instanceId;
         this.host = builder.host;
         if (builder.port != null) {
             this.port = String.valueOf(builder.port);
@@ -197,7 +190,6 @@ public static class Builder {
         private String apiProtocol = "";
         private String apiPath = "";
         private String apiMethod = "";
-        private String instanceId = "";
         private String host = "";
         private Integer port;
         private String sourceNamespace = "";
@@ -259,11 +251,6 @@ public Builder withApiMethod(String apiMethod) {
             return this;
         }
 
-        public Builder withInstanceId(String instanceId) {
-            this.instanceId = instanceId;
-            return this;
-        }
-
         public Builder withHost(String host) {
             this.host = host;
             return this;
@@ -359,10 +346,6 @@ public String getApiMethod() {
         return apiMethod;
     }
 
-    public String getInstanceId() {
-        return instanceId;
-    }
-
     public String getHost() {
         return host;
     }
@@ -420,7 +403,6 @@ public String toString() {
                 ", apiProtocol='" + apiProtocol + '\'' +
                 ", apiPath='" + apiPath + '\'' +
                 ", apiMethod='" + apiMethod + '\'' +
-                ", instanceId='" + instanceId + '\'' +
                 ", host='" + host + '\'' +
                 ", port='" + port + '\'' +
                 ", sourceNamespace='" + sourceNamespace + '\'' +

polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-composite/src/main/java/com/tencent/polaris/plugins/circuitbreaker/composite/ResourceCounters.java

@@ -351,7 +351,6 @@ private void reportEvent(CircuitBreakerStatus.Status previousStatus, CircuitBrea
                 .withClientIp(extensions.getValueContext().getHost())
                 .withNamespace(resource.getService().getNamespace())
                 .withService(resource.getService().getService())
-                .withInstanceId(extensions.getValueContext().getInstanceId())
                 .withSourceNamespace(resource.getCallerService().getNamespace())
                 .withSourceService(resource.getService().getService())
                 .withCurrentStatus(currentFlowEventStatus)

polaris-plugins/polaris-plugins-lossless/lossless-common/src/main/java/com/tencent/polaris/plugin/lossless/common/LosslessEventUtils.java

@@ -44,7 +44,6 @@ public static void reportEvent(Extensions extensions, String namespace, String s
                 .withClientIp(extensions.getValueContext().getHost())
                 .withNamespace(namespace)
                 .withService(service)
-                .withInstanceId(extensions.getValueContext().getInstanceId())
                 .withHost(host)
                 .withPort(port);
 

polaris-plugins/polaris-plugins-observability/event-logger/src/main/java/com/tencent/polaris/plugins/event/logger/LoggerEventReporter.java

@@ -117,9 +117,8 @@ public String convertMessage(FlowEvent event) {
         return eventType + "|" + eventName + "|" + formattedDateTime + "|" + event.getClientId() + "|"
                 + event.getClientIp() + "|" + event.getNamespace() + "|" + event.getService() + "|"
                 + event.getApiProtocol() + "|" + event.getApiPath() + "|" + event.getApiMethod() + "|"
-                + event.getInstanceId() + "|" + event.getHost() + "|" + event.getPort() + "|"
-                + event.getSourceNamespace() + "|" + event.getSourceService() + "|" + event.getLabels() + "|"
-                + currentStatus + "|" + previousStatus + "|" + resourceType + "|" + event.getRuleName() + "|"
-                + event.getReason();
+                + event.getHost() + "|" + event.getPort() + "|" + event.getSourceNamespace() + "|"
+                + event.getSourceService() + "|" + event.getLabels() + "|" + currentStatus + "|"
+                + previousStatus + "|" + resourceType + "|" + event.getRuleName() + "|" + event.getReason();
     }
 }

polaris-plugins/polaris-plugins-observability/event-pushgateway/src/test/java/com/tencent/polaris/plugins/event/pushgateway/PushGatewayEventRequestTest.java

@@ -50,7 +50,6 @@ public void test() throws JsonProcessingException {
                 .withClientIp("1.2.3.4")
                 .withNamespace("test-namespace")
                 .withService("test-service")
-                .withInstanceId("test-instance")
                 .withHost("1.2.3.4")
                 .withPort(8080)
                 .build();

polaris-ratelimit/polaris-ratelimit-client/src/main/java/com/tencent/polaris/ratelimit/client/utils/RateLimiterEventUtils.java

@@ -56,9 +56,7 @@ public static void reportEvent(Extensions extensions, ServiceKey serviceKey, Rat
                 .withNamespace(serviceKey.getNamespace())
                 .withService(serviceKey.getService())
                 .withApiPath(rule.getMethod().getValue().getValue())
-                .withInstanceId(extensions.getValueContext().getInstanceId())
                 .withHost(extensions.getValueContext().getHost())
-                .withPort(extensions.getValueContext().getPort())
                 .withSourceNamespace(sourceNamespace)
                 .withSourceService(sourceService)
                 .withLabels(labels)