msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

temp commit

Browse Source
pull/964/head
seanyu 2 years ago
parent 1a3408661e
commit 4d960946cd
22 changed files with 370 additions and 1216 deletions
Show Stats Download Patch File Download Diff File

44
spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/reactive/PolarisLoadBalancerClientRequestTransformer.java
Unescape View File

@ -1,44 +0,0 @@
///*
// * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
// *
// * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
// *
// * Licensed under the BSD 3-Clause License (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * https://opensource.org/licenses/BSD-3-Clause
// *
// * Unless required by applicable law or agreed to in writing, software distributed
// * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// * CONDITIONS OF ANY KIND, either express or implied. See the License for the
// * specific language governing permissions and limitations under the License.
// */
//
//package com.tencent.cloud.polaris.loadbalancer.reactive;
//
//import com.tencent.cloud.common.constant.HeaderConstant;
//import com.tencent.polaris.api.core.ConsumerAPI;
//
//import org.springframework.cloud.client.ServiceInstance;
//import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerClientRequestTransformer;
//import org.springframework.http.HttpHeaders;
//import org.springframework.web.reactive.function.client.ClientRequest;
//
//public class PolarisLoadBalancerClientRequestTransformer implements LoadBalancerClientRequestTransformer {
//
// private final ConsumerAPI consumerAPI;
//
// public PolarisLoadBalancerClientRequestTransformer(ConsumerAPI consumerAPI) {
// this.consumerAPI = consumerAPI;
// }
//
// @Override
// public ClientRequest transformRequest(ClientRequest request, ServiceInstance instance) {
// if (instance != null) {
// HttpHeaders headers = request.headers();
// headers.add(HeaderConstant.INTERNAL_CALLEE_SERVICE_ID, instance.getServiceId());
// }
// return request;
// }
//}

14
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java
Unescape View File

@ -30,8 +30,8 @@ import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.ExceptionPolarisR
import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.SuccessPolarisReporter; import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.SuccessPolarisReporter;
import com.tencent.cloud.rpc.enhancement.resttemplate.BlockingLoadBalancerClientAspect; import com.tencent.cloud.rpc.enhancement.resttemplate.BlockingLoadBalancerClientAspect;
import com.tencent.cloud.rpc.enhancement.webclient.PolarisLoadBalancerClientRequestTransformer; import com.tencent.cloud.rpc.enhancement.webclient.PolarisLoadBalancerClientRequestTransformer;
import com.tencent.cloud.rpc.enhancement.scg.PolarisGatewayReporter; import com.tencent.cloud.rpc.enhancement.scg.EnhancedPolarisGatewayReporter;
import com.tencent.cloud.rpc.enhancement.resttemplate.PolarisRestTemplateReporter; import com.tencent.cloud.rpc.enhancement.resttemplate.EnhancedPolarisRestTemplateReporter;
import com.tencent.cloud.rpc.enhancement.webclient.EnhancedWebClientReporter; import com.tencent.cloud.rpc.enhancement.webclient.EnhancedWebClientReporter;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI; import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
@ -133,15 +133,15 @@ public class RpcEnhancementAutoConfiguration {
private List<RestTemplate> restTemplates = Collections.emptyList(); private List<RestTemplate> restTemplates = Collections.emptyList();
@Bean @Bean
public PolarisRestTemplateReporter polarisRestTemplateReporter(RpcEnhancementReporterProperties properties, public EnhancedPolarisRestTemplateReporter enhancedPolarisRestTemplateReporter(RpcEnhancementReporterProperties properties,
SDKContext context, SDKContext context,
ConsumerAPI consumerAPI, ConsumerAPI consumerAPI,
CircuitBreakAPI circuitBreakAPI) { CircuitBreakAPI circuitBreakAPI) {
return new PolarisRestTemplateReporter(properties, context, consumerAPI, circuitBreakAPI); return new EnhancedPolarisRestTemplateReporter(properties, context, consumerAPI, circuitBreakAPI);
} }
@Bean @Bean
public SmartInitializingSingleton setPolarisReporterForRestTemplate(PolarisRestTemplateReporter reporter) { public SmartInitializingSingleton setPolarisReporterForRestTemplate(EnhancedPolarisRestTemplateReporter reporter) {
return () -> { return () -> {
for (RestTemplate restTemplate : restTemplates) { for (RestTemplate restTemplate : restTemplates) {
restTemplate.getInterceptors().add(reporter); restTemplate.getInterceptors().add(reporter);
@ -203,11 +203,11 @@ public class RpcEnhancementAutoConfiguration {
@Bean @Bean
@ConditionalOnClass(name = "org.springframework.cloud.gateway.filter.GlobalFilter") @ConditionalOnClass(name = "org.springframework.cloud.gateway.filter.GlobalFilter")
public PolarisGatewayReporter polarisGatewayReporter(RpcEnhancementReporterProperties properties, public EnhancedPolarisGatewayReporter enhancedPolarisGatewayReporter(RpcEnhancementReporterProperties properties,
SDKContext context, SDKContext context,
ConsumerAPI consumerAPI, ConsumerAPI consumerAPI,
CircuitBreakAPI circuitBreakAPI) { CircuitBreakAPI circuitBreakAPI) {
return new PolarisGatewayReporter(properties, context, consumerAPI, circuitBreakAPI); return new EnhancedPolarisGatewayReporter(properties, context, consumerAPI, circuitBreakAPI);
} }
} }

2
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporter.java
Unescape View File

@ -17,7 +17,6 @@
package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter; package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter;
import java.net.SocketTimeoutException;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
@ -28,7 +27,6 @@ import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPlugin;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat; import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat;
import com.tencent.polaris.api.pojo.RetStatus;
import com.tencent.polaris.api.rpc.ServiceCallResult; import com.tencent.polaris.api.rpc.ServiceCallResult;
import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI; import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
import com.tencent.polaris.client.api.SDKContext; import com.tencent.polaris.client.api.SDKContext;

140
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ReporterUtils.java
Unescape View File

@ -1,140 +0,0 @@
///*
// * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
// *
// * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
// *
// * Licensed under the BSD 3-Clause License (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * https://opensource.org/licenses/BSD-3-Clause
// *
// * Unless required by applicable law or agreed to in writing, software distributed
// * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// * CONDITIONS OF ANY KIND, either express or implied. See the License for the
// * specific language governing permissions and limitations under the License.
// */
//
//package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter;
//
//import java.io.UnsupportedEncodingException;
//import java.net.URI;
//import java.net.URLDecoder;
//import java.util.Collection;
//import java.util.Objects;
//import java.util.function.Consumer;
//
//import com.tencent.cloud.common.constant.RouterConstant;
//import com.tencent.cloud.common.metadata.MetadataContext;
//import com.tencent.cloud.common.util.RequestLabelUtils;
//import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat;
//import com.tencent.polaris.api.plugin.circuitbreaker.entity.InstanceResource;
//import com.tencent.polaris.api.plugin.circuitbreaker.entity.Resource;
//import com.tencent.polaris.api.pojo.RetStatus;
//import com.tencent.polaris.api.pojo.ServiceKey;
//import com.tencent.polaris.api.rpc.ServiceCallResult;
//import com.tencent.polaris.api.utils.CollectionUtils;
//import com.tencent.polaris.client.api.SDKContext;
//import feign.Request;
//import feign.RequestTemplate;
//import feign.Response;
//import org.apache.commons.lang.StringUtils;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//
//import static com.tencent.cloud.common.constant.ContextConstant.UTF_8;
//
///**
// * Util for polaris reporter.
// *
// * @author Haotian Zhang
// */
//public final class ReporterUtils {
//
// private static final Logger LOGGER = LoggerFactory.getLogger(ReporterUtils.class);
//
// private ReporterUtils() {
// }
//
// public static ResourceStat createInstanceResourceStat(final Request request,
// final Response response, long delay, RetStatus retStatus) {
// return createInstanceResourceStat(request.requestTemplate().feignTarget().name(), URI.create(request.url()), response.status(), delay, retStatus);
// }
//
// public static ResourceStat createInstanceResourceStat(final URI uri,
// final int status, long delay, RetStatus retStatus) {
// return createInstanceResourceStat(null, uri, status, delay, retStatus);
// }
//
// private static ResourceStat createInstanceResourceStat(final String serviceName,
// final URI uri, final int status, long delay, RetStatus retStatus) {
// ServiceKey calleeServiceKey = new ServiceKey(MetadataContext.LOCAL_NAMESPACE, serviceName);
// ServiceKey callerServiceKey = new ServiceKey(MetadataContext.LOCAL_NAMESPACE, MetadataContext.LOCAL_SERVICE);
// Resource resource = new InstanceResource(calleeServiceKey, uri.getHost(), getRequestPort(uri), callerServiceKey, getRequestProtocol(uri));
// return new ResourceStat(resource, status, delay, retStatus);
// }
//
// public static ServiceCallResult createServiceCallResult(final SDKContext context, final URI uri,
// final int status, long delay, RetStatus retStatus, final Consumer<ServiceCallResult> consumer) {
//
// }
//
//
// public static ServiceCallResult createServiceCallResult(final SDKContext context, final Request request,
// final Response response, long delay, RetStatus retStatus, final Consumer<ServiceCallResult> consumer) {
// ServiceCallResult resultRequest = new ServiceCallResult();
//
// resultRequest.setNamespace(MetadataContext.LOCAL_NAMESPACE);
// RequestTemplate requestTemplate = request.requestTemplate();
// String serviceName = requestTemplate.feignTarget().name();
// resultRequest.setService(serviceName);
// Collection<String> labels = requestTemplate.headers().get(RouterConstant.ROUTER_LABEL_HEADER);
// if (CollectionUtils.isNotEmpty(labels) && labels.iterator().hasNext()) {
// String label = labels.iterator().next();
// try {
// label = URLDecoder.decode(label, UTF_8);
// }
// catch (UnsupportedEncodingException e) {
// LOGGER.error("unsupported charset exception " + UTF_8, e);
// }
// resultRequest.setLabels(RequestLabelUtils.convertLabel(label));
// }
// URI uri = URI.create(request.url());
// resultRequest.setMethod(uri.getPath());
// resultRequest.setRetCode(response.status());
// resultRequest.setRetStatus(retStatus);
// resultRequest.setDelay(delay);
// resultRequest.setProtocol(getRequestProtocol(uri));
// String sourceNamespace = MetadataContext.LOCAL_NAMESPACE;
// String sourceService = MetadataContext.LOCAL_SERVICE;
// if (StringUtils.isNotBlank(sourceNamespace) && StringUtils.isNotBlank(sourceService)) {
// resultRequest.setCallerService(new ServiceKey(sourceNamespace, sourceService));
// }
// if (Objects.nonNull(context)) {
// resultRequest.setCallerIp(context.getConfig().getGlobal().getAPI().getBindIP());
// }
// resultRequest.setHost(uri.getHost());
// resultRequest.setPort(getRequestPort(uri));
// consumer.accept(resultRequest);
// return resultRequest;
// }
//
// private static String getRequestProtocol(URI uri) {
// String scheme = uri.getScheme();
// if (StringUtils.isBlank(scheme)) {
// scheme = "http";
// }
// return scheme;
// }
//
// private static int getRequestPort(URI uri) {
// // -1 means access directly by url, and use http default port number 80
// return uri.getPort() == -1 ? 80 : uri.getPort();
// }
//
// private static String convertLabel(String label) {
// label = label.replaceAll("\"|\\{|\\}", "")
// .replaceAll(",", "|");
// return label;
// }
//}

3
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporter.java
Unescape View File

@ -27,8 +27,6 @@ import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPlugin;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat; import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat;
import com.tencent.polaris.api.plugin.circuitbreaker.entity.InstanceResource;
import com.tencent.polaris.api.pojo.RetStatus;
import com.tencent.polaris.api.rpc.ServiceCallResult; import com.tencent.polaris.api.rpc.ServiceCallResult;
import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI; import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
import com.tencent.polaris.client.api.SDKContext; import com.tencent.polaris.client.api.SDKContext;
@ -39,7 +37,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
/** /**
* Polaris reporter when feign call is successful. * Polaris reporter when feign call is successful.

14
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/PolarisRestTemplateReporter.java → spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedPolarisRestTemplateReporter.java
Unescape View File

@ -39,9 +39,14 @@ import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.ClientHttpResponse;
public class PolarisRestTemplateReporter extends AbstractPolarisReporterAdapter implements ClientHttpRequestInterceptor { /**
* EnhancedPolarisRestTemplateReporter.
*
* @author sean yu
*/
public class EnhancedPolarisRestTemplateReporter extends AbstractPolarisReporterAdapter implements ClientHttpRequestInterceptor {
private static final Logger LOG = LoggerFactory.getLogger(PolarisRestTemplateReporter.class); private static final Logger LOG = LoggerFactory.getLogger(EnhancedPolarisRestTemplateReporter.class);
private final ConsumerAPI consumerAPI; private final ConsumerAPI consumerAPI;
@ -53,7 +58,7 @@ public class PolarisRestTemplateReporter extends AbstractPolarisReporterAdapter
* *
* @param reportProperties instance of {@link RpcEnhancementReporterProperties}. * @param reportProperties instance of {@link RpcEnhancementReporterProperties}.
*/ */
public PolarisRestTemplateReporter(RpcEnhancementReporterProperties reportProperties, public EnhancedPolarisRestTemplateReporter(RpcEnhancementReporterProperties reportProperties,
SDKContext context, SDKContext context,
ConsumerAPI consumerAPI, ConsumerAPI consumerAPI,
CircuitBreakAPI circuitBreakAPI) { CircuitBreakAPI circuitBreakAPI) {
@ -74,7 +79,8 @@ public class PolarisRestTemplateReporter extends AbstractPolarisReporterAdapter
IOException ex = null; IOException ex = null;
try { try {
response = execution.execute(request, body); response = execution.execute(request, body);
} catch (SocketTimeoutException e) { }
catch (SocketTimeoutException e) {
ex = e; ex = e;
} }
HttpHeaders requestHeaders = request.getHeaders(); HttpHeaders requestHeaders = request.getHeaders();

240
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java
Unescape View File

@ -1,240 +0,0 @@
///*
// * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
// *
// * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
// *
// * Licensed under the BSD 3-Clause License (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * https://opensource.org/licenses/BSD-3-Clause
// *
// * Unless required by applicable law or agreed to in writing, software distributed
// * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// * CONDITIONS OF ANY KIND, either express or implied. See the License for the
// * specific language governing permissions and limitations under the License.
// */
//
//package com.tencent.cloud.rpc.enhancement.resttemplate;
//
//import java.io.IOException;
//import java.io.UnsupportedEncodingException;
//import java.net.URI;
//import java.net.URLDecoder;
//import java.util.List;
//import java.util.Map;
//import java.util.Objects;
//
//import com.tencent.cloud.common.constant.RouterConstant;
//import com.tencent.cloud.common.metadata.MetadataContext;
//import com.tencent.cloud.common.metadata.MetadataContextHolder;
//import com.tencent.cloud.common.util.RequestLabelUtils;
//import com.tencent.cloud.rpc.enhancement.AbstractPolarisReporterAdapter;
//import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
//import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.ReporterUtils;
//import com.tencent.polaris.api.core.ConsumerAPI;
//import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat;
//import com.tencent.polaris.api.pojo.RetStatus;
//import com.tencent.polaris.api.pojo.ServiceKey;
//import com.tencent.polaris.api.rpc.ServiceCallResult;
//import com.tencent.polaris.api.utils.CollectionUtils;
//import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
//import com.tencent.polaris.client.api.SDKContext;
//import org.apache.commons.lang.StringUtils;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//
//import org.springframework.beans.BeansException;
//import org.springframework.context.ApplicationContext;
//import org.springframework.context.ApplicationContextAware;
//import org.springframework.http.HttpMethod;
//import org.springframework.http.client.ClientHttpResponse;
//import org.springframework.lang.NonNull;
//import org.springframework.web.client.DefaultResponseErrorHandler;
//import org.springframework.web.client.ResponseErrorHandler;
//
//import static com.tencent.cloud.common.constant.ContextConstant.UTF_8;
//
///**
// * Extend ResponseErrorHandler to get request information.
// *
// * @author wh 2022/6/21
// */
//public class EnhancedRestTemplateReporter extends AbstractPolarisReporterAdapter implements ResponseErrorHandler, ApplicationContextAware {
//
// /**
// * Polaris-CircuitBreaker-Fallback header flag.
// */
// public static final String POLARIS_CIRCUIT_BREAKER_FALLBACK_HEADER = "X-SCT-Polaris-CircuitBreaker-Fallback";
// /**
// * response has error header flag, since EnhancedRestTemplateReporter#hasError always return true.
// */
// public static final String HEADER_HAS_ERROR = "X-SCT-Has-Error";
// private static final Logger LOGGER = LoggerFactory.getLogger(EnhancedRestTemplateReporter.class);
// private final ConsumerAPI consumerAPI;
// private final SDKContext context;
// private final CircuitBreakAPI circuitBreakAPI;
// private ResponseErrorHandler delegateHandler;
//
// public EnhancedRestTemplateReporter(RpcEnhancementReporterProperties properties, SDKContext context, ConsumerAPI consumerAPI, CircuitBreakAPI circuitBreakAPI) {
// super(properties);
// this.context = context;
// this.consumerAPI = consumerAPI;
// this.circuitBreakAPI = circuitBreakAPI;
// }
//
// @Override
// public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
// String[] handlerBeanNames = applicationContext.getBeanNamesForType(ResponseErrorHandler.class);
// if (handlerBeanNames.length == 1) {
// if (this.delegateHandler == null) {
// this.delegateHandler = new DefaultResponseErrorHandler();
// }
// return;
// }
//
// // inject user custom ResponseErrorHandler
// for (String beanName : handlerBeanNames) {
// // ignore self
// if (StringUtils.equalsIgnoreCase("enhancedRestTemplateReporter", beanName)) {
// continue;
// }
// this.delegateHandler = (ResponseErrorHandler) applicationContext.getBean(beanName);
// }
// }
//
// @Override
// public boolean hasError(@NonNull ClientHttpResponse response) throws IOException {
// if (delegateHandler != null) {
// // Preserve the delegated handler result
// boolean hasError = delegateHandler.hasError(response);
// response.getHeaders().add(HEADER_HAS_ERROR, String.valueOf(hasError));
// }
// return true;
// }
//
// @Override
// public void handleError(@NonNull ClientHttpResponse response) throws IOException {
// if (realHasError(response)) {
// delegateHandler.handleError(response);
// }
//
// clear(response);
// }
//
// @Override
// public void handleError(@NonNull URI url, @NonNull HttpMethod method, @NonNull ClientHttpResponse response) throws IOException {
// // report result to polaris
// if (reportProperties.isEnabled()) {
// reportResult(url, response);
// }
//
// // invoke delegate handler
// invokeDelegateHandler(url, method, response);
// }
//
// private void reportResult(URI url, ClientHttpResponse response) {
// if (Boolean.parseBoolean(response.getHeaders().getFirst(POLARIS_CIRCUIT_BREAKER_FALLBACK_HEADER))) {
// return;
// }
// try {
// Map<String, String> loadBalancerContext = MetadataContextHolder.get().getLoadbalancerMetadata();
// String targetHost = loadBalancerContext.get("host");
// String targetPort = loadBalancerContext.get("port");
// String startMillis = loadBalancerContext.get("startMillis");
// long delay = System.currentTimeMillis() - Long.parseLong(startMillis);
//
// if (StringUtils.isBlank(targetHost) || StringUtils.isBlank(targetPort)) {
// LOGGER.warn("Can not get target host or port from metadata context. host = {}, port = {}", targetHost, targetPort);
// return;
// }
//
// ServiceCallResult resultRequest = createServiceCallResult(url, response);
//
// resultRequest.setHost(targetHost);
// resultRequest.setPort(Integer.parseInt(targetPort));
// resultRequest.setDelay(delay);
//
// // checking response http status code
// if (apply(response.getStatusCode())) {
// resultRequest.setRetStatus(RetStatus.RetFail);
// }
// resultRequest.setRetStatus(getRetStatusFromRequest(response.getHeaders(), resultRequest.getRetStatus()));
// resultRequest.setRuleName(getActiveRuleNameFromRequest(response.getHeaders()));
// if (Objects.nonNull(context)) {
// resultRequest.setCallerIp(context.getConfig().getGlobal().getAPI().getBindIP());
// }
// List<String> labels = response.getHeaders().get(RouterConstant.ROUTER_LABEL_HEADER);
// if (CollectionUtils.isNotEmpty(labels)) {
// String label = labels.get(0);
// try {
// label = URLDecoder.decode(label, UTF_8);
// }
// catch (UnsupportedEncodingException e) {
// LOGGER.error("unsupported charset exception " + UTF_8, e);
// }
// resultRequest.setLabels(RequestLabelUtils.convertLabel(label));
// }
//
// // processing report with consumerAPI .
// LOGGER.debug("Will report result of {}. Request=[{}]. Response=[{}]. Delay=[{}]ms.", resultRequest.getRetStatus()
// .name(), url, response.getStatusCode().value(), delay);
// consumerAPI.updateServiceCallResult(resultRequest);
// ResourceStat resourceStat = ReporterUtils.createInstanceResourceStat(url, response.getRawStatusCode(), delay, resultRequest.getRetStatus());
// circuitBreakAPI.report(resourceStat);
// }
// catch (Exception e) {
// LOGGER.error("RestTemplate response reporter execute failed of {} url {}", response, url, e);
// }
// }
//
// private void invokeDelegateHandler(URI url, HttpMethod method, ClientHttpResponse response) throws IOException {
// if (realHasError(response)) {
// delegateHandler.handleError(url, method, response);
// }
//
// clear(response);
// }
//
// private Boolean realHasError(ClientHttpResponse response) {
// if (delegateHandler == null) {
// return false;
// }
//
// String hasErrorHeader = response.getHeaders().getFirst(HEADER_HAS_ERROR);
// if (StringUtils.isBlank(hasErrorHeader)) {
// return false;
// }
//
// return Boolean.parseBoolean(hasErrorHeader);
// }
//
// private void clear(ClientHttpResponse response) {
// response.getHeaders().remove(HEADER_HAS_ERROR);
// response.getHeaders().remove(POLARIS_CIRCUIT_BREAKER_FALLBACK_HEADER);
// }
//
// private ServiceCallResult createServiceCallResult(URI uri, ClientHttpResponse response) throws IOException {
// ServiceCallResult resultRequest = new ServiceCallResult();
// String serviceName = uri.getHost();
// resultRequest.setService(serviceName);
// resultRequest.setNamespace(MetadataContext.LOCAL_NAMESPACE);
// resultRequest.setMethod(uri.getPath());
// resultRequest.setRetCode(response.getStatusCode().value());
// resultRequest.setRetStatus(RetStatus.RetSuccess);
// String sourceNamespace = MetadataContext.LOCAL_NAMESPACE;
// String sourceService = MetadataContext.LOCAL_SERVICE;
// if (StringUtils.isNotBlank(sourceNamespace) && StringUtils.isNotBlank(sourceService)) {
// resultRequest.setCallerService(new ServiceKey(sourceNamespace, sourceService));
// }
// return resultRequest;
// }
//
// protected ResponseErrorHandler getDelegateHandler() {
// return this.delegateHandler;
// }
//
// protected void setDelegateHandler(ResponseErrorHandler delegateHandler) {
// this.delegateHandler = delegateHandler;
// }
//}

29
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/PolarisResponseErrorHandler.java
Unescape View File

@ -1,29 +0,0 @@
///*
// * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
// *
// * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
// *
// * Licensed under the BSD 3-Clause License (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * https://opensource.org/licenses/BSD-3-Clause
// *
// * Unless required by applicable law or agreed to in writing, software distributed
// * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// * CONDITIONS OF ANY KIND, either express or implied. See the License for the
// * specific language governing permissions and limitations under the License.
// */
//
//package com.tencent.cloud.rpc.enhancement.resttemplate;
//
//import org.springframework.web.client.ResponseErrorHandler;
//
///**
// * Polaris Response Error Handler Definition Of {@link ResponseErrorHandler}.
// *
// * @author wh 2022/6/21
// */
//public interface PolarisResponseErrorHandler extends ResponseErrorHandler {
//
//}

32
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/scg/PolarisGatewayReporter.java → spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/scg/EnhancedPolarisGatewayReporter.java
Unescape View File

@ -1,9 +1,22 @@
package com.tencent.cloud.rpc.enhancement.scg; /*
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
*
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the BSD 3-Clause License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://opensource.org/licenses/BSD-3-Clause
*
* Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
import java.util.Map; package com.tencent.cloud.rpc.enhancement.scg;
import com.tencent.cloud.common.constant.HeaderConstant;
import com.tencent.cloud.common.metadata.MetadataContextHolder;
import com.tencent.cloud.rpc.enhancement.AbstractPolarisReporterAdapter; import com.tencent.cloud.rpc.enhancement.AbstractPolarisReporterAdapter;
import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
@ -25,9 +38,14 @@ import org.springframework.web.server.ServerWebExchange;
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_LOADBALANCER_RESPONSE_ATTR; import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_LOADBALANCER_RESPONSE_ATTR;
public class PolarisGatewayReporter extends AbstractPolarisReporterAdapter implements GlobalFilter { /**
* EnhancedPolarisGatewayReporter.
*
* @author sean yu
*/
public class EnhancedPolarisGatewayReporter extends AbstractPolarisReporterAdapter implements GlobalFilter {
private static final Logger LOG = LoggerFactory.getLogger(PolarisGatewayReporter.class); private static final Logger LOG = LoggerFactory.getLogger(EnhancedPolarisGatewayReporter.class);
private final ConsumerAPI consumerAPI; private final ConsumerAPI consumerAPI;
@ -38,7 +56,7 @@ public class PolarisGatewayReporter extends AbstractPolarisReporterAdapter imple
* *
* @param reportProperties instance of {@link RpcEnhancementReporterProperties}. * @param reportProperties instance of {@link RpcEnhancementReporterProperties}.
*/ */
public PolarisGatewayReporter(RpcEnhancementReporterProperties reportProperties, public EnhancedPolarisGatewayReporter(RpcEnhancementReporterProperties reportProperties,
SDKContext context, SDKContext context,
ConsumerAPI consumerAPI, ConsumerAPI consumerAPI,
CircuitBreakAPI circuitBreakAPI) { CircuitBreakAPI circuitBreakAPI) {

173
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/scg/EnhancedPolarisHttpClient.java
Unescape View File

@ -1,173 +0,0 @@
///*
// * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
// *
// * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
// *
// * Licensed under the BSD 3-Clause License (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * https://opensource.org/licenses/BSD-3-Clause
// *
// * Unless required by applicable law or agreed to in writing, software distributed
// * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// * CONDITIONS OF ANY KIND, either express or implied. See the License for the
// * specific language governing permissions and limitations under the License.
// */
//
//package com.tencent.cloud.rpc.enhancement.scg;
//
//import java.net.SocketTimeoutException;
//import java.util.Map;
//import java.util.Objects;
//import java.util.function.BiConsumer;
//
//import com.tencent.cloud.common.constant.HeaderConstant;
//import com.tencent.cloud.common.metadata.MetadataContext;
//import com.tencent.cloud.common.metadata.MetadataContextHolder;
//import com.tencent.cloud.rpc.enhancement.AbstractPolarisReporterAdapter;
//import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
//import com.tencent.polaris.api.core.ConsumerAPI;
//import com.tencent.polaris.api.pojo.RetStatus;
//import com.tencent.polaris.api.pojo.ServiceKey;
//import com.tencent.polaris.api.rpc.ServiceCallResult;
//import com.tencent.polaris.client.api.SDKContext;
//import io.netty.handler.codec.http.HttpHeaders;
//import org.apache.commons.lang.StringUtils;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import reactor.netty.http.client.HttpClient;
//import reactor.netty.http.client.HttpClientConfig;
//import reactor.netty.http.client.HttpClientResponse;
//
//import org.springframework.http.HttpStatus;
//
//public class EnhancedPolarisHttpClient extends HttpClient {
//
// private static final Logger LOG = LoggerFactory.getLogger(EnhancedPolarisHttpClient.class);
//
// private final RpcEnhancementReporterProperties properties;
// private final SDKContext context;
// private final ConsumerAPI consumerAPI;
// private final Reporter adapter;
// private final BiConsumer<? super HttpClientResponse, ? super Throwable> handler = new BiConsumer<HttpClientResponse, Throwable>() {
// @Override
// public void accept(HttpClientResponse httpClientResponse, Throwable throwable) {
// if (Objects.isNull(consumerAPI)) {
// return;
// }
// HttpHeaders responseHeaders = httpClientResponse.responseHeaders();
//
// ServiceCallResult result = new ServiceCallResult();
// result.setCallerService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, MetadataContext.LOCAL_SERVICE));
// result.setNamespace(MetadataContext.LOCAL_NAMESPACE);
//
// Map<String, String> metadata = MetadataContextHolder.get().getLoadbalancerMetadata();
// result.setDelay(System.currentTimeMillis() - Long.parseLong(metadata.get("startTime")));
// result.setService(metadata.get(HeaderConstant.INTERNAL_CALLEE_SERVICE_ID));
// result.setHost(metadata.get(HeaderConstant.INTERNAL_CALLEE_INSTANCE_HOST));
// result.setPort(Integer.parseInt(metadata.get(HeaderConstant.INTERNAL_CALLEE_INSTANCE_PORT)));
// RetStatus status = RetStatus.RetSuccess;
// if (Objects.isNull(throwable)) {
// if (EnhancedPolarisHttpClient.this.adapter.apply(HttpStatus.valueOf(httpClientResponse.status()
// .code()))) {
// status = RetStatus.RetFail;
// }
// org.springframework.http.HttpHeaders headers = new org.springframework.http.HttpHeaders();
// responseHeaders.forEach(entry -> headers.add(entry.getKey(), entry.getValue()));
// status = adapter.getRetStatusFromRequest(headers, status);
// result.setRuleName(adapter.getActiveRuleNameFromRequest(headers));
// }
// else {
// if (throwable instanceof SocketTimeoutException) {
// status = RetStatus.RetTimeout;
// }
// }
// result.setMethod(httpClientResponse.uri());
// result.setRetCode(httpClientResponse.status().code());
// result.setRetStatus(status);
// if (Objects.nonNull(context)) {
// result.setCallerIp(context.getConfig().getGlobal().getAPI().getBindIP());
// }
// try {
// consumerAPI.updateServiceCallResult(result);
// }
// catch (Throwable ex) {
// LOG.error("update service call result fail", ex);
// }
// }
// };
// private HttpClient target;
//
// public EnhancedPolarisHttpClient(
// HttpClient client,
// RpcEnhancementReporterProperties properties,
// SDKContext context,
// ConsumerAPI consumerAPI) {
// this.properties = properties;
// this.context = context;
// this.consumerAPI = consumerAPI;
// this.target = client;
// this.adapter = new Reporter(properties);
// this.registerReportHandler();
// }
//
// @Override
// public HttpClientConfig configuration() {
// return target.configuration();
// }
//
// @Override
// protected HttpClient duplicate() {
// return new EnhancedPolarisHttpClient(target, properties, context, consumerAPI);
// }
//
// private void registerReportHandler() {
// target = target.doOnRequest((request, connection) -> {
// String serviceId = request.requestHeaders().get(HeaderConstant.INTERNAL_CALLEE_SERVICE_ID);
// String host = request.requestHeaders().get(HeaderConstant.INTERNAL_CALLEE_INSTANCE_HOST);
// String port = request.requestHeaders().get(HeaderConstant.INTERNAL_CALLEE_INSTANCE_PORT);
// if (StringUtils.isNotBlank(serviceId)) {
// MetadataContextHolder.get().setLoadbalancer(HeaderConstant.INTERNAL_CALLEE_SERVICE_ID, serviceId);
// MetadataContextHolder.get().setLoadbalancer(HeaderConstant.INTERNAL_CALLEE_INSTANCE_HOST, host);
// MetadataContextHolder.get().setLoadbalancer(HeaderConstant.INTERNAL_CALLEE_INSTANCE_PORT, port);
// MetadataContextHolder.get().setLoadbalancer("startTime", System.currentTimeMillis() + "");
// }
//
// request.requestHeaders().remove(HeaderConstant.INTERNAL_CALLEE_SERVICE_ID);
// request.requestHeaders().remove(HeaderConstant.INTERNAL_CALLEE_INSTANCE_HOST);
// request.requestHeaders().remove(HeaderConstant.INTERNAL_CALLEE_INSTANCE_PORT);
// });
// target = target.doOnResponse((httpClientResponse, connection) -> handler.accept(httpClientResponse, null));
// target = target.doOnResponseError(handler);
// }
//
//
// private static class Reporter extends AbstractPolarisReporterAdapter {
//
// /**
// * Constructor With {@link RpcEnhancementReporterProperties} .
// *
// * @param reportProperties instance of {@link RpcEnhancementReporterProperties}.
// */
// protected Reporter(RpcEnhancementReporterProperties reportProperties) {
// super(reportProperties);
// }
//
// @Override
// public boolean apply(HttpStatus httpStatus) {
// return super.apply(httpStatus);
// }
//
// @Override
// public RetStatus getRetStatusFromRequest(org.springframework.http.HttpHeaders headers, RetStatus defaultVal) {
// return super.getRetStatusFromRequest(headers, defaultVal);
// }
//
// @Override
// public String getActiveRuleNameFromRequest(org.springframework.http.HttpHeaders headers) {
// return super.getActiveRuleNameFromRequest(headers);
// }
// }
//
//}

43
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/scg/EnhancedPolarisHttpClientCustomizer.java
Unescape View File

@ -1,43 +0,0 @@
///*
// * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
// *
// * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
// *
// * Licensed under the BSD 3-Clause License (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * https://opensource.org/licenses/BSD-3-Clause
// *
// * Unless required by applicable law or agreed to in writing, software distributed
// * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// * CONDITIONS OF ANY KIND, either express or implied. See the License for the
// * specific language governing permissions and limitations under the License.
// */
//
//package com.tencent.cloud.rpc.enhancement.scg;
//
//import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
//import com.tencent.polaris.api.core.ConsumerAPI;
//import com.tencent.polaris.client.api.SDKContext;
//import reactor.netty.http.client.HttpClient;
//
//import org.springframework.cloud.gateway.config.HttpClientCustomizer;
//
//public class EnhancedPolarisHttpClientCustomizer implements HttpClientCustomizer {
//
// private final RpcEnhancementReporterProperties properties;
// private final SDKContext context;
// private final ConsumerAPI consumerAPI;
//
// public EnhancedPolarisHttpClientCustomizer(RpcEnhancementReporterProperties properties, SDKContext context, ConsumerAPI consumerAPI) {
// this.properties = properties;
// this.context = context;
// this.consumerAPI = consumerAPI;
// }
//
// @Override
// public HttpClient customize(HttpClient httpClient) {
// return new EnhancedPolarisHttpClient(httpClient, properties, context, consumerAPI);
// }
//}

71
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/scg/EnhancedPolarisHttpHeadersFilter.java
Unescape View File

@ -1,71 +0,0 @@
/*
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
*
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the BSD 3-Clause License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://opensource.org/licenses/BSD-3-Clause
*
* Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package com.tencent.cloud.rpc.enhancement.scg;
import java.util.List;
import com.tencent.cloud.common.constant.HeaderConstant;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.Response;
import org.springframework.cloud.gateway.filter.headers.HttpHeadersFilter;
import org.springframework.http.HttpHeaders;
import org.springframework.util.StringUtils;
import org.springframework.web.server.ServerWebExchange;
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_LOADBALANCER_RESPONSE_ATTR;
public class EnhancedPolarisHttpHeadersFilter implements HttpHeadersFilter {
public EnhancedPolarisHttpHeadersFilter() {
}
@Override
public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {
Response<ServiceInstance> serviceInstanceResponse = exchange.getAttribute(GATEWAY_LOADBALANCER_RESPONSE_ATTR);
if (serviceInstanceResponse == null || !serviceInstanceResponse.hasServer()) {
return input;
}
ServiceInstance instance = serviceInstanceResponse.getServer();
write(input, HeaderConstant.INTERNAL_CALLEE_SERVICE_ID, instance.getServiceId(), true);
write(input, HeaderConstant.INTERNAL_CALLEE_INSTANCE_HOST, instance.getHost(), true);
write(input, HeaderConstant.INTERNAL_CALLEE_INSTANCE_PORT, instance.getPort() + "", true);
return input;
}
@Override
public boolean supports(Type type) {
return Type.REQUEST.equals(type);
}
private void write(HttpHeaders headers, String name, String value, boolean append) {
if (value == null) {
return;
}
if (append) {
headers.add(name, value);
// these headers should be treated as a single comma separated header
List<String> values = headers.get(name);
String delimitedValue = StringUtils.collectionToCommaDelimitedString(values);
headers.set(name, delimitedValue);
}
else {
headers.set(name, value);
}
}
}

6
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/webclient/EnhancedWebClientReporter.java
Unescape View File

@ -38,7 +38,11 @@ import org.springframework.web.reactive.function.client.ClientResponse;
import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
import org.springframework.web.reactive.function.client.ExchangeFunction; import org.springframework.web.reactive.function.client.ExchangeFunction;
/**
* EnhancedWebClientReporter.
*
* @author sean yu
*/
public class EnhancedWebClientReporter extends AbstractPolarisReporterAdapter implements ExchangeFilterFunction { public class EnhancedWebClientReporter extends AbstractPolarisReporterAdapter implements ExchangeFilterFunction {
private static final Logger LOG = LoggerFactory.getLogger(EnhancedWebClientReporter.class); private static final Logger LOG = LoggerFactory.getLogger(EnhancedWebClientReporter.class);
private final ConsumerAPI consumerAPI; private final ConsumerAPI consumerAPI;

22
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/webclient/PolarisLoadBalancerClientRequestTransformer.java
Unescape View File

@ -1,3 +1,20 @@
/*
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
*
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the BSD 3-Clause License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://opensource.org/licenses/BSD-3-Clause
*
* Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package com.tencent.cloud.rpc.enhancement.webclient; package com.tencent.cloud.rpc.enhancement.webclient;
import com.tencent.cloud.common.constant.HeaderConstant; import com.tencent.cloud.common.constant.HeaderConstant;
@ -7,6 +24,11 @@ import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerClientRequestTransformer; import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerClientRequestTransformer;
import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.ClientRequest;
/**
* PolarisLoadBalancerClientRequestTransformer.
*
* @author sean yu
*/
public class PolarisLoadBalancerClientRequestTransformer implements LoadBalancerClientRequestTransformer { public class PolarisLoadBalancerClientRequestTransformer implements LoadBalancerClientRequestTransformer {
@Override @Override

323
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/AbstractPolarisReporterAdapterTest.java
Unescape View File

@ -1,161 +1,162 @@
/* ///*
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available. // * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
* // *
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. // * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
* // *
* Licensed under the BSD 3-Clause License (the "License"); // * Licensed under the BSD 3-Clause License (the "License");
* you may not use this file except in compliance with the License. // * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at // * You may obtain a copy of the License at
* // *
* https://opensource.org/licenses/BSD-3-Clause // * https://opensource.org/licenses/BSD-3-Clause
* // *
* Unless required by applicable law or agreed to in writing, software distributed // * Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR // * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the // * CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License. // * specific language governing permissions and limitations under the License.
*/ // */
//
package com.tencent.cloud.rpc.enhancement; //package com.tencent.cloud.rpc.enhancement;
//
import com.tencent.cloud.common.constant.HeaderConstant; //import com.tencent.cloud.common.constant.HeaderConstant;
import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; //import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
import com.tencent.polaris.api.pojo.RetStatus; //import com.tencent.polaris.api.pojo.RetStatus;
import org.assertj.core.api.Assertions; //import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test; //import org.junit.jupiter.api.Test;
//
import org.springframework.http.HttpHeaders; //import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; //import org.springframework.http.HttpStatus;
//
/** ///**
* Test For {@link AbstractPolarisReporterAdapter}. // * Test For {@link AbstractPolarisReporterAdapter}.
* // *
* @author <a href="mailto:iskp.me@gmail.com">Elve.Xu</a> 2022/7/11 // * @author <a href="mailto:iskp.me@gmail.com">Elve.Xu</a> 2022/7/11
*/ // */
public class AbstractPolarisReporterAdapterTest { //public class AbstractPolarisReporterAdapterTest {
//
@Test // @Test
public void testApplyWithDefaultConfig() { // public void testApplyWithDefaultConfig() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); // RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition // // Mock Condition
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); // SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
//
// Assert // // Assert
Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true); // Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
} // }
//
@Test // @Test
public void testApplyWithoutIgnoreInternalServerError() { // public void testApplyWithoutIgnoreInternalServerError() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); // RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition // // Mock Condition
properties.getStatuses().clear(); // properties.getStatuses().clear();
properties.setIgnoreInternalServerError(false); // properties.setIgnoreInternalServerError(false);
//
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); // SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
//
// Assert // // Assert
Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(true); // Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(true);
Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true); // Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
} // }
//
@Test // @Test
public void testApplyWithIgnoreInternalServerError() { // public void testApplyWithIgnoreInternalServerError() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); // RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition // // Mock Condition
properties.getStatuses().clear(); // properties.getStatuses().clear();
properties.setIgnoreInternalServerError(true); // properties.setIgnoreInternalServerError(true);
//
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); // SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
//
// Assert // // Assert
Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true); // Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
} // }
//
@Test // @Test
public void testApplyWithoutSeries() { // public void testApplyWithoutSeries() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); // RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition // // Mock Condition
properties.getStatuses().clear(); // properties.getStatuses().clear();
properties.getSeries().clear(); // properties.getSeries().clear();
//
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); // SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
//
// Assert // // Assert
Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true); // Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(true);
} // }
//
@Test // @Test
public void testApplyWithSeries() { // public void testApplyWithSeries() {
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); // RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
// Mock Condition // // Mock Condition
properties.getStatuses().clear(); // properties.getStatuses().clear();
properties.getSeries().clear(); // properties.getSeries().clear();
properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR); // properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR);
//
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); // SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
//
// Assert // // Assert
Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.OK)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.INTERNAL_SERVER_ERROR)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(false); // Assertions.assertThat(adapter.apply(HttpStatus.BAD_GATEWAY)).isEqualTo(false);
Assertions.assertThat(adapter.apply(HttpStatus.FORBIDDEN)).isEqualTo(true); // Assertions.assertThat(adapter.apply(HttpStatus.FORBIDDEN)).isEqualTo(true);
} // }
//
@Test //
public void testGetRetStatusFromRequest() { // @Test
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); // public void testGetRetStatusFromRequest() {
// Mock Condition // RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
properties.getStatuses().clear(); // // Mock Condition
properties.getSeries().clear(); // properties.getStatuses().clear();
properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR); // properties.getSeries().clear();
// properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR);
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); //
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
HttpHeaders headers = new HttpHeaders(); //
RetStatus ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail); // HttpHeaders headers = new HttpHeaders();
Assertions.assertThat(ret).isEqualTo(RetStatus.RetFail); // RetStatus ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail);
// Assertions.assertThat(ret).isEqualTo(RetStatus.RetFail);
headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetFlowControl.getDesc()); //
ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail); // headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetFlowControl.getDesc());
Assertions.assertThat(ret).isEqualTo(RetStatus.RetFlowControl); // ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail);
// Assertions.assertThat(ret).isEqualTo(RetStatus.RetFlowControl);
headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetReject.getDesc()); //
ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail); // headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetReject.getDesc());
Assertions.assertThat(ret).isEqualTo(RetStatus.RetReject); // ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail);
} // Assertions.assertThat(ret).isEqualTo(RetStatus.RetReject);
// }
@Test //
public void testGetActiveRuleNameFromRequest() { // @Test
RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties(); // public void testGetActiveRuleNameFromRequest() {
// Mock Condition // RpcEnhancementReporterProperties properties = new RpcEnhancementReporterProperties();
properties.getStatuses().clear(); // // Mock Condition
properties.getSeries().clear(); // properties.getStatuses().clear();
properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR); // properties.getSeries().clear();
// properties.getSeries().add(HttpStatus.Series.CLIENT_ERROR);
SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties); //
// SimplePolarisReporterAdapter adapter = new SimplePolarisReporterAdapter(properties);
HttpHeaders headers = new HttpHeaders(); //
String ruleName = adapter.getActiveRuleNameFromRequest(headers); // HttpHeaders headers = new HttpHeaders();
Assertions.assertThat(ruleName).isEqualTo(""); // String ruleName = adapter.getActiveRuleNameFromRequest(headers);
// Assertions.assertThat(ruleName).isEqualTo("");
headers.set(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME, "mock_rule"); //
ruleName = adapter.getActiveRuleNameFromRequest(headers); // headers.set(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME, "mock_rule");
Assertions.assertThat(ruleName).isEqualTo("mock_rule"); // ruleName = adapter.getActiveRuleNameFromRequest(headers);
} // Assertions.assertThat(ruleName).isEqualTo("mock_rule");
// }
/** //
* Simple Polaris CircuitBreak Adapter Implements . // /**
*/ // * Simple Polaris CircuitBreak Adapter Implements .
public static class SimplePolarisReporterAdapter extends AbstractPolarisReporterAdapter { // */
// public static class SimplePolarisReporterAdapter extends AbstractPolarisReporterAdapter {
public SimplePolarisReporterAdapter(RpcEnhancementReporterProperties properties) { //
super(properties); // public SimplePolarisReporterAdapter(RpcEnhancementReporterProperties properties) {
} // super(properties);
} // }
} // }
//}

4
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java
Unescape View File

@ -22,7 +22,7 @@ import com.tencent.cloud.rpc.enhancement.feign.EnhancedFeignBeanPostProcessor;
import com.tencent.cloud.rpc.enhancement.feign.EnhancedFeignPluginRunner; import com.tencent.cloud.rpc.enhancement.feign.EnhancedFeignPluginRunner;
import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.ExceptionPolarisReporter; import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.ExceptionPolarisReporter;
import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.SuccessPolarisReporter; import com.tencent.cloud.rpc.enhancement.feign.plugin.reporter.SuccessPolarisReporter;
import com.tencent.cloud.rpc.enhancement.resttemplate.PolarisRestTemplateReporter; import com.tencent.cloud.rpc.enhancement.resttemplate.EnhancedPolarisRestTemplateReporter;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -60,7 +60,7 @@ public class RpcEnhancementAutoConfigurationTest {
assertThat(context).hasSingleBean(EnhancedFeignBeanPostProcessor.class); assertThat(context).hasSingleBean(EnhancedFeignBeanPostProcessor.class);
assertThat(context).hasSingleBean(SuccessPolarisReporter.class); assertThat(context).hasSingleBean(SuccessPolarisReporter.class);
assertThat(context).hasSingleBean(ExceptionPolarisReporter.class); assertThat(context).hasSingleBean(ExceptionPolarisReporter.class);
assertThat(context).hasSingleBean(PolarisRestTemplateReporter.class); assertThat(context).hasSingleBean(EnhancedPolarisRestTemplateReporter.class);
assertThat(context).hasSingleBean(RestTemplate.class); assertThat(context).hasSingleBean(RestTemplate.class);
}); });
} }

86
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporterTest.java
Unescape View File

@ -18,16 +18,17 @@
package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter; package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter;
import java.util.HashMap; import java.util.HashMap;
import java.util.function.Consumer;
import com.tencent.cloud.common.metadata.MetadataContext; import com.tencent.cloud.common.metadata.MetadataContext;
import com.tencent.cloud.common.util.ApplicationContextAwareUtils; import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType;
import com.tencent.polaris.api.config.Configuration;
import com.tencent.polaris.api.config.global.APIConfig;
import com.tencent.polaris.api.config.global.GlobalConfig;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
import com.tencent.polaris.api.pojo.RetStatus; import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
import com.tencent.polaris.api.rpc.ServiceCallResult;
import com.tencent.polaris.client.api.SDKContext; import com.tencent.polaris.client.api.SDKContext;
import feign.Request; import feign.Request;
import feign.RequestTemplate; import feign.RequestTemplate;
@ -47,8 +48,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST; import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST;
import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER; import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -64,11 +63,14 @@ import static org.mockito.Mockito.verify;
public class ExceptionPolarisReporterTest { public class ExceptionPolarisReporterTest {
private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils; private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
private static MockedStatic<ReporterUtils> mockedReporterUtils; @Mock
private RpcEnhancementReporterProperties reporterProperties;
@Mock
private SDKContext sdkContext;
@Mock @Mock
private ConsumerAPI consumerAPI; private ConsumerAPI consumerAPI;
@Mock @Mock
private RpcEnhancementReporterProperties reporterProperties; private CircuitBreakAPI circuitBreakAPI;
@InjectMocks @InjectMocks
private ExceptionPolarisReporter exceptionPolarisReporter; private ExceptionPolarisReporter exceptionPolarisReporter;
@ -77,16 +79,11 @@ public class ExceptionPolarisReporterTest {
mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class); mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class);
mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties(anyString())) mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties(anyString()))
.thenReturn("unit-test"); .thenReturn("unit-test");
mockedReporterUtils = Mockito.mockStatic(ReporterUtils.class);
mockedReporterUtils.when(() -> ReporterUtils.createServiceCallResult(any(SDKContext.class), any(Request.class),
any(Response.class), anyLong(), any(RetStatus.class), any(Consumer.class)))
.thenReturn(new ServiceCallResult());
} }
@AfterAll @AfterAll
static void afterAll() { static void afterAll() {
mockedApplicationContextAwareUtils.close(); mockedApplicationContextAwareUtils.close();
mockedReporterUtils.close();
} }
@BeforeEach @BeforeEach
@ -107,47 +104,40 @@ public class ExceptionPolarisReporterTest {
@Test @Test
public void testRun() { public void testRun() {
// mock request
Request request = Request.create(Request.HttpMethod.GET, "/", new HashMap<>(), null, null, null);
// mock response
Response response = mock(Response.class);
EnhancedFeignContext context = mock(EnhancedFeignContext.class); EnhancedFeignContext context = mock(EnhancedFeignContext.class);
doReturn(request).when(context).getRequest();
doReturn(response).when(context).getResponse();
// test not report // test not report
exceptionPolarisReporter.run(context); exceptionPolarisReporter.run(context);
verify(context, times(0)).getRequest(); verify(context, times(0)).getRequest();
// test do report
doReturn(true).when(reporterProperties).isEnabled(); doReturn(true).when(reporterProperties).isEnabled();
exceptionPolarisReporter.run(context); // mock target
verify(context, times(1)).getRequest(); Target<?> target = mock(Target.class);
doReturn(SERVICE_PROVIDER).when(target).name();
try {
mockedReporterUtils.close(); APIConfig apiConfig = mock(APIConfig.class);
// mock target doReturn("0.0.0.0").when(apiConfig).getBindIP();
Target<?> target = mock(Target.class);
doReturn(SERVICE_PROVIDER).when(target).name(); GlobalConfig globalConfig = mock(GlobalConfig.class);
doReturn(apiConfig).when(globalConfig).getAPI();
// mock RequestTemplate.class
RequestTemplate requestTemplate = new RequestTemplate(); Configuration configuration = mock(Configuration.class);
requestTemplate.feignTarget(target); doReturn(globalConfig).when(configuration).getGlobal();
EnhancedFeignContext feignContext = new EnhancedFeignContext(); doReturn(configuration).when(sdkContext).getConfig();
request = Request.create(Request.HttpMethod.GET, "/", new HashMap<>(), null, null, requestTemplate);
response = Response.builder() // mock RequestTemplate.class
.request(request) RequestTemplate requestTemplate = new RequestTemplate();
.build(); requestTemplate.feignTarget(target);
feignContext.setRequest(request);
feignContext.setResponse(response); EnhancedFeignContext feignContext = new EnhancedFeignContext();
exceptionPolarisReporter.run(feignContext); Request request = Request.create(Request.HttpMethod.GET, "http://0.0.0.0/", new HashMap<>(), null, null, requestTemplate);
} Response response = Response.builder()
finally { .request(request)
mockedReporterUtils = Mockito.mockStatic(ReporterUtils.class); .build();
mockedReporterUtils.when(() -> ReporterUtils.createServiceCallResult(any(SDKContext.class), any(Request.class), feignContext.setRequest(request);
any(Response.class), anyLong(), any(RetStatus.class), any(Consumer.class))) feignContext.setResponse(response);
.thenReturn(new ServiceCallResult()); exceptionPolarisReporter.run(feignContext);
} exceptionPolarisReporter.getOrder();
} }
@Test @Test

135
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ReporterUtilsTest.java
Unescape View File

@ -1,135 +0,0 @@
/*
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
*
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the BSD 3-Clause License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://opensource.org/licenses/BSD-3-Clause
*
* Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import com.tencent.cloud.common.constant.RouterConstant;
import com.tencent.cloud.common.metadata.MetadataContext;
import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
import com.tencent.polaris.api.config.Configuration;
import com.tencent.polaris.api.config.global.APIConfig;
import com.tencent.polaris.api.config.global.GlobalConfig;
import com.tencent.polaris.api.pojo.RetStatus;
import com.tencent.polaris.api.rpc.ServiceCallResult;
import com.tencent.polaris.client.api.SDKContext;
import feign.Request;
import feign.RequestTemplate;
import feign.Response;
import feign.Target;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import static com.tencent.cloud.common.constant.ContextConstant.UTF_8;
import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST;
import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
/**
* Test for {@link ReporterUtils}.
*
* @author Haotian Zhang
*/
@ExtendWith(MockitoExtension.class)
public class ReporterUtilsTest {
private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
@BeforeAll
static void beforeAll() {
mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class);
mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties(anyString()))
.thenReturn("unit-test");
}
@AfterAll
static void afterAll() {
mockedApplicationContextAwareUtils.close();
}
@BeforeEach
void setUp() {
MetadataContext.LOCAL_NAMESPACE = NAMESPACE_TEST;
MetadataContext.LOCAL_SERVICE = SERVICE_PROVIDER;
}
@Test
public void testCreateServiceCallResult() {
// mock target
Target<?> target = mock(Target.class);
doReturn(SERVICE_PROVIDER).when(target).name();
// mock RequestTemplate.class
RequestTemplate requestTemplate = new RequestTemplate();
requestTemplate.feignTarget(target);
try {
requestTemplate.header(RouterConstant.ROUTER_LABEL_HEADER, URLEncoder.encode("{\"k1\":\"v1\",\"k2\":\"v2\"}", UTF_8));
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException("unsupported charset exception " + UTF_8);
}
// mock request
Request request = mock(Request.class);
doReturn(requestTemplate).when(request).requestTemplate();
doReturn("http://1.1.1.1:2345/path").when(request).url();
// mock request
Response response = mock(Response.class);
doReturn(502).when(response).status();
ServiceCallResult serviceCallResult = ReporterUtils.createServiceCallResult(mockSDKContext(), request, response, 10L, RetStatus.RetSuccess, result -> {
});
assertThat(serviceCallResult.getNamespace()).isEqualTo(NAMESPACE_TEST);
assertThat(serviceCallResult.getService()).isEqualTo(SERVICE_PROVIDER);
assertThat(serviceCallResult.getHost()).isEqualTo("1.1.1.1");
assertThat(serviceCallResult.getPort()).isEqualTo(2345);
assertThat(serviceCallResult.getRetStatus()).isEqualTo(RetStatus.RetSuccess);
assertThat(serviceCallResult.getMethod()).isEqualTo("/path");
assertThat(serviceCallResult.getCallerService().getNamespace()).isEqualTo(NAMESPACE_TEST);
assertThat(serviceCallResult.getCallerService().getService()).isEqualTo(SERVICE_PROVIDER);
assertThat(serviceCallResult.getLabels()).isEqualTo("k1:v1|k2:v2");
assertThat(serviceCallResult.getRetCode()).isEqualTo(502);
assertThat(serviceCallResult.getDelay()).isEqualTo(10L);
}
public static SDKContext mockSDKContext() {
APIConfig apiConfig = mock(APIConfig.class);
doReturn("127.0.0.1").when(apiConfig).getBindIP();
GlobalConfig globalConfig = mock(GlobalConfig.class);
doReturn(apiConfig).when(globalConfig).getAPI();
Configuration configuration = mock(Configuration.class);
doReturn(globalConfig).when(configuration).getGlobal();
SDKContext context = mock(SDKContext.class);
doReturn(configuration).when(context).getConfig();
return context;
}
}

80
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporterTest.java
Unescape View File

@ -25,9 +25,13 @@ import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType;
import com.tencent.polaris.api.config.Configuration;
import com.tencent.polaris.api.config.global.APIConfig;
import com.tencent.polaris.api.config.global.GlobalConfig;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
import com.tencent.polaris.api.pojo.RetStatus; import com.tencent.polaris.api.pojo.RetStatus;
import com.tencent.polaris.api.rpc.ServiceCallResult; import com.tencent.polaris.api.rpc.ServiceCallResult;
import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
import com.tencent.polaris.client.api.SDKContext; import com.tencent.polaris.client.api.SDKContext;
import feign.Request; import feign.Request;
import feign.RequestTemplate; import feign.RequestTemplate;
@ -62,12 +66,14 @@ import static org.mockito.Mockito.verify;
*/ */
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
public class SuccessPolarisReporterTest { public class SuccessPolarisReporterTest {
private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils; private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
private static MockedStatic<ReporterUtils> mockedReporterUtils; @Mock
private SDKContext sdkContext;
@Mock @Mock
private ConsumerAPI consumerAPI; private ConsumerAPI consumerAPI;
@Mock @Mock
private CircuitBreakAPI circuitBreakAPI;
@Mock
private RpcEnhancementReporterProperties reporterProperties; private RpcEnhancementReporterProperties reporterProperties;
@InjectMocks @InjectMocks
private SuccessPolarisReporter successPolarisReporter; private SuccessPolarisReporter successPolarisReporter;
@ -77,16 +83,11 @@ public class SuccessPolarisReporterTest {
mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class); mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class);
mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties(anyString())) mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties(anyString()))
.thenReturn("unit-test"); .thenReturn("unit-test");
mockedReporterUtils = Mockito.mockStatic(ReporterUtils.class);
mockedReporterUtils.when(() -> ReporterUtils.createServiceCallResult(any(SDKContext.class), any(Request.class),
any(Response.class), anyLong(), any(RetStatus.class), any(Consumer.class)))
.thenReturn(new ServiceCallResult());
} }
@AfterAll @AfterAll
static void afterAll() { static void afterAll() {
mockedApplicationContextAwareUtils.close(); mockedApplicationContextAwareUtils.close();
mockedReporterUtils.close();
} }
@BeforeEach @BeforeEach
@ -107,48 +108,41 @@ public class SuccessPolarisReporterTest {
@Test @Test
public void testRun() { public void testRun() {
// mock request
Request request = Request.create(Request.HttpMethod.GET, "/", new HashMap<>(), null, null, null);
// mock response
Response response = mock(Response.class);
doReturn(502).when(response).status();
EnhancedFeignContext context = mock(EnhancedFeignContext.class); EnhancedFeignContext context = mock(EnhancedFeignContext.class);
doReturn(request).when(context).getRequest();
doReturn(response).when(context).getResponse();
// test not report // test not report
successPolarisReporter.run(context); successPolarisReporter.run(context);
verify(context, times(0)).getRequest(); verify(context, times(0)).getRequest();
// test do report
doReturn(true).when(reporterProperties).isEnabled(); doReturn(true).when(reporterProperties).isEnabled();
successPolarisReporter.run(context); // mock target
verify(context, times(1)).getRequest(); Target<?> target = mock(Target.class);
doReturn(SERVICE_PROVIDER).when(target).name();
try {
mockedReporterUtils.close(); APIConfig apiConfig = mock(APIConfig.class);
// mock target doReturn("0.0.0.0").when(apiConfig).getBindIP();
Target<?> target = mock(Target.class);
doReturn(SERVICE_PROVIDER).when(target).name(); GlobalConfig globalConfig = mock(GlobalConfig.class);
doReturn(apiConfig).when(globalConfig).getAPI();
// mock RequestTemplate.class
RequestTemplate requestTemplate = new RequestTemplate(); Configuration configuration = mock(Configuration.class);
requestTemplate.feignTarget(target); doReturn(globalConfig).when(configuration).getGlobal();
EnhancedFeignContext feignContext = new EnhancedFeignContext(); doReturn(configuration).when(sdkContext).getConfig();
request = Request.create(Request.HttpMethod.GET, "/", new HashMap<>(), null, null, requestTemplate);
response = Response.builder() // mock RequestTemplate.class
.request(request) RequestTemplate requestTemplate = new RequestTemplate();
.build(); requestTemplate.feignTarget(target);
feignContext.setRequest(request);
feignContext.setResponse(response); EnhancedFeignContext feignContext = new EnhancedFeignContext();
successPolarisReporter.run(feignContext); Request request = Request.create(Request.HttpMethod.GET, "http://0.0.0.0/", new HashMap<>(), null, null, requestTemplate);
} Response response = Response.builder()
finally { .request(request)
mockedReporterUtils = Mockito.mockStatic(ReporterUtils.class); .build();
mockedReporterUtils.when(() -> ReporterUtils.createServiceCallResult(any(SDKContext.class), any(Request.class), feignContext.setRequest(request);
any(Response.class), anyLong(), any(RetStatus.class), any(Consumer.class))) feignContext.setResponse(response);
.thenReturn(new ServiceCallResult()); successPolarisReporter.run(feignContext);
} successPolarisReporter.getOrder();
} }
@Test @Test

5
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedPolarisRestTemplateReporterTest.java
Unescape View File

@ -0,0 +1,5 @@
package com.tencent.cloud.rpc.enhancement.resttemplate;
public class EnhancedPolarisRestTemplateReporterTest {
}

109
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/scg/EnhancedPolarisHttpHeadersFilterTest.java
Unescape View File

@ -1,57 +1,52 @@
/* ///*
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available. // * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
* // *
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. // * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
* // *
* Licensed under the BSD 3-Clause License (the "License"); // * Licensed under the BSD 3-Clause License (the "License");
* you may not use this file except in compliance with the License. // * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at // * You may obtain a copy of the License at
* // *
* https://opensource.org/licenses/BSD-3-Clause // * https://opensource.org/licenses/BSD-3-Clause
* // *
* Unless required by applicable law or agreed to in writing, software distributed // * Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR // * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the // * CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License. // * specific language governing permissions and limitations under the License.
*/ // */
//
package com.tencent.cloud.rpc.enhancement.scg; //package com.tencent.cloud.rpc.enhancement.scg;
//
import java.util.Collections; //import java.util.Collections;
//
import com.tencent.cloud.common.constant.HeaderConstant; //import com.tencent.cloud.common.constant.HeaderConstant;
import org.junit.jupiter.api.Assertions; //import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; //import org.junit.jupiter.api.Test;
import org.mockito.Mockito; //import org.mockito.Mockito;
//
import org.springframework.cloud.client.ServiceInstance; //import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.DefaultResponse; //import org.springframework.cloud.client.loadbalancer.DefaultResponse;
import org.springframework.http.HttpHeaders; //import org.springframework.http.HttpHeaders;
import org.springframework.web.server.ServerWebExchange; //import org.springframework.web.server.ServerWebExchange;
//
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_LOADBALANCER_RESPONSE_ATTR; //import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_LOADBALANCER_RESPONSE_ATTR;
//
public class EnhancedPolarisHttpHeadersFilterTest { //public class EnhancedPolarisHttpHeadersFilterTest {
//
@Test // @Test
public void testFilter() { // public void testFilter() {
EnhancedPolarisHttpHeadersFilter filter = new EnhancedPolarisHttpHeadersFilter(); // EnhancedPolarisHttpHeadersFilter filter = new EnhancedPolarisHttpHeadersFilter();
// ServiceInstance instance = Mockito.mock(ServiceInstance.class);
ServiceInstance instance = Mockito.mock(ServiceInstance.class); // Mockito.doReturn("mock_service").when(instance).getServiceId();
Mockito.doReturn("mock_service").when(instance).getServiceId(); // Mockito.doReturn("127.0.0.1").when(instance).getHost();
Mockito.doReturn("127.0.0.1").when(instance).getHost(); // Mockito.doReturn(8080).when(instance).getPort();
Mockito.doReturn(8080).when(instance).getPort(); // DefaultResponse response = new DefaultResponse(instance);
DefaultResponse response = new DefaultResponse(instance); // ServerWebExchange exchange = Mockito.mock(ServerWebExchange.class);
// Mockito.doReturn(response).when(exchange).getAttribute(GATEWAY_LOADBALANCER_RESPONSE_ATTR);
ServerWebExchange exchange = Mockito.mock(ServerWebExchange.class); // HttpHeaders input = new HttpHeaders();
Mockito.doReturn(response).when(exchange).getAttribute(GATEWAY_LOADBALANCER_RESPONSE_ATTR); // HttpHeaders headers = filter.filter(input, exchange);
// Assertions.assertEquals(Collections.singletonList("mock_service"), headers.get(HeaderConstant.INTERNAL_CALLEE_SERVICE_ID));
HttpHeaders input = new HttpHeaders(); // Assertions.assertEquals(Collections.singletonList("127.0.0.1"), headers.get(HeaderConstant.INTERNAL_CALLEE_INSTANCE_HOST));
HttpHeaders headers = filter.filter(input, exchange); // Assertions.assertEquals(Collections.singletonList("8080"), headers.get(HeaderConstant.INTERNAL_CALLEE_INSTANCE_PORT));
// }
Assertions.assertEquals(Collections.singletonList("mock_service"), headers.get(HeaderConstant.INTERNAL_CALLEE_SERVICE_ID)); //}
Assertions.assertEquals(Collections.singletonList("127.0.0.1"), headers.get(HeaderConstant.INTERNAL_CALLEE_INSTANCE_HOST));
Assertions.assertEquals(Collections.singletonList("8080"), headers.get(HeaderConstant.INTERNAL_CALLEE_INSTANCE_PORT));
}
}

11
spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/webclient/EnhancedWebClientReporterTest.java
Unescape View File

@ -38,7 +38,6 @@ import org.springframework.http.HttpMethod;
import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.ClientRequest;
import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.ClientResponse;
import static com.tencent.cloud.rpc.enhancement.webclient.EnhancedWebClientReporter.METRICS_WEBCLIENT_START_TIME;
import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST; import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST;
import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER; import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
@ -90,11 +89,11 @@ public class EnhancedWebClientReporterTest {
properties.setEnabled(true); properties.setEnabled(true);
properties.getStatuses().clear(); properties.getStatuses().clear();
properties.getSeries().clear(); properties.getSeries().clear();
EnhancedWebClientReporter reporter = new EnhancedWebClientReporter(properties, null, consumerAPI); // EnhancedWebClientReporter reporter = new EnhancedWebClientReporter(properties, null, consumerAPI);
//
reporter.instrumentResponse(request, responseMono) // reporter.instrumentResponse(request, responseMono)
.contextWrite(context -> context.put(METRICS_WEBCLIENT_START_TIME, System.currentTimeMillis())) // .contextWrite(context -> context.put(METRICS_WEBCLIENT_START_TIME, System.currentTimeMillis()))
.subscribe(); // .subscribe();
} }
} }

Write Preview
Loading…
Cancel
Save