alibaba · yyuuttaaoo · Nov 28, 2024 · Nov 26, 2024 · Nov 26, 2024 · Nov 27, 2024
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -45,4 +45,4 @@ RUN source /tmp/.env && rm /tmp/.env; \
 
 USER $USERNAME
 
-RUN go env -w GO111MODULE=on && go env -w GOPROXY=https://goproxy.cn,direct
+RUN go env -w GO111MODULE=on && go env -w GOPROXY=https://goproxy.cn,direct
diff --git a/.github/workflows/build-core-ut.yaml b/.github/workflows/build-core-ut.yaml
@@ -76,14 +76,17 @@ jobs:
           WITHOUTGDB: ON
           MAKE_JOBS: 16
           WITHSPL: ON
-          # BUILD_TYPE: Debug # TODO: Uncomment when memory management is refined
+          BUILD_TYPE: Debug
         run: CURRENT_DIR=$(pwd) && sed -i "s|/src|$CURRENT_DIR|g" docker/Dockerfile_build && make core PATH_IN_DOCKER=$(pwd)
 
+      - name: Build Coverage Image
+        run: docker build -t unittest_coverage -f ./docker/Dockerfile_coverage .
+
       - name: Unit Test
-        run: make unittest_core
+        run: docker run -v $(pwd):$(pwd) unittest_coverage bash -c "cd $(pwd) && make unittest_core"
 
       - name: Unit Test Coverage
-        run: docker build -t unittest_coverage -f ./docker/Dockerfile_coverage . && docker run -v $(pwd):$(pwd) unittest_coverage bash -c "cd $(pwd)/core && gcovr --gcov-ignore-errors=no_working_dir_found --root . --json coverage.json --json-summary-pretty --json-summary summary.json -e \".*\.pb\.cc\" -e \".*\.pb\.h\" -e \".*unittest.*\" -e \".*sdk.*\" -e \".*logger.*\" -e \".*config_server.*\" -e \".*go_pipeline.*\" -e \".*application.*\" -e \".*runner.*\""
+        run: docker run -v $(pwd):$(pwd) unittest_coverage bash -c "cd $(pwd)/core && gcovr --gcov-ignore-errors=no_working_dir_found --root . --json coverage.json --json-summary-pretty --json-summary summary.json -e \".*\.pb\.cc\" -e \".*\.pb\.h\" -e \".*unittest.*\" -e \".*sdk.*\" -e \".*logger.*\" -e \".*config_server.*\" -e \".*go_pipeline.*\" -e \".*application.*\" -e \".*runner.*\""
 
       - name: Setup Python3.10
         uses: actions/setup-python@v5

diff --git a/core/unittest/ebpf/CMakeLists.txt b/core/unittest/ebpf/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.22)
 project(ebpf_unittest)
 
-add_executable(ebpf_server_unittest eBPFServerUnittest.cpp)
-target_link_libraries(ebpf_server_unittest ${UT_BASE_TARGET})
+# add_executable(ebpf_server_unittest eBPFServerUnittest.cpp)
+# target_link_libraries(ebpf_server_unittest ${UT_BASE_TARGET})
 
 include(GoogleTest)
 
-gtest_discover_tests(ebpf_server_unittest)
+# gtest_discover_tests(ebpf_server_unittest)
 
diff --git a/core/unittest/metadata/CMakeLists.txt b/core/unittest/metadata/CMakeLists.txt
@@ -15,8 +15,8 @@
 cmake_minimum_required(VERSION 3.22)
 project(metadata_unittest)
 
-add_executable(metadata_unittest K8sMetadataUnittest.cpp)
-target_link_libraries(metadata_unittest ${UT_BASE_TARGET})
+# add_executable(metadata_unittest K8sMetadataUnittest.cpp)
+# target_link_libraries(metadata_unittest ${UT_BASE_TARGET})
 
 include(GoogleTest)
-gtest_discover_tests(metadata_unittest)
+# gtest_discover_tests(metadata_unittest)
diff --git a/core/unittest/models/CMakeLists.txt b/core/unittest/models/CMakeLists.txt
@@ -39,8 +39,8 @@ target_link_libraries(pipeline_event_ptr_unittest ${UT_BASE_TARGET})
 add_executable(pipeline_event_group_unittest PipelineEventGroupUnittest.cpp)
 target_link_libraries(pipeline_event_group_unittest ${UT_BASE_TARGET})
 
-add_executable(event_pool_unittest EventPoolUnittest.cpp)
-target_link_libraries(event_pool_unittest ${UT_BASE_TARGET})
+# add_executable(event_pool_unittest EventPoolUnittest.cpp)
+# target_link_libraries(event_pool_unittest ${UT_BASE_TARGET})
 
 include(GoogleTest)
 gtest_discover_tests(pipeline_event_unittest)
@@ -51,7 +51,7 @@ gtest_discover_tests(span_event_unittest)
 gtest_discover_tests(raw_event_unittest)
 gtest_discover_tests(pipeline_event_ptr_unittest)
 gtest_discover_tests(pipeline_event_group_unittest)
-gtest_discover_tests(event_pool_unittest)
+# gtest_discover_tests(event_pool_unittest)
 
 add_executable(event_group_benchmark EventGroupBenchmark.cpp)
 target_link_libraries(event_group_benchmark ${UT_BASE_TARGET})
diff --git a/core/unittest/processor/CMakeLists.txt b/core/unittest/processor/CMakeLists.txt
@@ -54,12 +54,6 @@ target_link_libraries(processor_merge_multiline_log_native_unittest ${UT_BASE_TA
 add_executable(processor_parse_container_log_native_unittest ProcessorParseContainerLogNativeUnittest.cpp)
 target_link_libraries(processor_parse_container_log_native_unittest ${UT_BASE_TARGET})
 
-add_executable(parse_container_log_benchmark ParseContainerLogBenchmark.cpp)
-target_link_libraries(parse_container_log_benchmark ${UT_BASE_TARGET})
-
-add_executable(boost_regex_benchmark BoostRegexBenchmark.cpp)
-target_link_libraries(boost_regex_benchmark ${UT_BASE_TARGET})
-
 add_executable(processor_prom_parse_metric_native_unittest ProcessorPromParseMetricNativeUnittest.cpp)
 target_link_libraries(processor_prom_parse_metric_native_unittest unittest_base)
 
@@ -78,3 +72,9 @@ gtest_discover_tests(processor_desensitize_native_unittest)
 gtest_discover_tests(processor_merge_multiline_log_native_unittest)
 gtest_discover_tests(processor_parse_container_log_native_unittest)
 gtest_discover_tests(processor_prom_parse_metric_native_unittest)
+
+add_executable(boost_regex_benchmark BoostRegexBenchmark.cpp)
+target_link_libraries(boost_regex_benchmark ${UT_BASE_TARGET})
+
+add_executable(parse_container_log_benchmark ParseContainerLogBenchmark.cpp)
+target_link_libraries(parse_container_log_benchmark ${UT_BASE_TARGET})
diff --git a/core/unittest/prometheus/CMakeLists.txt b/core/unittest/prometheus/CMakeLists.txt
@@ -36,9 +36,6 @@ target_link_libraries(prometheus_input_runner_unittest ${UT_BASE_TARGET})
 add_executable(textparser_unittest TextParserUnittest.cpp)
 target_link_libraries(textparser_unittest ${UT_BASE_TARGET})
 
-add_executable(textparser_benchmark TextParserBenchmark.cpp)
-target_link_libraries(textparser_benchmark ${UT_BASE_TARGET})
-
 add_executable(scrape_config_unittest ScrapeConfigUnittest.cpp)
 target_link_libraries(scrape_config_unittest ${UT_BASE_TARGET})
 
@@ -57,7 +54,9 @@ gtest_discover_tests(scrape_scheduler_unittest)
 gtest_discover_tests(target_subscriber_scheduler_unittest)
 gtest_discover_tests(prometheus_input_runner_unittest)
 gtest_discover_tests(textparser_unittest)
-gtest_discover_tests(textparser_benchmark)
 gtest_discover_tests(scrape_config_unittest)
 gtest_discover_tests(prom_utils_unittest)
 gtest_discover_tests(prom_asyn_unittest)
+
+add_executable(textparser_benchmark TextParserBenchmark.cpp)
+target_link_libraries(textparser_benchmark ${UT_BASE_TARGET})
diff --git a/core/unittest/reader/CMakeLists.txt b/core/unittest/reader/CMakeLists.txt
@@ -36,8 +36,8 @@ target_link_libraries(source_buffer_unittest ${UT_BASE_TARGET})
 add_executable(get_last_line_data_unittest GetLastLineDataUnittest.cpp)
 target_link_libraries(get_last_line_data_unittest ${UT_BASE_TARGET})
 
-add_executable(force_read_unittest ForceReadUnittest.cpp)
-target_link_libraries(force_read_unittest ${UT_BASE_TARGET})
+# add_executable(force_read_unittest ForceReadUnittest.cpp)
+# target_link_libraries(force_read_unittest ${UT_BASE_TARGET})
 
 if (UNIX)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDataSet)
@@ -55,4 +55,4 @@ gtest_discover_tests(remove_last_incomplete_log_unittest)
 gtest_discover_tests(log_file_reader_unittest)
 gtest_discover_tests(source_buffer_unittest)
 gtest_discover_tests(get_last_line_data_unittest)
-gtest_discover_tests(force_read_unittest)
+# gtest_discover_tests(force_read_unittest)
diff --git a/core/unittest/spl/CMakeLists.txt b/core/unittest/spl/CMakeLists.txt
@@ -17,7 +17,10 @@ project(spl_unittest)
 
 
 add_executable(spl_unittest SplUnittest.cpp)
-add_executable(spl_benchmark_test SplBenchmark.cpp)
 target_link_libraries(spl_unittest ${UT_BASE_TARGET})
 
+include(GoogleTest)
+gtest_discover_tests(spl_unittest)
+
+add_executable(spl_benchmark_test SplBenchmark.cpp)
 target_link_libraries(spl_benchmark_test ${UT_BASE_TARGET})
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,4 +45,4 @@ RUN source /tmp/.env && rm /tmp/.env; \

		USER $USERNAME

		RUN go env -w GO111MODULE=on && go env -w GOPROXY=https://goproxy.cn,direct
		RUN go env -w GO111MODULE=on && go env -w GOPROXY=https://goproxy.cn,direct