diff options
| author | yangwei <[email protected]> | 2024-07-15 11:37:32 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2024-07-16 10:31:31 +0800 |
| commit | 8e9bfb8721cf71f4062d91e840006bccea0d82d6 (patch) | |
| tree | 45b7c6ebea321ed30ebf9912cb49cf46d06e57bb | |
| parent | b7801737151e31c117a41c6354e56b91dd38ae50 (diff) | |
🐞 fix(rename histogram API ): API from histogram to distribution
| -rw-r--r-- | inc/fieldstat.h | 2 | ||||
| -rw-r--r-- | src/fieldstat.cpp | 8 | ||||
| -rw-r--r-- | test/fieldstat_test.cpp | 4 | ||||
| -rw-r--r-- | test/src/gtest_fieldstat_interface.cpp | 10 | ||||
| -rw-r--r-- | test/src/gtest_fieldstat_output.cpp | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/inc/fieldstat.h b/inc/fieldstat.h index 7e6327a..4d38bf3 100644 --- a/inc/fieldstat.h +++ b/inc/fieldstat.h @@ -173,7 +173,7 @@ void fieldstat_passive_output(struct fieldstat_instance *instance); * @param output_window The of output data. 1: output the data in the time interval window, 0: output data all the time. * @return metric id: -1 is failed, >= 0 is success */ -int fieldstat_register_histogram(struct fieldstat_instance *instance, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag, +int fieldstat_register_distribution(struct fieldstat_instance *instance, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag, const char *upper_inclusive_bounds, const long long lowest_trackable_value, long long highest_trackable_value, int significant_figures, int output_window); /** diff --git a/src/fieldstat.cpp b/src/fieldstat.cpp index fed711c..53d64a3 100644 --- a/src/fieldstat.cpp +++ b/src/fieldstat.cpp @@ -1118,7 +1118,7 @@ error_out: } -static int fieldstat_register_histogram_and_summary(struct fieldstat_instance *instance, enum field_type type, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag, +static int fieldstat_register_histogram(struct fieldstat_instance *instance, enum field_type type, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag, const char * bins, long long lowest_trackable_value, long long highest_trackable_value, int significant_figures, int output_window) { struct metric *metric = NULL; @@ -1181,17 +1181,17 @@ static int fieldstat_register_histogram_and_summary(struct fieldstat_instance *i } -int fieldstat_register_histogram(struct fieldstat_instance *instance, const char *field_name,const struct fieldstat_tag tags[], size_t n_tag, +int fieldstat_register_distribution(struct fieldstat_instance *instance, const char *field_name,const struct fieldstat_tag tags[], size_t n_tag, const char * bins, long long lowest_trackable_value, long long highest_trackable_value, int significant_figures, int output_window) { - return fieldstat_register_histogram_and_summary(instance, FILED_TYPE_HISTOGRAM, field_name, tags, n_tag, + return fieldstat_register_histogram(instance, FILED_TYPE_HISTOGRAM, field_name, tags, n_tag, bins, lowest_trackable_value, highest_trackable_value, significant_figures, output_window); } int fieldstat_register_summary(struct fieldstat_instance *instance, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag, const char * bins, long long lowest_trackable_value, long long highest_trackable_value, int significant_figures, int output_window) { - return fieldstat_register_histogram_and_summary(instance, FIELD_TYPE_SUMMARY, field_name, tags, n_tag, + return fieldstat_register_histogram(instance, FIELD_TYPE_SUMMARY, field_name, tags, n_tag, bins, lowest_trackable_value, highest_trackable_value, significant_figures, output_window); } diff --git a/test/fieldstat_test.cpp b/test/fieldstat_test.cpp index 003d367..95fa11b 100644 --- a/test/fieldstat_test.cpp +++ b/test/fieldstat_test.cpp @@ -98,7 +98,7 @@ 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, 0); + fieldstat_register_distribution(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); @@ -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, 0); + ret = fieldstat_register_distribution(instance, "htr", NULL, 0, bins_htr, 1, 1000, 2, 0); if(ret == -1) { printf("Failed ot register htr, type = histogram\n"); diff --git a/test/src/gtest_fieldstat_interface.cpp b/test/src/gtest_fieldstat_interface.cpp index 95c9e65..eb236b7 100644 --- a/test/src/gtest_fieldstat_interface.cpp +++ b/test/src/gtest_fieldstat_interface.cpp @@ -649,19 +649,19 @@ TEST(FeildStatAPI, RegisterHistogram) instance = fieldstat_instance_new("maat"); - ret = fieldstat_register_histogram(instance, "latency", NULL, 0, quantiles, 1, 5, 2, 0); + ret = fieldstat_register_distribution(instance, "latency", NULL, 0, quantiles, 1, 5, 2, 0); EXPECT_EQ(0, ret); - ret = fieldstat_register_histogram(instance, "latency", NULL, 0, quantiles, -1, 5, 2, 0); + ret = fieldstat_register_distribution(instance, "latency", NULL, 0, quantiles, -1, 5, 2, 0); EXPECT_EQ(-1, ret); - ret = fieldstat_register_histogram(instance, "latency", NULL, 0, quantiles, 2, 3, 2, 0); + ret = fieldstat_register_distribution(instance, "latency", NULL, 0, quantiles, 2, 3, 2, 0); EXPECT_EQ(-1, ret); - ret = fieldstat_register_histogram(instance, "latency", NULL, 0, quantiles, 1, 5, 10, 0); + ret = fieldstat_register_distribution(instance, "latency", NULL, 0, quantiles, 1, 5, 10, 0); EXPECT_EQ(-1, ret); - ret = fieldstat_register_histogram(instance, "latency", NULL, 0, quantiles, 1, 5, 2, 2); + ret = fieldstat_register_distribution(instance, "latency", NULL, 0, quantiles, 1, 5, 2, 2); EXPECT_EQ(-1, ret); fieldstat_instance_free(instance); diff --git a/test/src/gtest_fieldstat_output.cpp b/test/src/gtest_fieldstat_output.cpp index 198875a..4faa5e5 100644 --- a/test/src/gtest_fieldstat_output.cpp +++ b/test/src/gtest_fieldstat_output.cpp @@ -615,7 +615,7 @@ TEST(FeildStatOutput, HistogramOutputFile) struct fieldstat_instance *instance = fieldstat_instance_new("maat"); fieldstat_set_local_output(instance, "/tmp/fieldstat.txt", "default"); - metric_id = fieldstat_register_histogram(instance, "hit_rate", NULL, 0, + metric_id = fieldstat_register_distribution(instance, "hit_rate", NULL, 0, upper_inclusive_bounds, 1, 100, 2, 0); EXPECT_EQ(0, metric_id); fieldstat_instance_start(instance); @@ -669,7 +669,7 @@ TEST(FeildStatOutput, HistogramOutputLineProtocol) instance = fieldstat_instance_new("maat"); fieldstat_set_line_protocol_server(instance, "127.0.0.1", 8700); - metric_id = fieldstat_register_histogram(instance, "hit_rate", NULL, 0, + metric_id = fieldstat_register_distribution(instance, "hit_rate", NULL, 0, upper_inclusive_bounds, 1, 100, 2, 0); EXPECT_EQ(0, metric_id); fieldstat_instance_start(instance); @@ -737,7 +737,7 @@ TEST(FeildStatOutput, HistogramOutputPrometheus) instance = fieldstat_instance_new("maat"); fieldstat_global_enable_prometheus_endpoint(9024, NULL); fieldstat_enable_prometheus_output(instance); - metric_id = fieldstat_register_histogram(instance, "hit_rate", NULL, 0, + metric_id = fieldstat_register_distribution(instance, "hit_rate", NULL, 0, upper_inclusive_bounds, 1, 100, 2, 0); EXPECT_EQ(0, metric_id); fieldstat_instance_start(instance); |
