Follow-up on #2178

This commit is contained in:
Sukchan Lee 2023-03-24 23:04:32 +09:00
parent 6f593432a4
commit 28d5659aa5
1 changed files with 5 additions and 7 deletions

View File

@ -345,6 +345,9 @@ ogs_metrics_spec_t *ogs_metrics_spec_new(
ogs_metrics_spec_t *spec; ogs_metrics_spec_t *spec;
unsigned int i; unsigned int i;
prom_histogram_buckets_t *buckets;
double *upper_bounds;
ogs_assert(name); ogs_assert(name);
ogs_assert(description); ogs_assert(description);
ogs_assert(num_labels <= MAX_LABELS); ogs_assert(num_labels <= MAX_LABELS);
@ -373,8 +376,8 @@ ogs_metrics_spec_t *ogs_metrics_spec_new(
spec->prom = prom_gauge_new(spec->name, spec->description, spec->prom = prom_gauge_new(spec->name, spec->description,
spec->num_labels, (const char **)spec->labels); spec->num_labels, (const char **)spec->labels);
break; break;
case OGS_METRICS_METRIC_TYPE_HISTOGRAM: { case OGS_METRICS_METRIC_TYPE_HISTOGRAM:
prom_histogram_buckets_t *buckets; ogs_assert(histogram_params);
switch (histogram_params->type) { switch (histogram_params->type) {
case OGS_METRICS_HISTOGRAM_BUCKET_TYPE_EXPONENTIAL: case OGS_METRICS_HISTOGRAM_BUCKET_TYPE_EXPONENTIAL:
buckets = prom_histogram_buckets_exponential(histogram_params->exp.start, buckets = prom_histogram_buckets_exponential(histogram_params->exp.start,
@ -387,9 +390,6 @@ ogs_metrics_spec_t *ogs_metrics_spec_new(
ogs_assert(buckets); ogs_assert(buckets);
break; break;
case OGS_METRICS_HISTOGRAM_BUCKET_TYPE_VARIABLE: case OGS_METRICS_HISTOGRAM_BUCKET_TYPE_VARIABLE:
{
double *upper_bounds;
buckets = (prom_histogram_buckets_t *)prom_malloc(sizeof(prom_histogram_buckets_t)); buckets = (prom_histogram_buckets_t *)prom_malloc(sizeof(prom_histogram_buckets_t));
ogs_assert(buckets); ogs_assert(buckets);
@ -406,7 +406,6 @@ ogs_metrics_spec_t *ogs_metrics_spec_new(
} }
buckets->upper_bounds = upper_bounds; buckets->upper_bounds = upper_bounds;
break; break;
}
default: default:
ogs_assert_if_reached(); ogs_assert_if_reached();
break; break;
@ -415,7 +414,6 @@ ogs_metrics_spec_t *ogs_metrics_spec_new(
buckets, spec->num_labels, (const char **)spec->labels); buckets, spec->num_labels, (const char **)spec->labels);
ogs_assert(spec->prom); ogs_assert(spec->prom);
break; break;
}
default: default:
ogs_assert_if_reached(); ogs_assert_if_reached();
break; break;