fix

Author: KayzzzZ

Diff for: core/collection_pipeline/serializer/SLSSerializer.cpp

@@ -128,8 +128,6 @@ bool SLSEventGroupSerializer::Serialize(BatchedEvents&& group, string& res, stri
                 }
                 if (e.Is<UntypedSingleValue>()) {
                     metricEventContentCache[i].first = to_string(e.GetValue<UntypedSingleValue>()->mValue);
-                    // should not happen
-                    LOG_DEBUG(sLogger, ("config", mFlusher->GetContext().GetConfigName())("metricname", e.GetName()));
                 } else {
                     // untyped multi value is not supported
                     LOG_WARNING(sLogger,
@@ -153,18 +151,6 @@ bool SLSEventGroupSerializer::Serialize(BatchedEvents&& group, string& res, stri
         case PipelineEvent::Type::SPAN:
             for (size_t i = 0; i < group.mEvents.size(); ++i) {
                 const auto& e = group.mEvents[i].Cast<SpanEvent>();
-                if (SHOULD_LOG_DEBUG(sLogger)) {
-                    for (auto tag = e.TagsBegin(); tag != e.TagsEnd(); tag++) {
-                        LOG_DEBUG(sLogger,
-                                  ("event tags for spanname", std::string(e.GetName()))(std::string(tag->first),
-                                                                                        std::string(tag->second)));
-                    }
-                    for (auto tag = group.mTags.mInner.begin(); tag != group.mTags.mInner.end(); tag++) {
-                        LOG_DEBUG(sLogger,
-                                  ("group tags for spanname", std::string(e.GetName()))(std::string(tag->first),
-                                                                                        std::string(tag->second)));
-                    }
-                }
                 size_t contentSZ = 0;
                 contentSZ += GetLogContentSize(DEFAULT_TRACE_TAG_TRACE_ID.size(), e.GetTraceId().size());
                 contentSZ += GetLogContentSize(DEFAULT_TRACE_TAG_SPAN_ID.size(), e.GetSpanId().size());

Diff for: core/ebpf/plugin/network_observer/Connection.cpp

@@ -161,15 +161,12 @@ void Connection::TryUpdateProtocolAttr() {
         mTags.SetNoCopy<kRpcType>(RPC_25_STR);
         mTags.SetNoCopy<kCallKind>(HTTP_CLIENT_STR);
         mTags.SetNoCopy<kCallType>(HTTP_CLIENT_STR);
-        MarkL7MetaAttached();
     } else if (mRole == support_role_e::IsServer) {
         mTags.SetNoCopy<kRpcType>(RPC_0_STR);
         mTags.SetNoCopy<kCallKind>(HTTP_STR);
         mTags.SetNoCopy<kCallType>(HTTP_STR);
-        MarkL7MetaAttached();
     }
-
-    return;
+    MarkL7MetaAttached();
 }
 
 void Connection::UpdateNetMetaAttr(struct conn_stats_event_t* event) {
@@ -228,10 +225,6 @@ void Connection::UpdateNetMetaAttr(struct conn_stats_event_t* event) {
 }
 
 void Connection::UpdateSelfPodMeta(const std::shared_ptr<K8sPodInfo>& pod) {
-    if (IsSelfMetaAttachReady()) {
-        return;
-    }
-
     if (!pod) {
         // no meta info ...
         LOG_WARNING(sLogger, ("no pod info ... cid:", mTags.Get<kContainerId>()));
@@ -269,10 +262,6 @@ void Connection::UpdatePeerPodMetaForExternal() {
 }
 
 void Connection::UpdatePeerPodMetaForLocalhost() {
-    if (IsPeerMetaAttachReady()) {
-        return;
-    }
-
     mTags.SetNoCopy<kPeerAppName>(LOCALHOST_STR);
     mTags.SetNoCopy<kPeerPodName>(LOCALHOST_STR);
     mTags.SetNoCopy<kPeerPodIp>(LOCALHOST_STR);
@@ -285,10 +274,6 @@ void Connection::UpdatePeerPodMetaForLocalhost() {
 }
 
 void Connection::UpdateSelfPodMetaForUnknown() {
-    if (IsSelfMetaAttachReady()) {
-        return;
-    }
-
     mTags.SetNoCopy<kAppName>(UNKNOWN_STR);
     mTags.SetNoCopy<kAppId>(UNKNOWN_STR);
     mTags.SetNoCopy<kPodIp>(UNKNOWN_STR);
@@ -299,12 +284,8 @@ void Connection::UpdateSelfPodMetaForUnknown() {
 }
 
 void Connection::UpdatePeerPodMeta(const std::shared_ptr<K8sPodInfo>& pod) {
-    if (IsPeerMetaAttachReady()) {
-        return;
-    }
     if (!pod) {
         // no meta info ...
-
         return;
     }
 
@@ -376,7 +357,6 @@ void Connection::TryAttachPeerMeta(bool enable, int family, uint32_t ip) {
     }
 
     if (IsLocalhost()) {
-        LOG_DEBUG(sLogger, ("remote ip is localhost", "attach localhost for peer pod meta"));
         UpdatePeerPodMetaForLocalhost();
         MarkPeerMetaAttached();
         return;