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.

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

Support config server v2 provider #1633

Merged
merged 62 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
e510929
modify pb
quzard Jul 3, 2024
735ff23
Merge remote-tracking branch 'origin/main' into add-pb-v2-config
quzard Jul 5, 2024
e12c3c9
fix
quzard Jul 5, 2024
5fc1a8a
rm mAttributes
quzard Jul 5, 2024
ab3622a
rm FetchConfig
quzard Jul 5, 2024
5099796
rm SendHeartBeat
quzard Jul 5, 2024
ce7f50c
add ProcessSourceDir
quzard Jul 5, 2024
2d6f928
support CommonConfigProvider
quzard Jul 5, 2024
ecb0ae8
add FetchProcessConfigFromServer and FetchPipelineConfigFromServer
quzard Jul 5, 2024
b4c5c35
fix test
quzard Jul 5, 2024
29a5716
add config feedbacker
yyuuttaaoo Jul 7, 2024
632c4e2
fix loadconfigfile
yyuuttaaoo Jul 7, 2024
61f2236
heartbeat
quzard Jul 8, 2024
f7c71ff
Merge branch 'add-pb-v2-config' of github.com:quzard/ilogtail into ad…
quzard Jul 8, 2024
bcf2965
rm once from cpp
quzard Jul 8, 2024
73ed36e
add mProcessFileInfoMap
quzard Jul 8, 2024
2a35ce6
add CommandSource
quzard Jul 8, 2024
10bdd72
modify ConfigWatcher
quzard Jul 10, 2024
201596e
modify mRegion
quzard Jul 10, 2024
b631d23
modify operator=
quzard Jul 10, 2024
e965763
modify
quzard Jul 10, 2024
dfd8252
format
quzard Jul 10, 2024
fd9be79
modify
quzard Jul 10, 2024
1b64e88
Merge remote-tracking branch 'origin/main' into add-pb-v2-config
quzard Jul 15, 2024
2feaf90
fix Update
quzard Jul 15, 2024
e4270e6
add test
quzard Jul 15, 2024
210007e
add RegisterCallback
quzard Jul 15, 2024
a7679b3
fix
quzard Jul 15, 2024
2a1e6b8
format
quzard Jul 15, 2024
9620876
add test
quzard Jul 15, 2024
b6300f7
fix test
quzard Jul 15, 2024
0596d47
add FeedbackProcessConfigStatus
quzard Jul 16, 2024
8ae972e
rm callbacks
quzard Jul 16, 2024
6e37835
fix test
quzard Jul 16, 2024
2dd767c
add ConfigFeedbackableUnittest
quzard Jul 16, 2024
9b091f8
fix
quzard Jul 16, 2024
f4e6281
add GenerateCommandFeedBackKey
quzard Jul 16, 2024
3c086e3
LCOV_EXCL_STOP
quzard Jul 16, 2024
6ed5cb1
fix
quzard Jul 16, 2024
71d41ec
Merge remote-tracking branch 'origin/main' into add-pb-v2-config
quzard Jul 16, 2024
e3858c1
Merge remote-tracking branch 'origin/main' into support_configServerV…
quzard Jul 22, 2024
12d9207
SendHeartbeat
quzard Jul 22, 2024
e094fdc
add test
SteveYitao Jul 22, 2024
0b2a83c
fix
SteveYitao Jul 22, 2024
8a79bfd
ilogtail-community-edition/ilogtail-build-linux:2.0.4
SteveYitao Jul 22, 2024
d0a4e4d
fix
SteveYitao Jul 22, 2024
d9b046c
fix
SteveYitao Jul 22, 2024
4eb95b6
fix
quzard Jul 23, 2024
1d80710
Merge remote-tracking branch 'origin/main' into support_configServerV…
quzard Jul 23, 2024
5b21d39
fix
quzard Jul 23, 2024
c45d094
fix
quzard Jul 23, 2024
210767f
fix
quzard Jul 23, 2024
d411dc6
fix
quzard Jul 23, 2024
2c57855
fix
quzard Jul 23, 2024
c81faa4
fix
quzard Jul 23, 2024
b6d6c1c
fix
quzard Jul 23, 2024
a53126b
fix
quzard Jul 23, 2024
b60d492
fix
quzard Jul 23, 2024
951c5a3
fix
quzard Jul 23, 2024
97f257b
fix
quzard Jul 24, 2024
7a93d8a
fix
quzard Jul 24, 2024
12e71c9
Merge remote-tracking branch 'origin/main' into support_configServerV…
quzard Jul 30, 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 .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.2
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.4

ARG USERNAME=admin
USER root
Expand Down
2 changes: 1 addition & 1 deletion config_server/service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.2 as build
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.4 as build

USER root
WORKDIR /src
Expand Down
3 changes: 3 additions & 0 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ if (UNIX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
add_definitions(-DVIRTUAL=virtual)
else()
add_definitions(-DVIRTUAL= )
quzard marked this conversation as resolved.
Show resolved Hide resolved
endif ()
elseif (MSVC)
add_definitions(-DNOMINMAX)
Expand Down
5 changes: 4 additions & 1 deletion core/application/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
#endif
#else
#include "config/provider/CommonConfigProvider.h"
#include "config/provider/LegacyCommonConfigProvider.h"
#endif
#include "queue/ExactlyOnceQueueManager.h"
#include "queue/SenderQueueManager.h"
Expand Down Expand Up @@ -227,7 +228,8 @@ void Application::Start() { // GCOVR_EXCL_START
EnterpriseConfigProvider::GetInstance()->Init("enterprise");
LegacyConfigProvider::GetInstance()->Init("legacy");
#else
CommonConfigProvider::GetInstance()->Init("common");
CommonConfigProvider::GetInstance()->Init("common_v2");
LegacyCommonConfigProvider::GetInstance()->Init("common");
#endif

LogtailAlarm::GetInstance()->Init();
Expand Down Expand Up @@ -353,6 +355,7 @@ void Application::Exit() {
LegacyConfigProvider::GetInstance()->Stop();
#else
CommonConfigProvider::GetInstance()->Stop();
LegacyCommonConfigProvider::GetInstance()->Stop();
#endif

LogtailMonitor::GetInstance()->Stop();
Expand Down
1 change: 1 addition & 0 deletions core/application/Application.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class Application {

std::string GetInstanceId() { return mInstanceId; }
bool TryGetUUID();
int32_t GetStartTime() {return mStartTime;}
std::string GetUUID() {
mUUIDLock.lock();
std::string uuid(mUUID);
Expand Down
Loading
Loading