Revert "feat: support go to cpp PipelineEventGroup transfer (#1771)" (#…

…1808)

This reverts commit 0bdbe66.

.gitignore

@@ -55,7 +55,7 @@ _deps
 # Custom
 /build/
 core/build/
-core/protobuf/*/*.pb.*
+core/protobuf/sls/*.pb.*
 core/common/Version.cpp
 !/Makefile
 # Enterprise

core/CMakeLists.txt

@@ -117,7 +117,7 @@ set(SUB_DIRECTORIES_LIST
         config config/watcher
         pipeline pipeline/batch pipeline/limiter pipeline/plugin pipeline/plugin/creator pipeline/plugin/instance pipeline/plugin/interface pipeline/queue pipeline/route pipeline/serializer
         runner runner/sink/http
-        protobuf/sls protobuf/models
+        protobuf/sls
         file_server file_server/event file_server/event_handler file_server/event_listener file_server/reader file_server/polling
         prometheus prometheus/labels prometheus/schedulers prometheus/async
         ebpf ebpf/observer ebpf/security ebpf/handler

core/dependencies.cmake

@@ -131,9 +131,6 @@ logtail_define(protobuf_BIN "Absolute path to protoc" "${DEPS_BINARY_ROOT}/proto
 set(PROTO_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/protobuf/sls")
 set(PROTO_FILES ${PROTO_FILE_PATH}/sls_logs.proto ${PROTO_FILE_PATH}/logtail_buffer_meta.proto ${PROTO_FILE_PATH}/metric.proto ${PROTO_FILE_PATH}/checkpoint.proto)
 execute_process(COMMAND ${protobuf_BIN} --proto_path=${PROTO_FILE_PATH} --cpp_out=${PROTO_FILE_PATH} ${PROTO_FILES})
-set(PROTO_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/protobuf/models")
-set(PROTO_FILES ${PROTO_FILE_PATH}/log_event.proto ${PROTO_FILE_PATH}/metric_event.proto ${PROTO_FILE_PATH}/span_event.proto ${PROTO_FILE_PATH}/pipeline_event_group.proto)
-execute_process(COMMAND ${protobuf_BIN} --proto_path=${PROTO_FILE_PATH} --cpp_out=${PROTO_FILE_PATH} ${PROTO_FILES})
 
 # re2
 macro(link_re2 target_name)

core/go_pipeline/LogtailPlugin.cpp

@@ -616,4 +616,3 @@ K8sContainerMeta LogtailPlugin::GetContainerMeta(const string& containerID) {
     }
     return K8sContainerMeta();
 }
-

core/models/LogEvent.cpp

@@ -56,15 +56,15 @@ void LogEvent::SetContentNoCopy(const StringBuffer& key, const StringBuffer& val
 }
 
 void LogEvent::SetContentNoCopy(StringView key, StringView val) {
-    auto rst = mIndex.insert(make_pair(key, mContents.size()));
-    if (!rst.second) {
-        auto& it = rst.first;
+    auto it = mIndex.find(key);
+    if (it != mIndex.end()) {
         auto& field = mContents[it->second].first;
         mAllocatedContentSize += key.size() + val.size() - field.first.size() - field.second.size();
         field = make_pair(key, val);
     } else {
         mAllocatedContentSize += key.size() + val.size();
         mContents.emplace_back(make_pair(key, val), true);
+        mIndex[key] = mContents.size() - 1;
     }
 }
 
@@ -78,11 +78,6 @@ void LogEvent::DelContent(StringView key) {
     }
 }
 
-void LogEvent::SetLevel(const std::string& level) {
-    const StringBuffer& b = GetSourceBuffer()->CopyString(level); 
-    mLevel = StringView(b.data, b.size);
-}
-
 LogEvent::ContentIterator LogEvent::FindContent(StringView key) {
     auto it = mIndex.find(key);
     if (it != mIndex.end()) {

core/models/LogEvent.h

@@ -81,14 +81,11 @@ class LogEvent : public PipelineEvent {
     void SetContentNoCopy(StringView key, StringView val);
     void DelContent(StringView key);
 
-    void SetPosition(uint64_t offset, uint64_t size) {
+    void SetPosition(uint32_t offset, uint32_t size) {
         mFileOffset = offset;
         mRawSize = size;
     }
-    std::pair<uint64_t, uint64_t> GetPosition() const { return {mFileOffset, mRawSize}; }
-
-    StringView GetLevel() const { return mLevel; }
-    void SetLevel(const std::string& level);
+    std::pair<uint32_t, uint32_t> GetPosition() const { return {mFileOffset, mRawSize}; }
 
     bool Empty() const { return mIndex.empty(); }
     size_t Size() const { return mIndex.size(); }
@@ -120,9 +117,8 @@ class LogEvent : public PipelineEvent {
     ContentsContainer mContents;
     size_t mAllocatedContentSize = 0;
     std::map<StringView, size_t> mIndex;
-    uint64_t mFileOffset = 0;
-    uint64_t mRawSize = 0;
-    StringView mLevel;
+    uint32_t mFileOffset = 0;
+    uint32_t mRawSize = 0;
 };
 
 } // namespace logtail

core/models/SpanEvent.h

@@ -58,9 +58,6 @@ class SpanEvent : public PipelineEvent {
         void SetTagNoCopy(const StringBuffer& key, const StringBuffer& val);
         void SetTagNoCopy(StringView key, StringView val);
         void DelTag(StringView key);
-        std::map<StringView, StringView>::const_iterator TagsBegin() const { return mTags.mInner.begin(); }
-        std::map<StringView, StringView>::const_iterator TagsEnd() const { return mTags.mInner.end(); }
-        size_t TagsSize() const { return mTags.mInner.size(); }
 
         std::shared_ptr<SourceBuffer>& GetSourceBuffer();
 
@@ -98,9 +95,6 @@ class SpanEvent : public PipelineEvent {
         void SetTagNoCopy(const StringBuffer& key, const StringBuffer& val);
         void SetTagNoCopy(StringView key, StringView val);
         void DelTag(StringView key);
-        std::map<StringView, StringView>::const_iterator TagsBegin() const { return mTags.mInner.begin(); }
-        std::map<StringView, StringView>::const_iterator TagsEnd() const { return mTags.mInner.end(); }
-        size_t TagsSize() const { return mTags.mInner.size(); }
 
         std::shared_ptr<SourceBuffer>& GetSourceBuffer();
 
@@ -159,9 +153,6 @@ class SpanEvent : public PipelineEvent {
     void SetTagNoCopy(const StringBuffer& key, const StringBuffer& val);
     void SetTagNoCopy(StringView key, StringView val);
     void DelTag(StringView key);
-    std::map<StringView, StringView>::const_iterator TagsBegin() const { return mTags.mInner.begin(); }
-    std::map<StringView, StringView>::const_iterator TagsEnd() const { return mTags.mInner.end(); }
-    size_t TagsSize() const { return mTags.mInner.size(); }
 
     const std::vector<InnerEvent>& GetEvents() const { return mEvents; }
     InnerEvent* AddEvent();
@@ -179,9 +170,6 @@ class SpanEvent : public PipelineEvent {
     void SetScopeTagNoCopy(const StringBuffer& key, const StringBuffer& val);
     void SetScopeTagNoCopy(StringView key, StringView val);
     void DelScopeTag(StringView key);
-    std::map<StringView, StringView>::const_iterator ScopeTagsBegin() const { return mScopeTags.mInner.begin(); }
-    std::map<StringView, StringView>::const_iterator ScopeTagsEnd() const { return mScopeTags.mInner.end(); }
-    size_t ScopeTagsSize() const { return mScopeTags.mInner.size(); }
 
     size_t DataSize() const override;