Skip to content

Commit f478b00

Browse files
authored
fix: C++ source tag (#2092)
1 parent 072b67b commit f478b00

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

core/plugin/processor/inner/ProcessorTagNative.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,15 @@ bool ProcessorTagNative::Init(const Json::Value& config) {
9595
// should keep same with Go addAllConfigurableTags
9696
void ProcessorTagNative::Process(PipelineEventGroup& logGroup) {
9797
AddTag(logGroup, TagKey::HOST_NAME_TAG_KEY, LoongCollectorMonitor::GetInstance()->mHostname);
98+
#ifdef __ENTERPRISE__
9899
auto entity = InstanceIdentity::Instance()->GetEntity();
99100
if (entity != nullptr) {
100101
AddTag(logGroup, TagKey::HOST_ID_TAG_KEY, entity->GetHostID());
101-
#ifdef __ENTERPRISE__
102102
ECSMeta meta = entity->GetECSMeta();
103103
const string cloudProvider
104104
= meta.GetInstanceID().empty() ? DEFAULT_VALUE_DOMAIN_INFRA : DEFAULT_VALUE_DOMAIN_ACS;
105-
#else
106-
const string cloudProvider = DEFAULT_VALUE_DOMAIN_INFRA;
107-
#endif
108105
AddTag(logGroup, TagKey::CLOUD_PROVIDER_TAG_KEY, cloudProvider);
109106
}
110-
#ifdef __ENTERPRISE__
111107
AddTag(logGroup, TagKey::AGENT_TAG_TAG_KEY, EnterpriseConfigProvider::GetInstance()->GetUserDefinedIdSet());
112108
#else
113109
AddTag(logGroup, TagKey::HOST_IP_TAG_KEY, LoongCollectorMonitor::GetInstance()->mIpAddr);
@@ -145,6 +141,7 @@ void ProcessorTagNative::Process(PipelineEventGroup& logGroup) {
145141
// When flushing through Go pipeline, it will skip serializer, add a new unexpected tag
146142
auto sb = logGroup.GetSourceBuffer()->CopyString(Application::GetInstance()->GetUUID());
147143
logGroup.SetTagNoCopy(LOG_RESERVED_KEY_MACHINE_UUID, StringView(sb.data, sb.size));
144+
logGroup.SetTagNoCopy(LOG_RESERVED_KEY_SOURCE, LoongCollectorMonitor::mIpAddr);
148145
}
149146

150147
bool ProcessorTagNative::IsSupportedEvent(const PipelineEventPtr& /*e*/) const {

core/unittest/processor/ProcessorTagNativeUnittest.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ void ProcessorTagNativeUnittest::TestProcess() {
108108
APSARA_TEST_EQUAL_FATAL(LoongCollectorMonitor::GetInstance()->mIpAddr,
109109
eventGroup.GetTag(GetDefaultTagKeyString(TagKey::HOST_IP_TAG_KEY)));
110110
#endif
111+
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag(LOG_RESERVED_KEY_SOURCE));
112+
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag(LOG_RESERVED_KEY_MACHINE_UUID));
111113
}
112114
{ // native branch default
113115
Json::Value config;
@@ -161,6 +163,8 @@ void ProcessorTagNativeUnittest::TestProcess() {
161163
APSARA_TEST_EQUAL_FATAL(LoongCollectorMonitor::GetInstance()->mIpAddr,
162164
eventGroup.GetTag(GetDefaultTagKeyString(TagKey::HOST_IP_TAG_KEY)));
163165
#endif
166+
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag(LOG_RESERVED_KEY_SOURCE));
167+
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag(LOG_RESERVED_KEY_MACHINE_UUID));
164168
}
165169
{ // native branch rename
166170
Json::Value config;
@@ -217,6 +221,8 @@ void ProcessorTagNativeUnittest::TestProcess() {
217221
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag("test_host_ip"));
218222
APSARA_TEST_EQUAL_FATAL(LoongCollectorMonitor::GetInstance()->mIpAddr, eventGroup.GetTag("test_host_ip"));
219223
#endif
224+
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag(LOG_RESERVED_KEY_SOURCE));
225+
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag(LOG_RESERVED_KEY_MACHINE_UUID));
220226
}
221227
{ // native branch delete
222228
Json::Value config;
@@ -266,6 +272,8 @@ void ProcessorTagNativeUnittest::TestProcess() {
266272
#else
267273
APSARA_TEST_FALSE_FATAL(eventGroup.HasTag(GetDefaultTagKeyString(TagKey::HOST_IP_TAG_KEY)));
268274
#endif
275+
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag(LOG_RESERVED_KEY_SOURCE));
276+
APSARA_TEST_TRUE_FATAL(eventGroup.HasTag(LOG_RESERVED_KEY_MACHINE_UUID));
269277
}
270278
}
271279

0 commit comments

Comments
 (0)