Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: prom textparser with simd #1947

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

feat: prom textparser with simd #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
483d230
feat: v1
catdogpandas Dec 7, 2024
5a86248
ut
catdogpandas Dec 7, 2024
1aa13f7
feat: simd v2
catdogpandas Dec 7, 2024
189fd7d
chore: change to SIMDTextParser
catdogpandas Dec 7, 2024
3dfc16a
chore: remove simd in processor
catdogpandas Dec 10, 2024
543b70f
chore: update code style
catdogpandas Dec 10, 2024
de02789
Merge branch 'main' into feat/prom-simd
catdogpandas Dec 16, 2024
732cd9f
feat: textparser with simd
catdogpandas Dec 17, 2024
012acb7
chore: remove textparser_simd ut
catdogpandas Dec 17, 2024
aa64981
chore: update ut
catdogpandas Dec 17, 2024
5f11f21
chore: update ut
catdogpandas Dec 17, 2024
2c8459f
chore: update macro define of SSE4.2
catdogpandas Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ else ()
endif ()

if (NOT WITHSPL)
add_definitions(-D__EXCLUDE_SPL__)
add_definitions(-D__EXCLUDE_SSE4_2__)
endif()

# Default C/CXX flags.
Expand Down
4 changes: 2 additions & 2 deletions core/pipeline/plugin/PluginRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include "plugin/processor/inner/ProcessorSplitLogStringNative.h"
#include "plugin/processor/inner/ProcessorSplitMultilineLogStringNative.h"
#include "plugin/processor/inner/ProcessorTagNative.h"
#if defined(__linux__) && !defined(__ANDROID__) && !defined(__EXCLUDE_SPL__)
#if defined(__linux__) && !defined(__ANDROID__) && !defined(__EXCLUDE_SSE4_2__)
#include "plugin/processor/ProcessorSPL.h"
#endif

Expand Down Expand Up @@ -154,7 +154,7 @@ void PluginRegistry::LoadStaticPlugins() {
RegisterProcessorCreator(new StaticProcessorCreator<ProcessorFilterNative>());
RegisterProcessorCreator(new StaticProcessorCreator<ProcessorPromParseMetricNative>());
RegisterProcessorCreator(new StaticProcessorCreator<ProcessorPromRelabelMetricNative>());
#if defined(__linux__) && !defined(__ANDROID__) && !defined(__EXCLUDE_SPL__)
#if defined(__linux__) && !defined(__ANDROID__) && !defined(__EXCLUDE_SSE4_2__)
if (BOOL_FLAG(enable_processor_spl)) {
RegisterProcessorCreator(new StaticProcessorCreator<ProcessorSPL>());
}
Expand Down
4 changes: 2 additions & 2 deletions core/plugin/processor/inner/ProcessorPromParseMetricNative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void ProcessorPromParseMetricNative::Process(PipelineEventGroup& eGroup) {
auto timestampMilliSec = StringTo<uint64_t>(scrapeTimestampMilliSecStr.to_string());
auto timestamp = timestampMilliSec / 1000;
auto nanoSec = timestampMilliSec % 1000 * 1000000;
TextParser parser(mScrapeConfigPtr->mHonorTimestamps);
prom::TextParser parser(mScrapeConfigPtr->mHonorTimestamps);
parser.SetDefaultTimestamp(timestamp, nanoSec);

for (auto& e : events) {
Expand All @@ -49,7 +49,7 @@ bool ProcessorPromParseMetricNative::IsSupportedEvent(const PipelineEventPtr& e)
bool ProcessorPromParseMetricNative::ProcessEvent(PipelineEventPtr& e,
EventsContainer& newEvents,
PipelineEventGroup& eGroup,
TextParser& parser) {
prom::TextParser& parser) {
if (!IsSupportedEvent(e)) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion core/plugin/processor/inner/ProcessorPromParseMetricNative.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ProcessorPromParseMetricNative : public Processor {
bool IsSupportedEvent(const PipelineEventPtr&) const override;

private:
bool ProcessEvent(PipelineEventPtr&, EventsContainer&, PipelineEventGroup&, TextParser& parser);
bool ProcessEvent(PipelineEventPtr&, EventsContainer&, PipelineEventGroup&, prom::TextParser& parser);
std::unique_ptr<ScrapeConfig> mScrapeConfigPtr;

#ifdef APSARA_UNIT_TEST_MAIN
Expand Down
Loading
Loading