Skip to content

support V2 config #1188

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.

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

Merged
merged 130 commits into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
756d817
complete pipeline definition (#1185)
henryzhx8 Oct 18, 2023
04b64ad
polish code
henryzhx8 Oct 18, 2023
5b301b9
Merge remote-tracking branch 'upstream/main' into feat/pipeline
henryzhx8 Oct 19, 2023
ef6b2a0
polish code
henryzhx8 Oct 19, 2023
5b76185
add pipeline implementation
henryzhx8 Oct 21, 2023
18ce59b
Merge remote-tracking branch 'upstream/main' into feat/pipeline
henryzhx8 Oct 21, 2023
b81b5bf
polish code
henryzhx8 Oct 21, 2023
b0fb7b0
seperate params from input_file
henryzhx8 Oct 22, 2023
255e512
polish code
henryzhx8 Oct 23, 2023
fbe3121
polish code
henryzhx8 Oct 23, 2023
a3ccba1
add file server
henryzhx8 Oct 23, 2023
f9af3e4
polish code
henryzhx8 Oct 24, 2023
fe77de3
polish code
henryzhx8 Oct 24, 2023
e2b622a
polish code
henryzhx8 Oct 24, 2023
957f820
Merge remote-tracking branch 'upstream/main' into feat/pipeline
henryzhx8 Oct 29, 2023
ae09dbb
fix bug
henryzhx8 Oct 29, 2023
adc9d3f
polish code
henryzhx8 Oct 29, 2023
e8b30b4
fix bug
henryzhx8 Oct 30, 2023
01c138d
polish code
henryzhx8 Oct 30, 2023
73f1dc4
refactor code
henryzhx8 Oct 30, 2023
5a0083f
refactor event dispatcher
henryzhx8 Oct 31, 2023
77eb3db
remove global filter
henryzhx8 Oct 31, 2023
39a35ae
refactor app config
henryzhx8 Oct 31, 2023
22be81f
remove shennong and streamlog
henryzhx8 Oct 31, 2023
25a3418
fix bug
henryzhx8 Oct 31, 2023
a16470d
upgrade V1 config to V2
henryzhx8 Oct 31, 2023
6cecdf1
fix bug
henryzhx8 Oct 31, 2023
a341cda
refactor pipeline management
henryzhx8 Nov 14, 2023
5819cfe
add ut
henryzhx8 Nov 15, 2023
696ddb1
add ut
henryzhx8 Nov 16, 2023
05fa6a3
fix e2e
henryzhx8 Nov 16, 2023
4921b06
polish code
henryzhx8 Nov 17, 2023
fc7784a
for tmp use
henryzhx8 Nov 18, 2023
1974bfd
for tmp use
henryzhx8 Nov 18, 2023
be7981a
polish code
henryzhx8 Nov 19, 2023
6bf179f
for tmp use
henryzhx8 Nov 19, 2023
ae7d4d6
for tmp use
henryzhx8 Nov 19, 2023
5e56fa0
fix
henryzhx8 Nov 19, 2023
565337f
fix e2e
henryzhx8 Nov 20, 2023
a7eebaf
temporarily remove observer case
henryzhx8 Nov 20, 2023
0270a36
fix e2e
henryzhx8 Nov 20, 2023
0b51b20
fix e2e
henryzhx8 Nov 20, 2023
2b7123f
polish code
henryzhx8 Nov 20, 2023
d4e558b
Yaml (#3)
quzard Nov 20, 2023
83e0a92
polish code
henryzhx8 Nov 20, 2023
fb24ba3
fix e2e
henryzhx8 Nov 21, 2023
e51de7e
remove old config
henryzhx8 Nov 21, 2023
46ef30c
cleanup gflags
henryzhx8 Nov 21, 2023
7ff3f01
merge main into branch
henryzhx8 Nov 21, 2023
82472c0
fix bug
henryzhx8 Nov 21, 2023
dc5ec41
merge main into branch
henryzhx8 Nov 21, 2023
a5c4cd8
merge pipeline into branch
henryzhx8 Nov 21, 2023
42fba17
polish code
henryzhx8 Nov 23, 2023
98bd681
polish code
henryzhx8 Nov 23, 2023
263a4d3
polish code
henryzhx8 Nov 23, 2023
f6a8588
fix bug
henryzhx8 Nov 24, 2023
b245b70
polish code
henryzhx8 Nov 24, 2023
3f8fba6
polish code
henryzhx8 Nov 24, 2023
f7ab5d9
fix code
henryzhx8 Nov 26, 2023
330d390
polish code
henryzhx8 Nov 26, 2023
1c457aa
polish
henryzhx8 Nov 26, 2023
bdf622a
fix code
henryzhx8 Nov 26, 2023
340db5c
fix
henryzhx8 Nov 26, 2023
04a2fa7
fix
henryzhx8 Nov 27, 2023
924a95c
polish code
henryzhx8 Nov 27, 2023
d00df4c
fix
henryzhx8 Nov 27, 2023
4843055
fix
henryzhx8 Nov 28, 2023
57694f7
fix
henryzhx8 Nov 28, 2023
10a62a3
polish
henryzhx8 Nov 28, 2023
a2a1f16
polish
henryzhx8 Nov 28, 2023
b6069cc
polish code
henryzhx8 Nov 28, 2023
6b41e7c
test
henryzhx8 Nov 28, 2023
790db9c
merge upstream/main into branch
henryzhx8 Nov 28, 2023
cca9087
merge upstream/pipeline into branch
henryzhx8 Nov 28, 2023
22f76fd
test
henryzhx8 Nov 28, 2023
9f4cc0b
polish
henryzhx8 Nov 29, 2023
0e6d6fd
fix observer
henryzhx8 Nov 29, 2023
0564f97
polish test
henryzhx8 Nov 29, 2023
d1413e6
fix code
henryzhx8 Nov 29, 2023
3a5d24f
polish code
henryzhx8 Nov 29, 2023
53a27ba
polish code
henryzhx8 Nov 29, 2023
7781d0a
fix bug
henryzhx8 Nov 30, 2023
566a118
Pipeline processor (#2)
quzard Nov 30, 2023
2fdaa44
polish code
henryzhx8 Dec 3, 2023
23c41d6
polish
henryzhx8 Dec 3, 2023
1e685f7
polish
henryzhx8 Dec 3, 2023
6da4fb3
polish code
henryzhx8 Dec 4, 2023
3426d6d
Merge pull request #1238 from henryzhx8/stage4
henryzhx8 Dec 4, 2023
c3d0a9a
polish code
henryzhx8 Dec 4, 2023
500a83b
In order to achieve a relatively unified interface for SPL and other …
linrunqi08 Dec 5, 2023
3e8b2b1
polish code
henryzhx8 Dec 5, 2023
689c977
Merge remote-tracking branch 'upstream/feat/pipeline' into feat/pipeline
henryzhx8 Dec 5, 2023
f3fbeb2
polish
henryzhx8 Dec 5, 2023
5763b6a
polish
henryzhx8 Dec 5, 2023
71ae546
polish code
henryzhx8 Dec 5, 2023
61c31fd
polish
henryzhx8 Dec 5, 2023
0ecc49c
fix code
henryzhx8 Dec 6, 2023
75d3d24
fix
henryzhx8 Dec 6, 2023
2875046
fix
henryzhx8 Dec 7, 2023
229f4df
polish code
henryzhx8 Dec 7, 2023
8215df6
add log
henryzhx8 Dec 7, 2023
03451e0
fix
henryzhx8 Dec 7, 2023
7ae34b3
fix bug
henryzhx8 Dec 7, 2023
209d6c6
fix
henryzhx8 Dec 8, 2023
759d499
fix bug
henryzhx8 Dec 8, 2023
28d87ed
polish
henryzhx8 Dec 8, 2023
b801628
fix
quzard Dec 8, 2023
ba72059
fix
quzard Dec 8, 2023
448925e
fix
quzard Dec 8, 2023
736b1b1
fix
quzard Dec 8, 2023
a2a6935
merge remote branch into feat/pipeline
henryzhx8 Dec 8, 2023
3e50f45
fix
henryzhx8 Dec 8, 2023
fd4ac3b
Merge remote-tracking branch 'github_alibaba/feat/pipeline' into merg…
SteveYitao Dec 8, 2023
46d4cee
Merge remote-tracking branch 'github_alibaba/main' into mergeMain
SteveYitao Dec 8, 2023
814b3eb
fix
henryzhx8 Dec 8, 2023
328f04b
Merge processor changes of main branches (#1259)
quzard Dec 8, 2023
801405e
Merge remote-tracking branch 'github_alibaba/feat/pipeline' into merg…
SteveYitao Dec 8, 2023
aa436b9
Merge pull request #1261 from quzard/mergeMain
henryzhx8 Dec 8, 2023
9c9286c
polish
henryzhx8 Dec 9, 2023
33fe1d0
Merge remote-tracking branch 'upstream/feat/pipeline' into feat/pipeline
henryzhx8 Dec 9, 2023
e5c8af9
add alarm
Dec 11, 2023
456f718
polish
Dec 11, 2023
2e5733e
polish
Dec 11, 2023
9f02230
polish
Dec 11, 2023
94ff42a
Merge remote-tracking branch 'upstream/main' into feat/pipeline
Dec 11, 2023
2a01ca6
polish code
Dec 11, 2023
49a3f07
polish
Dec 11, 2023
2121627
Merge remote-tracking branch 'upstream/main' into feat/pipeline
Dec 23, 2023
4a3747a
polish code
Dec 23, 2023
0998621
polish
Dec 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ AlwaysBreakTemplateDeclarations: true
IndentCaseLabels: true
SpaceAfterTemplateKeyword: true
SpaceBeforeCpp11BracedList: false
SortIncludes: false
SortIncludes: true
ReflowComments: true
AlignEscapedNewlinesLeft: false
AlignEscapedNewlines: DontAlign
Expand Down
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ignore build artifacts

build/
core/build/
output/
147 changes: 87 additions & 60 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,74 +1,101 @@
# editor
*.swp
*.swo
### VSCode
.vscode/*
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
# Local History for Visual Studio Code
.history/
# Built Visual Studio Code Extensions
*.vsix
# Dev Container
.devcontainer/

### GoLand
.idea

### MacOS
.DS_Store
# ctags generated file.
/tags
# backup files.
*.bak
/.devcontainer/
.AppleDouble
.LSOverride
# Thumbnails
._*

# go
/plugin_main/plugin_main
/pluginmanager/checkpoint/
*.prof
/plugin_main/checkpoint/*
*.LOG
*.LOG.*
*.test
plugin_logger.xml
license_coverage.txt
vendor
go.work
go.work.sum
### Common
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Compiled Static libraries
*.a
*.lib
# Executables
*.exe
*.out
*.app

# C++
CMakeFiles
### C++
# Prerequisites
*.d
# Compiled Object files
*.o
*.obj
# CMake
CMakeLists.txt.user
CMakeCache.txt
*.cmake
CMakeFiles
CMakeScripts
Testing
Makefile
*.cbp
*.a
/core/log_pb/*.pb.*
/core/build/
/core/common/Version.cpp
/core/installer/public/
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
Copy link
Collaborator

Choose a reason for hiding this comment

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

这些都是啥?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

cmake的gitignore模版里默认带的

_deps
# Custom
/build/
core/build/
core/log_pb/*.pb.*
core/common/Version.cpp
!/Makefile
!core/dependencies.cmake
!core/utils.cmake
!core/libulogfs.a
# Enterprise
core/installer/public/
core/unittest/ut.output/
core/test/**/report/

# output
e2e-test
/bin/
/generated_files/
/build/
/find_licenses/
*-test/

# vscode
.vscode
!.vscode/settings.json
!.vscode/launch.json
output
dist

# goland
.idea

# unit test
### Go
# Test binary, built with `go test -c`
*.test
# Dependency directories (remove the comment below to include it)
vendor/
# Go workspace file
go.work
go.work.sum
# Profile
*.prof
# Coverage
.coretestCoverage.txt
.testCoverage.txt
plugin_main/*.dll
plugin_main/*.so
plugin_main/*.json

# e2e report
report

# plugins
e2e-engine-coverage.txt
# Plugin
plugins/all/
/external_plugins.yml
*.go.mod
*.go.mod.sum
# Custom
plugin_logger.xml

### E2E
/*-test/

### License
find_licenses/
license_coverage.txt

### Others
*.bak
/bin/
/output/
/generated_files/
/dist/
/tags/
36 changes: 24 additions & 12 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
"version": "0.2.0",
"configurations": [
{
"name": "(gdb) Launch UT",
"name": "(gdb) Launch iLogtail",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/core/build/unittest/processor/processor_parse_timestamp_native_unittest",
"args": [],
"program": "${workspaceFolder}/output/ilogtail",
"args": [
"-ilogtail_disable_core=false"
],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/core/build/unittest/processor",
"environment": [],
"cwd": "${workspaceFolder}/output",
"externalConsole": false,
"MIMode": "gdb",
"miDebuggerPath": "/usr/bin/gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
Expand All @@ -26,16 +28,19 @@
]
},
{
"name": "(gdb) Launch ilogtail",
"name": "(ctest) Launch UT",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/core/build/ilogtail",
"args": [],
"program": "${cmake.testProgram}",
"args": [
"${cmake.testArgs}"
],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/core/build",
"cwd": "${cmake.testWorkingDirectory}",
"environment": [],
"externalConsole": false,
"MIMode": "gdb",
"miDebuggerPath": "/usr/bin/gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
Expand All @@ -50,11 +55,18 @@
]
},
{
"name": "(gdb) Attach ilogtail",
"name": "(gdb) Launch memory dump",
"type": "cppdbg",
"request": "attach",
"program": "${workspaceFolder}/core/build/ilogtail",
"request": "launch",
"program": "${workspaceFolder}/output/ilogtail",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/output",
"environment": [],
"externalConsole": false,
"coreDumpPath": "${workspaceFolder}/output/core",
"MIMode": "gdb",
"miDebuggerPath": "/usr/bin/gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
Expand Down
Loading