feature:summay和histogram注册接口新增output_window参数

3 files changed, 42 insertions, 8 deletions

diff --git a/test/fieldstat_test.cpp b/test/fieldstat_test.cpp
index 311f461..003d367 100644
--- a/test/fieldstat_test.cpp
+++ b/test/fieldstat_test.cpp
@@ -98,11 +98,11 @@ static void* dynamic_register(void* arg)
 
 		memset(name, 0, sizeof(name));
 		snprintf(name, sizeof(name), "summary_%d_%d", loops, rand()%10000);
-		fieldstat_register_histogram(instance, name, tags, 1, bins_htr, 1, 10000, 2);
+		fieldstat_register_histogram(instance, name, tags, 1, bins_htr, 1, 10000, 2, 0);
 
 		memset(name, 0, sizeof(name));
 		snprintf(name, sizeof(name), "histogram_%d_%d", loops, rand()%10000);
-		fieldstat_register_summary(instance, name, tags, 1, bins_sar,1,10000,2);
+		fieldstat_register_summary(instance, name, tags, 1, bins_sar,1,10000,2, 1);
 
 		memset(name, 0, sizeof(name));
 		snprintf(name, sizeof(name), "shp_%d_%d", loops, rand()%10000);
@@ -266,7 +266,7 @@ int test_register_by_fieldstat_type(struct fieldstat_instance *instance)
 
 //Register histogram and summary start
 	const char * bins_htr = "10,20,30,40,50,60,70,80,90";
-	ret = fieldstat_register_histogram(instance, "htr", NULL, 0, bins_htr, 1, 1000, 2);
+	ret = fieldstat_register_histogram(instance, "htr", NULL, 0, bins_htr, 1, 1000, 2, 0);
 	if(ret == -1)
 	{
 		printf("Failed ot register htr, type = histogram\n");
@@ -274,7 +274,7 @@ int test_register_by_fieldstat_type(struct fieldstat_instance *instance)
 	}
 	g_histogram_id = ret;
 	const char * bins_sar = "0.1,0.5,0.8,0.9,0.95,0.99";
-	ret = fieldstat_register_summary(instance, "sar", NULL, 0, bins_sar, 1, 1000, 2);
+	ret = fieldstat_register_summary(instance, "sar", NULL, 0, bins_sar, 1, 1000, 2, 0);
 	if(ret == -1)
 	{
 		printf("Failed ot register sar, type = summary\n");
diff --git a/test/src/gtest_dynamic_fieldstat.cpp b/test/src/gtest_dynamic_fieldstat.cpp
index 994df26..6bdf643 100644
--- a/test/src/gtest_dynamic_fieldstat.cpp
+++ b/test/src/gtest_dynamic_fieldstat.cpp
@@ -601,13 +601,15 @@ void parse_telegraf_cjson_output(const char *compare)
 
 //{"fields":{"Active_sessions":10},"name":"Active_sessions","tags":{"app_name":"firewall","host":"developer-testing-41.22"},"timestamp":1679308196}
 //{"fields":{"Active_sessions":10},"name":"Active_sessions","tags":{"app_name":"firewall"}}
-
+	if(strlen(line) == 0)
+	{
+		return;
+	}
 	cJSON *cjson_metric = NULL;
 	cJSON *cjson_tags = NULL;
-
 	cjson_metric = cJSON_Parse(line);
 	EXPECT_NE(nullptr, cjson_metric);
-	cJSON_DeleteItemFromObject(cjson_metric ,"timestamp");
+	cJSON_DeleteItemFromObject(cjson_metric, "timestamp");
 
 	cjson_tags = cJSON_GetObjectItem(cjson_metric, "tags");
 	EXPECT_NE(nullptr, cjson_tags);
@@ -1043,6 +1045,10 @@ void parse_telegraf_cjson_output_not_equal(const char *compare)
 	}
 	fclose(fp);
 
+	if(strlen(line) == 0)
+	{
+		return;
+	}
 
 	cJSON *cjson_metric = NULL;
 	cJSON *cjson_tags = NULL;
diff --git a/test/src/gtest_fieldstat.cpp b/test/src/gtest_fieldstat.cpp
index cf99443..da1e8a5 100644
--- a/test/src/gtest_fieldstat.cpp
+++ b/test/src/gtest_fieldstat.cpp
@@ -215,13 +215,41 @@ TEST(FieldStatAPI, FieldStatRegisterTableMetrics)
 
 	instance = fieldstat_instance_new("test");
 	EXPECT_STREQ("test", instance->name);
-
 	table_id = fieldstat_register_table(instance, sc_table_name, sc_column_name, sc_column_type, sizeof(sc_column_name)/sizeof(sc_column_name[0]));
 	EXPECT_EQ(0, table_id);
 	fieldstat_instance_free(instance);
 }
 
 
+TEST(FeildStatAPI, FieldStatLocalOutputFormatJson)
+{
+	int metric_id = -1;
+	int ret_set_local_output = 0;
+	struct fieldstat_instance * instance = NULL;
+	int ret = 0;
+
+	instance = fieldstat_instance_new("test");
+	EXPECT_STREQ("test", instance->name);
+
+	metric_id = fieldstat_register(instance, FIELD_TYPE_COUNTER, "Traffic_bytes",NULL,0);
+	EXPECT_EQ(0, metric_id);
+
+	ret_set_local_output = fieldstat_set_local_output(instance,"test.json","json");
+	EXPECT_EQ(0, ret_set_local_output);
+	instance->running = 1;
+
+	ret = fieldstat_value_incrby(instance, metric_id, 10);
+	EXPECT_EQ(0, ret);
+	fieldstat_passive_output(instance);
+	sleep(1);
+	ret = fieldstat_value_incrby(instance, metric_id, 10);
+	sleep(1);
+	fieldstat_passive_output(instance);
+	EXPECT_EQ(0, ret);
+	instance->running = 0;
+	fieldstat_instance_free(instance);	
+}
+
 int main(int argc, char *argv[]) 
 {
 	testing::InitGoogleTest(&argc, argv);