polish code

core/common/BoostRegexValidator.cpp

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <boost/regex.hpp>
 #include <boost/algorithm/string.hpp>
-#include "json/json.h"
+#include <json/json.h>
 
 using namespace std;
 

core/common/JsonUtil.h

@@ -19,7 +19,7 @@
 #include <cstdint>
 #include <string>
 
-#include "json/json.h"
+#include <json/json.h>
 
 namespace logtail {
 

core/common/YamlUtil.h

@@ -16,7 +16,7 @@
 
 #include <string>
 
-#include "json/json.h"
+#include <json/json.h>
 #include "yaml-cpp/yaml.h"
 
 namespace logtail {

core/config/provider/CommonConfigProvider.cpp

@@ -18,7 +18,7 @@
 #include <iostream>
 #include <random>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "app_config/AppConfig.h"
 #include "application/Application.h"

core/container_manager/ContainerDiscoveryOptions.h

@@ -20,7 +20,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "pipeline/PipelineContext.h"
 

core/file_server/DockerContainerPath.h

@@ -21,7 +21,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "log_pb/sls_logs.pb.h"
 

core/file_server/FileDiscoveryOptions.h

@@ -22,7 +22,7 @@
 #include <utility>
 #include <vector>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "file_server/DockerContainerPath.h"
 #include "pipeline/PipelineContext.h"

core/file_server/MultilineOptions.h

@@ -19,7 +19,7 @@
 #include <string>
 #include <utility>
 
-#include "json/json.h"
+#include <json/json.h>
 #include "boost/regex.hpp"
 
 #include "pipeline/PipelineContext.h"

core/flusher/FlusherSLS.h

@@ -23,7 +23,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "common/LogstoreFeedbackKey.h"
 

core/go_pipeline/LogtailPlugin.h

@@ -26,7 +26,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "flusher/FlusherSLS.h"
 #include "log_pb/sls_logs.pb.h"

core/observer/network/NetworkConfig.cpp

@@ -16,7 +16,7 @@
 #include <sstream>
 #include "LogtailAlarm.h"
 #include "logger/Logger.h"
-#include "json/json.h"
+#include <json/json.h>
 #include "common/JsonUtil.h"
 #include "ExceptionBase.h"
 #include "input/InputObserverNetwork.h"

core/pipeline/GlobalConfig.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <unordered_set>
 
-#include "json/json.h"
+#include <json/json.h>
 
 namespace logtail {
 

core/pipeline/Pipeline.h

@@ -21,7 +21,7 @@
 #include <memory>
 #include <unordered_map>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "config/Config.h"
 #include "models/PipelineEventGroup.h"

core/plugin/instance/FlusherInstance.h

@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "plugin/instance/PluginInstance.h"
 #include "plugin/interface/Flusher.h"

core/plugin/instance/InputInstance.h

@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "plugin/instance/PluginInstance.h"
 #include "plugin/interface/Input.h"

core/plugin/instance/ProcessorInstance.h

@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "models/PipelineEventGroup.h"
 #include "monitor/LogtailMetric.h"

core/plugin/interface/Flusher.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "plugin/interface/Plugin.h"
 

core/plugin/interface/Input.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "json/json.h"
+#include <json/json.h>
 
 #include "plugin/interface/Plugin.h"
 

core/plugin/interface/Processor.h

@@ -16,8 +16,10 @@
 
 #pragma once
 
-#include "json/json.h"
+#include <json/json.h>
 
+#include "models/PipelineEventGroup.h"
+#include "models/PipelineEventPtr.h"
 #include "plugin/interface/Plugin.h"
 
 namespace logtail {

core/processor/ProcessorSplitLogStringNative.cpp

@@ -16,37 +16,38 @@
 
 #include "processor/ProcessorSplitLogStringNative.h"
 
-#include <string>
-
-#include "common/Constants.h"
 #include "common/ParamExtractor.h"
 #include "models/LogEvent.h"
-#include "monitor/MetricConstants.h"
-#include "plugin/instance/ProcessorInstance.h"
 
 namespace logtail {
+
 const std::string ProcessorSplitLogStringNative::sName = "processor_split_string_native";
 
 bool ProcessorSplitLogStringNative::Init(const Json::Value& config) {
     std::string errorMsg;
-    // SplitKey
-    if (!GetOptionalStringParam(config, "SplitKey", mSplitKey, errorMsg)) {
-        PARAM_WARNING_DEFAULT(mContext->GetLogger(), errorMsg, mSplitKey, sName, mContext->GetConfigName());
+
+    // SourceKey
+    if (!GetOptionalStringParam(config, "SourceKey", mSourceKey, errorMsg)) {
+        PARAM_WARNING_DEFAULT(mContext->GetLogger(), errorMsg, mSourceKey, sName, mContext->GetConfigName());
     }
-    // Compatible with old logic.
+
+    // SplitChar
     int32_t splitter = '\n';
     if (!GetOptionalIntParam(config, "SplitChar", splitter, errorMsg)) {
         PARAM_WARNING_DEFAULT(mContext->GetLogger(), errorMsg, "\\n", sName, mContext->GetConfigName());
     } else {
         mSplitChar = static_cast<char>(splitter);
     }
+
     // AppendingLogPositionMeta
     if (!GetOptionalBoolParam(config, "AppendingLogPositionMeta", mAppendingLogPositionMeta, errorMsg)) {
         PARAM_WARNING_DEFAULT(
             mContext->GetLogger(), errorMsg, mAppendingLogPositionMeta, sName, mContext->GetConfigName());
     }
+
     mFeedLines = &(GetContext().GetProcessProfile().feedLines);
     mSplitLines = &(GetContext().GetProcessProfile().splitLines);
+
     return true;
 }
 
@@ -76,11 +77,11 @@ void ProcessorSplitLogStringNative::ProcessEvent(PipelineEventGroup& logGroup,
         return;
     }
     const LogEvent& sourceEvent = e.Cast<LogEvent>();
-    if (!sourceEvent.HasContent(mSplitKey)) {
+    if (!sourceEvent.HasContent(mSourceKey)) {
         newEvents.emplace_back(e);
         return;
     }
-    StringView sourceVal = sourceEvent.GetContent(mSplitKey);
+    StringView sourceVal = sourceEvent.GetContent(mSourceKey);
     std::vector<StringView> logIndex; // all splitted logs
     int feedLines = 0;
     LogSplit(sourceVal.data(), sourceVal.size(), feedLines, logIndex);
@@ -90,7 +91,7 @@ void ProcessorSplitLogStringNative::ProcessEvent(PipelineEventGroup& logGroup,
     if (sourceEvent.HasContent(LOG_RESERVED_KEY_FILE_OFFSET)) {
         sourceoffset = atol(sourceEvent.GetContent(LOG_RESERVED_KEY_FILE_OFFSET).data()); // use safer method
     }
-    StringBuffer splitKey = logGroup.GetSourceBuffer()->CopyString(mSplitKey);
+    StringBuffer splitKey = logGroup.GetSourceBuffer()->CopyString(mSourceKey);
     for (auto& content : logIndex) {
         std::unique_ptr<LogEvent> targetEvent = LogEvent::CreateEvent(logGroup.GetSourceBuffer());
         targetEvent->SetTimestamp(
@@ -104,7 +105,7 @@ void ProcessorSplitLogStringNative::ProcessEvent(PipelineEventGroup& logGroup,
         }
         if (sourceEvent.GetContents().size() > 1) { // copy other fields
             for (auto& kv : sourceEvent.GetContents()) {
-                if (kv.first != mSplitKey && kv.first != LOG_RESERVED_KEY_FILE_OFFSET) {
+                if (kv.first != mSourceKey && kv.first != LOG_RESERVED_KEY_FILE_OFFSET) {
                     targetEvent->SetContentNoCopy(kv.first, kv.second);
                 }
             }

core/processor/ProcessorSplitLogStringNative.h

@@ -1,48 +1,54 @@
 /*
-* Copyright 2023 iLogtail Authors
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright 2023 iLogtail Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #pragma once
 
+#include <cstdint>
+#include <vector>
+
+#include "common/Constants.h"
 #include "plugin/interface/Processor.h"
 
 namespace logtail {
 
 class ProcessorSplitLogStringNative : public Processor {
 public:
-   static const std::string sName;
+    static const std::string sName;
 
-   std::string mSplitKey = DEFAULT_CONTENT_KEY;
-   char mSplitChar = '\n';
-   bool mAppendingLogPositionMeta = false;
+    std::string mSourceKey = DEFAULT_CONTENT_KEY;
+    char mSplitChar = '\n';
+    bool mAppendingLogPositionMeta = false;
 
-   const std::string& Name() const override { return sName; }
-   bool Init(const Json::Value& config) override;
-   void Process(PipelineEventGroup& logGroup) override;
+    const std::string& Name() const override { return sName; }
+    bool Init(const Json::Value& config) override;
+    void Process(PipelineEventGroup& logGroup) override;
 
 protected:
-   bool IsSupportedEvent(const PipelineEventPtr& e) const override;
+    bool IsSupportedEvent(const PipelineEventPtr& e) const override;
 
 private:
-   void ProcessEvent(PipelineEventGroup& logGroup, const PipelineEventPtr& e, EventsContainer& newEvents);
-   void LogSplit(const char* buffer, int32_t size, int32_t& lineFeed, std::vector<StringView>& logIndex);
-   int* mFeedLines = nullptr;
-   int* mSplitLines = nullptr;
+    void ProcessEvent(PipelineEventGroup& logGroup, const PipelineEventPtr& e, EventsContainer& newEvents);
+    void LogSplit(const char* buffer, int32_t size, int32_t& lineFeed, std::vector<StringView>& logIndex);
+
+    int* mFeedLines = nullptr;
+    int* mSplitLines = nullptr;
+
 #ifdef APSARA_UNIT_TEST_MAIN
-   friend class ProcessorRegexStringNativeUnittest;
-   friend class ProcessorParseDelimiterNativeUnittest;
+    friend class ProcessorRegexStringNativeUnittest;
+    friend class ProcessorParseDelimiterNativeUnittest;
 #endif
 };