【fix】ignore tag injection when the key exists

Signed-off-by: lilai <[email protected]>
sermant-io · Nov 25, 2024 · 36d34b0 · 36d34b0
1 parent f6f66b0
commit 36d34b0
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 4 deletions.
diff --git a/...o/sermant/tag/transmission/alibabadubbo/interceptors/AlibabaDubboConsumerInterceptor.java b/...o/sermant/tag/transmission/alibabadubbo/interceptors/AlibabaDubboConsumerInterceptor.java
@@ -71,6 +71,13 @@ protected void injectTrafficTag2Carrier(RpcInvocation invocation) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original attachment contains the specific key, then ignore
+            String originalAttachment = invocation.getAttachment(key);
+            if (originalAttachment != null) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // If the tag value is not null on the provider side, it will be converted to list storage. If it is null,

diff --git a/...o/sermant/tag/transmission/apachedubbov2/interceptors/ApacheDubboConsumerInterceptor.java b/...o/sermant/tag/transmission/apachedubbov2/interceptors/ApacheDubboConsumerInterceptor.java
@@ -66,6 +66,13 @@ protected void injectTrafficTag2Carrier(RpcInvocation invocation) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original attachment contains the specific key, then ignore
+            String originalAttachment = invocation.getAttachment(key);
+            if (originalAttachment != null) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // If the tag value is not null on the provider side, it will be converted to list storage. If it is null,

diff --git a/...java/io/sermant/tag/transmission/dubbov3/interceptors/ApacheDubboConsumerInterceptor.java b/...java/io/sermant/tag/transmission/dubbov3/interceptors/ApacheDubboConsumerInterceptor.java
@@ -66,6 +66,13 @@ protected void injectTrafficTag2Carrier(RpcInvocation invocation) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original attachment contains the specific key, then ignore
+            Object originalAttachment = invocation.getObjectAttachment(key);
+            if (originalAttachment != null) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // If the tag value is not null on the provider side, it will be converted to list storage. If it is null,

diff --git a/...rc/main/java/io/sermant/tag/transmission/grpc/interceptors/ClientCallImplInterceptor.java b/...rc/main/java/io/sermant/tag/transmission/grpc/interceptors/ClientCallImplInterceptor.java
@@ -65,6 +65,13 @@ protected void injectTrafficTag2Carrier(Metadata header) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original metadata contains the specific key, then ignore
+            String originalHeaderValue = header.get(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER));
+            if (originalHeaderValue != null) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // The server side converts the label value to list storage when it is not null. If it is null, it directly

diff --git a/...n/java/io/sermant/tag/transmission/httpclientv3/interceptors/HttpClient3xInterceptor.java b/...n/java/io/sermant/tag/transmission/httpclientv3/interceptors/HttpClient3xInterceptor.java
@@ -23,6 +23,7 @@
 import io.sermant.tag.transmission.config.strategy.TagKeyMatcher;
 import io.sermant.tag.transmission.interceptors.AbstractClientInterceptor;
 
+import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethod;
 
 import java.util.List;
@@ -66,6 +67,13 @@ protected void injectTrafficTag2Carrier(HttpMethod httpMethod) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original headers contains the specific key, then ignore
+            Header originalRequestHeader = httpMethod.getRequestHeader(key);
+            if (originalRequestHeader != null) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // The server side converts the label value to list storage when it is not null. If it is null, it directly

diff --git a/...n/java/io/sermant/tag/transmission/httpclientv4/interceptors/HttpClient4xInterceptor.java b/...n/java/io/sermant/tag/transmission/httpclientv4/interceptors/HttpClient4xInterceptor.java
@@ -23,6 +23,7 @@
 import io.sermant.tag.transmission.config.strategy.TagKeyMatcher;
 import io.sermant.tag.transmission.interceptors.AbstractClientInterceptor;
 
+import org.apache.http.Header;
 import org.apache.http.HttpRequest;
 
 import java.util.List;
@@ -66,6 +67,13 @@ protected void injectTrafficTag2Carrier(HttpRequest httpRequest) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original headers contains the specific key, then ignore
+            Header[] originalHeaders = httpRequest.getHeaders(key);
+            if (originalHeaders != null && originalHeaders.length != 0) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // The server side converts the label value to list storage when it is not null. If it is null, it directly

diff --git a/.../main/java/io/sermant/tag/transmission/jdkhttp/interceptors/JdkHttpClientInterceptor.java b/.../main/java/io/sermant/tag/transmission/jdkhttp/interceptors/JdkHttpClientInterceptor.java
@@ -83,6 +83,13 @@ protected void injectTrafficTag2Carrier(MessageHeader messageHeader) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original headers contains the specific key, then ignore
+            Map<String, List<String>> originalHeaders = messageHeader.getHeaders();
+            if (!CollectionUtils.isEmpty(originalHeaders.get(key))) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // The server side converts the label value to list storage when it is not null. If it is null, it directly

diff --git a/...rc/main/java/io/sermant/tag/transmission/kafka/interceptors/KafkaProducerInterceptor.java b/...rc/main/java/io/sermant/tag/transmission/kafka/interceptors/KafkaProducerInterceptor.java
@@ -24,6 +24,7 @@
 import io.sermant.tag.transmission.interceptors.AbstractClientInterceptor;
 
 import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.Headers;
 
 import java.nio.charset.StandardCharsets;
@@ -69,6 +70,13 @@ protected void injectTrafficTag2Carrier(ProducerRecord<?, ?> producerRecord) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original headers contains the specific key, then ignore
+            Header originalHeader = headers.lastHeader(key);
+            if (originalHeader != null) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // On the producer side, if the tag value is not null, it is converted to list storage. If it is null, it

diff --git a/.../src/main/java/io/sermant/tag/transmission/okhttpv2/interceptors/OkHttp2xInterceptor.java b/.../src/main/java/io/sermant/tag/transmission/okhttpv2/interceptors/OkHttp2xInterceptor.java
@@ -16,17 +16,20 @@
 
 package io.sermant.tag.transmission.okhttpv2.interceptors;
 
+import com.squareup.okhttp.Headers;
 import com.squareup.okhttp.Request.Builder;
 
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.plugin.agent.entity.ExecuteContext;
 import io.sermant.core.utils.CollectionUtils;
+import io.sermant.core.utils.ReflectUtils;
 import io.sermant.core.utils.tag.TrafficUtils;
 import io.sermant.tag.transmission.config.strategy.TagKeyMatcher;
 import io.sermant.tag.transmission.interceptors.AbstractClientInterceptor;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -75,6 +78,17 @@ protected void injectTrafficTag2Carrier(Builder builder) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original headers contains the specific key, then ignore
+            Optional<Object> headersBuilderObject = ReflectUtils.getFieldValue(builder, "headers");
+            if (headersBuilderObject.isPresent()) {
+                Headers.Builder headersBuilder = (Headers.Builder) headersBuilderObject.get();
+                String value = headersBuilder.get(key);
+                if (value != null) {
+                    continue;
+                }
+            }
+
             List<String> values = entry.getValue();
 
             // The server side converts the label value to list storage when it is not null. If it is null, it directly

diff --git a/.../io/sermant/tag/transmission/rocketmqv4/interceptors/RocketmqProducerSendInterceptor.java b/.../io/sermant/tag/transmission/rocketmqv4/interceptors/RocketmqProducerSendInterceptor.java
@@ -75,8 +75,8 @@ protected void injectTrafficTag2Carrier(SendMessageRequestHeader header) {
     }
 
     /**
-     * Insert the traffic tag into the properties string. The format of the original properties is as
-     * follows: key1[SOH]value1[STX]key2[SOH]value2, [SOH] is the symbol of ASCII=1, [STX] is the symbol of ASCII=2
+     * Insert the traffic tag into the properties string. The format of the original properties is as follows:
+     * key1[SOH]value1[STX]key2[SOH]value2, [SOH] is the symbol of ASCII=1, [STX] is the symbol of ASCII=2
      *
      * @param oldProperties original properties
      * @return String
@@ -88,6 +88,12 @@ private String insertTags2Properties(String oldProperties) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original properties contains the specific key, then ignore
+            if (oldProperties.contains(key)) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
             newProperties.append(key);
             newProperties.append(LINK_MARK);

diff --git a/...a/io/sermant/tag/transmission/rocketmqv5/interceptor/RocketmqProducerSendInterceptor.java b/...a/io/sermant/tag/transmission/rocketmqv5/interceptor/RocketmqProducerSendInterceptor.java
@@ -75,8 +75,8 @@ protected void injectTrafficTag2Carrier(SendMessageRequestHeader header) {
     }
 
     /**
-     * Insert the traffic tag into the properties string. The format of the original properties is as
-     * follows: key1[SOH]value1[STX]key2[SOH]value2, [SOH] is the symbol of ASCII=1, [STX] is the symbol of ASCII=2
+     * Insert the traffic tag into the properties string. The format of the original properties is as follows:
+     * key1[SOH]value1[STX]key2[SOH]value2, [SOH] is the symbol of ASCII=1, [STX] is the symbol of ASCII=2
      *
      * @param oldProperties original properties
      * @return String
@@ -88,6 +88,12 @@ private String insertTags2Properties(String oldProperties) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original properties contains the specific key, then ignore
+            if (oldProperties.contains(key)) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
             newProperties.append(key);
             newProperties.append(LINK_MARK);

diff --git a/.../sermant/tag/transmission/servicecomb/interceptors/ServiceCombRpcConsumerInterceptor.java b/.../sermant/tag/transmission/servicecomb/interceptors/ServiceCombRpcConsumerInterceptor.java
@@ -69,6 +69,13 @@ protected void injectTrafficTag2Carrier(Invocation invocation) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original headers contains the specific key, then ignore
+            String originalHeader = invocation.getContext().get(key);
+            if (originalHeader != null) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // If the tag value is not null on the provider side, it will be converted to list storage. If it is null,

diff --git a/.../main/java/io/sermant/tag/transmission/sofarpc/interceptors/SofaRpcClientInterceptor.java b/.../main/java/io/sermant/tag/transmission/sofarpc/interceptors/SofaRpcClientInterceptor.java
@@ -69,6 +69,13 @@ protected void injectTrafficTag2Carrier(SofaRequest sofaRequest) {
             if (!TagKeyMatcher.isMatch(key)) {
                 continue;
             }
+
+            // if original headers contains the specific key, then ignore
+            Object originalHeader = sofaRequest.getRequestProp(key);
+            if (originalHeader != null) {
+                continue;
+            }
+
             List<String> values = entry.getValue();
 
             // The server side converts the label value to list storage when it is not null. If it is null, it directly