Skip to content

Commit c4713dd

Browse files
committed
update singleton service name and fix ut
1 parent 3d22141 commit c4713dd

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

Diff for: core/app_config/AppConfig.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ DEFINE_FLAG_STRING(operator_service, "loong collector operator service", "");
129129
DEFINE_FLAG_INT32(operator_service_port, "loong collector operator service port", 8888);
130130
DEFINE_FLAG_INT32(k8s_meta_service_port, "loong collector operator service port", 9000);
131131

132-
DEFINE_FLAG_STRING(singleton_service, "loong collector singleton service", "loongcollector-singleton");
133-
DEFINE_FLAG_INT32(singleton_port, "loong collector singleton service port", 8899);
132+
DEFINE_FLAG_STRING(k8s_metadata_server_name,
133+
"loong collector singleton service for k8s metadata server",
134+
"loongcollector-singleton");
135+
DEFINE_FLAG_INT32(k8s_metadata_server_port, "loong collector singleton service port for k8s metadata server", 8899);
134136
DEFINE_FLAG_STRING(_pod_name_, "agent pod name", "");
135137

136138
DEFINE_FLAG_STRING(app_info_file, "", "app_info.json");

Diff for: core/metadata/K8sMetadata.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ K8sMetadata::~K8sMetadata() {
8585

8686
K8sMetadata::K8sMetadata(size_t ipCacheSize, size_t cidCacheSize, size_t externalIpCacheSize)
8787
: mIpCache(ipCacheSize, 20), mContainerCache(cidCacheSize, 20), mExternalIpCache(externalIpCacheSize, 20) {
88-
mServiceHost = STRING_FLAG(singleton_service);
89-
mServicePort = INT32_FLAG(singleton_port);
88+
mServiceHost = STRING_FLAG(k8s_metadata_server_name);
89+
mServicePort = INT32_FLAG(k8s_metadata_server_port);
9090
const char* value = getenv("_node_ip_");
9191
if (value != nullptr) {
9292
mHostIp = StringTo<string>(value);

Diff for: core/metadata/K8sMetadata.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "monitor/metric_models/MetricRecord.h"
3636
#include "monitor/metric_models/MetricTypes.h"
3737

38-
DECLARE_FLAG_STRING(singleton_service);
39-
DECLARE_FLAG_INT32(singleton_port);
38+
DECLARE_FLAG_STRING(k8s_metadata_server_name);
39+
DECLARE_FLAG_INT32(k8s_metadata_server_port);
4040

4141
namespace logtail {
4242

Diff for: core/unittest/config/PipelineConfigWatcherUnittest.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828

2929
using namespace std;
3030

31+
DECLARE_FLAG_BOOL(enable_ebpf_network_secure);
32+
DECLARE_FLAG_BOOL(enable_ebpf_file_secure);
33+
DECLARE_FLAG_BOOL(enable_ebpf_process_secure);
34+
DECLARE_FLAG_BOOL(enable_ebpf_network_observer);
35+
3136
namespace logtail {
3237

3338
class PipelineConfigWatcherUnittest : public testing::Test {
@@ -39,6 +44,10 @@ class PipelineConfigWatcherUnittest : public testing::Test {
3944

4045
protected:
4146
static void SetUpTestCase() {
47+
FLAGS_enable_ebpf_network_observer = true;
48+
FLAGS_enable_ebpf_process_secure = true;
49+
FLAGS_enable_ebpf_file_secure = true;
50+
FLAGS_enable_ebpf_network_secure = true;
4251
PluginRegistry::GetInstance()->LoadPlugins();
4352
PipelineConfigWatcher::GetInstance()->SetPipelineManager(PipelineManagerMock::GetInstance());
4453
}

0 commit comments

Comments
 (0)