fix: tsf related bugfixes (#1698)
Co-authored-by: shedfreewu <49236872+shedfreewu@users.noreply.github.com>pull/1699/head
Haotian Zhang
3 weeks ago
committed by
GitHub
parent
3cb0c07121
commit
616c9f2358
@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making spring-cloud-tencent available.
|
||||
*
|
||||
* Copyright (C) 2021 Tencent. 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.common.util;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import com.tencent.cloud.common.metadata.MetadataContextHolder;
|
||||
import com.tencent.polaris.metadata.core.MetadataObjectValue;
|
||||
import com.tencent.polaris.metadata.core.MetadataType;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Utils for MetadataContext.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
public final class MetadataContextUtils {
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(MetadataContextUtils.class);
|
||||
|
||||
private MetadataContextUtils() {
|
||||
}
|
||||
|
||||
public static void putMetadataObjectValue(String key, Object value) {
|
||||
MetadataContextHolder.get().getMetadataContainer(MetadataType.APPLICATION, true).
|
||||
putMetadataObjectValue(key, value);
|
||||
}
|
||||
|
||||
public static boolean existMetadataValue(MetadataObjectValue<?> metadataObjectValue) {
|
||||
return Optional.ofNullable(metadataObjectValue).map(MetadataObjectValue::getObjectValue).
|
||||
map(Optional::isPresent).orElse(false);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making spring-cloud-tencent available.
|
||||
*
|
||||
* Copyright (C) 2021 Tencent. 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.plugin.trace;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.tencent.cloud.plugin.trace.attribute.SpanAttributesProvider;
|
||||
import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
|
||||
import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPlugin;
|
||||
import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
|
||||
import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
|
||||
import com.tencent.cloud.rpc.enhancement.plugin.PluginOrderConstant;
|
||||
import com.tencent.polaris.api.utils.CollectionUtils;
|
||||
import com.tencent.polaris.assembly.api.AssemblyAPI;
|
||||
import com.tencent.polaris.assembly.api.pojo.TraceAttributes;
|
||||
|
||||
public class TraceServerFinallyEnhancedPlugin implements EnhancedPlugin {
|
||||
|
||||
private final PolarisSDKContextManager polarisSDKContextManager;
|
||||
|
||||
private final List<SpanAttributesProvider> spanAttributesProviderList;
|
||||
|
||||
public TraceServerFinallyEnhancedPlugin(PolarisSDKContextManager polarisSDKContextManager, List<SpanAttributesProvider> spanAttributesProviderList) {
|
||||
this.polarisSDKContextManager = polarisSDKContextManager;
|
||||
this.spanAttributesProviderList = spanAttributesProviderList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnhancedPluginType getType() {
|
||||
return EnhancedPluginType.Server.FINALLY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(EnhancedPluginContext context) throws Throwable {
|
||||
Map<String, String> attributes = new HashMap<>();
|
||||
if (CollectionUtils.isNotEmpty(spanAttributesProviderList)) {
|
||||
for (SpanAttributesProvider spanAttributesProvider : spanAttributesProviderList) {
|
||||
Map<String, String> additionalAttributes = spanAttributesProvider.getServerFinallySpanAttributes(context);
|
||||
if (CollectionUtils.isNotEmpty(additionalAttributes)) {
|
||||
attributes.putAll(additionalAttributes);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TraceAttributes traceAttributes = new TraceAttributes();
|
||||
traceAttributes.setAttributes(attributes);
|
||||
traceAttributes.setAttributeLocation(TraceAttributes.AttributeLocation.SPAN);
|
||||
|
||||
AssemblyAPI assemblyAPI = polarisSDKContextManager.getAssemblyAPI();
|
||||
assemblyAPI.updateTraceAttributes(traceAttributes);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getOrder() {
|
||||
return PluginOrderConstant.ServerPluginOrder.TRACE_SERVER_PRE_PLUGIN_ORDER;
|
||||
}
|
||||
}
|
||||
15
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/resttemplate/EnhancedRestTemplateWrapInterceptor.java → spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/resttemplate/EnhancedRestTemplateBlockingLoadBalancerClientInterceptor.java
15
spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/resttemplate/EnhancedRestTemplateWrapInterceptor.java → spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/instrument/resttemplate/EnhancedRestTemplateBlockingLoadBalancerClientInterceptor.java
@ -0,0 +1,75 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making spring-cloud-tencent available.
|
||||
*
|
||||
* Copyright (C) 2021 Tencent. 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.instrument.resttemplate;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import com.tencent.cloud.common.constant.OrderConstant;
|
||||
import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
|
||||
import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginRunner;
|
||||
import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginType;
|
||||
import com.tencent.cloud.rpc.enhancement.util.EnhancedPluginUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
|
||||
import org.springframework.core.Ordered;
|
||||
import org.springframework.http.HttpRequest;
|
||||
import org.springframework.http.client.ClientHttpRequestExecution;
|
||||
import org.springframework.http.client.ClientHttpRequestInterceptor;
|
||||
import org.springframework.http.client.ClientHttpResponse;
|
||||
import org.springframework.lang.NonNull;
|
||||
|
||||
/**
|
||||
* Interceptor used for before calling plugin in RestTemplate.
|
||||
*
|
||||
* It needs to execute after {@link LoadBalancerInterceptor}, because LaneRouter may add calleeTransitiveHeaders.
|
||||
*
|
||||
* @author Haotian Zhang
|
||||
*/
|
||||
public class EnhancedRestTemplateInterceptor implements ClientHttpRequestInterceptor, Ordered {
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(EnhancedRestTemplateInterceptor.class);
|
||||
|
||||
private final EnhancedPluginRunner pluginRunner;
|
||||
|
||||
public EnhancedRestTemplateInterceptor(EnhancedPluginRunner pluginRunner) {
|
||||
this.pluginRunner = pluginRunner;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getOrder() {
|
||||
return OrderConstant.Client.RestTemplate.ENHANCE_INTERCEPTOR_ORDER;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ClientHttpResponse intercept(@NonNull HttpRequest httpRequest, @NonNull byte[] bytes,
|
||||
@NonNull ClientHttpRequestExecution clientHttpRequestExecution) throws IOException {
|
||||
|
||||
|
||||
EnhancedPluginContext enhancedPluginContext = EnhancedPluginUtils.getEnhancedPluginContextFromMetadataContext();
|
||||
if (enhancedPluginContext != null) {
|
||||
pluginRunner.run(EnhancedPluginType.Client.BEFORE_CALLING, enhancedPluginContext);
|
||||
}
|
||||
else {
|
||||
LOG.debug("No exist enhanced plugin context, request:{}", httpRequest.getURI());
|
||||
}
|
||||
|
||||
return clientHttpRequestExecution.execute(httpRequest, bytes);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making spring-cloud-tencent available.
|
||||
*
|
||||
* Copyright (C) 2021 Tencent. 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.util;
|
||||
|
||||
import com.tencent.cloud.common.constant.ContextConstant;
|
||||
import com.tencent.cloud.common.metadata.MetadataContextHolder;
|
||||
import com.tencent.cloud.common.util.MetadataContextUtils;
|
||||
import com.tencent.cloud.rpc.enhancement.plugin.EnhancedPluginContext;
|
||||
import com.tencent.polaris.metadata.core.MetadataObjectValue;
|
||||
import com.tencent.polaris.metadata.core.MetadataType;
|
||||
|
||||
/**
|
||||
* EnhancedPluginUtils.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
public final class EnhancedPluginUtils {
|
||||
|
||||
private EnhancedPluginUtils() {
|
||||
}
|
||||
|
||||
public static EnhancedPluginContext createEnhancedPluginContext() {
|
||||
EnhancedPluginContext context = new EnhancedPluginContext();
|
||||
MetadataContextUtils.putMetadataObjectValue(ContextConstant.ENHANCED_PLUGIN_CONTEXT, context);
|
||||
return context;
|
||||
}
|
||||
|
||||
public static EnhancedPluginContext getEnhancedPluginContextFromMetadataContext() {
|
||||
|
||||
MetadataObjectValue<EnhancedPluginContext> enhancedPluginContextObject = MetadataContextHolder.get().
|
||||
getMetadataContainer(MetadataType.APPLICATION, true).
|
||||
getMetadataValue(ContextConstant.ENHANCED_PLUGIN_CONTEXT);
|
||||
|
||||
if (MetadataContextUtils.existMetadataValue(enhancedPluginContextObject)) {
|
||||
return enhancedPluginContextObject.getObjectValue().get();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue