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

Jump to bottom

fix: refactor multiline split state #1410

Merged
merged 16 commits into from
Mar 29, 2024
Merged

fix: refactor multiline split state #1410

merged 16 commits into from
Mar 29, 2024

Conversation

Abingcbc
Copy link
Collaborator

No description provided.

@CLAassistant
Copy link

CLAassistant commented Mar 19, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@Abingcbc Abingcbc force-pushed the refactor-multiline branch from 0011ac6 to 9fd9a68 Compare March 19, 2024 11:33
henryzhx8
henryzhx8 reviewed Mar 20, 2024
View reviewed changes
Copy link
Collaborator

@henryzhx8 henryzhx8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feedlines相关的都删了，这个实际用不到，是个废指标

core/processor/ProcessorSplitRegexNative.h Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
henryzhx8
henryzhx8 requested changes Mar 20, 2024
View reviewed changes
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
henryzhx8
henryzhx8 reviewed Mar 20, 2024
View reviewed changes
Copy link
Collaborator

@henryzhx8 henryzhx8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

形式上和merge完全对齐，unmatch的时候就直接打印日志，不用再维护discardIndex之类的。

henryzhx8
henryzhx8 requested changes Mar 21, 2024
View reviewed changes
Copy link
Collaborator

@henryzhx8 henryzhx8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

插件名称改成SplitMultilineLogStringNative

core/file_server/MultilineOptions.h Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitRegexNative.h Outdated Show resolved Hide resolved
@Abingcbc Abingcbc requested a review from henryzhx8 March 21, 2024 07:49
henryzhx8
henryzhx8 requested changes Mar 22, 2024
View reviewed changes
core/processor/ProcessorSplitMultilineLogStringNative.h Outdated Show resolved Hide resolved
core/processor/ProcessorSplitMultilineLogStringNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitMultilineLogStringNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitMultilineLogStringNative.cpp Outdated Show resolved Hide resolved
core/processor/ProcessorSplitMultilineLogStringNative.cpp Outdated Show resolved Hide resolved
core/unittest/processor/ProcessorSplitMultilineLogStringNativeUnittest.cpp Outdated Show resolved Hide resolved
core/unittest/processor/ProcessorSplitMultilineLogStringNativeUnittest.cpp Show resolved Hide resolved
core/unittest/processor/ProcessorSplitMultilineLogStringNativeUnittest.cpp Outdated Show resolved Hide resolved
core/unittest/processor/ProcessorSplitMultilineLogStringNativeUnittest.cpp Outdated Show resolved Hide resolved
henryzhx8
henryzhx8 requested changes Mar 25, 2024
View reviewed changes
Copy link
Collaborator

@henryzhx8 henryzhx8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. 指标有误，需要完善一下
  2. handleunmatch那边，只需打印第一条日志和有多少行不匹配就可以了

@Abingcbc Abingcbc requested a review from henryzhx8 March 26, 2024 06:11
@yyuuttaaoo yyuuttaaoo merged commit f4f444a into alibaba:main Mar 29, 2024
15 checks passed
@yyuuttaaoo yyuuttaaoo added the enhancement Feature enhancement label Mar 29, 2024
@yyuuttaaoo yyuuttaaoo changed the title fix: refactor split state fix: refactor multiline split state Mar 29, 2024
@yyuuttaaoo yyuuttaaoo added this to the v2.1 milestone Apr 28, 2024
@Abingcbc Abingcbc deleted the refactor-multiline branch November 27, 2024 03:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henryzhx8 henryzhx8 henryzhx8 approved these changes

@yyuuttaaoo yyuuttaaoo yyuuttaaoo approved these changes

@messixukejia messixukejia Awaiting requested review from messixukejia

Assignees
No one assigned
Labels
enhancement Feature enhancement
Projects
None yet
Milestone
v2.1
Development

Successfully merging this pull request may close these issues.
4 participants
@Abingcbc @CLAassistant @yyuuttaaoo @henryzhx8