summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorfengweihao <[email protected]>2021-11-15 18:46:52 +0800
committerfengweihao <[email protected]>2021-11-15 18:46:52 +0800
commit16b4a629426bcbd14db9468608e9d6132283efd7 (patch)
treedcad9d3a143f2c751a629e02989a991c52cea1c9 /plugin
parente4ed3b0b28863472c872e1eb4434cf27bbb3c6d6 (diff)
TSG-8451 common_stream_trace_id已超过long型,同安全策略修改trace_id为字符串v4.5.25-20211115
Diffstat (limited to 'plugin')
-rw-r--r--plugin/business/doh/src/logger.cpp2
-rw-r--r--plugin/business/pangu-http/src/pangu_logger.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugin/business/doh/src/logger.cpp b/plugin/business/doh/src/logger.cpp
index 53ff201..d54edf8 100644
--- a/plugin/business/doh/src/logger.cpp
+++ b/plugin/business/doh/src/logger.cpp
@@ -341,7 +341,7 @@ int doh_send_log(struct doh_conf *handle, const struct tfe_http_session *http, c
int ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_STREAM_TRACE_ID, (unsigned char *)opt_val, sizeof(opt_val), &opt_out_size);
if (ret == 0)
{
- cJSON_AddNumberToObject(common_obj, "common_stream_trace_id", atoll(opt_val));
+ cJSON_AddStringToObject(common_obj, "common_stream_trace_id", opt_val);
}
ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_COMMON_DIRECTION, (unsigned char *)&common_direction, sizeof(common_direction), &opt_out_size);
if (ret==0)
diff --git a/plugin/business/pangu-http/src/pangu_logger.cpp b/plugin/business/pangu-http/src/pangu_logger.cpp
index 33301a4..4b502aa 100644
--- a/plugin/business/pangu-http/src/pangu_logger.cpp
+++ b/plugin/business/pangu-http/src/pangu_logger.cpp
@@ -160,7 +160,7 @@ int pangu_send_log(struct pangu_logger* handle, const struct pangu_log* log_msg)
int ret=tfe_cmsg_get_value(cmsg, TFE_CMSG_STREAM_TRACE_ID, (unsigned char *) opt_val, sizeof(opt_val), &opt_out_size);
if (ret==0)
{
- cJSON_AddNumberToObject(common_obj, "common_stream_trace_id", atoll(opt_val));
+ cJSON_AddStringToObject(common_obj, "common_stream_trace_id", opt_val);
}
ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_COMMON_DIRECTION, (unsigned char *)&common_direction, sizeof(common_direction), &opt_out_size);
if (ret==0)