Skip to content

Commit 7821cd5

Browse files
SkyeBeFreemanSkyeBeFreeman
committed
remove instance id.
1 parent 3c49a68 commit 7821cd5

File tree

9 files changed

+139
-144
lines changed

9 files changed

+139
-144
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ private InstanceRegisterResponse doRegister(InstanceRegisterRequest req, Map<Str
153153
response.getInstanceID());
154154
serviceCallResult.setRetStatus(RetStatus.RetSuccess);
155155
serviceCallResult.setRetCode(ErrorCode.Success.getCode());
156-
sdkContext.getValueContext().setPort(req.getPort());
157-
sdkContext.getValueContext().setInstanceId(response.getInstanceID());
158156
return new InstanceRegisterResponse(response.getInstanceID(), response.isExists());
159157
} catch (PolarisException e) {
160158
serviceCallResult.setRetStatus(RetStatus.RetFail);

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,8 @@ public class ValueContext {
3434

3535
private static final String KEY_HOST = "key_host";
3636

37-
private static final String KEY_PORT = "key_port";
38-
3937
private static final String KEY_CLIENT_ID = "key_clientId";
4038

41-
private static final String KEY_INSTANCE_ID = "key_instanceId";
42-
4339
private static final String KEY_ENGINE = "key_engine";
4440

4541
private static final String KEY_SERVER_CONNECTOR_PROTOCOL = "key_serverConnectorProtocol";
@@ -93,14 +89,6 @@ public void setHost(String host) {
9389
setValue(KEY_HOST, host);
9490
}
9591

96-
public Integer getPort() {
97-
return getValue(KEY_PORT);
98-
}
99-
100-
public void setPort(Integer port) {
101-
setValue(KEY_PORT, port);
102-
}
103-
10492
public String getClientId() {
10593
return getValue(KEY_CLIENT_ID);
10694
}
@@ -109,14 +97,6 @@ public void setClientId(String clientId) {
10997
setValue(KEY_CLIENT_ID, clientId);
11098
}
11199

112-
public String getInstanceId() {
113-
return getValue(KEY_INSTANCE_ID);
114-
}
115-
116-
public void setInstanceId(String instanceId) {
117-
setValue(KEY_INSTANCE_ID, instanceId);
118-
}
119-
120100
public String getServerConnectorProtocol() {
121101
return getValue(KEY_SERVER_CONNECTOR_PROTOCOL);
122102
}

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@ public class FlowEvent {
9393
@JsonProperty("api_method")
9494
private final String apiMethod;
9595

96-
/**
97-
* 实例ID
98-
*/
99-
@JsonProperty("instance_id")
100-
private final String instanceId;
101-
10296
/**
10397
* 实例IP
10498
*/
@@ -168,7 +162,6 @@ private FlowEvent(Builder builder) {
168162
this.apiProtocol = builder.apiProtocol;
169163
this.apiPath = builder.apiPath;
170164
this.apiMethod = builder.apiMethod;
171-
this.instanceId = builder.instanceId;
172165
this.host = builder.host;
173166
if (builder.port != null) {
174167
this.port = String.valueOf(builder.port);
@@ -197,7 +190,6 @@ public static class Builder {
197190
private String apiProtocol = "";
198191
private String apiPath = "";
199192
private String apiMethod = "";
200-
private String instanceId = "";
201193
private String host = "";
202194
private Integer port;
203195
private String sourceNamespace = "";
@@ -259,11 +251,6 @@ public Builder withApiMethod(String apiMethod) {
259251
return this;
260252
}
261253

262-
public Builder withInstanceId(String instanceId) {
263-
this.instanceId = instanceId;
264-
return this;
265-
}
266-
267254
public Builder withHost(String host) {
268255
this.host = host;
269256
return this;
@@ -359,10 +346,6 @@ public String getApiMethod() {
359346
return apiMethod;
360347
}
361348

362-
public String getInstanceId() {
363-
return instanceId;
364-
}
365-
366349
public String getHost() {
367350
return host;
368351
}
@@ -420,7 +403,6 @@ public String toString() {
420403
", apiProtocol='" + apiProtocol + '\'' +
421404
", apiPath='" + apiPath + '\'' +
422405
", apiMethod='" + apiMethod + '\'' +
423-
", instanceId='" + instanceId + '\'' +
424406
", host='" + host + '\'' +
425407
", port='" + port + '\'' +
426408
", sourceNamespace='" + sourceNamespace + '\'' +

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

Lines changed: 13 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,28 @@
2626
import com.tencent.polaris.api.plugin.circuitbreaker.entity.Resource;
2727
import com.tencent.polaris.api.plugin.common.PluginTypes;
2828
import com.tencent.polaris.api.plugin.compose.Extensions;
29-
import com.tencent.polaris.api.plugin.event.FlowEvent;
30-
import com.tencent.polaris.api.plugin.event.FlowEventConstants;
3129
import com.tencent.polaris.api.plugin.stat.DefaultCircuitBreakResult;
3230
import com.tencent.polaris.api.plugin.stat.StatInfo;
3331
import com.tencent.polaris.api.plugin.stat.StatReporter;
34-
import com.tencent.polaris.api.pojo.*;
32+
import com.tencent.polaris.api.pojo.CircuitBreakerStatus;
3533
import com.tencent.polaris.api.pojo.CircuitBreakerStatus.FallbackInfo;
3634
import com.tencent.polaris.api.pojo.CircuitBreakerStatus.Status;
37-
import com.tencent.polaris.api.utils.CollectionUtils;
35+
import com.tencent.polaris.api.pojo.HalfOpenStatus;
36+
import com.tencent.polaris.api.pojo.RetStatus;
37+
import com.tencent.polaris.api.pojo.TrieNode;
3838
import com.tencent.polaris.api.utils.StringUtils;
3939
import com.tencent.polaris.api.utils.TrieUtil;
40-
import com.tencent.polaris.client.flow.BaseFlow;
4140
import com.tencent.polaris.logging.LoggerFactory;
4241
import com.tencent.polaris.plugins.circuitbreaker.composite.trigger.ConsecutiveCounter;
4342
import com.tencent.polaris.plugins.circuitbreaker.composite.trigger.CounterOptions;
4443
import com.tencent.polaris.plugins.circuitbreaker.composite.trigger.ErrRateCounter;
4544
import com.tencent.polaris.plugins.circuitbreaker.composite.trigger.TriggerCounter;
45+
import com.tencent.polaris.plugins.circuitbreaker.composite.utils.CircuitBreakerEventUtils;
4646
import com.tencent.polaris.plugins.circuitbreaker.composite.utils.CircuitBreakerUtils;
4747
import com.tencent.polaris.specification.api.v1.fault.tolerance.CircuitBreakerProto;
4848
import com.tencent.polaris.specification.api.v1.fault.tolerance.CircuitBreakerProto.*;
4949
import org.slf4j.Logger;
5050

51-
import java.time.LocalDateTime;
5251
import java.util.*;
5352
import java.util.concurrent.ScheduledExecutorService;
5453
import java.util.concurrent.TimeUnit;
@@ -58,7 +57,6 @@
5857
import java.util.regex.Pattern;
5958

6059
import static com.tencent.polaris.api.plugin.cache.CacheConstants.API_ID;
61-
import static com.tencent.polaris.api.plugin.event.tsf.TsfEventDataConstants.*;
6260
import static com.tencent.polaris.logging.LoggingConsts.LOGGING_CIRCUIT_BREAKER;
6361

6462
/**
@@ -204,7 +202,8 @@ private void toOpen(CircuitBreakerStatus preStatus, String circuitBreaker, Strin
204202
CB_LOG.info("previous status {}, current status {}, resource {}, rule {}", preStatus.getStatus(),
205203
newStatus.getStatus(), resource, circuitBreaker);
206204
reportCircuitStatus();
207-
reportEvent(preStatus.getStatus(), newStatus.getStatus(), circuitBreaker, reason);
205+
CircuitBreakerEventUtils.reportEvent(extensions, resource, currentActiveRule,
206+
preStatus.getStatus(), newStatus.getStatus(), circuitBreaker, reason);
208207
long sleepWindow = CircuitBreakerUtils.getSleepWindowMilli(currentActiveRule, circuitBreakerConfig);
209208
// add callback after timeout
210209
stateChangeExecutors.schedule(new Runnable() {
@@ -233,7 +232,8 @@ public void openToHalfOpen() {
233232
circuitBreakerStatus.getStatus(),
234233
halfOpenStatus.getStatus(), resource, circuitBreakerStatus.getCircuitBreaker());
235234
circuitBreakerStatusReference.set(halfOpenStatus);
236-
reportEvent(circuitBreakerStatus.getStatus(), halfOpenStatus.getStatus(), circuitBreakerStatus.getCircuitBreaker());
235+
CircuitBreakerEventUtils.reportEvent(extensions, resource, currentActiveRule,
236+
circuitBreakerStatus.getStatus(), halfOpenStatus.getStatus(), circuitBreakerStatus.getCircuitBreaker(), null);
237237
reportCircuitStatus();
238238
}
239239
}
@@ -256,7 +256,8 @@ public void halfOpenToClose() {
256256
for (TriggerCounter triggerCounter : counters) {
257257
triggerCounter.resume();
258258
}
259-
reportEvent(circuitBreakerStatus.getStatus(), newStatus.getStatus(), circuitBreakerStatus.getCircuitBreaker());
259+
CircuitBreakerEventUtils.reportEvent(extensions, resource, currentActiveRule,
260+
circuitBreakerStatus.getStatus(), newStatus.getStatus(), circuitBreakerStatus.getCircuitBreaker(), null);
260261
reportCircuitStatus();
261262
}
262263
}
@@ -330,90 +331,6 @@ public CircuitBreakerStatus getCircuitBreakerStatus() {
330331
return circuitBreakerStatusReference.get();
331332
}
332333

333-
private void reportEvent(CircuitBreakerStatus.Status previousStatus, CircuitBreakerStatus.Status currentStatus, String ruleName) {
334-
reportEvent(previousStatus, currentStatus, ruleName, null);
335-
}
336-
337-
private void reportEvent(CircuitBreakerStatus.Status previousStatus, CircuitBreakerStatus.Status currentStatus,
338-
String ruleName, String reason) {
339-
if (extensions == null) {
340-
return;
341-
}
342-
343-
FlowEventConstants.Status currentFlowEventStatus = CircuitBreakerUtils.parseFlowEventStatus(currentStatus);
344-
FlowEventConstants.Status previousFlowEventStatus = CircuitBreakerUtils.parseFlowEventStatus(previousStatus);
345-
346-
FlowEvent.Builder flowEventBuilder = new FlowEvent.Builder()
347-
.withEventType(ServiceEventKey.EventType.CIRCUIT_BREAKING)
348-
.withEventName(CircuitBreakerUtils.parseFlowEventName(currentFlowEventStatus, previousFlowEventStatus))
349-
.withTimestamp(LocalDateTime.now())
350-
.withClientId(extensions.getValueContext().getClientId())
351-
.withClientIp(extensions.getValueContext().getHost())
352-
.withNamespace(resource.getService().getNamespace())
353-
.withService(resource.getService().getService())
354-
.withInstanceId(extensions.getValueContext().getInstanceId())
355-
.withSourceNamespace(resource.getCallerService().getNamespace())
356-
.withSourceService(resource.getService().getService())
357-
.withCurrentStatus(currentFlowEventStatus)
358-
.withPreviousStatus(previousFlowEventStatus)
359-
.withRuleName(ruleName);
360-
if (StringUtils.isNotBlank(reason)) {
361-
flowEventBuilder.withReason(reason);
362-
}
363-
String isolationObject = "";
364-
switch (resource.getLevel()) {
365-
case SERVICE:
366-
flowEventBuilder = flowEventBuilder.withResourceType(FlowEventConstants.ResourceType.SERVICE);
367-
isolationObject = CircuitBreakerUtils.getServiceCircuitBreakerName(
368-
resource.getService().getNamespace(), resource.getService().getService());
369-
break;
370-
case METHOD:
371-
MethodResource methodResource = (MethodResource) resource;
372-
flowEventBuilder = flowEventBuilder.withResourceType(FlowEventConstants.ResourceType.METHOD)
373-
.withApiProtocol(methodResource.getProtocol())
374-
.withApiPath(methodResource.getPath())
375-
.withApiMethod(methodResource.getMethod());
376-
isolationObject = CircuitBreakerUtils.getApiCircuitBreakerName(
377-
methodResource.getService().getNamespace(), methodResource.getService().getService(),
378-
methodResource.getPath(), methodResource.getMethod());
379-
break;
380-
case INSTANCE:
381-
InstanceResource instanceResource = (InstanceResource) resource;
382-
flowEventBuilder = flowEventBuilder.withResourceType(FlowEventConstants.ResourceType.INSTANCE)
383-
.withHost(instanceResource.getHost())
384-
.withPort(instanceResource.getPort());
385-
isolationObject = CircuitBreakerUtils.getInstanceCircuitBreakerName(
386-
instanceResource.getHost(), instanceResource.getPort());
387-
break;
388-
}
389-
390-
FlowEvent flowEvent = flowEventBuilder.build();
391-
392-
String failureRate = "";
393-
String slowCallRate = "";
394-
if (CollectionUtils.isNotEmpty(currentActiveRule.getBlockConfigsList())) {
395-
for (BlockConfig blockConfig : currentActiveRule.getBlockConfigsList()) {
396-
if (CollectionUtils.isNotEmpty(blockConfig.getTriggerConditionsList())) {
397-
if (StringUtils.equals(blockConfig.getName(), "failure")) {
398-
failureRate = String.valueOf(blockConfig.getTriggerConditions(0).getErrorPercent());
399-
} else if (StringUtils.equals(blockConfig.getName(), "slow")) {
400-
slowCallRate = String.valueOf(blockConfig.getTriggerConditions(0).getErrorPercent());
401-
}
402-
}
403-
}
404-
}
405-
if (StringUtils.isNotBlank(isolationObject)) {
406-
flowEvent.getAdditionalParams().put(ISOLATION_OBJECT_KEY, isolationObject);
407-
}
408-
if (StringUtils.isNotBlank(failureRate)) {
409-
flowEvent.getAdditionalParams().put(FAILURE_RATE_KEY, failureRate);
410-
}
411-
if (StringUtils.isNotBlank(slowCallRate)) {
412-
flowEvent.getAdditionalParams().put(SLOW_CALL_DURATION_KEY, slowCallRate);
413-
}
414-
BaseFlow.reportFlowEvent(extensions, flowEvent);
415-
}
416-
417334
public void reportCircuitStatus() {
418335
if (Objects.isNull(extensions)) {
419336
return;
@@ -479,7 +396,8 @@ private void toDestroy() {
479396
for (TriggerCounter triggerCounter : counters) {
480397
triggerCounter.resume();
481398
}
482-
reportEvent(circuitBreakerStatus.getStatus(), Status.DESTROY, circuitBreakerStatus.getCircuitBreaker());
399+
CircuitBreakerEventUtils.reportEvent(extensions, resource, currentActiveRule,
400+
circuitBreakerStatus.getStatus(), Status.CLOSE, circuitBreakerStatus.getCircuitBreaker(), null);
483401
reportCircuitStatus();
484402
}
485403
}

0 commit comments

Comments
 (0)